diff --git a/charts/prometheus-smartctl-exporter/Chart.yaml b/charts/prometheus-smartctl-exporter/Chart.yaml index 6802e623bb3c..81b0e5112588 100644 --- a/charts/prometheus-smartctl-exporter/Chart.yaml +++ b/charts/prometheus-smartctl-exporter/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.12.0 +version: 0.13.0 # 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 diff --git a/charts/prometheus-smartctl-exporter/ci/default-values.yaml b/charts/prometheus-smartctl-exporter/ci/default-values.yaml new file mode 100644 index 000000000000..d6c93d3e865b --- /dev/null +++ b/charts/prometheus-smartctl-exporter/ci/default-values.yaml @@ -0,0 +1 @@ +# default values diff --git a/charts/prometheus-smartctl-exporter/ci/device-exclude-values.yaml b/charts/prometheus-smartctl-exporter/ci/device-exclude-values.yaml new file mode 100644 index 000000000000..54be11996564 --- /dev/null +++ b/charts/prometheus-smartctl-exporter/ci/device-exclude-values.yaml @@ -0,0 +1,3 @@ +# exclude devices +config: + device_exclude: "/dev/sr.*" diff --git a/charts/prometheus-smartctl-exporter/ci/device-include-values.yaml b/charts/prometheus-smartctl-exporter/ci/device-include-values.yaml new file mode 100644 index 000000000000..426bbd674444 --- /dev/null +++ b/charts/prometheus-smartctl-exporter/ci/device-include-values.yaml @@ -0,0 +1,3 @@ +# include devices +config: + device_include: "/dev/sd.*" diff --git a/charts/prometheus-smartctl-exporter/ci/prometheusrules-values.yaml b/charts/prometheus-smartctl-exporter/ci/prometheusrules-values.yaml new file mode 100644 index 000000000000..dc92a7642443 --- /dev/null +++ b/charts/prometheus-smartctl-exporter/ci/prometheusrules-values.yaml @@ -0,0 +1,5 @@ +# enable prometheus rules +prometheusRules: + enabled: true + extraLabels: + release: prometheus-operator diff --git a/charts/prometheus-smartctl-exporter/ci/resources-values.yaml b/charts/prometheus-smartctl-exporter/ci/resources-values.yaml new file mode 100644 index 000000000000..4bbaaad8cb35 --- /dev/null +++ b/charts/prometheus-smartctl-exporter/ci/resources-values.yaml @@ -0,0 +1,8 @@ +# set resources +resources: + limits: + cpu: 100m + memory: 64Mi + requests: + cpu: 100m + memory: 64Mi diff --git a/charts/prometheus-smartctl-exporter/ci/servicemonitor-values.yaml b/charts/prometheus-smartctl-exporter/ci/servicemonitor-values.yaml new file mode 100644 index 000000000000..48802074691e --- /dev/null +++ b/charts/prometheus-smartctl-exporter/ci/servicemonitor-values.yaml @@ -0,0 +1,5 @@ +# enable service monitor +serviceMonitor: + enabled: true + extraLabels: + release: prometheus-operator diff --git a/charts/prometheus-smartctl-exporter/templates/daemonset.yaml b/charts/prometheus-smartctl-exporter/templates/daemonset.yaml index 1500c092698e..1aefec512ee5 100644 --- a/charts/prometheus-smartctl-exporter/templates/daemonset.yaml +++ b/charts/prometheus-smartctl-exporter/templates/daemonset.yaml @@ -35,12 +35,24 @@ spec: {{- include "prometheus-smartctl-exporter.selectorLabels" $global | nindent 8 }} idx: i{{ $idx }} spec: + {{- if $global.Values.image.pullSecrets }} + imagePullSecrets: + {{- range $secret := $global.Values.image.pullSecrets }} + - name: {{ $secret }} + {{- end }} + {{- end }} containers: - image: "{{ $global.Values.image.repository }}:{{ $global.Values.image.tag | default $global.Chart.AppVersion }}" imagePullPolicy: {{ $global.Values.image.pullPolicy }} args: - '--smartctl.path={{ $config.smartctl_location }}' - '--smartctl.interval={{ $config.collect_not_more_than_period }}' +{{- if $config.device_exclude }} + - '--smartctl.device-exclude={{ $config.device_exclude }}' +{{- end }} +{{- if $config.device_include }} + - '--smartctl.device-include={{ $config.device_include }}' +{{- end }} {{ range $config.devices }} - '--smartctl.device={{ . }}' {{ end }} diff --git a/charts/prometheus-smartctl-exporter/values.yaml b/charts/prometheus-smartctl-exporter/values.yaml index d3bcfea73f14..89d7d5a7f217 100644 --- a/charts/prometheus-smartctl-exporter/values.yaml +++ b/charts/prometheus-smartctl-exporter/values.yaml @@ -1,6 +1,8 @@ config: {} # devices: # - /dev/sda +# device_include: /dev/sd.* +# device_exclude: /dev/sr.* extraInstances: [] # - config: @@ -38,9 +40,10 @@ prometheusRules: image: repository: quay.io/prometheuscommunity/smartctl-exporter - pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "" + pullPolicy: IfNotPresent + pullSecrets: [] serviceAccount: # Specifies whether a service account should be created