multi-provider monitoring charts (prometheus, gke)

Signed-off-by: sallyom <somalley@redhat.com>

Author: sallyom

config/charts/inferencepool/templates/epp-sa-token-secret.yaml

@@ -1,9 +1,9 @@
-{{- if .Values.inferenceExtension.monitoring.servicemonitor.enabled }}
+{{- if or .Values.inferenceExtension.monitoring.prometheus.enabled .Values.inferenceExtension.monitoring.gke.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "gateway-api-inference-extension.name" . }}-token
-  namespace: {{ .Release.Namespace }}
+  name: {{ .Values.inferenceExtension.monitoring.secret.name }}
+  namespace: {{ .Values.inferenceExtension.monitoring.secret.namespace }}
   labels:
     {{- include "gateway-api-inference-extension.labels" . | nindent 4 }}
   annotations:

config/charts/inferencepool/templates/epp-servicemonitor.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.inferenceExtension.monitoring.servicemonitor.enabled }}
+{{- if .Values.inferenceExtension.monitoring.prometheus.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -8,41 +8,41 @@ metadata:
     {{- include "gateway-api-inference-extension.labels" . | nindent 4 }}
 spec:
   endpoints:
-  - interval: {{ .Values.inferenceExtension.monitoring.servicemonitor.interval }}
-    port: {{ .Values.inferenceExtension.monitoring.servicemonitor.port }}
-    path: {{ .Values.inferenceExtension.monitoring.servicemonitor.path }}
+  - interval: {{ .Values.inferenceExtension.monitoring.interval }}
+    port: {{ .Values.inferenceExtension.monitoring.port }}
+    path: {{ .Values.inferenceExtension.monitoring.path }}
     authorization:
       credentials:
         key: token
-        name: {{ include "gateway-api-inference-extension.name" . }}-token
-    {{- with .Values.inferenceExtension.monitoring.servicemonitor.scrapeTimeout }}
+        name: {{ .Values.inferenceExtension.monitoring.secret.name }}
+    {{- with .Values.inferenceExtension.monitoring.prometheus.scrapeTimeout }}
     scrapeTimeout: {{ . }}
     {{- end }}
-    {{- with .Values.inferenceExtension.monitoring.servicemonitor.relabelings }}
+    {{- with .Values.inferenceExtension.monitoring.prometheus.relabelings }}
     relabelings:
       {{- toYaml . | nindent 6 }}
     {{- end }}
-    {{- with .Values.inferenceExtension.monitoring.servicemonitor.metricRelabelings }}
+    {{- with .Values.inferenceExtension.monitoring.prometheus.metricRelabelings }}
     metricRelabelings:
       {{- toYaml . | nindent 6 }}
     {{- end }}
   jobLabel: {{ include "gateway-api-inference-extension.name" . }}
   namespaceSelector:
-    {{- if .Values.inferenceExtension.monitoring.servicemonitor.namespaceSelector.any }}
+    {{- if .Values.inferenceExtension.monitoring.prometheus.namespaceSelector.any }}
     any: true
     {{- else }}
     matchNames:
     - {{ .Release.Namespace }}
-    {{- if .Values.inferenceExtension.monitoring.servicemonitor.namespaceSelector.matchNames }}
-    {{- range .Values.inferenceExtension.monitoring.servicemonitor.namespaceSelector.matchNames }}
+    {{- if .Values.inferenceExtension.monitoring.prometheus.namespaceSelector.matchNames }}
+    {{- range .Values.inferenceExtension.monitoring.prometheus.namespaceSelector.matchNames }}
     - {{ . }}
     {{- end }}
     {{- end }}
     {{- end }}
   selector:
     matchLabels:
       {{- include "gateway-api-inference-extension.labels" . | nindent 6 }}
-      {{- with .Values.inferenceExtension.monitoring.servicemonitor.selector.matchLabels }}
+      {{- with .Values.inferenceExtension.monitoring.prometheus.selector.matchLabels }}
       {{- toYaml . | nindent 6 }}
       {{- end }}
 {{- end }}

config/charts/inferencepool/templates/gke.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.provider.name "gke" }}
+{{- if and (eq .Values.provider.name "gke") .Values.inferenceExtension.monitoring.gke.enabled }}
 ---
 kind: HealthCheckPolicy
 apiVersion: networking.gke.io/v1
@@ -44,17 +44,17 @@ metadata:
     {{- include "gateway-api-inference-extension.labels" . | nindent 4 }}
 spec:
   endpoints:
-  - port: metrics
-    scheme: http
-    interval: 5s
-    path: /metrics
+  - port: {{ .Values.inferenceExtension.monitoring.port }}
+    scheme: {{ .Values.inferenceExtension.monitoring.scheme }}
+    interval: {{ .Values.inferenceExtension.monitoring.interval }}
+    path: {{ .Values.inferenceExtension.monitoring.path }}
     authorization:
       type: Bearer
       credentials:
         secret:
-          name: {{ .Values.gke.monitoringSecret.name }}
+          name: {{ .Values.inferenceExtension.monitoring.secret.name }}
           key: token
-          namespace: {{ .Values.gke.monitoringSecret.namespace }}
+          namespace: {{ .Values.inferenceExtension.monitoring.secret.namespace }}
   selector:
     matchLabels:
       {{- include "gateway-api-inference-extension.selectorLabels" . | nindent 8 }}

config/charts/inferencepool/templates/rbac.yaml

@@ -17,9 +17,9 @@ rules:
   - subjectaccessreviews
   verbs:
   - create
-{{- if .Values.inferenceExtension.monitoring.servicemonitor.enabled }}
+{{- if or .Values.inferenceExtension.monitoring.prometheus.enabled .Values.inferenceExtension.monitoring.gke.enabled }}
 - nonResourceURLs:
-  - {{ .Values.inferenceExtension.monitoring.servicemonitor.path }}
+  - {{ .Values.inferenceExtension.monitoring.path }}
   verbs:
   - get
 {{- end }}

config/charts/inferencepool/values.yaml

@@ -38,13 +38,20 @@ inferenceExtension:
 
   # Monitoring configuration for EPP
   monitoring:
-    # ServiceMonitor configuration for EPP metrics collection with Prometheus Operator
-    servicemonitor:
+    # Common monitoring parameters
+    path: "/metrics"
+    interval: "10s"
+    scheme: "http"
+    # port -- Port name to scrape metrics from (must match service port name)
+    port: "http-metrics"
+    # secret -- Service account token secret for authentication
+    secret:
+      name: inference-gateway-sa-metrics-reader-secret
+      namespace: default
+
+    # Prometheus ServiceMonitor configuration for EPP metrics collection with Prometheus Operator
+    prometheus:
       enabled: false
-      # port -- Port name to scrape metrics from (must match service port name)
-      port: "http-metrics"
-      path: "/metrics"
-      interval: "10s"
       # scrapeTimeout: "10s"
       # relabelings -- RelabelConfigs to apply to samples before scraping
       relabelings: []
@@ -57,6 +64,10 @@ inferenceExtension:
         # matchLabels in template match the EPP service by default
         matchLabels: {}
 
+    # GKE monitoring configuration (ClusterPodMonitoring)
+    gke:
+      enabled: false
+
 inferencePool:
   targetPorts:
     - number: 8000
@@ -68,7 +79,3 @@ inferencePool:
 provider:
   name: none
 
-gke:
-  monitoringSecret:
-    name: inference-gateway-sa-metrics-reader-secret
-    namespace: default