-
Notifications
You must be signed in to change notification settings - Fork 450
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] Adapt monitoring configuration for shoot cluster system components #9737
[GEP-19] Adapt monitoring configuration for shoot cluster system components #9737
Conversation
40bbe80
to
2084d04
Compare
/assign |
There was a problem hiding this 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 simplifying the monitoring configuration further. I have a few questions/remarks.
pkg/component/observability/monitoring/prometheus/shoot/utils.go
Outdated
Show resolved
Hide resolved
pkg/component/observability/monitoring/prometheus/shoot/utils.go
Outdated
Show resolved
Hide resolved
pkg/component/observability/monitoring/nodeexporter/nodeexporter.go
Outdated
Show resolved
Hide resolved
pkg/component/observability/monitoring/nodeexporter/nodeexporter.go
Outdated
Show resolved
Hide resolved
pkg/component/observability/monitoring/nodeexporter/nodeexporter.go
Outdated
Show resolved
Hide resolved
…s running inside the shoot cluster
2084d04
to
6fe62de
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
LGTM label has been added. Git tree hash: 41b5f5efc4dfcbb38a18402c2576a7e50cfe0771
|
/approve |
[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 |
…nents (#9848) * Drop `Monitoring` struct from `shoot/types.go` This seperation is not clear/does not bring benefits since the `SystemComponents` struct also contains monitoring-related deployers. To correct these, we would have to introduce a struct like `MonitoringSystemComponents` or whatever, but I don't think that's reasonable. Using the `ControlPlane` and `SystemComponents` alone seems good enough and is also clear because it directly shows where the respective component is deployed. * Drop `Logging` struct from `shoot/types.go` Similar to previous commit * Adapt `cluster-autoscaler` * Adapt `machine-controller-manager` * Adapt `vali` * Adapt `gardener-resource-manager` The `__meta_kubernetes_{pod_node_name,namespace}` relabel configs are automatically added by `prometheus-operator`, so no need to specify them explicitly. * Adapt `vpn-seed-server` * Adapt `kube-scheduler` * Adapt `kube-controller-manager` * Adapt `kube-apiserver` * Adapt `kube-state-metrics` * Adapt `etcd` * Align `istio` component structure * Run rule tests for components running in shoot cluster Left-over of #9737 😇 * Cleanup no longer needed code * Address PR review feedback
How to categorize this PR?
/area monitoring
/kind enhancement
What this PR does / why we need it:
As a follow-up of #9695, this PR adapts the monitoring configuration for the system components running inside the shoot cluster.
The shoot cluster control plane components will be adapted in a subsequent PR.
Which issue(s) this PR fixes:
Part of #9065
Special notes for your reviewer:
/cc @ScheererJ
Release note:
Extensions deploying shoot cluster system components can now make use of the `pkg/component/observability/monitoring/prometheus/shoot.ClusterComponentScrapeConfigSpec` function in order to generate a [`ScrapeConfig`](https://github.com/gardener/gardener/blob/master/docs/extensions/logging-and-monitoring.md#scrapeconfigs) for the shoot's Prometheus.