Merge pull request #216 from camptocamp/multiple-pod-monitor-endpoints

Be able to have more that one PodMonitor endpoint on a pod

templates/podmonitor.yaml

@@ -16,9 +16,9 @@ metadata:
 spec:
   selector:
     matchLabels: {{- include "common.selectorLabels" ( dict "root" $ "service" $serviceDefinition "serviceName" $serviceName ) | nindent 6 }}
-  {{- with $serviceDefinition.podMonitor.endpoint }}
+  {{- with $serviceDefinition.podMonitor.podMetricsEndpoints }}
   podMetricsEndpoints:
-    - {{ . | toYaml | nindent 6 }}
+    {{- include "common.dictToList" ( dict "keyName" "port" "contents" . ) | nindent 4 }}
   {{- end }}
 {{- end }}
 {{- end }}

tests/expected.yaml

@@ -1544,7 +1544,9 @@ spec:
       app.kubernetes.io/instance: custom
       app.kubernetes.io/component: with-service-name
   podMetricsEndpoints:
-    -
+    - port: config-prometheus
+      honorLabels: true
+      interval: 10s
+    - port: prometheus
       honorLabels: true
       interval: 10s
-      port: prometheus

tests/values.yaml

@@ -131,10 +131,13 @@ services:
       path: /one
     podMonitor:
       enabled: true
-      endpoint:
-        port: prometheus
-        interval: 10s
-        honorLabels: true
+      podMetricsEndpoints:
+        prometheus:
+          interval: 10s
+          honorLabels: true
+        config-prometheus:
+          interval: 10s
+          honorLabels: true
     replicaCount: 1
     nodeSelector: {}
     affinity:

values.md

@@ -210,7 +210,8 @@
       - **`ports`** _(array)_
     - **`podMonitor`** _(object)_: The Prometheus Pod monitor configuration. Cannot contain additional properties.
       - **`enabled`** _(boolean)_: Enable the Pod monitor for this service.
-      - **`endpoint`** _(object)_: The endpoint of the Pod monitor.
+      - **`podMetricsEndpoints`** _(object)_: The endpoints of the Pod monitor by port. Can contain additional properties.
+        - **Additional properties** _(object)_: The endpoint of the Pod monitor.
 
 ## Definitions
 

values.schema.json

@@ -1083,9 +1083,13 @@
                 "type": "boolean",
                 "description": "Enable the Pod monitor for this service"
               },
-              "endpoint": {
+              "podMetricsEndpoints": {
                 "type": "object",
-                "description": "The endpoint of the Pod monitor"
+                "description": "The endpoints of the Pod monitor by port",
+                "additionalProperties": {
+                  "type": "object",
+                  "description": "The endpoint of the Pod monitor"
+                }
               }
             }
           }