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

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

Merged
merged 3 commits into from
Oct 16, 2023

Conversation

r3kzi
Copy link
Contributor

@r3kzi r3kzi commented Oct 13, 2023

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

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

@QuentinBisson
Copy link
Member

Thank you @r3kzi

@QuentinBisson QuentinBisson merged commit 25238a6 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 <[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]>
spiceratops referenced this pull request in spiceratops/k8s-gitops Oct 16, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](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
[@&#8203;TheRealNoob](https://togithub.com/TheRealNoob) in
[https://github.com/prometheus-community/helm-charts/pull/3515](https://togithub.com/prometheus-community/helm-charts/pull/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
[@&#8203;r3kzi](https://togithub.com/r3kzi) in
[https://github.com/prometheus-community/helm-charts/pull/3888](https://togithub.com/prometheus-community/helm-charts/pull/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 [@&#8203;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 [@&#8203;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 <[email protected]>
Co-committed-by: Renovate <[email protected]>
Matiasmct pushed a commit to giffgaff/prometheus-charts-backup that referenced this pull request Mar 20, 2024
…heus-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]>
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants