Prometheus 2.1 (#80)

* Initial commit * Renamed Deployment dashboard -> Deployments * Added Makefile * prometheus-operator v0.1.2 * use prometheus-operator v0.2.3 * kube-prometheus v0.1.1 * use prometheus-operator v0.2.3 * use Grafana v4.1.1 * use Prometheus v1.5.0 * updated TLS validation settings * grafana: added Prometheus Stats dashboard * grafana: updated dashboards to v4.1.1 * grafana: added inputs section to dashboards * Prep for TPRs working * Separate TPR hooks * Jobs fixes * Cleanup services * Hardcoded alertmanager & prometheus names * prometheus-operator v0.4.0 * standalone prometheus (TPR) chart * Operator v0.6.0; improved cleanup * Fixed operator cleanup job * Allow nodeSelector for operator * No default resources; ClusterIP service * Only create configmap if there's config * Created alertmanager chart * Prometheus chart creates ServiceMonitors * Updated README & Makefile * Reverted chart versions to v0.1.0 * README * Renamed manifests * Back to basics * Values tweaks * README * Added chart READMEs * No Makefile * Removed kube-prometheus from README * Added kube-prometheus-charts * Added node exporter * Added exporters * Split charts * Remove unnecessary charts * Update requirements * Fix prometheus-operator * Fix prometheus operator * Fix prometheus operator * Fix prometheus operator * Add lock files to gitignore * Fix kube-prometheus * Port prometheus charts to support prometheus 0.7.0 * Remove deps * Fix rules for prometheus * Added exporters * Added exporters * Current prometheus state * Current prometheus state * Fix requirements * Fix requirements * Update deployment.yaml * Fix prometheus chart * Revert back name * Changed default service monitor and rules selector. * Changed hash sum to all 0 because it is mock hash * Changed hash sum to all 0 because it is mock hash
cloudposse · Apr 5, 2017 · 87b3f5d · 87b3f5d
1 parent 31d9c29
commit 87b3f5d
Show file tree

Hide file tree

Showing 54 changed files with 85 additions and 972 deletions.
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.yaml b/incubator/kube-prometheus/requirements.yaml
@@ -5,4 +5,30 @@ dependencies:
   - 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: https://charts.cloudposse.com/incubator
diff --git a/incubator/kube-prometheus/rules/etcd2.rules b/incubator/kube-prometheus/rules/etcd2.rules