Merge "Prometheus: Update Alertmanager discovery, fix rules entry"

prometheus/values.yaml

@@ -120,8 +120,9 @@ endpoints:
     name: alertmanager
     namespace: null
     hosts:
-      default: alerts-api
+      default: alerts-engine
       public: alertmanager
+      discovery: alertmanager-discovery
     host_fqdn_override:
       default: null
     path:
@@ -132,6 +133,8 @@ endpoints:
       api:
         default: 9093
         public: 80
+      mesh:
+        default: 6783
 
 dependencies:
   dynamic:
@@ -452,20 +455,23 @@ conf:
       alerting:
         alertmanagers:
         - kubernetes_sd_configs:
-          - role: pod
+            - role: pod
+          tls_config:
+            ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+          bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
           relabel_configs:
-          - source_labels:
-              - __meta_kubernetes_pod_label_name
+          - source_labels: [__meta_kubernetes_pod_label_application]
             regex: alertmanager
             action: keep
-          - source_labels:
-              - __meta_kubernetes_namespace
+          - source_labels: [__meta_kubernetes_pod_container_port_name]
+            regex: alerts-api
+            action: keep
+          - source_labels: [__meta_kubernetes_pod_container_port_name]
+            regex: peer-mesh
+            action: drop
+          - source_labels: [__meta_kubernetes_namespace]
             regex: openstack
             action: keep
-          - source_labels:
-              - __meta_kubernetes_pod_container_port_number
-            regex:
-            action: drop
     rules:
       alertmanager:
         groups:
@@ -626,7 +632,7 @@ conf:
         - name: kube-controller-manager.rules
           rules:
           - alert: K8SControllerManagerDown
-            expr: absent(up{job="kube-controller-manager"} == 1)
+            expr: absent(up{job="kube-controller-manager-discovery"} == 1)
             for: 5m
             labels:
               severity: critical