From e0f2d66ee35f9fd811faf7645724617482fa6fe6 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Tue, 6 Nov 2018 13:56:37 -0600
Subject: [PATCH] Prometheus: Update discovery configuration for ceph-mgr
 services

This updates the Prometheus scrape configuration to use the
service based discovery mechanism instead of endpoints. This
removes issues associated with multiple ceph-mgr replicas deployed

Change-Id: I2c557af0c7200d0c4aea646c5f9ecd1a070db33e
---
 prometheus/values.yaml | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/prometheus/values.yaml b/prometheus/values.yaml
index f4be8bd1a..05cb5a122 100644
--- a/prometheus/values.yaml
+++ b/prometheus/values.yaml
@@ -886,7 +886,7 @@ conf:
           - source_labels:
               - __meta_kubernetes_service_name
             action: drop
-            regex: '(openstack-metrics|prom-metrics)'
+            regex: '(openstack-metrics|prom-metrics|ceph-mgr)'
           - source_labels:
               - __meta_kubernetes_service_annotation_prometheus_io_scrape
             action: keep
@@ -988,6 +988,43 @@ conf:
             replacement: ${1}
           - target_label: endpoint
             replacement: "calico-etcd"
+        - job_name: ceph-mgr
+          kubernetes_sd_configs:
+          - role: service
+          scrape_interval: 20s
+          relabel_configs:
+          - action: labelmap
+            regex: __meta_kubernetes_service_label_(.+)
+          - action: keep
+            source_labels:
+              - __meta_kubernetes_service_name
+            regex: "ceph-mgr"
+          - source_labels:
+              - __meta_kubernetes_service_port_name
+            action: drop
+            regex: 'ceph-mgr'
+          - action: keep
+            source_labels:
+              - __meta_kubernetes_namespace
+            regex: ceph
+            target_label: namespace
+          - source_labels:
+              - __meta_kubernetes_pod_name
+            target_label: pod
+          - source_labels:
+              - __meta_kubernetes_service_name
+            target_label: service
+          - source_labels:
+              - __meta_kubernetes_service_name
+            target_label: job
+            replacement: ${1}
+          - source_labels:
+              - __meta_kubernetes_service_label
+            target_label: job
+            regex: ceph-mgr
+            replacement: ${1}
+          - target_label: endpoint
+            replacement: "ceph-mgr"
       alerting:
         alertmanagers:
         - kubernetes_sd_configs: