-
Notifications
You must be signed in to change notification settings - Fork 5.1k
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-json-exporter] defaults and service labels/annotations support #3865
Merged
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: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]>
Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]>
Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]>
Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]>
bentonam
changed the title
prometheus-json-exporter defaults and service labels/annotations support
[prometheus-json-exporter] defaults and service labels/annotations support
Oct 6, 2023
zanhsieh
approved these changes
Oct 8, 2023
QuentinBisson
pushed a commit
that referenced
this pull request
Oct 16, 2023
* add serviceMonitor.additionalEndpoints Signed-off-by: TheRealNoob <[email protected]> * [prometheus-json-exporter] defaults and service labels/annotations support (#3865) * Fixed defaults for annotations from list to dict Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Added service labels and annotations Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Added ingress labels Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Bumped version to 0.7.2 Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> --------- Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> Signed-off-by: TheRealNoob <[email protected]> * fix closing if statements Signed-off-by: TheRealNoob <[email protected]> * add newlines Signed-off-by: TheRealNoob <[email protected]> * fix root reference Signed-off-by: TheRealNoob <[email protected]> * [kube-prometheus-stack] Fix IO panels in Cluster Overview (#3902) Signed-off-by: Jan-Otto Kröpke <[email protected]> Signed-off-by: TheRealNoob <[email protected]> * [kube-prometheus-stack] fix range function in servicemonitors (#3888) * fix range function to include relabelings and metricRelabelings Signed-off-by: Christian Niehoff <[email protected]> * bump chart version Signed-off-by: Christian Niehoff <[email protected]> --------- Signed-off-by: Christian Niehoff <[email protected]> Signed-off-by: TheRealNoob <[email protected]> * [prometheus-smartctl-exporter] Add relabelings to servicemonitor (#3891) * [prometheus-smartctl-exporter] Add relabelings to servicemonitor Signed-off-by: nepomucen <[email protected]> * bump chart version to 0.6.1 Signed-off-by: nepomucen <[email protected]> * Revert "bump chart version to 0.6.1" This reverts commit 124b85c. Signed-off-by: nepomucen <[email protected]> * Bump chart's minor version instead of patch version Signed-off-by: nepomucen <[email protected]> * Use with to control variable scoping Signed-off-by: nepomucen <[email protected]> --------- Signed-off-by: nepomucen <[email protected]> Signed-off-by: TheRealNoob <[email protected]> * bump chart version Signed-off-by: TheRealNoob <[email protected]> --------- Signed-off-by: TheRealNoob <[email protected]> Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> Signed-off-by: Jan-Otto Kröpke <[email protected]> Signed-off-by: Christian Niehoff <[email protected]> Signed-off-by: nepomucen <[email protected]> Signed-off-by: TheRealNoob <[email protected]> Co-authored-by: Aaron <[email protected]> Co-authored-by: Jan-Otto Kröpke <[email protected]> Co-authored-by: Christian Niehoff <[email protected]> Co-authored-by: Szymon Janczy <[email protected]>
Matiasmct
pushed a commit
to giffgaff/prometheus-charts-backup
that referenced
this pull request
Mar 20, 2024
…pport (prometheus-community#3865) * Fixed defaults for annotations from list to dict Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Added service labels and annotations Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Added ingress labels Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Bumped version to 0.7.2 Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> --------- Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]>
Matiasmct
pushed a commit
to giffgaff/prometheus-charts-backup
that referenced
this pull request
Mar 20, 2024
…theus-community#3515) * add serviceMonitor.additionalEndpoints Signed-off-by: TheRealNoob <[email protected]> * [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<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Added service labels and annotations Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Added ingress labels Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Bumped version to 0.7.2 Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> --------- Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> Signed-off-by: TheRealNoob <[email protected]> * fix closing if statements Signed-off-by: TheRealNoob <[email protected]> * add newlines Signed-off-by: TheRealNoob <[email protected]> * fix root reference Signed-off-by: TheRealNoob <[email protected]> * [kube-prometheus-stack] Fix IO panels in Cluster Overview (prometheus-community#3902) Signed-off-by: Jan-Otto Kröpke <[email protected]> Signed-off-by: TheRealNoob <[email protected]> * [kube-prometheus-stack] fix range function in servicemonitors (prometheus-community#3888) * fix range function to include relabelings and metricRelabelings Signed-off-by: Christian Niehoff <[email protected]> * bump chart version Signed-off-by: Christian Niehoff <[email protected]> --------- Signed-off-by: Christian Niehoff <[email protected]> Signed-off-by: TheRealNoob <[email protected]> * [prometheus-smartctl-exporter] Add relabelings to servicemonitor (prometheus-community#3891) * [prometheus-smartctl-exporter] Add relabelings to servicemonitor Signed-off-by: nepomucen <[email protected]> * bump chart version to 0.6.1 Signed-off-by: nepomucen <[email protected]> * Revert "bump chart version to 0.6.1" This reverts commit 124b85c. Signed-off-by: nepomucen <[email protected]> * Bump chart's minor version instead of patch version Signed-off-by: nepomucen <[email protected]> * Use with to control variable scoping Signed-off-by: nepomucen <[email protected]> --------- Signed-off-by: nepomucen <[email protected]> Signed-off-by: TheRealNoob <[email protected]> * bump chart version Signed-off-by: TheRealNoob <[email protected]> --------- Signed-off-by: TheRealNoob <[email protected]> Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> Signed-off-by: Jan-Otto Kröpke <[email protected]> Signed-off-by: Christian Niehoff <[email protected]> Signed-off-by: nepomucen <[email protected]> Signed-off-by: TheRealNoob <[email protected]> Co-authored-by: Aaron <[email protected]> Co-authored-by: Jan-Otto Kröpke <[email protected]> Co-authored-by: Christian Niehoff <[email protected]> Co-authored-by: Szymon Janczy <[email protected]>
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
Fixes some default values from
[]
to{}
and adds support for setting service labels and annotations.@schmiddim @zanhsieh @xiu
Checklist
[prometheus-couchdb-exporter]
)