move cert-manager and ingress-nginx from kubespray to separate modules, remove reset action and update observability template

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

@@ -33,6 +33,74 @@
       scrapeInterval: {{ .Modules.Observability.Monitoring.Prometheus.ScrapeInterval }}
       retention: {{ .Modules.Observability.Monitoring.Prometheus.Persistence.Retention }}
       # serviceNodePort: 30008
+      additionalConfigs: |
+        - job_name: "kubelet"
+          scheme: https
+          metrics_path: /metrics/cadvisor
+          tls_config:
+            insecure_skip_verify: true
+          authorization:
+            credentials_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+          kubernetes_sd_configs:
+            - role: node
+          relabel_configs:
+            - action: labelmap
+              regex: __meta_kubernetes_node_label_(.+)
+
+        - job_name: "kubernetes-apiservers"
+          kubernetes_sd_configs:
+            - role: endpoints
+          scheme: https
+          tls_config:
+            ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+          authorization:
+            credentials_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+          relabel_configs:
+            - source_labels:
+                [
+                  __meta_kubernetes_namespace,
+                  __meta_kubernetes_service_name,
+                  __meta_kubernetes_endpoint_port_name,
+                ]
+              action: keep
+              regex: default;kubernetes;https
+
+        - job_name: "coredns"
+          kubernetes_sd_configs:
+            - role: endpoints
+          scheme: http
+          relabel_configs:
+            - source_labels:
+                [
+                  __meta_kubernetes_namespace,
+                  __meta_kubernetes_service_name,
+                  __meta_kubernetes_endpoint_port_name,
+                ]
+              action: keep
+              regex: kube-system;.*dns.*;metrics
+
+        - job_name: 'ingress-endpoints'
+          metrics_path: /probe
+          params:
+            module: [https_ok]
+          kubernetes_sd_configs:
+            - role: ingress
+          relabel_configs:
+            - source_labels: [__address__]
+              target_label: __param_target
+            - source_labels: [__param_target]
+              target_label: instance
+            - source_labels:
+                [
+                  __meta_kubernetes_ingress_scheme,
+                  __address__,
+                  __meta_kubernetes_ingress_path,
+                ]
+              regex: (.+);(.+);(.+)
+              replacement: https://${2}${3}
+              target_label: __param_target
+            - target_label: __address__
+              replacement: observability-blackbox-exporter:9115
 
     alertManager:
       enabled: {{ .Modules.Observability.Monitoring.AlertManager.Enabled }}
@@ -46,13 +114,18 @@
       # serviceNodePort: 30009
 
       configPath: /etc/alertmanager
-
+      {{- if .Modules.Observability.Monitoring.AlertManager.AdditionalMessageTemplates }}
+      additionalMessageTemplates:
+        {{- .Modules.Observability.Monitoring.AlertManager.AdditionalMessageTemplates | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if .Modules.Observability.Monitoring.AlertManager.Route }}
       route:
         {{- .Modules.Observability.Monitoring.AlertManager.Route | toYaml | nindent 8 }}
-
+      {{- end }}
+      {{- if .Modules.Observability.Monitoring.AlertManager.Receivers }}
       receivers:
         {{- .Modules.Observability.Monitoring.AlertManager.Receivers | toYaml | nindent 8 }}
-
+      {{- end }}
 
     blackboxExporter:
       enabled: {{ .Modules.Observability.Monitoring.Blackbox.Enabled }}