@leverege/build-tools 2.0.13 → 2.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "A package for development build tools.",
   "main": "index.js",
   "scripts": {

package/src/helmup

@@ -44,6 +44,7 @@ function color() {
 }
 RED_ERROR=`color r '***ERROR:'`
 YELO_WARN="`color y '***WARNING:'`"
+GREEN_INFO=`color g '***INFO:'`
 
 function setOrUnset() {
   local setting=`color toast "NEEDS TO BE SET"`
@@ -78,25 +79,35 @@ function installMonitoringCharts(){
   fi
 
   ## Install Prometheus
-  helm upgrade --install prometheus --namespace monitoring stable/prometheus -f prometheus/values.yaml
+  helm upgrade --install prometheus stable/prometheus \
+    --namespace monitoring \
+    -f prometheus/values.yaml \
+    --version 11.0.0
 
   ## Installing ES exporter
   helm upgrade --install elasticsearch-exporter stable/elasticsearch-exporter \
     --namespace monitoring \
-    --set-string service.annotations."prometheus\.io/port"="9108" \
-    --set-string service.annotations."prometheus\.io/scrape"="true" \ 
-    --set es.uri="http://databases-elasticsearch.default.svc.cluster.local:9200" \
+    -f elasticsearch-exporter/values-es-exporter.yaml \
     --version 3.0.0
 
   ## Install Grafana  
   helm upgrade --install grafana stable/grafana \
     --namespace monitoring \
-    --set service.type="NodePort" \
-    --set service.port="9000" \
-    --set persistence.enabled="true" \
-    --set persistence.storageClassName="ssd" \
+    -f grafana/values-grafana.yaml \
     --version 5.0.3
-  
+
+  ## Print out instructions
+  printf "\n$GREEN_INFO To access prometheus =>\n\n"
+  printf "Prometheus Server (manage targets, configs, alerts): \n
+    export POD_NAME=\$(kubectl get pods --namespace monitoring -l 'app=prometheus,component=server' -o jsonpath='{.items[0].metadata.name}')
+    kubectl --namespace monitoring port-forward \$POD_NAME 9090\n\n"
+
+  printf "Alertmanager (manage alert notification, silences): \n
+    export POD_NAME=\$(kubectl get pods --namespace monitoring -l 'app=prometheus,component=alertmanager' -o jsonpath='{.items[0].metadata.name}')
+    kubectl --namespace monitoring port-forward \$POD_NAME 9093\n\n"
+
+  printf "$YELO_WARN Save Grafana password to Keeweb if you haven't already & create ingress\n\n"
+  printf "  kubectl get secret --namespace monitoring grafana -o jsonpath='{.data.admin-password}' | base64 --decode ; echo\n\n"
 }
 
 function createSSDYAML(){
@@ -238,6 +249,28 @@ EOK8S
   exit 1
 fi
 
+OLD_MONITORING="${GITTOP}/values-monitoring.yaml"
+if [ -f "$OLD_MONITORING" ];
+then
+  cat<<OLDMON
+
+$RED_ERROR Old monitoring setup detected
+
+  Monitoring now runs in the monitoring namespace, centrally managed via helmup.
+  
+  To migrate to the new setup:
+  1) Delete values-monitoring.yaml
+  2) Grab prometheus/values-local.yaml from master branch (modify as needed for opsgenie config)
+  3) Grab stackdriver-exporter/values-local.yaml from master branch
+  4) Create grafana dir => add .nohelm and values-grafana.yaml
+  5) Create elasticsearch-exporter dir => add .nohelm and values-es-exporter.yaml
+
+  Now run helmup monitoring and follow directions. 
+
+OLDMON
+  exit 1
+fi 
+
 npm run ahoy
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1