Merge pull request microservices-demo#758 from microservices-demo/fix-rabbitmq-scrape

vlal · web-flow · commit ecda86c68e2b · 2018-01-24T01:57:30.000+01:00
Add annotation to not scrape
diff --git a/deploy/kubernetes/manifests/rabbitmq-dep.yaml b/deploy/kubernetes/manifests/rabbitmq-dep.yaml
@@ -12,12 +12,17 @@ spec:
     metadata:
       labels:
         name: rabbitmq
+      annotations:
+        prometheus.io/scrape: "false"
     spec:
       containers:
       - name: rabbitmq
-        image: rabbitmq:3.6.8
+        image: rabbitmq:3.6.8-management
         ports:
+        - containerPort: 15672
+          name: management
         - containerPort: 5672
+          name: rabbitmq
         securityContext:
           capabilities:
             drop:
@@ -28,5 +33,10 @@ spec:
               - SETUID
               - DAC_OVERRIDE
           readOnlyRootFilesystem: true
+      - name: rabbitmq-exporter
+        image: kbudde/rabbitmq-exporter
+        ports:
+        - containerPort: 9090
+          name: exporter
       nodeSelector:
-        beta.kubernetes.io/os: linux
+        beta.kubernetes.io/os: linux
diff --git a/deploy/kubernetes/manifests/rabbitmq-svc.yaml b/deploy/kubernetes/manifests/rabbitmq-svc.yaml
@@ -10,6 +10,11 @@ spec:
   ports:
     # the port that this service should serve on
   - port: 5672
+    name: rabbitmq
     targetPort: 5672
+  - port: 9090
+    name: exporter
+    targetPort: exporter
+    protocol: TCP
   selector:
     name: rabbitmq
