Do not require prometheus.zebrium.custom/scrape=true annotation on no…

…de-exporter service

This will allow users to use existing node-exporter deployment without adding
new annotation (which may not do).

For custom service, users are still required to add prometheus.zebrium.custom/scrape=true
annotation.

charts/index.yaml

@@ -2,10 +2,10 @@ apiVersion: v1
 entries:
   zstats:
   - apiVersion: v1
-    appVersion: 1.40.1
-    created: 2020-09-11T14:51:39.817205715-07:00
+    appVersion: 1.44.0
+    created: 2020-10-28T09:39:51.743925768-07:00
     description: Zebrium stats collector for Kubernetes.
-    digest: de5f28f0899e967698190a9ec5e0496dad891fdef5988aca1f4b129be125c571
+    digest: a2dd6b652b5e1103d737244fd68a9c5f6b8db23ec7e4d074301b3e91a90c7114
     home: https://www.zebrium.com
     icon: https://www.zebrium.com/hubfs/logo2.png
     keywords:
@@ -20,6 +20,6 @@ entries:
     sources:
     - https://github.com/zebrium/ze-stats
     urls:
-    - https://github.com/zebrium/ze-stats/releases/download/1.40.1/zstats-1.40.1.tgz
-    version: 1.40.1
-generated: 2020-09-11T14:51:39.816909078-07:00
+    - https://github.com/zebrium/ze-stats/releases/download/1.44.0/zstats-1.44.0.tgz
+    version: 1.44.0
+generated: 2020-10-28T09:39:51.742536304-07:00

charts/zstats/Chart.yaml

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

charts/zstats/templates/configmap.yaml

@@ -41,15 +41,9 @@ 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
-        {{- end }}
         - action: labelmap
           regex: __meta_kubernetes_service_label_(.+)
         - source_labels: [__meta_kubernetes_namespace]
@@ -67,15 +61,9 @@ 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_custom_scrape]
           action: keep
           regex: true
-        {{- end }}
         - action: labelmap
           regex: __meta_kubernetes_service_label_(.+)
         - source_labels: [__meta_kubernetes_namespace]

charts/zstats/values.yaml

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