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] hack: fix etcd mixin #3880

Merged
merged 3 commits into from Oct 12, 2023

Conversation

jkroepke
Copy link
Member

What this PR does / why we need it

In etcd-io/etcd#16246, etcd maintainers refactor the mixins. Instead having one mixin file, the distribute all the declaration across multiple files.

Running sync_prometheus_rules results into this error:

Generating rules from https://raw.githubusercontent.com/etcd-io/etcd/main/contrib/mixin/mixin.libsonnet
Traceback (most recent call last):
  File "/Users/jok/IdeaProjects/prometheus-community-helm-charts/charts/kube-prometheus-stack/hack/./sync_prometheus_rules.py", line 445, in <module>
    main()
  File "/Users/jok/IdeaProjects/prometheus-community-helm-charts/charts/kube-prometheus-stack/hack/./sync_prometheus_rules.py", line 426, in main
    alerts = json.loads(_jsonnet.evaluate_snippet(chart['source'], raw_text + '.prometheusAlerts'))
RuntimeError: RUNTIME ERROR: couldn't open import "./config.libsonnet": no match locally or in the Jsonnet library paths.
        https://raw.githubusercontent.com/etcd-io/etcd/main/contrib/mixin/mixin.libsonnet:1:2-29  

Addition, jsonnet-builder is required for proceed the jsonnet now. I added a switch which allows to clone the source and run jb + jsonnet to generate the prometheus rules.

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

  • 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: Jan-Otto Kröpke <joe@cloudeteer.de>
Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>
@QuentinBisson
Copy link
Member

@jkroepke can you fix the imports? :)

Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>
@jkroepke
Copy link
Member Author

@QuentinBisson done

@QuentinBisson QuentinBisson merged commit bdfef97 into prometheus-community:main Oct 12, 2023
4 checks passed
@jkroepke jkroepke deleted the hack-etcd branch October 12, 2023 13:21
nrdufour added a commit to nrdufour/home-ops that referenced this pull request Oct 13, 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.5.3` -> `51.6.1` |

---

> ⚠ **Warning**
>
> Some dependencies could not be looked up. Check the warning logs for more information.

---

### Release Notes

<details>
<summary>prometheus-community/helm-charts (kube-prometheus-stack)</summary>

### [`v51.6.1`](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.6.1)

[Compare Source](prometheus-community/helm-charts@kube-prometheus-stack-51.6.0...kube-prometheus-stack-51.6.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] - bump thanos to 0.32.4 by [@&#8203;DrFaust92](https://github.com/DrFaust92) in prometheus-community/helm-charts#3885

**Full Changelog**: prometheus-community/helm-charts@prometheus-rabbitmq-exporter-1.9.0...kube-prometheus-stack-51.6.1

### [`v51.6.0`](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.6.0)

[Compare Source](prometheus-community/helm-charts@kube-prometheus-stack-51.5.3...kube-prometheus-stack-51.6.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] hack: fix etcd mixin by [@&#8203;jkroepke](https://github.com/jkroepke) in prometheus-community/helm-charts#3880

**Full Changelog**: prometheus-community/helm-charts@kube-prometheus-stack-51.5.3...kube-prometheus-stack-51.6.0

</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:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMy4wIiwidXBkYXRlZEluVmVyIjoiMzcuMTMuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Reviewed-on: https://git.home/nrdufour/home-ops/pulls/146
Co-authored-by: Renovate <renovate@ptinem.io>
Co-committed-by: Renovate <renovate@ptinem.io>
spiceratops added a commit to spiceratops/k8s-gitops that referenced this pull request 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)
| major | `48.6.0` -> `51.8.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.8.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.8.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] Fix IO panels in Cluster Overview by
[@&#8203;jkroepke](https://togithub.com/jkroepke) in
[prometheus-community/helm-charts#3902

**Full Changelog**:
prometheus-community/helm-charts@prometheus-json-exporter-0.7.2...kube-prometheus-stack-51.8.0

###
[`v51.7.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.7.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] Allow to configure keep_firing_for for all
Prometheus rules by [@&#8203;jkroepke](https://togithub.com/jkroepke) in
[prometheus-community/helm-charts#3890

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-51.6.1...kube-prometheus-stack-51.7.0

###
[`v51.6.1`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.6.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] - bump thanos to 0.32.4 by
[@&#8203;DrFaust92](https://togithub.com/DrFaust92) in
[prometheus-community/helm-charts#3885

**Full Changelog**:
prometheus-community/helm-charts@prometheus-rabbitmq-exporter-1.9.0...kube-prometheus-stack-51.6.1

###
[`v51.6.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.6.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] hack: fix etcd mixin by
[@&#8203;jkroepke](https://togithub.com/jkroepke) in
[prometheus-community/helm-charts#3880

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-51.5.3...kube-prometheus-stack-51.6.0

###
[`v51.5.3`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.5.3)

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] bump thanos to 0.32.3 by
[@&#8203;DrFaust92](https://togithub.com/DrFaust92) in
[prometheus-community/helm-charts#3845

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-51.5.2...kube-prometheus-stack-51.5.3

###
[`v51.5.2`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.5.2)

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 thanos ruler alertmanager configs by
[@&#8203;thameezb](https://togithub.com/thameezb) in
[prometheus-community/helm-charts#3870

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-51.5.1...kube-prometheus-stack-51.5.2

###
[`v51.5.1`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.5.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] bump prometheus image tag to 2.47.1 by
[@&#8203;FlorisFeddema](https://togithub.com/FlorisFeddema) in
[prometheus-community/helm-charts#3877

#### New Contributors

- [@&#8203;FlorisFeddema](https://togithub.com/FlorisFeddema) made their
first contribution in
[prometheus-community/helm-charts#3877

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-51.5.0...kube-prometheus-stack-51.5.1

###
[`v51.5.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.5.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] bump windows rules and dashboards by
[@&#8203;TheKangaroo](https://togithub.com/TheKangaroo) in
[prometheus-community/helm-charts#3818

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-51.4.1...kube-prometheus-stack-51.5.0

###
[`v51.4.1`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.4.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] Bump dependencies by
[@&#8203;jkroepke](https://togithub.com/jkroepke) in
[prometheus-community/helm-charts#3876

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-51.4.0...kube-prometheus-stack-51.4.1

###
[`v51.4.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.4.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] updated kube-state-metrics to 5.14.x by
[@&#8203;dotdc](https://togithub.com/dotdc) in
[prometheus-community/helm-charts#3873

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-51.3.0...kube-prometheus-stack-51.4.0

###
[`v51.3.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.3.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] lift to grafana helm-chart version 6.60 by
[@&#8203;YuleZ](https://togithub.com/YuleZ) in
[prometheus-community/helm-charts#3864

#### New Contributors

- [@&#8203;YuleZ](https://togithub.com/YuleZ) made their first
contribution in
[prometheus-community/helm-charts#3864

**Full Changelog**:
prometheus-community/helm-charts@kube-state-metrics-5.14.0...kube-prometheus-stack-51.3.0

###
[`v51.2.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.2.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 support for attaching node metadata by
[@&#8203;zeritti](https://togithub.com/zeritti) in
[prometheus-community/helm-charts#3820

**Full Changelog**:
prometheus-community/helm-charts@prometheus-statsd-exporter-0.10.1...kube-prometheus-stack-51.2.0

###
[`v51.1.1`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.1.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: use correct job name for dashboards to
work, make deployment more intuitively by
[@&#8203;lippertmarkus](https://togithub.com/lippertmarkus) in
[prometheus-community/helm-charts#3672

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-51.1.0...kube-prometheus-stack-51.1.1

###
[`v51.1.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.1.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] remove default cpu and memory requests and
li… by [@&#8203;mmianl](https://togithub.com/mmianl) in
[prometheus-community/helm-charts#3813

#### New Contributors

- [@&#8203;mmianl](https://togithub.com/mmianl) made their first
contribution in
[prometheus-community/helm-charts#3813

**Full Changelog**:
prometheus-community/helm-charts@prometheus-25.0.0...kube-prometheus-stack-51.1.0

###
[`v51.0.3`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.0.3)

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] Adding operating systems values for node
exporter by [@&#8203;nicon89](https://togithub.com/nicon89) in
[prometheus-community/helm-charts#3778

#### New Contributors

- [@&#8203;nicon89](https://togithub.com/nicon89) made their first
contribution in
[prometheus-community/helm-charts#3778

**Full Changelog**:
prometheus-community/helm-charts@prometheus-node-exporter-4.23.1...kube-prometheus-stack-51.0.3

###
[`v51.0.2`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.0.2)

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 reloader-web's app protocol by
[@&#8203;abaguas](https://togithub.com/abaguas) in
[prometheus-community/helm-charts#3762

#### New Contributors

- [@&#8203;abaguas](https://togithub.com/abaguas) made their first
contribution in
[prometheus-community/helm-charts#3762

**Full Changelog**:
prometheus-community/helm-charts@prometheus-pushgateway-2.4.1...kube-prometheus-stack-51.0.2

###
[`v51.0.1`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.0.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 prometheus-operator cilium netpol when
using TLS by [@&#8203;hervenicol](https://togithub.com/hervenicol) in
[prometheus-community/helm-charts#3788

#### New Contributors

- [@&#8203;hervenicol](https://togithub.com/hervenicol) made their first
contribution in
[prometheus-community/helm-charts#3788

**Full Changelog**:
prometheus-community/helm-charts@prometheus-kafka-exporter-2.5.0...kube-prometheus-stack-51.0.1

###
[`v51.0.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.0.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] operator bump to 0.68.0 by
[@&#8203;DrFaust92](https://togithub.com/DrFaust92) in
[prometheus-community/helm-charts#3770

**Full Changelog**:
prometheus-community/helm-charts@prometheus-cloudwatch-exporter-0.25.2...kube-prometheus-stack-51.0.0

###
[`v50.3.1`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-50.3.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 thanos sidecar ingress by
[@&#8203;DrFaust92](https://togithub.com/DrFaust92) in
[prometheus-community/helm-charts#3756

**Full Changelog**:
prometheus-community/helm-charts@prometheus-24.2.0...kube-prometheus-stack-50.3.1

###
[`v50.3.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-50.3.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] regenerate grafana dashboards by
[@&#8203;DrFaust92](https://togithub.com/DrFaust92) in
[prometheus-community/helm-charts#3757

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-50.2.0...kube-prometheus-stack-50.3.0

###
[`v50.2.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-50.2.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] Generate latest alerts by
[@&#8203;DrFaust92](https://togithub.com/DrFaust92) in
[prometheus-community/helm-charts#3753

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-50.1.0...kube-prometheus-stack-50.2.0

###
[`v50.1.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-50.1.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] bump kube-state-metrics and
prometheus-node-exporter by
[@&#8203;DrFaust92](https://togithub.com/DrFaust92) in
[prometheus-community/helm-charts#3752

**Full Changelog**:
prometheus-community/helm-charts@prometheus-node-exporter-4.23.0...kube-prometheus-stack-50.1.0

###
[`v50.0.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-50.0.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] Bump minimun kubeVersion to ">=1.19.0-0" by
[@&#8203;arukiidou](https://togithub.com/arukiidou) in
[prometheus-community/helm-charts#3606

**Full Changelog**:
prometheus-community/helm-charts@kube-state-metrics-5.12.1...kube-prometheus-stack-50.0.0

###
[`v49.2.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-49.2.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 support for relabelings and
metricRelabelings by [@&#8203;Jonnobrow](https://togithub.com/Jonnobrow)
in
[prometheus-community/helm-charts#3683

#### New Contributors

- [@&#8203;Jonnobrow](https://togithub.com/Jonnobrow) made their first
contribution in
[prometheus-community/helm-charts#3683

**Full Changelog**:
prometheus-community/helm-charts@kube-prometheus-stack-49.1.0...kube-prometheus-stack-49.2.0

###
[`v49.1.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-49.1.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] Updates thanos image to v0.32.1 by
[@&#8203;arukiidou](https://togithub.com/arukiidou) in
[prometheus-community/helm-charts#3735

**Full Changelog**:
prometheus-community/helm-charts@prometheus-24.0.0...kube-prometheus-stack-49.1.0

###
[`v49.0.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-49.0.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] Upgrade crds to 0.67.1 by
[@&#8203;EtienneBarbier](https://togithub.com/EtienneBarbier) in
[prometheus-community/helm-charts#3668

**Full Changelog**:
prometheus-community/helm-charts@prometheus-mongodb-exporter-3.3.0...kube-prometheus-stack-49.0.0

</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:eyJjcmVhdGVkSW5WZXIiOiIzNy44LjEiLCJ1cGRhdGVkSW5WZXIiOiIzNy4xOS4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
@dragoangel
Copy link
Contributor

dragoangel commented Oct 16, 2023

Hi @QuentinBisson @jkroepke

After getting dashboard from this PR there is issue with all panels as they use wrong filters:
sum(etcd_server_has_leader{job=~".*etcd.*", job="$cluster"})

when it should be:
sum(etcd_server_has_leader{job="$job"})

as:

  • we already limit scope of $job to ~".*etcd.*"
  • we don't have $cluster variable, we have $job variable which just have "display name" of cluster

@jkroepke
Copy link
Member Author

@dragoangel I double check this now, but it seems like that someone manually removes the job=~".*etcd.*", label. I can validate the this limitation exists since 2021 in etcd repository and someone modify the dashboard and rules locally by hand.

It seems like that the etcd maintainer enforcing that the job label contains etcd somewhere.

@QuentinBisson whats your opinion? Restore the initial behavior by hand or replicate the new behavior? While creating the PR, I expect the changes and double check them with upstream.

@QuentinBisson
Copy link
Member

The issue is actually coming from this line upstream:
https://github.com/etcd-io/etcd/blob/252f5a6f4d452b63c091ed73315bd3612a890e07/contrib/mixin/dashboards/targets.libsonnet#L8

@QuentinBisson
Copy link
Member

But as you can see here it was already set that way

@QuentinBisson
Copy link
Member

IMO the issue is that when upstream migrated to grafonnet instead of grafonnet-lib, they screwed the mixin variable definition here https://github.com/etcd-io/etcd/blob/252f5a6f4d452b63c091ed73315bd3612a890e07/contrib/mixin/dashboards/variables.libsonnet#L12

@jkroepke how about we manually fix this with a comment and create an issue upstream ? Can you take care ?

@jkroepke
Copy link
Member Author

jkroepke commented Oct 16, 2023

@QuentinBisson I bit of tracking the changes in this PR compared to the Changes linked the commit you mentioned.
etcd-io/etcd@f564436#diff-007651fd1693f51e6c72b237590b65d2a1a72fa3bba2d24993c2bf417bb25792L332

I have the option that the definition of the template variables is equal, except that label_values(etcd_server_has_leader, job) has been changed to label_values(etcd_server_has_leader{job=~".*etcd.*"}, job). And the queries of the panel are changes from sum(etcd_server_has_leader{job="$cluster"}) to sum(etcd_server_has_leader{job=~".*etcd.*",job="$cluster"})

Saving the label values of job label to a variable named $cluster, and re-use job="$cluster" in Panel Query seems legit to me. (Except the naming of the cluster label feels a bit odd). This logic has not been changed in this PR here. The only thing that is new here is the filter job=~".*etcd.*" appears everyone. At the moment, I have not the feeling that upstream does something wrong here.

To restore the old behavior, the can adjust the jsonnet config, like set etcd_selector: 'job=~".*"' ( I guess empty string is not support here)

Edit: I saw your upstream issue now. Looking forward there. 👍

@QuentinBisson
Copy link
Member

I think the issue is not really that the variable upstream is called job instead of cluster so the dashboard variable templating is incorrect.

Sadly, setting etcd_selector: 'job=~".*"' will not fix the fact the $cluster variable is not set :)

As a temporary fix (i.e. if the etcd fix is not merged in a decent timeline), we can edit the value in our template (with a comment that would be seen during a review) to name the variable cluster instead of job in the etcd dashboard. WDYT @jkroepke ?

@QuentinBisson
Copy link
Member

It's now fixed by #3917

Matiasmct pushed a commit to giffgaff/prometheus-charts that referenced this pull request Mar 20, 2024
* [kube-prometheus-stack] hack: fix etcd mixin

Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>

* [kube-prometheus-stack] hack: fix etcd mixin

Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>

* fix imports

Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>

---------

Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>
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

3 participants