[aaisp-exporter] Update to common 4.5.3

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.2
+version: 0.2.3
 kubeVersion: ">=1.16.0-0"
 keywords:
   - aaisp-exporter
@@ -15,4 +15,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://nikdoof.github.io/helm-charts/
-    version: 4.5.2
+    version: 4.5.3

charts/aaisp-exporter/templates/prometheusrules.yaml

@@ -1,28 +0,0 @@
-{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
-{{- include "common.values.setup" . -}}
-apiVersion: monitoring.coreos.com/v1
-kind: PrometheusRule
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-    {{- with .Values.metrics.prometheusRule.labels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  groups:
-    - name: {{ include "common.names.fullname" . }}
-      rules:
-        - alert: AAISPExporterAbsent
-          annotations:
-            description: AAISP Exporter has disappeared from Prometheus service discovery.
-            summary: AAISP Exporter is down.
-          expr: |
-            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
-          for: 5m
-          labels:
-            severity: critical
-        {{- with .Values.metrics.prometheusRule.rules }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-{{- end }}

charts/aaisp-exporter/templates/servicemonitor.yaml

@@ -1,25 +0,0 @@
-{{- if .Values.metrics.enabled }}
-{{- include "common.values.setup" . -}}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-    {{- with .Values.metrics.serviceMonitor.labels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
-  endpoints:
-    - port: metrics
-      {{- with .Values.metrics.serviceMonitor.interval }}
-      interval: {{ . }}
-      {{- end }}
-      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
-      scrapeTimeout: {{ . }}
-      {{- end }}
-      path: /metrics
-{{- end }}

charts/aaisp-exporter/values.yaml

@@ -48,15 +48,15 @@ metrics:
   prometheusRule:
     enabled: false
     labels: {}
-    # -- Configure additionial rules for the chart under this key.
+    # -- Configure additional rules for the chart under this key.
     # @default -- See prometheusrules.yaml
-    rules: []
+    rules:
-      # - alert: aaispExporterAbsent
+      - alert: AAISPExporterAbsent
-      #   annotations:
+        annotations:
-      #     description: aaisp Exporter has disappeared from Prometheus service discovery.
+          description: AAISP Exporter has disappeared from Prometheus service discovery.
-      #     summary: aaisp Exporter is down.
+          summary: AAISP Exporter is down.
-      #   expr: |
+        expr: |
-      #     absent(up{job=~".*aaispexporter.*"} == 1)
+          absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
-      #   for: 5m
+        for: 5m
-      #   labels:
+        labels:
-      #     severity: critical
+          severity: critical