add tls config, bearer token options, namespace selection, labels, and scrape limits

Author: kgrubb

charts/netobserv/README.md

@@ -51,9 +51,9 @@ For additional environment configurations, please refer to the [configuration re
 
 ### Prometheus Operator ServiceMonitor
 
-If you use the Prometheus Operator, you can enable a `ServiceMonitor` to scrape metrics from the collector Service.
+If you use the Prometheus Operator, you can enable a `ServiceMonitor` to scrape metrics from the flow collector Service.
 
-Example values:
+Quick start:
 
 ```yaml
 serviceMonitor:

charts/netobserv/templates/servicemonitor.yaml

@@ -16,15 +16,48 @@ spec:
     matchLabels:
       {{- include "netobserv.selectorLabels" . | nindent 6 }}
   namespaceSelector:
+    {{- if .Values.serviceMonitor.namespaceSelector.any }}
+    any: true
+    {{- else if .Values.serviceMonitor.namespaceSelector.matchNames }}
+    matchNames:
+      {{- toYaml .Values.serviceMonitor.namespaceSelector.matchNames | nindent 6 }}
+    {{- else }}
     matchNames:
       - {{ .Release.Namespace }}
+    {{- end }}
   endpoints:
     - port: {{ .Values.serviceMonitor.portName }}
       path: {{ .Values.serviceMonitor.path }}
       interval: {{ .Values.serviceMonitor.interval }}
       scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
       scheme: {{ .Values.serviceMonitor.scheme }}
       honorLabels: {{ .Values.serviceMonitor.honorLabels }}
+      followRedirects: {{ .Values.serviceMonitor.followRedirects }}
+      {{- with .Values.serviceMonitor.params }}
+      params:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.serviceMonitor.bearerTokenSecret.enabled }}
+      bearerTokenSecret:
+        name: {{ .Values.serviceMonitor.bearerTokenSecret.name }}
+        key: {{ .Values.serviceMonitor.bearerTokenSecret.key }}
+      {{- end }}
+      {{- if .Values.serviceMonitor.tlsConfig.enabled }}
+      tlsConfig:
+        insecureSkipVerify: {{ .Values.serviceMonitor.tlsConfig.insecureSkipVerify }}
+        {{- with .Values.serviceMonitor.tlsConfig.serverName }}
+        serverName: {{ . | quote }}
+        {{- end }}
+        {{- with .Values.serviceMonitor.tlsConfig.caFile }}
+        caFile: {{ . | quote }}
+        {{- end }}
+        {{- with .Values.serviceMonitor.tlsConfig.certFile }}
+        certFile: {{ . | quote }}
+        {{- end }}
+        {{- with .Values.serviceMonitor.tlsConfig.keyFile }}
+        keyFile: {{ . | quote }}
+        {{- end }}
+      {{- end }}
       {{- with .Values.serviceMonitor.relabelings }}
       relabelings:
         {{- toYaml . | nindent 8 }}
@@ -33,6 +66,28 @@ spec:
       metricRelabelings:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+  {{- with .Values.serviceMonitor.jobLabel }}
+  jobLabel: {{ . }}
+  {{- end }}
+  {{- with .Values.serviceMonitor.targetLabels }}
+  targetLabels:
+    {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- if .Values.serviceMonitor.sampleLimit }}
+  sampleLimit: {{ .Values.serviceMonitor.sampleLimit }}
+  {{- end }}
+  {{- if .Values.serviceMonitor.labelLimit }}
+  labelLimit: {{ .Values.serviceMonitor.labelLimit }}
+  {{- end }}
+  {{- if .Values.serviceMonitor.labelNameLengthLimit }}
+  labelNameLengthLimit: {{ .Values.serviceMonitor.labelNameLengthLimit }}
+  {{- end }}
+  {{- if .Values.serviceMonitor.labelValueLengthLimit }}
+  labelValueLengthLimit: {{ .Values.serviceMonitor.labelValueLengthLimit }}
+  {{- end }}
+  {{- with .Values.serviceMonitor.proxyUrl }}
+  proxyUrl: {{ . | quote }}
+  {{- end }}
 {{- end }}
 
 

charts/netobserv/values.yaml

@@ -298,6 +298,12 @@ serviceMonitor:
   namespace: ""
   # Extra labels to add to the ServiceMonitor (e.g., release: prometheus)
   labels: {}
+  # Select Services to scrape across namespaces
+  namespaceSelector:
+    # When true, select Services in all namespaces. If true, matchNames is ignored.
+    any: false
+    # Explicit list of namespaces to match. Defaults to the release namespace when empty and any=false.
+    matchNames: []
   # Endpoint settings
   interval: 30s
   scrapeTimeout: 10s
@@ -309,3 +315,26 @@ serviceMonitor:
   # Optional relabelings
   relabelings: []
   metricRelabelings: []
+  # Optional params to append to scrape requests (?foo=bar)
+  params: {}
+  # Authentication and TLS (if your endpoint requires it)
+  bearerTokenSecret:
+    enabled: false
+    name: ""
+    key: ""
+  tlsConfig:
+    enabled: false
+    insecureSkipVerify: false
+    serverName: ""
+    caFile: ""
+    certFile: ""
+    keyFile: ""
+  # Limits and labeling
+  jobLabel: ""
+  targetLabels: []
+  sampleLimit: 0
+  labelLimit: 0
+  labelNameLengthLimit: 0
+  labelValueLengthLimit: 0
+  followRedirects: true
+  proxyUrl: ""