Add metrics port

Change-Id: I44330fe3958af4049ef30b2d2b06de5726e9b7c2

rabbitmq/Chart.yaml

@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v3.9.0
 description: OpenStack-Helm RabbitMQ
 name: rabbitmq
-version: 0.1.28
+version: 0.1.29
 home: https://github.com/rabbitmq/rabbitmq-server
 ...

rabbitmq/templates/service.yaml

@@ -32,6 +32,8 @@ spec:
       name: clustering
     - port: {{ tuple "oslo_messaging" "internal" $protocol . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
       name: {{  printf "%s" $protocol }}
+    - name: metrics
+      port: {{ tuple "oslo_messaging" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
   selector:
 {{ tuple $envAll "rabbitmq" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 {{ end }}

rabbitmq/templates/statefulset.yaml

@@ -205,6 +205,9 @@ spec:
             {{- if .Values.network.host_namespace }}
               hostPort: {{ add (tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup") 20000 }}
             {{- end }}
+            - name: metrics
+              containerPort: {{ tuple "oslo_messaging" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+              protocol: TCP
           env:
             - name: MY_POD_NAME
               valueFrom:

rabbitmq/values.yaml

@@ -356,6 +356,8 @@ endpoints:
       http:
         default: 15672
         public: 80
+      metrics:
+        default: 15692
   prometheus_rabbitmq_exporter:
     namespace: null
     hosts:
@@ -421,9 +423,9 @@ manifests:
   job_image_repo_sync: true
   monitoring:
     prometheus:
-      configmap_bin: true
+      configmap_bin: false
-      deployment_exporter: true
+      deployment_exporter: false
-      service_exporter: true
+      service_exporter: false
       network_policy_exporter: false
   network_policy: false
   pod_test: true

rabbitmq/values_overrides/builtin-metrics.yaml

@@ -0,0 +1,16 @@
+---
+# This enable Rabbitmq built-in prometheus plugin
+conf:
+  enabled_plugins:
+    - rabbitmq_management
+    - rabbitmq_peer_discovery_k8s
+    - rabbitmq_prometheus
+
+manifests:
+  monitoring:
+    prometheus:
+      configmap_bin: false
+      deployment_exporter: false
+      service_exporter: false
+      network_policy_exporter: false
+...

rabbitmq/values_overrides/rabbitmq-exporter.yaml

@@ -0,0 +1,10 @@
+---
+# This enable external pod for rabbitmq-exporter
+manifests:
+  monitoring:
+    prometheus:
+      configmap_bin: true
+      deployment_exporter: true
+      service_exporter: true
+      network_policy_exporter: false
+...

releasenotes/notes/rabbitmq.yaml

@@ -28,4 +28,5 @@ rabbitmq:
   - 0.1.26 Moved guest admin removal to init template
   - 0.1.27 Replace node-role.kubernetes.io/master with control-plane
   - 0.1.28 Add IPv6 environment support for rabbitmq
+  - 0.1.29 Add build-in prometheus plugin and disable external exporter
 ...