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

[GEP-19] Integrate long-term Prometheus deployment into Garden controller #9606

Merged
merged 5 commits into from
Apr 24, 2024

Conversation

rfranzke
Copy link
Member

How to categorize this PR?

/area dev-productivity monitoring
/kind enhancement

What this PR does / why we need it:
gardener-operator now deploys two Prometheus replicas into the garden namespace for long-term retention of some metrics (e.g., availability/SLI or metering data).

This also features a cortex frontend for caching purposes.

Which issue(s) this PR fixes:
Part of #9065

Special notes for your reviewer:
/cc @ScheererJ
FYI @istvanballok @vicwicker

Release note:

`gardener-operator` now deploys two more Prometheus replicas into the `garden` namespace for storing long-term metrics. Read more about it [here](https://github.com/gardener/gardener/blob/master/docs/concepts/operator.md#long-term-prometheus).

@gardener-prow gardener-prow bot requested a review from ScheererJ April 17, 2024 16:07
@gardener-prow gardener-prow bot added area/dev-productivity Developer productivity related (how to improve development) area/monitoring Monitoring (including availability monitoring and alerting) related kind/enhancement Enhancement, improvement, extension cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 17, 2024
@ScheererJ
Copy link
Contributor

/assign

Copy link
Contributor

@ScheererJ ScheererJ left a comment

Choose a reason for hiding this comment

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

Thanks a lot for this great contribution. It highlights nicely how easy it is now with prometheus operator to add another prometheus to the gardener ecosystem.

docs/concepts/operator.md Outdated Show resolved Hide resolved
docs/concepts/operator.md Outdated Show resolved Hide resolved
docs/concepts/operator.md Show resolved Hide resolved
docs/concepts/operator.md Outdated Show resolved Hide resolved
pkg/operator/controller/garden/garden/components.go Outdated Show resolved Hide resolved
pkg/operator/controller/garden/garden/components.go Outdated Show resolved Hide resolved
@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Apr 19, 2024
Copy link
Contributor

gardener-prow bot commented Apr 19, 2024

LGTM label has been added.

Git tree hash: c0d74d679a7bdb8889c5452316403ae2f3a94339

@gardener-prow gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 22, 2024
The longterm Prometheus uses this for caching, see docs (first commit)
Also adapt Plutono dashboard datasources

This Prometheus has a cortex sidecar which serves as frontend, so the port must be 9091 (cortex container port)
@gardener-prow gardener-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 22, 2024
@gardener-prow gardener-prow bot requested a review from ScheererJ April 22, 2024 15:59
Copy link
Contributor

gardener-prow bot commented Apr 22, 2024

New changes are detected. LGTM label has been removed.

@gardener-prow gardener-prow bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 22, 2024
@rfranzke
Copy link
Member Author

Already /lgtmed in #9606 (comment), rebased removed this, so let's proceed.
/approve

@rfranzke rfranzke added the lgtm Indicates that a PR is ready to be merged. label Apr 24, 2024
Copy link
Contributor

gardener-prow bot commented Apr 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rfranzke

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gardener-prow gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2024
@gardener-prow gardener-prow bot merged commit 4beb353 into gardener:master Apr 24, 2024
17 checks passed
@rfranzke rfranzke deleted the gep19/longterm-prom branch April 25, 2024 05:27
rfranzke added a commit to rfranzke/gardener that referenced this pull request May 31, 2024
rfranzke added a commit to rfranzke/gardener that referenced this pull request May 31, 2024
gardener-prow bot pushed a commit that referenced this pull request Jun 4, 2024
* Remove deprecated fields from `OperatingSystemConfig`

(from #9477, released with `v1.92.0`)

* Remove cleanup of old `kube-apiserver` `Ingress` resource

(from #9300, released with `v1.91.0`)

* Remove Istio zone migration code

(from #9304 and #9457, released with `v1.91.0` and `v1.92.0`)

* Increase removal period of `<name>.ca-cluster` `Secret`

To give users more time to adapt

* Remove PVC migration for `garden` Prometheus

(from #9543, released with `v1.93.0`)

* Remove PVC migration for `longterm` Prometheus

(from #9606, released with `v1.94.0`)

* Drop migration code in `skaffold.yaml` for `core.gardener.cloud/v1` API

(from #9771, released with `v1.96.0`)

* Remove migration code for e2e upgrade tests after `provider-local` VPN fix

(from #9752, released with `v1.96.0`)

* Remove cleanup of old `vali` `VerticalPodAutoscaler`s

(from #9681, released with `v1.94.0`)

* Remove cleanuop code after making `Secret`s of `ManagedResource`s immutable

(from #8116, released with `v1.77.0`)

* Remove cleanup code of resources of legacy `cloud-config-downloader`

(from #8847, released with `v1.85.0`)

* Revert "Remove Istio zone migration code"

This reverts commit 8850346.

* Increase removal period of Istio zone migration code
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dev-productivity Developer productivity related (how to improve development) area/monitoring Monitoring (including availability monitoring and alerting) related cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/enhancement Enhancement, improvement, extension lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants