Merge branch 'master' into restrict-service-monitor

hack/example-service-monitoring/deploy

@@ -1,18 +1,3 @@
 #!/usr/bin/env bash
 
-if [ -z "${KUBECONFIG}" ]; then
+kubectl apply -f manifests/examples/example-app
-    KUBECONFIG=~/.kube/config
-fi
-
-if [ -z "${NAMESPACE}" ]; then
-    NAMESPACE=default
-fi
-
-kubectl --namespace "$NAMESPACE" --kubeconfig="$KUBECONFIG" apply -f manifests/examples/example-app/prometheus-frontend-service-account.yaml
-kubectl --namespace "$NAMESPACE" --kubeconfig="$KUBECONFIG" apply -f manifests/examples/example-app/prometheus-frontend-role.yaml
-kubectl --namespace "$NAMESPACE" --kubeconfig="$KUBECONFIG" apply -f manifests/examples/example-app/prometheus-frontend-role-binding.yaml
-kubectl --namespace "$NAMESPACE" --kubeconfig="$KUBECONFIG" apply -f manifests/examples/example-app/prometheus-frontend-svc.yaml
-kubectl --namespace "$NAMESPACE" --kubeconfig="$KUBECONFIG" apply -f manifests/examples/example-app/example-app.yaml
-kubectl --namespace "$NAMESPACE" --kubeconfig="$KUBECONFIG" apply -f manifests/examples/example-app/prometheus-frontend.yaml
-kubectl --namespace "$NAMESPACE" --kubeconfig="$KUBECONFIG" apply -f manifests/examples/example-app/servicemonitor-frontend.yaml
-

hack/example-service-monitoring/teardown

@@ -1,12 +1,3 @@
 #!/usr/bin/env bash
 
-if [ -z "${KUBECONFIG}" ]; then
+kubectl delete -f manifests/examples/example-app
-    KUBECONFIG=~/.kube/config
-fi
-
-if [ -z "${NAMESPACE}" ]; then
-    NAMESPACE=default
-fi
-
-kubectl --namespace "$NAMESPACE" --kubeconfig="$KUBECONFIG" delete -f manifests/examples/example-app
-

hack/scripts/generate-rules-configmap.sh

@@ -6,7 +6,7 @@ kind: ConfigMap
 metadata:
   name: prometheus-k8s-rules
   labels:
-    role: prometheus-rulefiles
+    role: alert-rules
     prometheus: k8s
 data:
 EOF

manifests/examples/example-app/example-app.yaml

@@ -4,6 +4,7 @@ metadata:
   name: example-app
   labels:
     tier: frontend
+  namespace: default
 spec: 
   selector: 
     app: example-app 
@@ -17,6 +18,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: example-app
+  namespace: default
 spec:
   replicas: 4
   template:

manifests/examples/example-app/prometheus-frontend-alertmanager-discovery-role-binding.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+  name: prometheus-frontend
+  namespace: monitoring
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: alertmanager-discovery
+subjects:
+- kind: ServiceAccount
+  name: prometheus-frontend
+  namespace: default

manifests/examples/example-app/prometheus-frontend-alertmanager-discovery-role.yaml

@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: Role
+metadata:
+  name: alertmanager-discovery
+  namespace: monitoring
+rules:
+- apiGroups: [""]
+  resources:
+  - services
+  - endpoints
+  - pods
+  verbs: ["list", "watch"]

manifests/examples/example-app/prometheus-frontend-service-account.yaml

@@ -2,3 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: prometheus-frontend
+  namespace: default

manifests/examples/example-app/prometheus-frontend-svc.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: prometheus-frontend
+  namespace: default
 spec:
   type: NodePort
   ports:

manifests/examples/example-app/servicemonitor-frontend.yaml

@@ -2,6 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: frontend
+  namespace: default
   labels:
     tier: frontend
 spec:

manifests/prometheus/prometheus-k8s-rules.yaml

@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: prometheus-k8s-rules
   labels:
-    role: prometheus-rulefiles
+    role: alert-rules
     prometheus: k8s
 data:
   alertmanager.rules.yaml: |+

manifests/prometheus/prometheus-k8s.yaml

@@ -13,7 +13,7 @@ spec:
     - {key: k8s-app, operator: Exists}
   ruleSelector:
     matchLabels:
-      role: prometheus-rulefiles
+      role: alert-rules
       prometheus: k8s
   resources:
     requests: