[prometheus-stackdriver-exporter] ServiceMonitor scrapeClass and separated endpoints (#6146)

Signed-off-by: Pavel Ageev <[email protected]>
Co-authored-by: Rico Pahlisch <[email protected]>

Author: insidieux

charts/prometheus-stackdriver-exporter/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Stackdriver exporter for Prometheus
 name: prometheus-stackdriver-exporter
-version: 4.10.0
+version: 4.11.0
 appVersion: v0.18.0
 home: https://www.stackdriver.com/
 sources:

charts/prometheus-stackdriver-exporter/templates/deployment.yaml

@@ -107,7 +107,8 @@ spec:
             - --stackdriver.max-retries={{ .Values.stackdriver.maxRetries }}
             - --stackdriver.retry-statuses={{ .Values.stackdriver.retryStatuses }}
             - --web.listen-address={{ .Values.web.listenAddress }}
-            - --web.telemetry-path={{ .Values.web.path }}
+            - --web.telemetry-path={{ .Values.web.telemetryPath }}
+            - --web.stackdriver-telemetry-path={{ .Values.web.stackdriverTelemetryPath }}
           {{- if .Values.stackdriver.dropDelegatedProjects }}
             - --monitoring.drop-delegated-projects
           {{- end }}

charts/prometheus-stackdriver-exporter/templates/servicemonitor.yaml

@@ -12,8 +12,12 @@ metadata:
     {{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }}
     {{- end }}
 spec:
+  {{- if .Values.serviceMonitor.scrapeClass }}
+  scrapeClass: {{ .Values.serviceMonitor.scrapeClass }}
+  {{- end }}
   endpoints:
   - port: http
+    path: {{ .Values.web.telemetryPath }}
     {{- if .Values.serviceMonitor.interval }}
     interval: {{ .Values.serviceMonitor.interval }}
     {{- end }}
@@ -30,6 +34,26 @@ spec:
     relabelings:
     {{- toYaml .Values.serviceMonitor.relabelings | nindent 4 }}
     {{- end }}
+  {{- if ne .Values.web.telemetryPath .Values.web.stackdriverTelemetryPath }}
+  - port: http
+    path: {{ .Values.web.stackdriverTelemetryPath }}
+    {{- if .Values.serviceMonitor.interval }}
+    interval: {{ .Values.serviceMonitor.interval }}
+    {{- end }}
+    {{- if .Values.serviceMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+    {{- end }}
+    honorLabels: {{ .Values.serviceMonitor.honorLabels }}
+    honorTimestamps: {{ .Values.serviceMonitor.honorTimestamps }}
+    {{- if .Values.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+    {{- toYaml .Values.serviceMonitor.metricRelabelings | nindent 4 }}
+    {{- end }}
+    {{- if .Values.serviceMonitor.relabelings }}
+    relabelings:
+    {{- toYaml .Values.serviceMonitor.relabelings | nindent 4 }}
+    {{- end }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "stackdriver-exporter.selectorLabels" . | indent 6 }}

charts/prometheus-stackdriver-exporter/values.yaml

@@ -118,8 +118,10 @@ stackdriver:
 web:
   # Port to listen on
   listenAddress: ':9255'
-  # Path under which to expose metrics.
-  path: /metrics
+  # Path under which to expose Stackdriver metrics.
+  stackdriverTelemetryPath: /metrics
+  # Path under which to expose Prometheus metrics
+  telemetryPath: /metrics
 
 ## Pod affinity
 ##
@@ -184,6 +186,8 @@ serviceAccount:
 serviceMonitor:
   enabled: false
   namespace: monitoring
+  # scrapeClass
+  scrapeClass:
   # additionalLabels is the set of additional labels to add to the ServiceMonitor
   additionalLabels: {}
   # How long until a scrape request times out.