Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[prometheus-smartctl-exporter] Add relabelings to servicemonitor #3891

Merged
merged 6 commits into from
Oct 16, 2023

Conversation

nepomucen
Copy link
Contributor

@nepomucen nepomucen commented Oct 13, 2023

What this PR does / why we need it

Allow to set relabelings on servicemonitor from values.yaml.

e.g. in order to have an alerting rules on disk devices triggered in context of "node name" instead of "pod's instance name = ip address" one could use the following custom values

#custom_values.yaml
serviceMonitor:
  enabled: true
  relabelings:
  - sourceLabels: [__meta_kubernetes_pod_node_name]
    targetLabel: instance

Usage of relabelings is common in other prometheus-community's helm charts

Which issue this PR fixes

Special notes for your reviewer

Checklist

  • DCO signed
  • Chart Version bumped
  • Title of the PR starts with chart name (e.g. [prometheus-couchdb-exporter])

Signed-off-by: nepomucen <szymon@aus.krakow.pl>
Signed-off-by: nepomucen <szymon@aus.krakow.pl>
This reverts commit 124b85c.

Signed-off-by: nepomucen <szymon@aus.krakow.pl>
Signed-off-by: nepomucen <szymon@aus.krakow.pl>
Signed-off-by: nepomucen <szymon@aus.krakow.pl>
@zeritti zeritti merged commit 228d33d into prometheus-community:main Oct 16, 2023
4 checks passed
QuentinBisson pushed a commit that referenced this pull request Oct 16, 2023
* add serviceMonitor.additionalEndpoints

Signed-off-by: TheRealNoob <mike1118@live.com>

* [prometheus-json-exporter] defaults and service labels/annotations support (#3865)

* Fixed defaults for annotations from list to dict

Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>

* Added service labels and annotations

Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>

* Added ingress labels

Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>

* Bumped version to 0.7.2

Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>

---------

Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>
Signed-off-by: TheRealNoob <mike1118@live.com>

* fix closing if statements

Signed-off-by: TheRealNoob <mike1118@live.com>

* add newlines

Signed-off-by: TheRealNoob <mike1118@live.com>

* fix root reference

Signed-off-by: TheRealNoob <mike1118@live.com>

* [kube-prometheus-stack] Fix IO panels in Cluster Overview (#3902)

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
Signed-off-by: TheRealNoob <mike1118@live.com>

* [kube-prometheus-stack] fix range function in servicemonitors (#3888)

* fix range function to include relabelings and metricRelabelings

Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>

* bump chart version

Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>

---------

Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>
Signed-off-by: TheRealNoob <mike1118@live.com>

* [prometheus-smartctl-exporter] Add relabelings to servicemonitor (#3891)

* [prometheus-smartctl-exporter] Add relabelings to servicemonitor

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* bump chart version to 0.6.1

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* Revert "bump chart version to 0.6.1"

This reverts commit 124b85c.

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* Bump chart's minor version instead of patch version

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* Use with to control variable scoping

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

---------

Signed-off-by: nepomucen <szymon@aus.krakow.pl>
Signed-off-by: TheRealNoob <mike1118@live.com>

* bump chart version

Signed-off-by: TheRealNoob <mike1118@live.com>

---------

Signed-off-by: TheRealNoob <mike1118@live.com>
Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>
Signed-off-by: nepomucen <szymon@aus.krakow.pl>
Signed-off-by: TheRealNoob <TheRealNoob@users.noreply.github.com>
Co-authored-by: Aaron <bentonam@gmail.com>
Co-authored-by: Jan-Otto Kröpke <github@jkroepke.de>
Co-authored-by: Christian Niehoff <mail@christian-niehoff.com>
Co-authored-by: Szymon Janczy <szymon@aus.krakow.pl>
Matiasmct pushed a commit to giffgaff/prometheus-charts that referenced this pull request Mar 20, 2024
…metheus-community#3891)

* [prometheus-smartctl-exporter] Add relabelings to servicemonitor

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* bump chart version to 0.6.1

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* Revert "bump chart version to 0.6.1"

This reverts commit 124b85c.

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* Bump chart's minor version instead of patch version

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* Use with to control variable scoping

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

---------

Signed-off-by: nepomucen <szymon@aus.krakow.pl>
Matiasmct pushed a commit to giffgaff/prometheus-charts that referenced this pull request Mar 20, 2024
…theus-community#3515)

* add serviceMonitor.additionalEndpoints

Signed-off-by: TheRealNoob <mike1118@live.com>

* [prometheus-json-exporter] defaults and service labels/annotations support (prometheus-community#3865)

* Fixed defaults for annotations from list to dict

Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>

* Added service labels and annotations

Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>

* Added ingress labels

Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>

* Bumped version to 0.7.2

Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>

---------

Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>
Signed-off-by: TheRealNoob <mike1118@live.com>

* fix closing if statements

Signed-off-by: TheRealNoob <mike1118@live.com>

* add newlines

Signed-off-by: TheRealNoob <mike1118@live.com>

* fix root reference

Signed-off-by: TheRealNoob <mike1118@live.com>

* [kube-prometheus-stack] Fix IO panels in Cluster Overview (prometheus-community#3902)

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
Signed-off-by: TheRealNoob <mike1118@live.com>

* [kube-prometheus-stack] fix range function in servicemonitors (prometheus-community#3888)

* fix range function to include relabelings and metricRelabelings

Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>

* bump chart version

Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>

---------

Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>
Signed-off-by: TheRealNoob <mike1118@live.com>

* [prometheus-smartctl-exporter] Add relabelings to servicemonitor (prometheus-community#3891)

* [prometheus-smartctl-exporter] Add relabelings to servicemonitor

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* bump chart version to 0.6.1

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* Revert "bump chart version to 0.6.1"

This reverts commit 124b85c.

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* Bump chart's minor version instead of patch version

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

* Use with to control variable scoping

Signed-off-by: nepomucen <szymon@aus.krakow.pl>

---------

Signed-off-by: nepomucen <szymon@aus.krakow.pl>
Signed-off-by: TheRealNoob <mike1118@live.com>

* bump chart version

Signed-off-by: TheRealNoob <mike1118@live.com>

---------

Signed-off-by: TheRealNoob <mike1118@live.com>
Signed-off-by: Aaron Benton<bentonam@gmail.com>
Signed-off-by: Aaron Benton <bentonam@gmail.com>
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>
Signed-off-by: nepomucen <szymon@aus.krakow.pl>
Signed-off-by: TheRealNoob <TheRealNoob@users.noreply.github.com>
Co-authored-by: Aaron <bentonam@gmail.com>
Co-authored-by: Jan-Otto Kröpke <github@jkroepke.de>
Co-authored-by: Christian Niehoff <mail@christian-niehoff.com>
Co-authored-by: Szymon Janczy <szymon@aus.krakow.pl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants