forked from gardener/gardener
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[GEP-19] Migrate aggregate Prometheus deployment and configuration (g…
…ardener#9200) * Integrate aggregate prometheus deployment into Seed controller `Ingress`, rules and configs are still missing. Will follow in separate commits. * Update Plutono config for targeting aggregate Prometheus * Incorporate health of `prometheus-aggregate` MR in seed care controller * `Ingress` * External labels * Alerting configuration * Translate `vali` scrape config and rules * Translate `fluent-bit` scrape config and rules * Translate remaining Prometheus rules The `metering.rules.stateful.yaml` file is exactly the same as used in the cache Prometheus. There is a bash script generating it (https://github.com/gardener/gardener/blob/master/pkg/component/monitoring/prometheus/cache/assets/prometheusrules/metering.rules.stateful.sh). Let's simply copy it from there and reuse it. * Translate `shoot-prometheus` scrape config * Translate cache `prometheus` scrape config We use a `ScrapeConfig` resource here because we explicitly want to have the `role=service` in the `kubernetes_sd_configs` * Translate `istio` scrape configs * Delete no longer needed code * Harmonize prometheus component instantiation * Move vali constants into new `vali/constants` package We already follow this approach for optimizing the transitive imports for other components, see - pkg/component/coredns/constants - pkg/component/etcd/constants - pkg/component/kubeapiserver/constants - pkg/component/nodelocaldns/constants - pkg/component/resourcemanager/constants - pkg/component/vpa/constants Without this, we would introduce some undesired transitive package imports, requiring to update the skaffold config: ``` >> Checking defined dependencies in Skaffold config 'provider-local' for 'gardener-extension-provider-local' in 'skaffold.yaml'... >>> The following actual dependencies are missing (need to be added): pkg/component/etcd pkg/component/etcd/constants pkg/component/monitoring pkg/component/monitoring/alertmanager pkg/component/monitoring/prometheus pkg/component/monitoring/prometheus/cache >>> The following dependencies are not needed actually (need to be removed): >>> Run './hack/update-skaffold-deps.sh' to fix. >> Checking defined dependencies in Skaffold config 'gardenlet' for 'gardener-node-agent' in 'skaffold.yaml'... >>> The following actual dependencies are missing (need to be added): pkg/component/etcd pkg/component/etcd/constants pkg/component/monitoring pkg/component/monitoring/alertmanager pkg/component/monitoring/prometheus pkg/component/monitoring/prometheus/cache pkg/extensions pkg/utils/kubernetes/unstructured >> Checking defined dependencies in Skaffold config 'gardener-operator' for 'gardener-operator' in 'skaffold-operator.yaml'... >>> The following actual dependencies are missing (need to be added): pkg/component/monitoring pkg/component/monitoring/alertmanager pkg/component/monitoring/prometheus >>> The following dependencies are not needed actually (need to be removed): >>> Run './hack/update-skaffold-deps.sh' to fix. ``` This approach actually allows us to drop some package dependencies. * Address PR review feedback
- Loading branch information
Showing
73 changed files
with
2,201 additions
and
1,841 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.