From 8a525893aa695de22bf3c19f27c247b765f57537 Mon Sep 17 00:00:00 2001
From: Jared Watts <jbw976@gmail.com>
Date: Mon, 24 Apr 2017 17:34:59 -0700
Subject: [PATCH] Update monitoring walkthrough to use RBAC

---
 Documentation/k8s-monitoring.md            | 31 +++++++++++-----
 demo/kubernetes/monitoring/prometheus.yaml | 43 ++++++++++++++++++++++
 2 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/Documentation/k8s-monitoring.md b/Documentation/k8s-monitoring.md
index 7e8d10ef7..a1db5c486 100644
--- a/Documentation/k8s-monitoring.md
+++ b/Documentation/k8s-monitoring.md
@@ -5,11 +5,11 @@ Note that these steps work best with a local Kubernetes cluster running in `Vagr
 ## Prometheus Operator
 First the Prometheus operator needs to be started in the cluster so it can watch for our requests to start monitoring Rook and respond by deploying the correct Prometheus pods and configuration.
 A full explanation can be found in the [Prometheus operator repository on github](https://github.com/coreos/prometheus-operator), but the quick instructions can be found here:
-```
-wget -qO- https://raw.githubusercontent.com/coreos/prometheus-operator/master/deployment.yaml | kubectl create -f -
+```bash
+kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.8/bundle.yaml
 ```
 This will start the Prometheus operator, but before moving on, wait until the operator is in the `Running` state:
-```
+```bash
 kubectl get pod
 ```
 Once the Prometheus operator is in the `Running` state, proceed to the next section.
@@ -17,28 +17,39 @@ Once the Prometheus operator is in the `Running` state, proceed to the next sect
 ## Prometheus Instances
 With the Prometheus operator running, we can create a service monitor that will watch the Rook cluster and collect metrics regularly.
 From the root of your locally cloned Rook repo, go the monitoring directory:
-```
+```bash
 cd demo/kubernetes/monitoring
 ```
 
 Create the service monitor as well as the Prometheus server pod and service:
-```
-kubectl create -f service-monitor.yaml 
+```bash
+kubectl create -f service-monitor.yaml
 kubectl create -f prometheus.yaml
 kubectl create -f prometheus-service.yaml
 ```
 
-Ensure that the Promtheus server pod is in the `Running` state before moving on:
-```
+Ensure that the Prometheus server pod gets created and advances to the `Running` state before moving on:
+```bash
 kubectl -n rook get pod prometheus-rook-prometheus-0
 ```
 
 ## Prometheus Web Console
 Once the Prometheus server is running, you can open a web browser and go to the URL that is output from this command:
-```
+```bash
 echo "http://$(kubectl -n rook -o jsonpath={.status.hostIP} get pod prometheus-rook-prometheus-0):30900"
 ```
 
 You should now see the Prometheus monitoring website.  Click on `Graph` in the top navigation bar.  In the dropdown that says ` - insert metric at cursor - `,
 select any metric you would like to see, for example `ceph_cluster_used_bytes`, followed by clicking on the `Execute` button.  Below the `Execute` button, ensure
-the `Graph` tab is selected and you should now see a graph of your chosen metric over time.
\ No newline at end of file
+the `Graph` tab is selected and you should now see a graph of your chosen metric over time.
+
+## Teardown
+To clean up all the artifacts created by the monitoring walkthrough, copy/paste the entire block below (note that errors about resources "not found" can be ignored):
+```bash
+kubectl delete -f service-monitor.yaml
+kubectl delete -f prometheus.yaml
+kubectl delete -f prometheus-service.yaml
+kubectl -n rook delete statefulset prometheus-rook-prometheus
+kubectl delete -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.8/bundle.yaml
+```
+Then the rest of the instructions in the [Prometheus Operator docs](https://github.com/coreos/prometheus-operator#removal) can be followed to finish cleaning up.
diff --git a/demo/kubernetes/monitoring/prometheus.yaml b/demo/kubernetes/monitoring/prometheus.yaml
index 1b81b22ba..fa85c9b13 100644
--- a/demo/kubernetes/monitoring/prometheus.yaml
+++ b/demo/kubernetes/monitoring/prometheus.yaml
@@ -1,9 +1,52 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: prometheus
+  namespace: rook
+---
+apiVersion: rbac.authorization.k8s.io/v1alpha1
+kind: ClusterRole
+metadata:
+  name: prometheus
+  namespace: rook
+rules:
+- apiGroups: [""]
+  resources:
+  - nodes
+  - services
+  - endpoints
+  - pods
+  verbs: ["get", "list", "watch"]
+- apiGroups: [""]
+  resources:
+  - configmaps
+  verbs: ["get"]
+- nonResourceURLs: ["/metrics"]
+  verbs: ["get"]
+---
+apiVersion: rbac.authorization.k8s.io/v1alpha1
+kind: ClusterRoleBinding
+metadata:
+  name: prometheus
+  namespace: rook
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: prometheus
+subjects:
+- kind: ServiceAccount
+  name: prometheus
+  namespace: rook
+---
 apiVersion: monitoring.coreos.com/v1alpha1
 kind: Prometheus
 metadata:
   name: rook-prometheus
   namespace: rook
+  labels:
+    prometheus: rook-prometheus
 spec:
+  serviceAccountName: prometheus
   serviceMonitorSelector:
     matchLabels:
       team: rook