[all] Fix PrometheusRule and ServiceMonitor after Common upgrade

charts/aaisp-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.2.1
 description: A prometheus exporter for the Andrew & Arnold CHAOS API
 name: aaisp-exporter
-version: 0.2.1
+version: 0.2.2
 kubeVersion: ">=1.16.0-0"
 keywords:
   - aaisp-exporter

charts/aaisp-exporter/templates/prometheusrules.yaml

@@ -1,4 +1,5 @@
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

charts/aaisp-exporter/templates/servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.metrics.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/hg612-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.1.2
 description: A prometheus exporter for the HG612 modem
 name: hg612-exporter
-version: 1.2.1
+version: 1.2.2
 kubeVersion: ">=1.16.0-0"
 keywords:
   - hg612-exporter

charts/hg612-exporter/templates/prometheusrules.yaml

@@ -1,4 +1,5 @@
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

charts/hg612-exporter/templates/servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.metrics.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/mqtt-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.0.0
 description: A prometheus exporter for generic MQTT metrics
 name: mqtt-exporter
-version: 1.1.1
+version: 1.1.2
 kubeVersion: ">=1.16.0-0"
 keywords:
   - mqtt-exporter

charts/mqtt-exporter/templates/prometheusrules.yaml

@@ -1,4 +1,5 @@
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

charts/mqtt-exporter/templates/servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.metrics.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/plex-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.2.2
 description: A prometheus exporter for Plex Media Server
 name: plex-exporter
-version: 0.1.1
+version: 0.1.2
 kubeVersion: ">=1.16.0-0"
 keywords:
   - plex-exporter

charts/plex-exporter/templates/prometheusrules.yaml

@@ -1,4 +1,5 @@
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

charts/plex-exporter/templates/servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.metrics.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/vmware-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.18.2
 description: A prometheus exporter for vSphere vCenter
 name: vmware-exporter
-version: 0.2.1
+version: 0.2.2
 kubeVersion: ">=1.16.0-0"
 keywords:
   - vmware-exporter

charts/vmware-exporter/templates/prometheusrules.yaml

@@ -1,4 +1,5 @@
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

charts/vmware-exporter/templates/servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.metrics.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata: