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/Chart.yaml b/incubator/alertmanager/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
 name: alertmanager
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.1.0
+version: 0.2.0
diff --git a/incubator/alertmanager/templates/_alertmanager.yaml.tpl b/incubator/alertmanager/templates/_alertmanager.yaml.tpl
@@ -0,0 +1,16 @@
+{{- if .Values.config }}
+{{ .Values.config }}
+{{- else }}
+global:
+  resolve_timeout: 5m
+receivers:
+  - name: 'webhook'
+    webhook_configs:
+      - url: 'http://alertmanagerwh:30500/'
+route:
+  group_by: ['job']
+  group_interval: 5m
+  group_wait: 30s
+  receiver: 'webhook'
+  repeat_interval: 12h
+{{- end }}
diff --git a/incubator/alertmanager/templates/configmap.yaml b/incubator/alertmanager/templates/configmap.yaml
diff --git a/incubator/alertmanager/templates/secret.yaml b/incubator/alertmanager/templates/secret.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    alertmanager: {{ .Release.Name }}
+    app: {{ template "name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: alertmanager-{{ .Release.Name }}
+data:
+  alertmanager.yaml: {{ include (print  (dir $.Template.Name) "/_alertmanager.yaml.tpl") . | b64enc | quote }}
diff --git a/...rometheus-kube-state-exporter/.helmignore → incubator/exporter-kube-api/.helmignore b/...rometheus-kube-state-exporter/.helmignore → incubator/exporter-kube-api/.helmignore
diff --git a/incubator/exporter-kube-api/Chart.yaml b/incubator/exporter-kube-api/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: exporter-kube-api
+version: 0.1.0
diff --git a/...heus-node-exporter/templates/_helpers.tpl → .../exporter-kube-api/templates/_helpers.tpl b/...heus-node-exporter/templates/_helpers.tpl → .../exporter-kube-api/templates/_helpers.tpl
diff --git a/...eus/templates/kube-apiserver-service.yaml → .../exporter-kube-api/templates/service.yaml b/...eus/templates/kube-apiserver-service.yaml → .../exporter-kube-api/templates/service.yaml
@@ -3,11 +3,11 @@ kind: Service
 metadata:
   labels:
     app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    component: kube-api
     heritage: {{ .Release.Service }}
-    k8s-app: kube-apiserver
     release: {{ .Release.Name }}
-  name: kube-apiserver-prometheus-discovery
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+  name: {{ template "fullname" . }}
   namespace: kube-system
 spec:
   clusterIP: None

diff --git a/incubator/exporter-kube-api/templates/servicemonitor.yaml b/incubator/exporter-kube-api/templates/servicemonitor.yaml
@@ -0,0 +1,29 @@
+apiVersion: monitoring.coreos.com/v1alpha1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app: prometheus
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    component: kube-api
+    heritage: "{{ .Release.Service }}"
+    release: "{{ .Release.Name }}"
+  name: {{ template "fullname" . }}
+spec:
+  jobLabel: {{ template "name" . }}
+  selector:
+    matchLabels:
+      app: {{ template "name" . }}
+      component: kube-api
+  namespaceSelector:
+    matchNames:
+      - "kube-system"
+  endpoints:
+  - port: https-metrics
+    interval: 15s
+    scheme: https
+    tlsConfig:
+      caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+      # Skip verification until we have resolved why the certificate validation
+      # for the kubelet on API server nodes fail.
+      insecureSkipVerify: true
+    bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/incubator/exporter-kube-api/values.yaml b/incubator/exporter-kube-api/values.yaml
@@ -0,0 +1,3 @@
+# Default values for prometheus-kube-api-server-exporter.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
diff --git a/...ator/prometheus-node-exporter/.helmignore → ...orter-kube-controller-manager/.helmignore b/...ator/prometheus-node-exporter/.helmignore → ...orter-kube-controller-manager/.helmignore
diff --git a/incubator/exporter-kube-controller-manager/Chart.yaml b/incubator/exporter-kube-controller-manager/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: exporter-kube-controller-manager
+version: 0.1.0
diff --git a/incubator/exporter-kube-controller-manager/templates/_helpers.tpl b/incubator/exporter-kube-controller-manager/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/...ates/kube-controller-manager-service.yaml → ...controller-manager/templates/service.yaml b/...ates/kube-controller-manager-service.yaml → ...controller-manager/templates/service.yaml
@@ -3,11 +3,11 @@ kind: Service
 metadata:
   labels:
     app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    component: kube-controller-manager
     heritage: {{ .Release.Service }}
-    k8s-app: kube-controller-manager
     release: {{ .Release.Name }}
-  name: kube-controller-manager-prometheus-discovery
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+  name: {{ template "fullname" . }}
   namespace: kube-system
 spec:
   clusterIP: None

diff --git a/incubator/exporter-kube-controller-manager/templates/servicemonitor.yaml b/incubator/exporter-kube-controller-manager/templates/servicemonitor.yaml
@@ -0,0 +1,28 @@
+apiVersion: monitoring.coreos.com/v1alpha1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app: prometheus
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    component: kube-controller-manager
+    heritage: "{{ .Release.Service }}"
+    release: "{{ .Release.Name }}"
+  name: {{ template "fullname" . }}
+spec:
+  jobLabel: {{ template "name" . }}
+  selector:
+    matchLabels:
+      app: {{ template "name" . }}
+      component: kube-controller-manager
+  namespaceSelector:
+    matchNames:
+      - "kube-system"
+  endpoints:
+  - port: http-metrics
+    interval: 15s
+    tlsConfig:
+      caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+      # Skip verification until we have resolved why the certificate validation
+      # for the kubelet on API server nodes fail.
+      insecureSkipVerify: true
+    bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/incubator/exporter-kube-controller-manager/values.yaml b/incubator/exporter-kube-controller-manager/values.yaml
@@ -0,0 +1,4 @@
+# Default values for prometheus-kube-controller-manager-exporter.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
diff --git a/incubator/prometheus-operator/.helmignore → incubator/exporter-kube-dns/.helmignore b/incubator/prometheus-operator/.helmignore → incubator/exporter-kube-dns/.helmignore
diff --git a/...prometheus-kube-state-exporter/Chart.yaml → incubator/exporter-kube-dns/Chart.yaml b/...prometheus-kube-state-exporter/Chart.yaml → incubator/exporter-kube-dns/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 description: A Helm chart singleton for kube-state-metrics
-name: prometheus-kube-state-exporter
+name: exporter-kube-dns
 version: 0.1.0
 maintainers:
   - name: Cloud Posse LLC

diff --git a/...ube-state-exporter/templates/_helpers.tpl → .../exporter-kube-dns/templates/_helpers.tpl b/...ube-state-exporter/templates/_helpers.tpl → .../exporter-kube-dns/templates/_helpers.tpl
diff --git a/...rometheus/templates/kube-dns-service.yaml → .../exporter-kube-dns/templates/service.yaml b/...rometheus/templates/kube-dns-service.yaml → .../exporter-kube-dns/templates/service.yaml
@@ -3,11 +3,11 @@ kind: Service
 metadata:
   labels:
     app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    component: kube-dns
     heritage: {{ .Release.Service }}
-    k8s-app: kube-dns
     release: {{ .Release.Name }}
-  name: kube-dns-prometheus-discovery
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+  name: {{ template "fullname" . }}
   namespace: kube-system
 spec:
   clusterIP: None

diff --git a/incubator/exporter-kube-dns/templates/servicemonitor.yaml b/incubator/exporter-kube-dns/templates/servicemonitor.yaml
@@ -0,0 +1,26 @@
+apiVersion: monitoring.coreos.com/v1alpha1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app: prometheus
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    component: kube-dns
+    heritage: "{{ .Release.Service }}"
+    release: "{{ .Release.Name }}"
+  name: {{ template "fullname" . }}
+spec:
+  jobLabel: {{ template "name" . }}
+  selector:
+    matchLabels:
+      app: {{ template "name" . }}
+      component: kube-dns
+  namespaceSelector:
+    matchNames:
+      - "kube-system"
+  endpoints:
+  - port: http-metrics-dnsmasq
+    interval: 15s
+    bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
+  - port: http-metrics-skydns
+    interval: 15s
+    bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/incubator/exporter-kube-dns/values.yaml b/incubator/exporter-kube-dns/values.yaml
@@ -0,0 +1,4 @@
+# Default values for kube-state-metrics.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
diff --git a/incubator/exporter-kube-scheduler/.helmignore b/incubator/exporter-kube-scheduler/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/incubator/exporter-kube-scheduler/Chart.yaml b/incubator/exporter-kube-scheduler/Chart.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+description: A Helm chart singleton for kube-state-metrics
+name: exporter-kube-scheduler
+version: 0.1.0
+maintainers:
+  - name: Cloud Posse LLC
+    email: [email protected]
diff --git a/incubator/exporter-kube-scheduler/templates/_helpers.tpl b/incubator/exporter-kube-scheduler/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 24 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 24 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/...eus/templates/kube-scheduler-service.yaml → ...ter-kube-scheduler/templates/service.yaml b/...eus/templates/kube-scheduler-service.yaml → ...ter-kube-scheduler/templates/service.yaml
@@ -3,11 +3,11 @@ kind: Service
 metadata:
   labels:
     app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    component: kube-scheduler
     heritage: {{ .Release.Service }}
-    k8s-app: kube-scheduler
     release: {{ .Release.Name }}
-  name: kube-scheduler-prometheus-discovery
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+  name: {{ template "fullname" . }}
   namespace: kube-system
 spec:
   clusterIP: None
@@ -19,3 +19,4 @@ spec:
   selector:
     k8s-app: kube-scheduler
   type: ClusterIP
+
diff --git a/incubator/exporter-kube-scheduler/templates/servicemonitor.yaml b/incubator/exporter-kube-scheduler/templates/servicemonitor.yaml
@@ -0,0 +1,23 @@
+apiVersion: monitoring.coreos.com/v1alpha1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app: prometheus
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    component: kube-scheduler
+    heritage: "{{ .Release.Service }}"
+    release: "{{ .Release.Name }}"
+  name: {{ template "fullname" . }}
+spec:
+  jobLabel: {{ template "name" . }}
+  selector:
+    matchLabels:
+      app: {{ template "name" . }}
+      component: kube-scheduler
+  namespaceSelector:
+    matchNames:
+      - "kube-system"
+  endpoints:
+  - port: http-metrics
+    interval: 15s
+    bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/incubator/exporter-kube-scheduler/values.yaml b/incubator/exporter-kube-scheduler/values.yaml
@@ -0,0 +1,4 @@
+# Default values for kube-state-metrics.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
diff --git a/incubator/exporter-kube-state/.helmignore b/incubator/exporter-kube-state/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/incubator/exporter-kube-state/Chart.yaml b/incubator/exporter-kube-state/Chart.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+description: A Helm chart singleton for kube-state-metrics
+name: exporter-kube-state
+version: 0.1.0
+maintainers:
+  - name: Cloud Posse LLC
+    email: [email protected]
diff --git a/...s-kube-state-exporter/templates/NOTES.txt → ...r/exporter-kube-state/templates/NOTES.txt b/...s-kube-state-exporter/templates/NOTES.txt → ...r/exporter-kube-state/templates/NOTES.txt