prometheus yaml file fix

adilek · Aug 16, 2018 · 8089dd3 · 8089dd3
1 parent e058ba9
commit 8089dd3
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 5 deletions.
diff --git a/Phase2/201-cluster-monitoring/templates/prometheus/alertmanager.yaml b/Phase2/201-cluster-monitoring/templates/prometheus/alertmanager.yaml
@@ -1,4 +1,4 @@
-global:
+globalapiversion:v1:
   resolve_timeout: 5m
 route:
   group_by: ['job']

diff --git a/Phase2/201-cluster-monitoring/templates/prometheus/prometheus-bundle.yaml b/Phase2/201-cluster-monitoring/templates/prometheus/prometheus-bundle.yaml
@@ -97,7 +97,7 @@ spec:
       - args:
         - --kubelet-service=kube-system/kubelet
         - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
-        image: quay.io/coreos/prometheus-operator:v0.14.1
+        image: quay.io/coreos/prometheus-operator:v0.21.0
         name: prometheus-operator
         ports:
         - containerPort: 8080

diff --git a/Phase2/201-cluster-monitoring/templates/prometheus/prometheus.yaml b/Phase2/201-cluster-monitoring/templates/prometheus/prometheus.yaml
@@ -160,7 +160,7 @@ spec:
       serviceAccountName: kube-state-metrics
       containers:
       - name: kube-state-metrics
-        image: quay.io/coreos/kube-state-metrics:v1.0.1
+        image: quay.io/coreos/kube-state-metrics:v1.3.1
         ports:
         - name: metrics
           containerPort: 8080
@@ -171,7 +171,7 @@ spec:
           initialDelaySeconds: 5
           timeoutSeconds: 5
       - name: addon-resizer
-        image: k8s.gcr.io/addon-resizer:1.0
+        image: k8s.gcr.io/addon-resizer:1.7
         resources:
           limits:
             cpu: 100m
@@ -225,7 +225,7 @@ metadata:
 spec:
   replicas: 2
   version: v2.0.0-rc.1
-  serviceAccountName: prometheus-operator
+  serviceAccountName: prometheus
   serviceMonitorSelector:
     matchExpressions:
     - {key: k8s-app, operator: Exists}
@@ -246,6 +246,45 @@ spec:
       name: alertmanager-main
       port: web
 ---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: prometheus
+  namespace: monitoring
+rules:
+- apiGroups: [""]
+  resources:
+  - nodes
+  - services
+  - endpoints
+  - pods
+  verbs: ["get", "list", "watch"]
+- apiGroups: [""]
+  resources:
+  - configmaps
+  verbs: ["get"]
+- nonResourceURLs: ["/metrics"]
+  verbs: ["get"]
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: prometheus
+  namespace: monitoring
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: prometheus
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: prometheus
+subjects:
+- kind: ServiceAccount
+  name: prometheus
+  namespace: monitoring
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata: