Skip to content

Commit

Permalink
Disable /usr/src mount and add ci test
Browse files Browse the repository at this point in the history
Signed-off-by: Pete Wall <[email protected]>
  • Loading branch information
petewall committed Jun 9, 2024
1 parent c33c794 commit b2ee5d8
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
1 change: 1 addition & 0 deletions charts/k8s-monitoring/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)) |

Check failure on line 738 in charts/k8s-monitoring/README.md

View workflow job for this annotation

GitHub Actions / runner / markdownlint

[markdownlint] reported by reviewdog 🐶 MD037/no-space-in-emphasis Spaces inside emphasis markers [Context: "__ ("] Raw Output: charts/k8s-monitoring/README.md:738:281 MD037/no-space-in-emphasis Spaces inside emphasis markers [Context: "__ ("]

Check failure on line 738 in charts/k8s-monitoring/README.md

View workflow job for this annotation

GitHub Actions / runner / markdownlint

[markdownlint] reported by reviewdog 🐶 MD037/no-space-in-emphasis Spaces inside emphasis markers [Context: ". __"] Raw Output: charts/k8s-monitoring/README.md:738:288 MD037/no-space-in-emphasis Spaces inside emphasis markers [Context: ". __"]
Expand Down
5 changes: 5 additions & 0 deletions charts/k8s-monitoring/ci/ci-integrations-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -128,6 +132,7 @@ test:

opencost:
enabled: false

kepler:
enabled: true

Expand Down
9 changes: 9 additions & 0 deletions charts/k8s-monitoring/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b2ee5d8

Please sign in to comment.