diff --git a/.configs/loki.yaml b/.configs/loki.yaml index 519195dfdd..b658d8a5c0 100644 --- a/.configs/loki.yaml +++ b/.configs/loki.yaml @@ -1,3 +1,4 @@ +--- deploymentMode: SingleBinary loki: commonConfig: @@ -11,7 +12,7 @@ loki: index: prefix: loki_index_ period: 24h - object_store: filesystem # we're storing on filesystem so there's no real persistence here. + object_store: filesystem # we're storing on filesystem so there's no real persistence here. schema: v13 singleBinary: replicas: 1 diff --git a/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/README.md b/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/README.md index 4b533bd328..e4b3f9dacb 100644 --- a/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/README.md +++ b/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/README.md @@ -4,8 +4,8 @@ --> # Annotation-based autodiscovery -This example shows how to enable the annotation-based autodiscovery feature, which makes it very simple to add scrape -targets. With this feature enabled, any Kubernetes Pods or Services with the `k8s.grafana.com/scrape` annotation set to +This example shows how to enable the annotation-based autodiscovery feature, which makes it easy to add scrape targets. +With this feature enabled, any Kubernetes Pods or Services with the `k8s.grafana.com/scrape` annotation set to `true` will be automatically discovered and scraped by the collector. There are several other annotations that can be used to customize the behavior of the scrape configuration, such as: diff --git a/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/description.txt b/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/description.txt index 0266cd6dd0..424a4d7b0b 100644 --- a/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/description.txt +++ b/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/description.txt @@ -1,7 +1,7 @@ # Annotation-based autodiscovery -This example shows how to enable the annotation-based autodiscovery feature, which makes it very simple to add scrape -targets. With this feature enabled, any Kubernetes Pods or Services with the `k8s.grafana.com/scrape` annotation set to +This example shows how to enable the annotation-based autodiscovery feature, which makes it easy to add scrape targets. +With this feature enabled, any Kubernetes Pods or Services with the `k8s.grafana.com/scrape` annotation set to `true` will be automatically discovered and scraped by the collector. There are several other annotations that can be used to customize the behavior of the scrape configuration, such as: diff --git a/charts/k8s-monitoring/tests/integration/cluster-monitoring/test-values.yaml b/charts/k8s-monitoring/tests/integration/cluster-monitoring/test-values.yaml index 67f29a1eff..6e0e64c4d0 100644 --- a/charts/k8s-monitoring/tests/integration/cluster-monitoring/test-values.yaml +++ b/charts/k8s-monitoring/tests/integration/cluster-monitoring/test-values.yaml @@ -29,7 +29,7 @@ tests: - query: count_over_time({cluster="cluster-monitoring-feature-test", job!="integrations/kubernetes/eventhandler"}[1h]) type: logql - # DPM check +# # DPM check # - query: avg(count_over_time(scrape_samples_scraped{cluster="cluster-monitoring-feature-test"}[1m])) # type: promql # expect: diff --git a/charts/k8s-monitoring/tests/integration/control-plane-monitoring/test-values.yaml b/charts/k8s-monitoring/tests/integration/control-plane-monitoring/test-values.yaml index e57d37c464..33ac8af037 100644 --- a/charts/k8s-monitoring/tests/integration/control-plane-monitoring/test-values.yaml +++ b/charts/k8s-monitoring/tests/integration/control-plane-monitoring/test-values.yaml @@ -37,7 +37,7 @@ tests: - query: count_over_time({cluster="control-plane-monitoring-test", job!="integrations/kubernetes/eventhandler"}[1h]) type: logql - # DPM check +# # DPM check # - query: "avg(count_over_time(scrape_samples_scraped{cluster=\"control-plane-monitoring-test\"}[1m]))" # type: promql # expect: diff --git a/charts/k8s-monitoring/tests/integration/profiling/pyroscope.yaml b/charts/k8s-monitoring/tests/integration/profiling/pyroscope.yaml index d559e8f231..edd93f1ec8 100644 --- a/charts/k8s-monitoring/tests/integration/profiling/pyroscope.yaml +++ b/charts/k8s-monitoring/tests/integration/profiling/pyroscope.yaml @@ -1,6 +1,3 @@ --- alloy: enabled: false -#pyroscope: -# extraArgs: -# "auth.multitenancy-enabled": true