Add job config to configmap for custom metrics

charts/zstats/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 name: zstats
 description: Zebrium stats collector for Kubernetes.
-version: 1.39.0
-appVersion: 1.39.0
+version: 1.40.0
+appVersion: 1.40.0
 keywords:
 - stats
 - prometheus

charts/zstats/templates/configmap.yaml

@@ -41,22 +41,15 @@ data:
         kubernetes_sd_configs:
         - role: endpoints
         relabel_configs:
+        {{- if .Values.zebrium.prometheusIoScrapeEnabled }}
+        - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
+          action: keep
+          regex: true
+        {{- else }}
         - source_labels: [__meta_kubernetes_service_annotation_prometheus_zebrium_io_scrape]
           action: keep
           regex: true
-        - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
-          action: replace
-          target_label: __scheme__
-          regex: (https?)
-        - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
-          action: replace
-          target_label: __metrics_path__
-          regex: (.+)
-        - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
-          action: replace
-          target_label: __address__
-          regex: ([^:]+)(?::\d+)?;(\d+)
-          replacement: $1:$2
+        {{- end }}
         - action: labelmap
           regex: __meta_kubernetes_service_label_(.+)
         - source_labels: [__meta_kubernetes_namespace]
@@ -69,3 +62,25 @@ data:
         - source_labels: [__name__]
           regex: '(node_cpu_seconds_.+|node_disk_.+|node_filesystem_.+|node_memory_.+|node_vmstat_.+)'
           action: keep
+
+      - job_name: 'custom-service-endpoints'
+        kubernetes_sd_configs:
+        - role: endpoints
+        relabel_configs:
+        {{- if .Values.zebrium.prometheusIoScrapeEnabled }}
+        - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
+          action: keep
+          regex: true
+        {{- else }}
+        - source_labels: [__meta_kubernetes_service_annotation_prometheus_zebrium_custom_scrape]
+          action: keep
+          regex: true
+        {{- end }}
+        - action: labelmap
+          regex: __meta_kubernetes_service_label_(.+)
+        - source_labels: [__meta_kubernetes_namespace]
+          action: replace
+          target_label: kubernetes_namespace
+        - source_labels: [__meta_kubernetes_service_name]
+          action: replace
+          target_label: kubernetes_name

charts/zstats/values.yaml

@@ -13,6 +13,7 @@ zebrium:
   authToken: ""
   autoupdate: "1"
   verifySSL: true
+  prometheusIoScrapeEnabled: false
   enableDebug: false
   name: zstats-collector
 

scripts/update_charts.sh

@@ -1,4 +1,5 @@
 cd ../charts
+version=`cat zstats/Chart.yaml | awk '/version: / { print $2 }'`
 helm package zstats
 cd ..
-helm serve --repo-path ./charts --url  https://github.com/zebrium/ze-stats/releases/download/1.39.0
+helm serve --repo-path ./charts --url  https://github.com/zebrium/ze-stats/releases/download/$version