#25 fixed selector for kube-prometheus-stack, changed url for grafana…

… dashboards
maddevsio · Apr 22, 2021 · 54deef3 · 54deef3
1 parent 149080b
commit 54deef3
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 16 deletions.
diff --git a/terraform/layer2-k8s/templates/cluster-autoscaler-values.yaml b/terraform/layer2-k8s/templates/cluster-autoscaler-values.yaml
@@ -10,10 +10,12 @@ autoDiscovery:
   clusterName: ${cluster_name}
 
 serviceMonitor:
-  enabled: false
+  enabled: true
+  interval: 10s
   namespace: monitoring
   selector:
-    prometheus: prometheus-operator
+    app: kube-prometheus-stack-operator
+    release: kube-prometheus-stack
   path: /metrics
 
 affinity:
@@ -23,5 +25,6 @@ affinity:
       - matchExpressions:
         - key: node.kubernetes.io/lifecycle
           operator: In
-          values: 
-            - ondemand
+          values:
+            - ondemand
+
diff --git a/terraform/layer2-k8s/templates/external-dns.yaml b/terraform/layer2-k8s/templates/external-dns.yaml
@@ -19,7 +19,8 @@ metrics:
     enabled: false
     namespace: monitoring
     selector:
-      prometheus: prometheus-operator
+      app: kube-prometheus-stack-operator
+      release: kube-prometheus-stack
 
 sources:
   - service

diff --git a/terraform/layer2-k8s/templates/nginx-ingress-certmanager-ssl-termination-values.yaml b/terraform/layer2-k8s/templates/nginx-ingress-certmanager-ssl-termination-values.yaml
@@ -30,9 +30,10 @@ controller:
   metrics:
     enabled: true
     serviceMonitor:
-      enabled: false
+      enabled: true
       additionalLabels:
-        release: prometheus-operator
+        app: kube-prometheus-stack-operator
+        release: kube-prometheus-stack
 
   affinity:
     nodeAffinity:
@@ -41,7 +42,7 @@ controller:
         - matchExpressions:
           - key: node.kubernetes.io/lifecycle
             operator: In
-            values: 
+            values:
               - ondemand
 
 rbac:

diff --git a/terraform/layer2-k8s/templates/nginx-ingress-values.yaml b/terraform/layer2-k8s/templates/nginx-ingress-values.yaml
@@ -21,9 +21,10 @@ controller:
   metrics:
     enabled: true
     serviceMonitor:
-      enabled: false
+      enabled: true
       additionalLabels:
-        release: prometheus-operator
+        app: kube-prometheus-stack-operator
+        release: kube-prometheus-stack
 
   podAnnotations:
     co.elastic.logs/module: nginx
@@ -37,7 +38,7 @@ controller:
         - matchExpressions:
           - key: node.kubernetes.io/lifecycle
             operator: In
-            values: 
+            values:
               - ondemand
 
 rbac:

diff --git a/terraform/layer2-k8s/templates/prometheus-mysql-exporter.yaml b/terraform/layer2-k8s/templates/prometheus-mysql-exporter.yaml
@@ -1,7 +1,8 @@
 serviceMonitor:
-  enabled: false
+  enabled: true
   additionalLabels:
-    release: prometheus-operator
+    app: kube-prometheus-stack-operator
+    release: kube-prometheus-stack
 
 mysql:
   existingSecret: mysql-exporter
@@ -13,5 +14,5 @@ affinity:
       - matchExpressions:
         - key: node.kubernetes.io/lifecycle
           operator: In
-          values: 
+          values:
             - spot
diff --git a/terraform/layer2-k8s/templates/prometheus-values.tmpl b/terraform/layer2-k8s/templates/prometheus-values.tmpl
@@ -125,13 +125,25 @@ grafana:
   dashboards:
     logs:
       logs:
-        url: https://gist.githubusercontent.com/khalezin/49766ed2976d49b0dc84a9c7809392e5/raw/53c0d067713e4da0e6cf187c6515a19e5dd996f5/loki-dashboard-quick-search.json
+        url: https://s3.amazonaws.com/grafana-dashboards.maddevs.org/common/aws-eks-base/loki-dashboard-quick-search.json
+
     k8s:
       nginx-ingress:
         gnetId: 6927
         datasource: Prometheus
       loki-promtail:
-        url: https://gist.githubusercontent.com/khalezin/dd63440a404afc7ff13815dded04e74a/raw/613f52a7c57b824ec52c15a8e89ff6ba2ba2f73d/loki-promtail.json
+        url: https://s3.amazonaws.com/grafana-dashboards.maddevs.org/common/aws-eks-base/loki-promtail.json
+      core-dns:
+        url: https://s3.amazonaws.com/grafana-dashboards.maddevs.org/common/aws-eks-base/core-dns.json
+      cluster-autoscaler:
+        url: https://s3.amazonaws.com/grafana-dashboards.maddevs.org/common/aws-eks-base/cluster-autoscaler.json
+
+
+  plugins:
+    - grafana-piechart-panel
+    - simpod-json-datasource
+    - devopsprodigy-kubegraf-app
+    - grafana-worldmap-panel
 
   affinity:
     nodeAffinity: