monitoring update to 60.4.0-bb.5

Package Merge Request

Package Changes

https://repo1.dso.mil/big-bang/product/packages/monitoring/-/blob/60.4.0-bb.5/CHANGELOG.md

Package MR

big-bang/product/packages/monitoring!362 (merged)

For Issue

Closes big-bang/product/packages/monitoring#236 (closed)

Upgrade Notices

N/A

chart/templates/monitoring/values.yaml

@@ -16,7 +16,6 @@ domain: {{ $domainName }}
 {{- $lokiEnabled := (.Values.loki.enabled) }}
 {{- $clusterName := ( default "logging-loki" .Values.loki.clusterName ) }}
 
-
 flux:
   enabled: true
 
@@ -101,6 +100,15 @@ alertmanager:
         {{ include "istioAnnotation" . }}
       {{- end }}
     {{- end }}
+  {{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.monitoring.values) "STRICT") }}
+  serviceMonitor:
+    scheme: https
+    tlsConfig:
+      caFile: /etc/prom-certs/root-cert.pem
+      certFile: /etc/prom-certs/cert-chain.pem
+      keyFile: /etc/prom-certs/key.pem
+      insecureSkipVerify: true  # Prometheus does not support Istio security naming, thus skip verifying target pod certificate
+  {{- end }}
 
 prometheus:
   {{- if $lokiEnabled }}
@@ -123,9 +131,32 @@ prometheus:
 
   thanosServiceMonitor:
     enabled: true
+    {{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.monitoring.values) "STRICT") }}
+    serviceMonitor:
+      scheme: https
+      tlsConfig:
+        caFile: /etc/prom-certs/root-cert.pem
+        certFile: /etc/prom-certs/cert-chain.pem
+        keyFile: /etc/prom-certs/key.pem
+        insecureSkipVerify: true  # Prometheus does not support Istio security naming, thus skip verifying target pod certificate
+    {{- end }}
   {{- end }}
 
   prometheusSpec:
+    {{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.monitoring.values) "STRICT") }}
+    alertingEndpoints:
+    - name: monitoring-monitoring-kube-alertmanager
+      namespace: monitoring
+      apiVersion: v2
+      port: http-web
+      pathPrefix: /
+      scheme: https
+      tlsConfig:
+        caFile: /etc/prom-certs/root-cert.pem
+        certFile: /etc/prom-certs/cert-chain.pem
+        keyFile: /etc/prom-certs/key.pem
+        insecureSkipVerify: true  # Prometheus does not support Istio security naming, thus skip verifying target pod certificate
+    {{- end }}
 
     {{- if $thanosEnabled }}
     thanos: