Merge branch 'main' of https://github.com/prometheus-operator/kube-prometheus into example/alertmanager-custom-config

examples/additional-namespaces-servicemonitor.jsonnet

@@ -24,7 +24,7 @@ local kp = (import 'kube-prometheus/main.libsonnet') + {
         ],
         selector: {
           matchLabels: {
-            app: 'myapp',
+            'app.kubernetes.io/name': 'myapp',
           },
         },
       },

examples/basic-auth/service-monitor.yaml

@@ -19,4 +19,4 @@ spec:
     - logging
   selector:
     matchLabels:
-      app: myapp
+      app.kubernetes.io/name: myapp

examples/example-app/example-app.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: default
 spec:
   selector:
-    app: example-app
+    app.kubernetes.io/name: example-app
   ports:
   - name: web
     protocol: TCP
@@ -22,17 +22,17 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: example-app
+      app.kubernetes.io/name: example-app
       version: 1.1.3
   replicas: 4
   template:
     metadata:
       labels:
-        app: example-app
+        app.kubernetes.io/name: example-app
         version: 1.1.3
     spec:
       containers:
-      - name: example-app 
+      - name: example-app
         image: quay.io/fabxc/prometheus_demo_service
         ports:
         - name: web

examples/grafana-ldap.jsonnet

@@ -0,0 +1,36 @@
+local kp =
+  (import 'kube-prometheus/main.libsonnet') +
+  {
+    values+:: {
+      common+: {
+        namespace: 'monitoring',
+      },
+      grafana+: {
+        config+: {
+          sections: {
+            'auth.ldap': {
+              enabled: true,
+              config_file: '/etc/grafana/ldap.toml',
+              allow_sign_up: true,
+            },
+          },
+        },
+        ldap: |||
+          [[servers]]
+          host = "127.0.0.1"
+          port = 389
+          use_ssl = false
+          start_tls = false
+          ssl_skip_verify = false
+
+          bind_dn = "cn=admins,dc=example,dc=com"
+          bind_password = 'grafana'
+
+          search_filter = "(cn=%s)"
+          search_base_dns = ["dc=example,dc=com"]
+        |||,
+      },
+    },
+  };
+
+{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) }