Merge "Add prometheus annotations to tiller-deploy service"

tiller/templates/deployment-tiller.yaml

@@ -87,6 +87,9 @@ spec:
         - containerPort: 44134
           name: tiller
           protocol: TCP
+        - containerPort: 44135
+          name: metrics
+          protocol: TCP
         readinessProbe:
           failureThreshold: 3
           httpGet:

tiller/templates/service-tiller-deploy.yaml

@@ -16,6 +16,7 @@ limitations under the License.
 
 {{- if .Values.manifests.service_tiller_deploy }}
 {{- $envAll := . }}
+{{- $prometheus_annotations := $envAll.Values.monitoring.prometheus.tiller }}
 ---
 apiVersion: v1
 kind: Service
@@ -24,12 +25,20 @@ metadata:
     app: helm
     name: tiller
   name: tiller-deploy
+  annotations:
+{{- if .Values.monitoring.prometheus.enabled }}
+{{ tuple $prometheus_annotations | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
+{{- end }}
 spec:
   ports:
   - name: tiller
     port: 44134
     protocol: TCP
     targetPort: tiller
+  - name: metrics
+    port: 44135
+    protocol: TCP
+    targetPort: metrics
   selector:
     app: helm
     name: tiller

tiller/values.yaml

@@ -78,6 +78,13 @@ endpoints:
       registry:
         node: 5000
 
+monitoring:
+  prometheus:
+    enabled: true
+    tiller:
+      scrape: true
+      port: 44135
+
 manifests:
   configmap_bin: true
   deployment_tiller: true

tools/gate/playbooks/gather-prom-metrics/tasks/main.yaml

@@ -29,6 +29,13 @@
   args:
     executable: /bin/bash
 
+- name: "Get prometheus metrics from tiller-deploy"
+  shell: |-
+          set -e
+          curl tiller-deploy.kube-system:44135/metrics >> "{{ logs_dir }}"/prometheus/kube-system-tiller-deploy.txt
+  args:
+    executable: /bin/bash
+
 - name: "Downloads logs to executor"
   synchronize:
     src: "{{ logs_dir }}/prometheus"