[prometheus-stackdriver-exporter] support new 0.17.0 flags (#5002)

Signed-off-by: Antoine Deschênes <[email protected]>
prometheus-community · Jan 7, 2025 · 59088c0 · 59088c0
1 parent c678ad7
commit 59088c0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/charts/prometheus-stackdriver-exporter/Chart.yaml b/charts/prometheus-stackdriver-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Stackdriver exporter for Prometheus
 name: prometheus-stackdriver-exporter
-version: 4.7.0
+version: 4.7.1
 appVersion: v0.17.0
 home: https://www.stackdriver.com/
 sources:

diff --git a/charts/prometheus-stackdriver-exporter/templates/deployment.yaml b/charts/prometheus-stackdriver-exporter/templates/deployment.yaml
@@ -73,10 +73,22 @@ spec:
               mountPath: /etc/secrets/service-account/
           {{- end}}
           args:
+            {{- if .Values.stackdriver.projectIds }}
+            {{- range .Values.stackdriver.projectIds }}
+            - --google.project-ids={{ . }}
+            {{- end }}
+            {{- else }}
             - --google.project-id={{ .Values.stackdriver.projectId }}
+            {{- end }}
             - --monitoring.metrics-interval={{ .Values.stackdriver.metrics.interval }}
             - --monitoring.metrics-offset={{ .Values.stackdriver.metrics.offset }}
+            {{- if .Values.stackdriver.metrics.prefixes }}
+            {{- range .Values.stackdriver.metrics.prefixes }}
+            - --monitoring.metrics-prefixes={{ . }}
+            {{- end }}
+            {{- else }}
             - --monitoring.metrics-type-prefixes={{ .Values.stackdriver.metrics.typePrefixes | replace " " "" }}
+            {{- end }}
             {{- range .Values.stackdriver.metrics.filters }}
             - --monitoring.filters={{ . }}
             {{- end }}

diff --git a/charts/prometheus-stackdriver-exporter/values.yaml b/charts/prometheus-stackdriver-exporter/values.yaml
@@ -48,8 +48,11 @@ secret:
   labels: {}
 
 stackdriver:
-  # The Google Project ID to gather metrics for
+  # DEPRECATED - The Google Project ID to gather metrics for
   projectId: "FALSE"
+  # The Google Project IDs to gather metrics for (requires 0.17.0+)
+  projectIds: []
+    # - "google-project-id"
   # An existing secret which contains credentials.json
   serviceAccountSecret: ""
   # Provide custom key for the existing secret to load credentials.json from
@@ -69,8 +72,11 @@ stackdriver:
   # Drop metrics from attached projects and fetch `project_id` only
   dropDelegatedProjects: false
   metrics:
-    # The prefixes to gather metrics for, we default to just CPU metrics.
+    # DEPRECATED - The prefixes to gather metrics for, we default to just CPU metrics.
     typePrefixes: 'compute.googleapis.com/instance/cpu'
+    # The prefixes to gather metrics for (requires 0.17.0+)
+    prefixes: []
+      # - 'compute.googleapis.com/instance/cpu'
     # The filters to refine the metrics query by using Filter objects that Google provides.
     # Filter objects: project, group.id, resource.type, resource.labels.[KEY], metric.type, metric.labels.[KEY]
     # https://cloud.google.com/monitoring/api/v3/filters