@leverege/build-tools 2.1.0 → 2.1.2

package/lib/web/dnsify/index.js

@@ -5,6 +5,8 @@ require("core-js/modules/es.symbol");
 
 require("core-js/modules/es.array.filter");
 
+require("core-js/modules/es.array.for-each");
+
 require("core-js/modules/es.object.get-own-property-descriptor");
 
 require("core-js/modules/es.object.get-own-property-descriptors");
@@ -21,7 +23,7 @@ require("regenerator-runtime/runtime");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/lib/web/packleate/Packleator.js

@@ -6,6 +6,8 @@ require("core-js/modules/es.array.concat");
 
 require("core-js/modules/es.array.filter");
 
+require("core-js/modules/es.array.for-each");
+
 require("core-js/modules/es.array.index-of");
 
 require("core-js/modules/es.array.iterator");
@@ -46,7 +48,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 

package/lib/web/packleate/index.js

@@ -5,6 +5,8 @@ require("core-js/modules/es.symbol");
 
 require("core-js/modules/es.array.filter");
 
+require("core-js/modules/es.array.for-each");
+
 require("core-js/modules/es.object.get-own-property-descriptor");
 
 require("core-js/modules/es.object.get-own-property-descriptors");
@@ -21,7 +23,7 @@ require("regenerator-runtime/runtime");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/package.json

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

package/src/dockreate

@@ -122,6 +122,11 @@ alias inf='wget -q -O- localhost:5111/logLevel/info'
 alias err='wget -q -O- localhost:5111/logLevel/error'
 alias wrn='wget -q -O- localhost:5111/logLevel/warn'
 
+cmetrics()
+{
+  wget -qO- localhost:5111/metrics
+}
+
 cmstat()
 {
   wget -qO- localhost:5111\${1}

package/src/helmup

@@ -60,7 +60,57 @@ function checkMonitoringNS(){
   fi
 }
 
+function upgradeMonitoringCharts(){
+  if [[ `git status --porcelain` ]];
+  then
+    cat<<DIRTYGIT
+
+$RED_ERROR This git repo must be clean before we can do the monitoring
+          upgrade so either commit or stash and rerun.
+
+`git status`
+
+DIRTYGIT
+    exit 1
+  fi
+
+  if [ -f values-monitoring.yaml ] || [ -d monitoring ];
+  then
+    rm -rf values-monitoring.yaml monitoring
+    git add -A
+  fi
+
+  # blow away the existing deployment
+  helm delete --purge monitoring
+
+  # Make certain the baseline branch is up to date
+  git fetch origin new-baseline:new-baseline
+
+  NEWMON="elasticsearch-exporter grafana prometheus stackdriver-exporter"
+  for SOURCE in $NEWMON;
+  do
+    printf "Grabbing $SOURCE from new-baseline\n"
+    git checkout --quiet new-baseline $SOURCE
+  done
+
+  cat<<RERUN
+  
+`git status`
+
+$GREEN_INFO Make certain the staged mods to this git repo are committed and
+         pushed so things don't get twisted up and sad.
+
+$GREEN_INFO Preparing to rerun overwhelm before continuing with the upgrade.
+
+         Hit return to coninue...
+RERUN
+
+  read ANS && overwhelm
+}
+
 function installMonitoringCharts(){
+  upgradeMonitoringCharts
+
   ## Set the project id by parsing current context
   currContext=`kubectl config current-context`
    
@@ -95,19 +145,31 @@ function installMonitoringCharts(){
     --namespace monitoring \
     -f grafana/values-grafana.yaml \
     --version 5.0.3
+}
+
+function monitoringHelp(){
+  MONPASS=`kubectl get secret --namespace monitoring grafana -o jsonpath='{.data.admin-password}' | base64 --decode`
 
-  ## Print out instructions
-  printf "\n$GREEN_INFO To access prometheus =>\n\n"
-  printf "Prometheus Server (manage targets, configs, alerts): \n
+  cat<<ACCESS
+  `color g "Proxy to Prometheus (manage targets, configs, alerts):"`
     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"
+    kubectl --namespace monitoring port-forward \$POD_NAME 9090
 
-  printf "Alertmanager (manage alert notification, silences): \n
+  `color g "Proxy to Alertmanager (manage alert notification, silences):"`
     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"
+    kubectl --namespace monitoring port-forward \$POD_NAME 9093
+
+  `color g "Proxy to Grafana (the charts you're looking for):"`
+    export GRAFANA_POD=\$(kubectl --namespace monitoring get pods -l 'app.kubernetes.io/instance=grafana' -o jsonpath='{.items[0].metadata.name}')
+    kubectl --namespace monitoring port-forward \$GRAFANA_POD 3000 &
+    sleep 2; open http://localhost:3000/d/stackdriver/stackdriver?orgId=1
 
-  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"
+  `color toast "Save monitoring login to Keeweb"`   => `color r "admin / $MONPASS"`
+
+  `color g "Show this helpful message again with"` => `color r "helmup monitoring-wtf"`
+
+ACCESS
+  exit 0
 }
 
 function createSSDYAML(){
@@ -249,28 +311,6 @@ 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
 
@@ -311,6 +351,11 @@ function doInstall() {
       "monitoring")
         checkMonitoringNS
         installMonitoringCharts
+        monitoringHelp
+        ;;
+
+      "monitoring-wtf")
+        monitoringHelp
         ;;
 
       "mysql")
@@ -399,9 +444,21 @@ NOTRUNNING
     esac
   done
 
-  printf "\nRunning => helm ls\n\n"
-  helm ls
+  printf "\nCheck helm deployment status by running => `color g helm\ ls`\n\n"
 }
 
 doInstall $@
 cd - &> /dev/null
+
+OLD_MONITORING="${GITTOP}/values-monitoring.yaml"
+if [ -f "$OLD_MONITORING" ];
+then
+  cat<<OLDMON
+
+$YELO_WARN The old monitoring setup has been detected.
+            Upgrade by running => `color g "helmup monitoring"`
+
+OLDMON
+  exit 1
+fi 
+