update observability module

internal/resources/templates/helm-apps/releases/observability/observability.yml.tmpl

@@ -80,6 +80,7 @@
               action: keep
               regex: kube-system;.*dns.*;metrics
 
+        {{- if .Modules.Observability.Monitoring.Blackbox.Enabled }}
         - job_name: 'ingress-endpoints'
           metrics_path: /probe
           params:
@@ -98,13 +99,14 @@
                   __meta_kubernetes_ingress_path,
                 ]
               regex: (.+);(.+);(.+)
-              replacement: https://${2}${3}
+              replacement: https://${2}${3}/
               target_label: __param_target
             - target_label: __address__
               replacement: observability-blackbox-exporter:9115
+         {{- end }}
 
     alertManager:
-      enabled: {{ .Modules.Observability.Monitoring.AlertManager.Enabled }}
+      enabled: {{ and .Modules.Observability.Monitoring.Enabled .Modules.Observability.Monitoring.AlertManager.Enabled }}
       serviceMonitor: {{ .Modules.Observability.Monitoring.Enabled }}
       enableDefaultRules: true
       image:
@@ -129,7 +131,7 @@
       {{- end }}
 
     blackboxExporter:
-      enabled: {{ .Modules.Observability.Monitoring.Blackbox.Enabled }}
+      enabled: {{ and .Modules.Observability.Monitoring.Enabled .Modules.Observability.Monitoring.Blackbox.Enabled }}
       serviceMonitor: {{ .Modules.Observability.Monitoring.Enabled }}
       image:
         repository: {{ .Modules.Observability.Monitoring.Blackbox.Image }}
@@ -143,7 +145,7 @@
 
 
     kubeStateMetrics:
-      enabled: {{ .Modules.Observability.Monitoring.KubeState.Enabled }}
+      enabled: {{ and .Modules.Observability.Monitoring.Enabled .Modules.Observability.Monitoring.KubeState.Enabled }}
       image:
         repository: {{ .Modules.Observability.Monitoring.KubeState.Image }}
         tag: "{{ .Modules.Observability.Monitoring.KubeState.Tag }}"
@@ -176,7 +178,7 @@
           pullPolicy: IfNotPresent
 
     nodeExporter:
-      enabled: {{ .Modules.Observability.Monitoring.Node.Enabled }}
+      enabled: {{ and .Modules.Observability.Monitoring.Enabled .Modules.Observability.Monitoring.Node.Enabled }}
       image:
         repository: {{ .Modules.Observability.Monitoring.Node.Image }}
         tag: {{ .Modules.Observability.Monitoring.Node.Tag }}