Fixed chart

Author: Dmitrii Ermakov

helm/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

helm/templates/deployment.yaml

@@ -38,6 +38,10 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command:
+            - "/usr/local/bin/redfish_exporter"
+            - "--config.file=/etc/prometheus/redfish_exporter.yml"
+            - "--log.level={{ .Values.logLevel }}"
           ports:
             - name: http
               containerPort: 9610

helm/templates/servicemonitors.yaml

@@ -24,17 +24,19 @@ spec:
       {{- include "redfish_exporter.selectorLabels" . | nindent 6 }}
 ---
 {{- range $host, $hostConfig := .Values.exporterConfig.hosts }}
+{{- if ne $host "default" }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "redfish_exporter.fullname" . }}-{{ $host }}
+  name: {{ include "redfish_exporter.fullname" $ }}-{{ $host }}
   labels:
-    {{- include "redfish_exporter.labels" . | nindent 4 }}
+    {{- include "redfish_exporter.labels" $ | nindent 4 }}
     redfish-exporter/host: {{ $host }}
 spec:
   endpoints:
     - port: http
-      interval: {{ .Values.serviceMonitor.interval }}
+      interval: {{ $.Values.serviceMonitor.interval }}
       params:
         target:
           - {{ $host }}
@@ -44,19 +46,15 @@ spec:
         {{- end }}
       {{- /* Path */}}
       path: /redfish
-      relabelings:
-        - sourceLabels: [__address__]
-          targetLabel: __param_target
-        - sourceLabels: [__param_target]
-          targetLabel: instance
-        - targetLabel: __address__
-          replacement: localhost:9610
+      metricRelabelings:
+        - targetLabel: instance
+          replacement: {{ $host }}
         # (optional) when using group config add this to have group=my_group_name
         {{- if $hostConfig.group }}
-        - targetLabel: __param_group
+        - targetLabel: instance_group
           replacement: {{ $hostConfig.group }}
         {{- end }}
-      scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ $.Values.serviceMonitor.scrapeTimeout }}
   targetLabels:
     - "app.kubernetes.io/instance"
     {{- if $.Values.extraLabels }}
@@ -66,7 +64,7 @@ spec:
     {{- end }}
   selector:
     matchLabels:
-      {{- include "redfish_exporter.selectorLabels" . | nindent 6 }}
+      {{- include "redfish_exporter.selectorLabels" $ | nindent 6 }}
+{{- end }}
+{{- end }}
 {{- end }}
-
-{{- end }}

helm/values.yaml

@@ -94,6 +94,8 @@ serviceMonitor:
   interval: 120s
   scrapeTimeout: 30s
 
+logLevel: error
+
 exporterConfig:
   {}
   # hosts: