cloudposse · goruha · Apr 5, 2017 · Jan 21, 2017 · Jan 23, 2017 · Jan 24, 2017
diff --git a/.gitignore b/.gitignore
@@ -39,4 +39,6 @@ Session.vim
 
 **/**/.values.yaml
 
-build-harness
+build-harness
+
+**/*/*.lock
diff --git a/incubator/alertmanager/templates/configmap.yaml b/incubator/alertmanager/templates/configmap.yaml
diff --git a/incubator/exporter-kube-api/templates/servicemonitor.yaml b/incubator/exporter-kube-api/templates/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
     component: kube-api
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+    prometheus: {{ .Release.Name }}
   name: {{ template "fullname" . }}
 spec:
   jobLabel: {{ template "fullname" . }}

diff --git a/incubator/exporter-kube-controller-manager/templates/servicemonitor.yaml b/incubator/exporter-kube-controller-manager/templates/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
     component: kube-controller-manager
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+    prometheus: {{ .Release.Name }}
   name: {{ template "fullname" . }}
 spec:
   jobLabel: {{ template "fullname" . }}

diff --git a/incubator/exporter-kube-dns/templates/servicemonitor.yaml b/incubator/exporter-kube-dns/templates/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
     component: kube-dns
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+    prometheus: {{ .Release.Name }}
   name: {{ template "fullname" . }}
 spec:
   jobLabel: {{ template "name" . }}

diff --git a/incubator/exporter-kube-etcd/templates/servicemonitor.yaml b/incubator/exporter-kube-etcd/templates/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
     component: kube-etcd
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+    prometheus: {{ .Release.Name }}
   name: {{ template "fullname" . }}
 spec:
   jobLabel: {{ template "fullname" . }}

diff --git a/incubator/exporter-kube-scheduler/templates/servicemonitor.yaml b/incubator/exporter-kube-scheduler/templates/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
     component: kube-scheduler
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+    prometheus: {{ .Release.Name }}
   name: {{ template "fullname" . }}
 spec:
   jobLabel: {{ template "fullname" . }}

diff --git a/incubator/exporter-kube-state/templates/servicemonitor.yaml b/incubator/exporter-kube-state/templates/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
     component: kube-state
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+    prometheus: {{ .Release.Name }}
   name: {{ template "fullname" . }}
 spec:
   jobLabel: {{ template "name" . }}

diff --git a/incubator/exporter-kubelets/templates/servicemonitor.yaml b/incubator/exporter-kubelets/templates/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
     component: kubelets
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+    prometheus: {{ .Release.Name }}
   name: {{ template "fullname" . }}
 spec:
   jobLabel: {{ template "fullname" . }}

diff --git a/incubator/exporter-kubernetes/templates/servicemonitor.yaml b/incubator/exporter-kubernetes/templates/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
     component: kubelets
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+    prometheus: {{ .Release.Name }}
   name: {{ template "fullname" . }}
 spec:
   jobLabel: {{ template "fullname" . }}

diff --git a/incubator/exporter-node/templates/servicemonitor.yaml b/incubator/exporter-node/templates/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
     component: node-exporter
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+    prometheus: {{ .Release.Name }}
   name: {{ template "fullname" . }}
 spec:
   jobLabel: {{ template "name" . }}

diff --git a/incubator/grafana/Chart.yaml b/incubator/grafana/Chart.yaml
@@ -8,4 +8,6 @@ sources:
 maintainers:
   - name: Ming Hsieh
     email: [email protected]
+  - name: Cloud Posse LLC
+    email: [email protected]
 engine: gotpl
diff --git a/incubator/kube-prometheus/requirements.lock b/incubator/kube-prometheus/requirements.lock
diff --git a/incubator/kube-prometheus/requirements.yaml b/incubator/kube-prometheus/requirements.yaml
@@ -1,8 +1,34 @@
 dependencies:
   - name: alertmanager
-    version: 0.1.0
-    repository: http://charts.opsgoodness.com
+    version: 0.2.0
+    repository: https://charts.cloudposse.com/incubator
   - name: prometheus
+    version: 0.2.0
+    repository: https://charts.cloudposse.com/incubator
+  - name: exporter-kube-api
+    version: 0.1.0
+    repository: https://charts.cloudposse.com/incubator
+  - name: exporter-kube-controller-manager
+    version: 0.1.0
+    repository: https://charts.cloudposse.com/incubator
+  - name: exporter-kube-dns
+    version: 0.1.0
+    repository: https://charts.cloudposse.com/incubator
+  - name: exporter-kube-etcd
+    version: 0.1.0
+    repository: https://charts.cloudposse.com/incubator
+  - name: exporter-kube-scheduler
+    version: 0.1.0
+    repository: https://charts.cloudposse.com/incubator
+  - name: exporter-kube-state
+    version: 0.1.0
+    repository: https://charts.cloudposse.com/incubator
+  - name: exporter-kubelets
+    version: 0.1.0
+    repository: https://charts.cloudposse.com/incubator
+  - name: exporter-kubernetes
+    version: 0.1.0
+    repository: https://charts.cloudposse.com/incubator
+  - name: exporter-node
     version: 0.1.0
-    repository: http://charts.opsgoodness.com
-
+    repository: https://charts.cloudposse.com/incubator
diff --git a/incubator/kube-prometheus/rules/etcd2.rules b/incubator/kube-prometheus/rules/etcd2.rules