From 0b88df5848fb5dba433bc96f2ca5e34443eb32fa Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Tue, 30 Mar 2021 16:11:02 +0200
Subject: [PATCH] set prometheus monitoring interval to default to work for
default grafana dashboards
---
ansible/roles/apps/templates/settings/grafana.yaml | 10 +++-------
ansible/roles/apps/templates/settings/loki-stack.yaml | 1 +
ansible/roles/apps/templates/settings/prometheus.yaml | 3 ---
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/ansible/roles/apps/templates/settings/grafana.yaml b/ansible/roles/apps/templates/settings/grafana.yaml
index 49da23af5..d3629808b 100644
--- a/ansible/roles/apps/templates/settings/grafana.yaml
+++ b/ansible/roles/apps/templates/settings/grafana.yaml
@@ -53,18 +53,14 @@ dashboardProviders:
path: /var/lib/grafana/dashboards
dashboards:
default:
- kube-dash:
- gnetId: 11074
- revision: 2
+ kubernetes-cluster-monitoring:
+ gnetId: 315
+ revision: 3
datasource: Prometheus
node-exporter-full:
gnetId: 1860
revision: 22
datasource: Prometheus
- detailed-pods-resources:
- gnetId: 11594
- revision: 5
- datasource: Prometheus
loki-dash:
gnetId: 13639
revision: 1
diff --git a/ansible/roles/apps/templates/settings/loki-stack.yaml b/ansible/roles/apps/templates/settings/loki-stack.yaml
index c8eb0f5dc..6a7b6b04b 100644
--- a/ansible/roles/apps/templates/settings/loki-stack.yaml
+++ b/ansible/roles/apps/templates/settings/loki-stack.yaml
@@ -6,3 +6,4 @@ promtail:
initContainer:
enabled: true
fsInotifyMaxUserInstances: 512
+
diff --git a/ansible/roles/apps/templates/settings/prometheus.yaml b/ansible/roles/apps/templates/settings/prometheus.yaml
index 1839cd7d6..d91bdcaf1 100644
--- a/ansible/roles/apps/templates/settings/prometheus.yaml
+++ b/ansible/roles/apps/templates/settings/prometheus.yaml
@@ -3,9 +3,6 @@ alertmanager:
persistentVolume:
existingClaim: "alertmanager"
server:
- global:
- scrape_interval: "3m"
- evaluation_interval: "3m"
persistentVolume:
existingClaim: "prometheus-server"
retention: "10d"
--
GitLab