diff --git a/apps/base/nut-exporter/release.yaml b/apps/base/nut-exporter/release.yaml index 95b5dd56b610c9bda2c2b5c572cf69dcc7d40f3b..5db6225659cc08b244899be5b1e4d62db7caae06 100644 --- a/apps/base/nut-exporter/release.yaml +++ b/apps/base/nut-exporter/release.yaml @@ -37,6 +37,10 @@ metadata: namespace: nut-exporter data: values.yaml: | + podMonitor: + params: + ups: + - ups env: - name: NUT_EXPORTER_USERNAME valueFrom: diff --git a/charts/nut-exporter/Chart.yaml b/charts/nut-exporter/Chart.yaml index 8fd807adcff59388155dd9bcb51acd9525315dba..0248d02b8bbbcb3d52fa4b9fa4d6191a8382015d 100644 --- a/charts/nut-exporter/Chart.yaml +++ b/charts/nut-exporter/Chart.yaml @@ -13,5 +13,5 @@ sources: - https://github.com/acolombier/nut_exporter/tree/feat/add-helm-chart type: application -version: 0.2.0 +version: 0.3.0 appVersion: 3.0.0 diff --git a/charts/nut-exporter/README.md b/charts/nut-exporter/README.md index a2cbd879e896288a12310daad2f6ed8c98168147..8c478745555dede177c390437ee8eb2d2a5611de 100644 --- a/charts/nut-exporter/README.md +++ b/charts/nut-exporter/README.md @@ -1,6 +1,6 @@ # nut-exporter -   +   Installs NUT exporter in Kubernetes @@ -21,7 +21,8 @@ Installs NUT exporter in Kubernetes | image.repository | string | `"ghcr.io/druggeri/nut_exporter"` | | | image.tag | string | `""` | | | nodeSelector | object | `{}` | | -| podMonitor | object | `{"enabled":true,"labels":{},"relabelings":[]}` | Enables podMonitor object for prometheus-operator based setups | +| podMonitor | object | `{"enabled":true,"labels":{},"params":{},"relabelings":[]}` | Enables podMonitor object for prometheus-operator based setups | +| podMonitor.params | object | `{}` | parameters that are used on the scrape target required for functional dashboard | | podSecurityContext.runAsGroup | int | `3642` | | | podSecurityContext.runAsNonRoot | bool | `true` | | | podSecurityContext.runAsUser | int | `3642` | | diff --git a/charts/nut-exporter/templates/podmonitor.yaml b/charts/nut-exporter/templates/podmonitor.yaml index e6b7f27157898583a0476cf173cb9cb304425d58..a20f344703b60ae899f60125ab7c5b241cbee7b0 100644 --- a/charts/nut-exporter/templates/podmonitor.yaml +++ b/charts/nut-exporter/templates/podmonitor.yaml @@ -10,18 +10,22 @@ metadata: name: {{ include "nutexporter.fullname" . }} spec: podMetricsEndpoints: - - interval: 15s - {{- with $.Values.podMonitor.metricRelabelings }} - metricRelabelings: - {{ toYaml . | nindent 6}} - {{- end }} - {{- with $.Values.podMonitor.relabelings }} - relabelings: - {{ toYaml . | nindent 6}} - {{- end }} - path: /ups_metrics - port: http - scheme: http + - interval: 15s + {{- with $.Values.podMonitor.metricRelabelings }} + metricRelabelings: + {{- toYaml . | nindent 8}} + {{- end }} + {{- with $.Values.podMonitor.relabelings }} + relabelings: + {{- toYaml . | nindent 8}} + {{- end }} + path: /ups_metrics + port: http + scheme: http + {{- with .Values.podMonitor.params }} + params: + {{ toYaml . | nindent 8}} + {{- end }} jobLabel: nut-exporter namespaceSelector: matchNames: diff --git a/charts/nut-exporter/values.yaml b/charts/nut-exporter/values.yaml index 026074e9f9ebbe72cb817faa7f41cab03aafd029..1bb3a4d1f8de6bcf19a3dc6b50f462ae71be86db 100644 --- a/charts/nut-exporter/values.yaml +++ b/charts/nut-exporter/values.yaml @@ -13,10 +13,13 @@ dashboard: podMonitor: enabled: true labels: {} - # key: value relabelings: [] # - replacement: "My UPS" # targetLabel: ups + # -- parameters that are used on the scrape target required for functional dashboard + params: {} + # ups: + # - ups extraArgs: [] # - --log.level=debug