Update current feature

install.sh

@@ -18,7 +18,7 @@ kubectl label ns "$NS" "name=$NS"
 helm repo add prometheus-community https://prometheus-community.github.io/helm-charts || echo "Unable to add repo prometheus-community"
 helm repo add stable https://charts.helm.sh/stable --force-update
 helm repo update
-helm install --version "65.4.0" prometheus-stack prometheus-community/kube-prometheus-stack -n monitoring  -f "$DIR"/values.yaml --create-namespace
+helm install --version "69.3.0" prometheus-stack prometheus-community/kube-prometheus-stack -n monitoring  -f "$DIR"/values.yaml --create-namespace
 
 echo "Exercice: access prometheus-grafana and other services using the website documentation"
 echo "1. Watch all pod in monitoring namespace"

manifests/deployment.yaml

@@ -0,0 +1,20 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: example-app
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: example-app
+  template:
+    metadata:
+      labels:
+        app: example-app
+    spec:
+      containers:
+      - name: example-app
+        image: quay.io/brancz/prometheus-example-app:v0.5.0
+        ports:
+        - name: web
+          containerPort: 8080

manifests/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: example-app

manifests/pod-monitor.yaml

@@ -0,0 +1,13 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: example-app
+  namespace: example-app
+  labels:
+    team: frontend
+spec:
+  selector:
+    matchLabels:
+      app: example-app
+  podMetricsEndpoints:
+  - port: web

values.yaml

@@ -15,17 +15,21 @@ prometheus:
           resources:
             requests:
               storage: 50Gi
-    podMonitorSelector:
-      matchLabels:
-        monitoring: "true"
-    podMonitorNamespaceSelector:
-      matchLabels:
-        monitoring: "true"
-    serviceMonitorSelector:
-      matchLabels:
-        monitoring: "true"
-    serviceMonitorNamespaceSelector:
-      matchLabels:
-         monitoring: "true"
+    serviceMonitorSelectorNilUsesHelmValues: true
+    podMonitorSelectorNilUsesHelmValues: true
+
+    # Code below prevent use of default serviceMonitor used for monitoring kubernetes components
+    # podMonitorSelector:
+    #   matchLabels:
+    #     monitoring: "true"
+    # podMonitorNamespaceSelector:
+    #   matchLabels:
+    #     monitoring: "true"
+    # serviceMonitorSelector:
+    #   matchLabels:
+    #     monitoring: "true"
+    # serviceMonitorNamespaceSelector:
+    #   matchLabels:
+    #      monitoring: "true"