-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
zeritti
merged 6 commits into
prometheus-community:main
from
nepomucen:relabelings-smartctl
Oct 16, 2023
Merged
[prometheus-smartctl-exporter] Add relabelings to servicemonitor #3891
zeritti
merged 6 commits into
prometheus-community:main
from
nepomucen:relabelings-smartctl
Oct 16, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: nepomucen <szymon@aus.krakow.pl>
nepomucen
force-pushed
the
relabelings-smartctl
branch
from
October 13, 2023 11:01
e294719
to
a4bfe66
Compare
Signed-off-by: nepomucen <szymon@aus.krakow.pl>
nepomucen
force-pushed
the
relabelings-smartctl
branch
from
October 13, 2023 11:05
48307ac
to
124b85c
Compare
zeritti
requested changes
Oct 13, 2023
charts/prometheus-smartctl-exporter/templates/servicemonitor.yaml
Outdated
Show resolved
Hide resolved
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
approved these changes
Oct 16, 2023
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it
Allow to set
relabelings
onservicemonitor
fromvalues.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
Usage of relabelings is common in other prometheus-community's helm charts
Which issue this PR fixes
Special notes for your reviewer
Checklist
[prometheus-couchdb-exporter]
)