diff --git a/charts/k8s-monitoring/Makefile b/charts/k8s-monitoring/Makefile index df869303d..4f75386f0 100644 --- a/charts/k8s-monitoring/Makefile +++ b/charts/k8s-monitoring/Makefile @@ -19,6 +19,7 @@ values.schema.json: values.yaml schema-mods/enums-and-types.json schema-mods/req | del(.properties["alloy-profiles"].properties.alloy) \ | del(.properties["alloy-profiles"].properties.controller) \ | del(.properties["alloy-profiles"].properties.crds) \ + | del(.properties["kepler"].properties.canMount) \ | del(.properties["kube-state-metrics"].properties.autosharding) \ | del(.properties["kube-state-metrics"].properties.nodeSelector) \ | del(.properties["kube-state-metrics"].properties.prometheusScrape) \ diff --git a/charts/k8s-monitoring/README.md b/charts/k8s-monitoring/README.md index 2c6c029fb..f0461e495 100644 --- a/charts/k8s-monitoring/README.md +++ b/charts/k8s-monitoring/README.md @@ -732,7 +732,7 @@ The Prometheus and Loki services may be hosted on the same cluster, or remotely | Key | Type | Default | Description | |-----|------|---------|-------------| -| kepler.enabled | bool | `false` | | +| kepler.enabled | bool | `false` | Should this Helm chart deploy Kepler to the cluster. Set this to false if your cluster already has Kepler, or if you do not want to scrape metrics from Kepler. | | metrics.kepler.enabled | bool | `false` | Scrape energy metrics from Kepler | | metrics.kepler.extraMetricRelabelingRules | string | `""` | Rule blocks to be added to the prometheus.relabel component for Kepler. ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus.relabel/#rule-block)) These relabeling rules are applied post-scrape against the metrics returned from the scraped target, no __meta* labels are present. | | metrics.kepler.extraRelabelingRules | string | `""` | Rule blocks to be added to the discovery.relabel component for Kepler. These relabeling rules are applied pre-scrape against the targets from service discovery. Before the scrape, any remaining target labels that start with __ (i.e. __meta_kubernetes*) are dropped. ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery.relabel/#rule-block)) | diff --git a/charts/k8s-monitoring/ci/ci-integrations-values.yaml b/charts/k8s-monitoring/ci/ci-integrations-values.yaml index 41c9b4b84..d822c678f 100644 --- a/charts/k8s-monitoring/ci/ci-integrations-values.yaml +++ b/charts/k8s-monitoring/ci/ci-integrations-values.yaml @@ -91,6 +91,10 @@ logs: test: attempts: 20 extraQueries: + # Check for Kepler metrics + - query: "kepler_container_joules_total{cluster=\"ci-integrations-cluster\"}" + type: promql + # Check for CertManager metrics, discovered by service annotations - query: "certmanager_clock_time_seconds{cluster=\"ci-integrations-cluster\", job=\"integrations/cert-manager\"}" type: promql @@ -128,6 +132,7 @@ test: opencost: enabled: false + kepler: enabled: true diff --git a/charts/k8s-monitoring/values.yaml b/charts/k8s-monitoring/values.yaml index 325f8d97b..6690e88c4 100644 --- a/charts/k8s-monitoring/values.yaml +++ b/charts/k8s-monitoring/values.yaml @@ -1941,9 +1941,18 @@ opencost: nodeSelector: kubernetes.io/os: linux +# Settings for the Kepler deployment +# You can use this sections to make modifications to the Kepler deployment. +# See https://github.com/sustainable-computing-io/kepler-helm-chart/tree/main/chart/kepler for available values. kepler: + # -- Should this Helm chart deploy Kepler to the cluster. + # Set this to false if your cluster already has Kepler, or if you do not want to scrape metrics from Kepler. enabled: false + # @ignored -- This skips including these values in README.md + canMount: + usrSrc: false + # Settings for the Grafana Alloy instance that gathers metrics, and opens receivers for application data. # See https://github.com/grafana/alloy/tree/main/operations/helm/charts/alloy for available values. # @ignored -- This skips including these values in README.md