@leverege/build-tools 2.0.11 → 2.0.13

package/lib/web/dnsify/index.js

@@ -5,8 +5,6 @@ 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");
@@ -23,7 +21,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(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 _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 _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,8 +6,6 @@ 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");
@@ -48,7 +46,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(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 _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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 

package/lib/web/packleate/index.js

@@ -5,8 +5,6 @@ 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");
@@ -23,7 +21,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(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 _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 _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.0.11",
+  "version": "2.0.13",
   "description": "A package for development build tools.",
   "main": "index.js",
   "scripts": {

package/src/decrypt-secrets

@@ -66,8 +66,13 @@ if [ "$CIRCLECI" == "true" ]; then
   initialize_gcloud
 fi
 
-# Attempt to grab org name from git remote origin
-git_orgname=`git config --get remote.origin.url | cut -d ":" -f 2 | cut -d "/" -f 1`
+git_origin=`git config --get remote.origin.url`
+
+if [[ $git_origin = https* ]]; then
+    git_orgname=`echo $git_origin | cut -d "@" -f 2 | cut -d "/" -f 2`
+else
+    git_orgname=`echo $git_origin | cut -d ":" -f 2 | cut -d "/" -f 1`
+fi
 
 # Set project based on org name
 printf "\nDetecting organization name...\n"

package/src/encrypt-secrets

@@ -10,7 +10,13 @@ if [ "$1" == "-h" ]; then
 fi
 
 # Attempt to grab org name from git remote origin
-git_orgname=`git config --get remote.origin.url | cut -d ":" -f 2 | cut -d "/" -f 1`
+git_origin=`git config --get remote.origin.url`
+
+if [[ $git_origin = https* ]]; then
+    git_orgname=`echo $git_origin | cut -d "@" -f 2 | cut -d "/" -f 2`
+else
+    git_orgname=`echo $git_origin | cut -d ":" -f 2 | cut -d "/" -f 1`
+fi
 
 # Set project based on org name
 printf "\nDetecting organization name...\n"

package/src/helmup

@@ -51,6 +51,53 @@ function setOrUnset() {
   echo "$setting"
 }
 
+function checkMonitoringNS(){
+  kubectl get namespace monitoring
+  if [[ $? -eq 1 ]]; then
+    printf "\n*** Creating monitoring namespace ***\n\n"
+    kubectl create namespace monitoring
+  fi
+}
+
+function installMonitoringCharts(){
+  ## Set the project id by parsing current context
+  currContext=`kubectl config current-context`
+   
+  IFS='_'
+  read -ra ADDR <<< "$currContext" 
+
+  [[ ${ADDR[0]} == "gke" ]] && IS_GKE=true || IS_GKE=false
+
+  ## Installing stackdriver exporter in GKE
+  if [[ "$IS_GKE" = true ]]; then
+    helm upgrade --install stackdriver-exporter \
+      stable/stackdriver-exporter \
+      --namespace monitoring \
+      -f stackdriver-exporter/values.yaml \
+      --version 1.2.2
+  fi
+
+  ## Install Prometheus
+  helm upgrade --install prometheus --namespace monitoring stable/prometheus -f prometheus/values.yaml
+
+  ## 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" \
+    --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" \
+    --version 5.0.3
+  
+}
 
 function createSSDYAML(){
   cat<<EOSSD > ${K8S_UTILS}/ssd-storageclass.yaml
@@ -229,7 +276,8 @@ function doInstall() {
         ;;
 
       "monitoring")
-        helm dep up ./monitoring && helm upgrade --install monitoring ./monitoring
+        checkMonitoringNS
+        installMonitoringCharts
         ;;
 
       "mysql")