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] fixes thanos ruler object store configs #3913

Conversation

thameezb
Copy link
Contributor

What this PR does / why we need it

Fixes ThanosRuler objectstore configs

Which issue this PR fixes

fixes #3912

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: ThameezBo <thameezbo@double.cloud>
@thameezb thameezb force-pushed the fix/kube-prometheus-stack-thanos-ruler-objectstore-configs branch from 8fd7d25 to b48ee42 Compare October 18, 2023 08:40
Copy link
Member

@GMartinez-Sisti GMartinez-Sisti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggesting to use object-storage-configs instead of objectstore-configs. WDYT?

thameezb and others added 2 commits October 18, 2023 12:55
Co-authored-by: Gabriel Martinez <19713226+GMartinez-Sisti@users.noreply.github.com>
Signed-off-by: thameezb <thameezbo@double.cloud>
Co-authored-by: Gabriel Martinez <19713226+GMartinez-Sisti@users.noreply.github.com>
Signed-off-by: thameezb <thameezbo@double.cloud>
@GMartinez-Sisti
Copy link
Member

Thanks @thameezb !!

@GMartinez-Sisti GMartinez-Sisti merged commit 1a8f84a into prometheus-community:main Oct 18, 2023
4 checks passed
@dragoangel
Copy link
Contributor

Hi @GMartinez-Sisti @thameezb , this PR is totally breaking, same as #3870

This code both worked for people (including me)
I don't know what was wrong here: #3869
But I used both alertmanagersConfig and objectStorageConfig (including queryConfig) as a:

    alertmanagersConfig:
      name: thanos-monitoring-config
      key: alertmanagers.yml

    objectStorageConfig:
      name: thanos-monitoring-config
      key: objstore.yml

    queryConfig:
      name: thanos-monitoring-config
      key: query.yml

to point Thanos Ruler to my own existing secret. These PRs break this behavior. I think initially that was a misunderstanding of what should be placed in values for people who created this issue. I don't want to place sensitive data inside of values and I already have Thanos deployed via bitnami chart which utilize exact same secret in almost same way. Can you please revert back changes done in this PRs or add sort of:
existingAlertmanagersConfig, existingObjectStorageConfig, existingQueryConfig that would have same behaviour that would allows to set both name and key to link in secret. Thank you.

@GMartinez-Sisti
Copy link
Member

Oh no! Thanks for letting us know @dragoangel. Let me see if we can easily fix it forward as you suggested, or we’ll revert it.

@dragoangel
Copy link
Contributor

Oh no! Thanks for letting us know @dragoangel. Let me see if we can easily fix it forward as you suggested, or we’ll revert it.

Thank you for your quick reply

nrdufour added a commit to nrdufour/home-ops that referenced this pull request Oct 20, 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)) | patch | `51.9.1` -> `51.9.4` |

---

### Release Notes

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

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

[Compare Source](prometheus-community/helm-charts@kube-prometheus-stack-51.9.3...kube-prometheus-stack-51.9.4)

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] Update CoreDNS Dashboard. Add job template variable by [@&#8203;StianOvrevage](https://github.com/StianOvrevage) in prometheus-community/helm-charts#3798

#### New Contributors

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

**Full Changelog**: prometheus-community/helm-charts@kube-prometheus-stack-51.9.3...kube-prometheus-stack-51.9.4

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

[Compare Source](prometheus-community/helm-charts@kube-prometheus-stack-51.9.2...kube-prometheus-stack-51.9.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] Fix etcd dashboards by [@&#8203;QuentinBisson](https://github.com/QuentinBisson) in prometheus-community/helm-charts#3917

**Full Changelog**: prometheus-community/helm-charts@kube-prometheus-stack-51.9.2...kube-prometheus-stack-51.9.3

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

[Compare Source](prometheus-community/helm-charts@kube-prometheus-stack-51.9.1...kube-prometheus-stack-51.9.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] fixes thanos ruler object store configs by [@&#8203;thameezb](https://github.com/thameezb) in prometheus-community/helm-charts#3913

**Full Changelog**: prometheus-community/helm-charts@kube-prometheus-stack-51.9.1...kube-prometheus-stack-51.9.2

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

Reviewed-on: https://git.home/nrdufour/home-ops/pulls/160
Co-authored-by: Renovate <renovate@ptinem.io>
Co-committed-by: Renovate <renovate@ptinem.io>
Matiasmct pushed a commit to giffgaff/prometheus-charts that referenced this pull request Mar 20, 2024
…etheus-community#3913)

* fix: kube-prom-stack thanos-ruler objectstoreConfigs

Signed-off-by: ThameezBo <thameezbo@double.cloud>

* Update charts/kube-prometheus-stack/templates/thanos-ruler/ruler.yaml

Co-authored-by: Gabriel Martinez <19713226+GMartinez-Sisti@users.noreply.github.com>
Signed-off-by: thameezb <thameezbo@double.cloud>

* Update charts/kube-prometheus-stack/templates/thanos-ruler/secret.yaml

Co-authored-by: Gabriel Martinez <19713226+GMartinez-Sisti@users.noreply.github.com>
Signed-off-by: thameezb <thameezbo@double.cloud>

---------

Signed-off-by: ThameezBo <thameezbo@double.cloud>
Signed-off-by: thameezb <thameezbo@double.cloud>
Co-authored-by: Gabriel Martinez <19713226+GMartinez-Sisti@users.noreply.github.com>
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.

[kube-prometheus-stack] Fix thanos rule object store config
3 participants