[kube-prometheus-stack] fix range function in servicemonitors #3888
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: Christian Niehoff <christian.niehoff@dwpbank.de>
Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>
r3kzi
requested review from
andrewgkew,
gianrubio,
gkarthiks,
GMartinez-Sisti,
QuentinBisson,
scottrigby and
Xtigyro
as code owners
Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>
QuentinBisson
approved these changes
Oct 16, 2023
|
Thank you @r3kzi |
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>
spiceratops
added a commit
to spiceratops/k8s-gitops
that referenced
this pull request
Oct 16, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [kube-prometheus-stack](https://togithub.com/prometheus-community/helm-charts) | minor | `51.8.0` -> `51.9.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>prometheus-community/helm-charts (kube-prometheus-stack)</summary> ### [`v51.9.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.9.0) kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. #### What's Changed - \[kube-prometheus-stack] add serviceMonitor.additionalEndpoints by [@​TheRealNoob](https://togithub.com/TheRealNoob) in [prometheus-community/helm-charts#3515 **Full Changelog**: prometheus-community/helm-charts@prometheus-smartctl-exporter-0.7.0...kube-prometheus-stack-51.9.0 ### [`v51.8.1`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.8.1) kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. #### What's Changed - \[kube-prometheus-stack] fix range function in servicemonitors by [@​r3kzi](https://togithub.com/r3kzi) in [prometheus-community/helm-charts#3888 **Full Changelog**: prometheus-community/helm-charts@kube-prometheus-stack-51.8.0...kube-prometheus-stack-51.8.1 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/spiceratops/k8s-gitops). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xOS4yIiwidXBkYXRlZEluVmVyIjoiMzcuMTkuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->
nrdufour
added a commit
to nrdufour/home-ops
that referenced
this pull request
Oct 17, 2023
This PR contains the following updates: | Package | Update | Change | |---|---|---| | [kube-prometheus-stack](https://github.com/prometheus-operator/kube-prometheus) ([source](https://github.com/prometheus-community/helm-charts)) | minor | `51.8.0` -> `51.9.0` | --- ### Release Notes <details> <summary>prometheus-community/helm-charts (kube-prometheus-stack)</summary> ### [`v51.9.0`](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.9.0) [Compare Source](prometheus-community/helm-charts@kube-prometheus-stack-51.8.1...kube-prometheus-stack-51.9.0) kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. #### What's Changed - \[kube-prometheus-stack] add serviceMonitor.additionalEndpoints by [@​TheRealNoob](https://github.com/TheRealNoob) in prometheus-community/helm-charts#3515 **Full Changelog**: prometheus-community/helm-charts@prometheus-smartctl-exporter-0.7.0...kube-prometheus-stack-51.9.0 ### [`v51.8.1`](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.8.1) [Compare Source](prometheus-community/helm-charts@kube-prometheus-stack-51.8.0...kube-prometheus-stack-51.8.1) kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. #### What's Changed - \[kube-prometheus-stack] fix range function in servicemonitors by [@​r3kzi](https://github.com/r3kzi) in prometheus-community/helm-charts#3888 **Full Changelog**: prometheus-community/helm-charts@kube-prometheus-stack-51.8.0...kube-prometheus-stack-51.8.1 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMC4yIiwidXBkYXRlZEluVmVyIjoiMzcuMjAuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Reviewed-on: https://git.home/nrdufour/home-ops/pulls/155 Co-authored-by: Renovate <renovate@ptinem.io> Co-committed-by: Renovate <renovate@ptinem.io>
Closed
1 task
Matiasmct
pushed a commit
to giffgaff/prometheus-charts
that referenced
this pull request
Mar 20, 2024
](https://renovatebot.com){kind=link}
…heus-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>
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
The PR #3683 introduced the option to include relabelings and metricRelabelings in additionalServiceMonitors, but the range function was closed too early so relabelings and metricRelabelings are never getting into the ServiceMonitor.
This PR fixed that.
Checklist
[prometheus-couchdb-exporter])