@leverege/build-tools 2.42.3 → 2.43.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.42.3",
+  "version": "2.43.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/helm-charts/elasticsearch8/helmup.plugin

@@ -13,3 +13,20 @@ helm upgrade --install elasticsearch8 bitnami/elasticsearch \
   --values $LOCAL_ES_VALUES $HELM_WHAT
 
 removeHelmRepo bitnami
+
+## Installing ES8 exporter
+addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
+helm upgrade --install elasticsearch8-exporter prometheus-community/prometheus-elasticsearch-exporter \
+  --namespace monitoring \
+  --version 5 \
+  -f - <<ELASTIC8_EXPORTER_CHART_MOD
+fullnameOverride: elasticsearch8-exporter
+
+service:
+  annotations:
+    prometheus.io/port: "9108"
+    prometheus.io/scrape: "true"
+es:
+  uri: http://elasticsearch8.elastic.svc.cluster.local:9200
+ELASTIC8_EXPORTER_CHART_MOD
+removeHelmRepo prometheus-community

package/src/helmup.sh

@@ -51,7 +51,7 @@ SYSTEM=(
 
 function isLeveregeService() {
   local answer=0
-  [[ ${PLATFORM[@]} =~ $1 || ${AUXILIARY[@]} =~ $1 ]] && answer=1
+  [[ ${PLATFORM[@]} =~ $1 || ${AUXILIARY[@]} =~ $1 || ${SYSTEM[@]} =~ $1 ]] && answer=1
   echo $answer
 }
 
@@ -271,6 +271,8 @@ function installMonitoringEnvironment() {
     --namespace monitoring \
     --version 5 \
     -f - <<ELASTIC_EXPORTER_CHART_MOD
+fullnameOverride: elasticsearch8-exporter
+
 service:
   annotations:
     prometheus.io/port: "9108"
@@ -634,7 +636,7 @@ function doInstall() {
     [ "$INVOKED_AS" == "helmwhat" ] && HELM_WHAT="--dry-run --debug"
 
     # helminit is used to redeploy an existing service
-    if [ "$INVOKED_AS" == "helminit" ] && [ -f "$SERVICE/helmup.plugin" ];
+    if [ "$INVOKED_AS" == "helminit" ] && [[ $(isLeveregeService $SERVICE) -eq 1 ]];
     then
       yesToContinue "if are you `color y certain` you want to run `color y helminit`"
       local BACKUP_DIR="$SERVICE-bak"

package/src/helm-charts/elasticsearch/elasticsearch-local.yaml

@@ -1,38 +0,0 @@
-# Foundation Chart: https://artifacthub.io/packages/helm/elastic/elasticsearch
-#
-# esJavaOpts: "" # example: "-Xmx1g -Xms1g"
-# 
-# resources:
-#   requests:
-#     cpu: "1000m"
-#     memory: "2Gi"
-#   limits:
-#     cpu: "1000m"
-#     memory: "2Gi"
-
-tolerations:
-- key: "database"
-  operator: "Equal"
-  value: "true"
-  effect: "NoSchedule"
-
-nodeAffinity:
-  requiredDuringSchedulingIgnoredDuringExecution:
-    nodeSelectorTerms:
-    - matchExpressions:
-      - key: target-env
-        operator: In
-        values:
-        - database
-
-# RecovR Prd Settings - very beefy on an n2-standard-8
-#
-# esJavaOpts: "-Xmx8g -Xms8g"
-# 
-# resources:
-#   requests:
-#     cpu: "6250m"
-#     memory: "16Gi"
-#   limits:
-#     cpu: "6750m"
-#     memory: "20Gi"

package/src/helm-charts/elasticsearch/helmup.plugin

@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# Do not move to 7.17+ until the memory explosion problem is resolved
-#
-showInstalling "Elastic Search"
-
-LOCAL_ES_VALUES="elasticsearch/elasticsearch-local.yaml"
-[ ! -f "$LOCAL_ES_VALUES" ] && exitOnError 1 "Missing the local ES config file => `color y $LOCAL_ES_VALUES`"
-
-addHelmRepo elastic https://helm.elastic.co
-helm upgrade --install elasticsearch leverege/elasticsearch \
-  --version 7.16 \
-  --values $LOCAL_ES_VALUES \
-  --set volumeClaimTemplate.storageClassName="ssd" $HELM_WHAT
-
-removeHelmRepo elastic

package/src/helm-charts/elasticsearch-cluster/elasticsearch-client.yaml

@@ -1,51 +0,0 @@
-# client / coordinating nodes - smart load balancers
-nodeGroup: "client"
-clusterName: "elasticsearch"
-
-#esJavaOpts: "-Xmx1g -Xms1g"
-#
-resources:
-  limits:            #
-    cpu:             #  1000m default
-    memory: "2Gi"    #  2Gi
-  requests:          # values.yaml defaults
-    cpu: "200m"      #  1000m
-    memory: "1500Mi" #  2Gi
-
-volumeClaimTemplate:
-  storageClassName: "ssd"
-  resources:
-    requests:
-      storage: "1Gi"
-
-roles:    # client / coordinator
-  master: "false"
-  ingest: "false"
-  data: "false"
-  remote_cluster_client: "false"
-  ml: "false"
-
-replicas: 3
-antiAffinity: "hard" # hard is default
-
-esConfig:
-  elasticsearch.yml: |
-    xpack.security.enabled: false
-
-persistence:
-  enabled: false
-
-tolerations:
-- key: "elastic"
-  operator: "Equal"
-  value: "true"
-  effect: "NoSchedule"
-
-nodeAffinity:
-  requiredDuringSchedulingIgnoredDuringExecution:
-    nodeSelectorTerms:
-    - matchExpressions:
-      - key: target-env
-        operator: In
-        values:
-        - elastic

package/src/helm-charts/elasticsearch-cluster/elasticsearch-data.yaml

@@ -1,51 +0,0 @@
-# 
-nodeGroup: "data"
-clusterName: "elasticsearch"
-
-esJavaOpts: "-Xmx4g -Xms4g"
-
-resources:
-  limits:         #
-    cpu:          #  1000m default
-    memory: "8Gi" #  2Gi
-  requests:       # values.yaml defaults
-    cpu: "1000m"  #  1000m
-    memory: "4Gi" #  2Gi
-
-volumeClaimTemplate:
-  storageClassName: "ssd"
-  resources:
-    requests:
-      storage: "64Gi"
-
-roles:    # data
-  master: "false"
-  ingest: "true"
-  data: "true"
-  remote_cluster_client: "false"
-  ml: "false"
-
-replicas: 3
-antiAffinity: "soft" # hard is default
-
-esConfig:
-  elasticsearch.yml: |
-    xpack.security.enabled: false
-
-persistence:
-  enabled: true
-
-tolerations:
-- key: "elastic"
-  operator: "Equal"
-  value: "true"
-  effect: "NoSchedule"
-
-nodeAffinity:
-  requiredDuringSchedulingIgnoredDuringExecution:
-    nodeSelectorTerms:
-    - matchExpressions:
-      - key: target-env
-        operator: In
-        values:
-        - elastic

package/src/helm-charts/elasticsearch-cluster/elasticsearch-master.yaml

@@ -1,51 +0,0 @@
-# master - manages indexes, tracks nodes and shards
-nodeGroup: "master"
-clusterName: "elasticsearch"
-
-#esJavaOpts: "-Xmx1g -Xms1g"
-#
-resources:
-  limits:            #
-    cpu:             #  1000m default
-    memory: "2Gi"    #  2Gi
-  requests:          # values.yaml defaults
-    cpu: "100m"      #  1000m
-    memory: "1500Mi" #  2Gi
-
-volumeClaimTemplate:
-  storageClassName: "ssd"
-  resources:
-    requests:
-      storage: "4Gi"
-
-roles:    # master
-  master: "true"
-  ingest: "false"
-  data: "false"
-  remote_cluster_client: "false"
-  ml: "false"
-
-replicas: 3
-antiAffinity: "hard" # hard is default
-
-esConfig:
-  elasticsearch.yml: |
-    xpack.security.enabled: false
-
-persistence:
-  enabled: true
-
-tolerations:
-- key: "elastic"
-  operator: "Equal"
-  value: "true"
-  effect: "NoSchedule"
-
-nodeAffinity:
-  requiredDuringSchedulingIgnoredDuringExecution:
-    nodeSelectorTerms:
-    - matchExpressions:
-      - key: target-env
-        operator: In
-        values:
-        - elastic

package/src/helm-charts/elasticsearch-cluster/helmup.plugin

@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# Do not move to 7.17+ until the memory explosion problem is resolved
-#
-ES_VERSION="7.16"
-
-showInstalling "Elastic Search Cluster v${ES_VERSION}"
-
-addHelmRepo elastic https://helm.elastic.co
-
-deployES() {
-  ES_TYPE="elasticsearch-${1}"
-  printf "\n   Deploying ES cluster component: `color y "$ES_TYPE"`\n"
-  helm upgrade --install $ES_TYPE elastic/elasticsearch \
-    --version $ES_VERSION \
-    --values  elasticsearch-cluster/$ES_TYPE.yaml $HELM_WHAT
-}
-
-deployES "master"
-deployES "client"
-deployES "data"
-
-removeHelmRepo elastic