diff --git a/charts/k8s-monitoring/README.md b/charts/k8s-monitoring/README.md index 8c9beaec0..d56d0b86c 100644 --- a/charts/k8s-monitoring/README.md +++ b/charts/k8s-monitoring/README.md @@ -753,15 +753,15 @@ The Prometheus and Loki services may be hosted on the same cluster, or remotely | rules.loki.namespace.label_expressions | list | `[]` | Label expressions for Namespace resources. | | rules.loki.namespace.label_selectors | object | `{}` | Label selector for Namespace resources. | | rules.loki.prefix | string | alloy | Prefix to be added to the rule namespace, used to differentiate multiple Alloy deployments added. | -| rules.loki.rule.label_expressions | list | `[]` | Label expressions for PrometheusRule resources. Example: ```alloy - key: team operator: In values: ["ops"] ``` | -| rules.loki.rule.label_selectors | object | `{"rule_type":"loki"}` | Label selectors for PrometheusRule resources as key/pair values. Example: ```alloy label_selectors: rule_type: loki sync: "true" loki: "true" ``` | +| rules.loki.rule.label_expressions | list | `[]` | Label expressions for PrometheusRule resources. | +| rules.loki.rule.label_selectors | object | `{"rule_type":"loki"}` | Label selectors for PrometheusRule resources as key/pair values. | | rules.loki.sync_interval | string | 5m | Amount of time between reconciliations with Mimir. | | rules.mimir.namespace.label_expressions | list | `[]` | Label expressions for Namespace resources. | | rules.mimir.namespace.label_selectors | object | `{}` | Label selector for Namespace resources. | | rules.mimir.prefix | string | alloy | Prefix to be added to the rule namespace, used to differentiate multiple Alloy deployments added. | | rules.mimir.prometheus_http_prefix | string | /api/prom | Path prefix for Mimir’s Prometheus endpoint (gem-path-prefix). | -| rules.mimir.rule.label_expressions | list | `[]` | Label expressions for PrometheusRule resources. Example: ```alloy - key: team operator: In values: ["ops"] ``` | -| rules.mimir.rule.label_selectors | object | `{"rule_type":"mimir"}` | Label selectors for PrometheusRule resources as key/pair values. Example: ```alloy label_selectors: rule_type: mimir sync: "true" mimir: "true" ``` | +| rules.mimir.rule.label_expressions | list | `[]` | Label expressions for PrometheusRule resources. | +| rules.mimir.rule.label_selectors | object | `{"rule_type":"mimir"}` | Label selectors for PrometheusRule resources as key/pair values. | | rules.mimir.sync_interval | string | 5m | Amount of time between reconciliations with Mimir. | ## Customizing the configuration diff --git a/charts/k8s-monitoring/values.yaml b/charts/k8s-monitoring/values.yaml index 5eaf53cb6..73560bfcd 100644 --- a/charts/k8s-monitoring/values.yaml +++ b/charts/k8s-monitoring/values.yaml @@ -1519,7 +1519,6 @@ rules: label_expressions: [] # Selector for PrometheusRule resources. rule: - # -- Label selectors for PrometheusRule resources as key/pair values. # Example: # ```alloy # label_selectors: @@ -1527,15 +1526,16 @@ rules: # sync: "true" # mimir: "true" # ``` + # -- Label selectors for PrometheusRule resources as key/pair values. label_selectors: rule_type: mimir - # -- Label expressions for PrometheusRule resources. # Example: # ```alloy # - key: team # operator: In # values: ["ops"] # ``` + # -- Label expressions for PrometheusRule resources. label_expressions: [] # Settings for Loki rules, see: https://grafana.com/docs/alloy/latest/reference/components/loki.rules.kubernetes/ @@ -1557,7 +1557,6 @@ rules: label_expressions: [] # Selector for PrometheusRule resources. rule: - # -- Label selectors for PrometheusRule resources as key/pair values. # Example: # ```alloy # label_selectors: @@ -1565,15 +1564,16 @@ rules: # sync: "true" # loki: "true" # ``` + # -- Label selectors for PrometheusRule resources as key/pair values. label_selectors: rule_type: loki - # -- Label expressions for PrometheusRule resources. # Example: # ```alloy # - key: team # operator: In # values: ["ops"] # ``` + # -- Label expressions for PrometheusRule resources. label_expressions: [] # Telemetry data receiver settings diff --git a/examples/rules-sync/output.yaml b/examples/rules-sync/output.yaml index 787c613ed..7ab5282b9 100644 --- a/examples/rules-sync/output.yaml +++ b/examples/rules-sync/output.yaml @@ -100,13 +100,13 @@ metadata: name: k8smon-prometheus-node-exporter namespace: default labels: - helm.sh/chart: prometheus-node-exporter-4.34.0 + helm.sh/chart: prometheus-node-exporter-4.36.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: prometheus-node-exporter app.kubernetes.io/name: prometheus-node-exporter app.kubernetes.io/instance: k8smon - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.8.1" --- # Source: k8s-monitoring/templates/log-service-credentials.yaml apiVersion: v1 @@ -52058,13 +52058,13 @@ metadata: name: k8smon-prometheus-node-exporter namespace: default labels: - helm.sh/chart: prometheus-node-exporter-4.34.0 + helm.sh/chart: prometheus-node-exporter-4.36.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: prometheus-node-exporter app.kubernetes.io/name: prometheus-node-exporter app.kubernetes.io/instance: k8smon - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.8.1" spec: type: ClusterIP ports: @@ -52228,13 +52228,13 @@ metadata: name: k8smon-prometheus-node-exporter namespace: default labels: - helm.sh/chart: prometheus-node-exporter-4.34.0 + helm.sh/chart: prometheus-node-exporter-4.36.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: prometheus-node-exporter app.kubernetes.io/name: prometheus-node-exporter app.kubernetes.io/instance: k8smon - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.8.1" spec: selector: matchLabels: @@ -52250,13 +52250,13 @@ spec: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "true" labels: - helm.sh/chart: prometheus-node-exporter-4.34.0 + helm.sh/chart: prometheus-node-exporter-4.36.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: prometheus-node-exporter app.kubernetes.io/name: prometheus-node-exporter app.kubernetes.io/instance: k8smon - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.8.1" spec: automountServiceAccountToken: false securityContext: @@ -52267,7 +52267,7 @@ spec: serviceAccountName: k8smon-prometheus-node-exporter containers: - name: node-exporter - image: quay.io/prometheus/node-exporter:v1.8.0 + image: quay.io/prometheus/node-exporter:v1.8.1 imagePullPolicy: IfNotPresent args: - --path.procfs=/host/proc