From 2f23ed19f93e9ce9a7773bf3bcedb91433791f49 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Mon, 23 Apr 2018 13:02:56 -0500
Subject: [PATCH] Ceph: Add metrics port to ceph-mgr service

This adds a port for ceph metrics to the ceph-mgr service to
expose an endpoint to query directly for ceph specific metrics.
This port only gets exposed when the prometheus plugin is included
in the ceph_mgr_enabled_modules: list in ceph's values

Change-Id: I5f3a5c101a87ba5b20a644fecbe808c771b9527a
---
 ceph/templates/deployment-mgr.yaml |  7 +++++++
 ceph/templates/service-mgr.yaml    | 10 ++++++++--
 ceph/values.yaml                   |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ceph/templates/deployment-mgr.yaml b/ceph/templates/deployment-mgr.yaml
index d329ce8b49..b54c22fba5 100644
--- a/ceph/templates/deployment-mgr.yaml
+++ b/ceph/templates/deployment-mgr.yaml
@@ -89,6 +89,13 @@ spec:
             {{- end }}
           command:
             - /mgr-start.sh
+          ports:
+            - name: mgr
+              containerPort: {{ tuple "ceph_mgr" "internal" "mgr" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          {{- if (has "prometheus" .Values.ceph_mgr_enabled_modules) }}
+            - name: metrics
+              containerPort: {{ tuple "ceph_mgr" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          {{ end -}}
           livenessProbe:
            exec:
             command:
diff --git a/ceph/templates/service-mgr.yaml b/ceph/templates/service-mgr.yaml
index 8e431607e7..3198e83d4c 100644
--- a/ceph/templates/service-mgr.yaml
+++ b/ceph/templates/service-mgr.yaml
@@ -28,9 +28,15 @@ metadata:
 {{- end }}
 spec:
   ports:
-  - port: {{ .Values.network.port.mgr }}
+  - name: ceph-mgr
+    port: {{ tuple "ceph_mgr" "internal" "mgr" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     protocol: TCP
-    targetPort: {{ .Values.network.port.mgr }}
+    targetPort: {{ tuple "ceph_mgr" "internal" "mgr" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+  {{ if (has "prometheus" .Values.ceph_mgr_enabled_modules) }}
+  - name: metrics
+    protocol: TCP
+    port: {{ tuple "ceph_mgr" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+  {{ end }}
   selector:
 {{ tuple $envAll "ceph" "mgr" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 {{- end }}
diff --git a/ceph/values.yaml b/ceph/values.yaml
index df7c7d80aa..89b035a3e1 100644
--- a/ceph/values.yaml
+++ b/ceph/values.yaml
@@ -605,6 +605,8 @@ endpoints:
     port:
       mgr:
         default: 7000
+      metrics:
+        default: 9283
     scheme:
       default: http