Making it work

Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Oct 22, 2024 · 752ddff · 752ddff
1 parent 36aded1
commit 752ddff
Show file tree

Hide file tree

Showing 43 changed files with 652 additions and 264 deletions.
diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml b/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml
@@ -195,6 +195,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-logs.alloy
@@ -6,7 +6,6 @@ otelcol.exporter.loki "loki" {
 loki.write "loki" {
   endpoint {
     url = "http://loki.loki.svc:3100/loki/api/v1/push"
-    tenant_id = ""
     bearer_token = "my-bearer-token"
   }
   external_labels = {

diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-metrics.alloy
@@ -15,9 +15,6 @@ prometheus.remote_write "prometheus" {
     }
     tls_config {
       insecure_skip_verify = false
-      ca_pem = ""
-      cert_pem = ""
-      key_pem = ""
     }
     send_native_histograms = false
     queue_config {

diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-receiver.alloy b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-receiver.alloy
@@ -15,9 +15,6 @@ prometheus.remote_write "prometheus" {
     }
     tls_config {
       insecure_skip_verify = false
-      ca_pem = ""
-      cert_pem = ""
-      key_pem = ""
     }
     send_native_histograms = false
     queue_config {
@@ -53,7 +50,6 @@ otelcol.exporter.loki "loki" {
 loki.write "loki" {
   endpoint {
     url = "http://loki.loki.svc:3100/loki/api/v1/push"
-    tenant_id = ""
     bearer_token = "my-bearer-token"
   }
   external_labels = {
@@ -92,14 +88,10 @@ otelcol.exporter.otlp "tempo" {
   client {
     endpoint = "http://tempo.tempo.svc:4317"
     headers = {
-      "X-Scope-OrgID" = "",
     }
     tls {
       insecure = false
       insecure_skip_verify = false
-      ca_pem = ""
-      cert_pem = ""
-      key_pem = ""
     }
   }
 }

diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml
@@ -72,9 +72,6 @@ data:
         }
         tls_config {
           insecure_skip_verify = false
-          ca_pem = ""
-          cert_pem = ""
-          key_pem = ""
         }
         send_native_histograms = false
         queue_config {
@@ -183,6 +180,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge
@@ -209,7 +208,6 @@ data:
     loki.write "loki" {
       endpoint {
         url = "http://loki.loki.svc:3100/loki/api/v1/push"
-        tenant_id = ""
         bearer_token = "my-bearer-token"
       }
       external_labels = {
@@ -359,9 +357,6 @@ data:
         }
         tls_config {
           insecure_skip_verify = false
-          ca_pem = ""
-          cert_pem = ""
-          key_pem = ""
         }
         send_native_histograms = false
         queue_config {
@@ -397,7 +392,6 @@ data:
     loki.write "loki" {
       endpoint {
         url = "http://loki.loki.svc:3100/loki/api/v1/push"
-        tenant_id = ""
         bearer_token = "my-bearer-token"
       }
       external_labels = {
@@ -436,14 +430,10 @@ data:
       client {
         endpoint = "http://tempo.tempo.svc:4317"
         headers = {
-          "X-Scope-OrgID" = "",
         }
         tls {
           insecure = false
           insecure_skip_verify = false
-          ca_pem = ""
-          cert_pem = ""
-          key_pem = ""
         }
       }
     }

diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml
@@ -188,6 +188,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/auth/sigv4/output.yaml b/charts/k8s-monitoring/docs/examples/auth/sigv4/output.yaml
@@ -399,6 +399,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/autoscaling/output.yaml b/charts/k8s-monitoring/docs/examples/autoscaling/output.yaml
@@ -375,6 +375,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml b/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml
@@ -391,6 +391,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml b/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml
@@ -536,6 +536,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/output.yaml
@@ -299,6 +299,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/...s-monitoring/docs/examples/features/annotation-autodiscovery/prom-annotations/output.yaml b/...s-monitoring/docs/examples/features/annotation-autodiscovery/prom-annotations/output.yaml
@@ -299,6 +299,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml
@@ -214,6 +214,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/...8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml b/...8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml
@@ -626,6 +626,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/features/cluster-metrics/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/cluster-metrics/default/output.yaml
@@ -375,6 +375,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/alloy/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/alloy/output.yaml
@@ -389,6 +389,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/cert-manager/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/cert-manager/output.yaml
@@ -130,6 +130,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/etcd/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/etcd/output.yaml
@@ -129,6 +129,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/output.yaml
@@ -143,6 +143,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/metrics-tuning/output.yaml b/charts/k8s-monitoring/docs/examples/metrics-tuning/output.yaml
@@ -586,6 +586,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml
@@ -487,6 +487,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml
@@ -437,6 +437,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml
@@ -437,6 +437,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml
@@ -541,6 +541,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml b/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml
@@ -397,6 +397,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/proxies/output.yaml b/charts/k8s-monitoring/docs/examples/proxies/output.yaml
@@ -521,6 +521,8 @@ data:
     }
     
     
+    
+    
   self-reporting-metric.prom: |
     # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_build_info gauge

diff --git a/charts/k8s-monitoring/docs/examples/remote-config/README.md b/charts/k8s-monitoring/docs/examples/remote-config/README.md
@@ -0,0 +1,22 @@
+<!--
+(NOTE: Do not edit README.md directly. It is a generated file!)
+(      To make changes, please modify values.yaml or description.txt and run `make examples`)
+-->
+# Example: remote-config/values.yaml
+
+## Values
+
+```yaml
+cluster:
+  name: remote-config-example-cluster
+
+alloy-metrics:
+  enabled: true
+  remoteConfig:
+    enabled: true
+    url: "https://remote-config.example.com/alloy"
+    auth:
+      type: "basic"
+      username: "my-remote-cfg-user"
+      password: "my-remote-cfg-password"
+```
diff --git a/charts/k8s-monitoring/docs/examples/remote-config/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/remote-config/alloy-metrics.alloy
@@ -0,0 +1,16 @@
+
+
+
+remotecfg {
+  url = "https://remote-config.example.com/alloy"
+  basic_auth {
+    username = nonsensitive(remote.kubernetes.secret.alloy_metrics_remote_cfg.data["username"])
+    password = remote.kubernetes.secret.alloy_metrics_remote_cfg.data["password"]
+  }
+  id = "remote-config-example-cluster-default-" + constants.hostnamepoll_frequency = "5m"
+  attributes = {
+    "cluster" = "remote-config-example-cluster",
+    "platform" = "kubernetes",
+    "workloadType": "statefulset",
+  }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -195,6 +195,8 @@ data: @@
         }
       self-reporting-metric.prom: |
         # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
         # TYPE grafana_kubernetes_monitoring_build_info gauge
@@ Expand Down @@