@leverege/build-tools 2.55.1 → 2.55.3

package/src/helm-charts/prom-operator/helmup.plugin

@@ -5,23 +5,23 @@ addHelmRepo prometheus-community https://prometheus-community.github.io/helm-cha
 
 showInstalling "The Prometheus Operator (kube-prometheus-stack)"
 [ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="65"
-helm upgrade --install prometheus-stack prometheus-community/kube-prometheus-stack \
-             --namespace prometheus --create-namespace \
-             --values  prom-operator/prometheus-stack.yaml \
-             --version $PROMETHEUS_STACK_CHART_VERSION $HELM_WHAT
+
+NS="--namespace prometheus"
+
+helm upgrade $NS --install prometheus-stack prometheus-community/kube-prometheus-stack \
+                 --values  prom-operator/prometheus-stack.yaml \
+                 --version $PROMETHEUS_STACK_CHART_VERSION $HELM_WHAT
 
 showInstalling "The Elasticsearch Exporter (prom-operator)"
-[ -z "$ELASTICSEARCH_EXPORTER_CHART_VERSION" ] && ELASTICSEARCH_EXPORTER_CHART_VERSION="4"
-helm upgrade --install elasticsearch8-exporter prometheus-community/prometheus-elasticsearch-exporter \
-             --namespace prometheus --create-namespace \
-             --values prom-operator/elasticsearch-exporter.yaml \
-             --version $ELASTICSEARCH_EXPORTER_CHART_VERSION $HELM_WHAT
+[ -z "$ELASTICSEARCH_EXPORTER_CHART_VERSION" ] && ELASTICSEARCH_EXPORTER_CHART_VERSION="6"
+helm upgrade $NS --install elasticsearch8-exporter prometheus-community/prometheus-elasticsearch-exporter \
+                 --values prom-operator/elasticsearch-exporter.yaml \
+                 --version $ELASTICSEARCH_EXPORTER_CHART_VERSION $HELM_WHAT
 
 showInstalling "The Stackdriver Exporter (prom-operator)"
 [ -z "$STACKDRIVER_EXPORTER_CHART_VERSION" ] && STACKDRIVER_EXPORTER_CHART_VERSION="4"
-helm upgrade --install stackdriver-exporter prometheus-community/prometheus-stackdriver-exporter \
-             --namespace prometheus --create-namespace \
-             --values prom-operator/stackdriver-exporter.yaml \
-             --version $STACKDRIVER_EXPORTER_CHART_VERSION $HELM_WHAT
+helm upgrade $NS --install stackdriver-exporter prometheus-community/prometheus-stackdriver-exporter \
+                 --values prom-operator/stackdriver-exporter.yaml \
+                 --version $STACKDRIVER_EXPORTER_CHART_VERSION $HELM_WHAT
 
 removeHelmRepo prometheus-community

package/src/helm-charts/prom-operator/prometheus-stack.yaml.ovh

@@ -53,7 +53,7 @@ grafana:
   service:
     port: 3000
   # -- the grafana admin password
-  adminPassword: prom-operator
+  adminPassword: leverege-monitoring
   defaultDashboardsEnabled: false
   sidecar:
       dashboards:

package/src/helm-charts/prom-operator/rules/gitignore

@@ -0,0 +1 @@
+*.yaml

package/src/helm-charts/prom-operator/{rules/test-alert.yaml → test-alert.yaml}

@@ -1,3 +1,7 @@
+#
+# test with => kubectl apply  -f prom-operator/test-alert.yaml
+# delete it => kubectl delete -f prom-operator/test-alert.yaml
+#
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

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

@@ -17,7 +17,7 @@ TRAEFIK_NAMESPACE="traefik"
 
 addHelmRepo traefik https://helm.traefik.io/traefik
 
-[ -z "$TRAEFIK_CHART_VERSION" ] && TRAEFIK_CHART_VERSION="32"
+[ -z "$TRAEFIK_CHART_VERSION" ] && TRAEFIK_CHART_VERSION="33"
 helm upgrade --install traefik traefik/traefik \
              --namespace $TRAEFIK_NAMESPACE --create-namespace \
              --values  traefik/traefik-local.yaml \

package/src/k8x.sh

@@ -43,6 +43,10 @@ K8X_HELP
     ns="elastic" && cmd="bash"
     ;;
 
+  "prom-operator"|"prometheus")
+    ns="prometheus" && cmd="bash"
+    ;;
+
   "psql"|"pgsql")
     FZFQ="--query=postgresql" && cmd='psql -U postgres'
     ;;

package/src/helm-charts/prometheus-operator/helmup.plugin

@@ -1,14 +0,0 @@
-#!/bin/bash
-#
-showInstalling "The Prometheus Operator (kube-prometheus-stack)"
-
-addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
-
-[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="62"
-
-helm upgrade --install prometheus-stack prometheus-community/kube-prometheus-stack \
-             --namespace prometheus --create-namespace \
-             --values  prometheus-operator/prometheus-stack.yaml \
-             --version $PROMETHEUS_STACK_CHART_VERSION $HELM_WHAT
-
-removeHelmRepo prometheus-community