Merge "Export ceph metrics via ceph-mgr prometheus plugin"

ceph/templates/service-mgr.yaml

@@ -16,6 +16,7 @@ limitations under the License.
 
 {{- if .Values.manifests.service_mgr }}
 {{- $envAll := . }}
+{{- $prometheus_annotations := $envAll.Values.monitoring.prometheus.ceph_mgr }}
 {{- if .Values.deployment.ceph }}
 {{- if .Values.ceph.enabled.mgr }}
 ---
@@ -23,6 +24,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: ceph-mgr
+  annotations:
+{{- if .Values.monitoring.prometheus.enabled }}
+{{ tuple $prometheus_annotations | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
+{{- end }}
 spec:
   ports:
   - port: {{ .Values.network.port.mgr }}

ceph/values.yaml

@@ -326,6 +326,7 @@ bootstrap:
 ceph_mgr_enabled_modules:
   - restful
   - status
+  - prometheus
 
 # You can configure your mgr modules
 # below. Each module has its own set
@@ -426,7 +427,24 @@ endpoints:
     port:
       mon:
         default: 6789
+  ceph_mgr:
+    namespace: null
+    hosts:
+      default: ceph-mgr
+    host_fqdn_override:
+      default: null
+    port:
+      mgr:
+        default: 7000
+    scheme:
+      default: http
 
+monitoring:
+  prometheus:
+    enabled: true
+    ceph_mgr:
+      scrape: true
+      port: 9283
 
 manifests:
   configmap_bin_clients: true