From 942a9f087f3c2831c626635163d6ed2f2685c973 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@tobru.ch>
Date: Sun, 16 Feb 2020 14:35:35 +0100
Subject: [PATCH] initial k8up monitoring config

---
 k8up/k8up.yaml                                   |  2 ++
 ...ice-monitor.yaml.dis => service-monitor.yaml} |  2 --
 ...prometheus-roleBindingSpecificNamespaces.yaml | 13 +++++++++++++
 .../prometheus-roleSpecificNamespaces.yaml       | 16 ++++++++++++++++
 monitoring/monitoring.jsonnet                    |  1 +
 5 files changed, 32 insertions(+), 2 deletions(-)
 rename k8up/{service-monitor.yaml.dis => service-monitor.yaml} (86%)

diff --git a/k8up/k8up.yaml b/k8up/k8up.yaml
index a910e04..9f1400a 100644
--- a/k8up/k8up.yaml
+++ b/k8up/k8up.yaml
@@ -165,6 +165,8 @@ spec:
           value: http://10.42.42.2:9000
         - name: BACKUP_GLOBALS3BUCKET
           value: knurrli-k8up
+        - name: BACKUP_PROMURL
+          value: prometheus-pushgateway.monitoring.svc
         ports:
         - containerPort: 8080
           protocol: TCP
diff --git a/k8up/service-monitor.yaml.dis b/k8up/service-monitor.yaml
similarity index 86%
rename from k8up/service-monitor.yaml.dis
rename to k8up/service-monitor.yaml
index fea3607..dcc3e5b 100644
--- a/k8up/service-monitor.yaml.dis
+++ b/k8up/service-monitor.yaml
@@ -4,8 +4,6 @@ kind: ServiceMonitor
 metadata:
   name: k8up
   namespace: k8up
-  labels:
-    release: prometheus-operator
 spec:
   endpoints:
   - interval: 30s
diff --git a/monitoring/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/monitoring/manifests/prometheus-roleBindingSpecificNamespaces.yaml
index c7527f6..7598598 100644
--- a/monitoring/manifests/prometheus-roleBindingSpecificNamespaces.yaml
+++ b/monitoring/manifests/prometheus-roleBindingSpecificNamespaces.yaml
@@ -39,4 +39,17 @@ items:
   - kind: ServiceAccount
     name: prometheus-k8s
     namespace: monitoring
+- apiVersion: rbac.authorization.k8s.io/v1
+  kind: RoleBinding
+  metadata:
+    name: prometheus-k8s
+    namespace: k8up
+  roleRef:
+    apiGroup: rbac.authorization.k8s.io
+    kind: Role
+    name: prometheus-k8s
+  subjects:
+  - kind: ServiceAccount
+    name: prometheus-k8s
+    namespace: monitoring
 kind: RoleBindingList
diff --git a/monitoring/manifests/prometheus-roleSpecificNamespaces.yaml b/monitoring/manifests/prometheus-roleSpecificNamespaces.yaml
index b920b88..730a3bd 100644
--- a/monitoring/manifests/prometheus-roleSpecificNamespaces.yaml
+++ b/monitoring/manifests/prometheus-roleSpecificNamespaces.yaml
@@ -48,4 +48,20 @@ items:
     - get
     - list
     - watch
+- apiVersion: rbac.authorization.k8s.io/v1
+  kind: Role
+  metadata:
+    name: prometheus-k8s
+    namespace: k8up
+  rules:
+  - apiGroups:
+    - ""
+    resources:
+    - services
+    - endpoints
+    - pods
+    verbs:
+    - get
+    - list
+    - watch
 kind: RoleList
diff --git a/monitoring/monitoring.jsonnet b/monitoring/monitoring.jsonnet
index c26b620..777725e 100644
--- a/monitoring/monitoring.jsonnet
+++ b/monitoring/monitoring.jsonnet
@@ -16,6 +16,7 @@ local kp =
       prometheus+:: {
         names: 'k8s',
         replicas: 1,
+        namespaces+: ['k8up'],
       },
       alertmanager+:: {
         replicas: 1,