From 33d2f32aa2a0c253391490fdd5d8d6ac73157c36 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Thu, 1 Apr 2021 10:58:25 +0200
Subject: [PATCH] try to add dashboards from monitoring-mixins
---
.gitlab-ci.yml | 10 ----
ansible/group_vars/all/settings.yml.example | 9 ++--
.../apps/templates/settings/grafana.yaml | 46 +++++++++----------
3 files changed, 27 insertions(+), 38 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de279612d..7cb68360f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -192,21 +192,11 @@ enable-grafana:
APP: "grafana"
extends: .enable_app_template
-enable-loki-stack:
- variables:
- APP: "loki-stack"
- extends: .enable_app_template
-
enable-nextcloud:
variables:
APP: "nextcloud"
extends: .enable_app_template
-enable-prometheus:
- variables:
- APP: "prometheus"
- extends: .enable_app_template
-
enable-rocketchat:
variables:
APP: "rocketchat"
diff --git a/ansible/group_vars/all/settings.yml.example b/ansible/group_vars/all/settings.yml.example
index 5d9c8e9b6..8f2a92165 100644
--- a/ansible/group_vars/all/settings.yml.example
+++ b/ansible/group_vars/all/settings.yml.example
@@ -92,6 +92,9 @@ enabled_applications:
- 'ingress'
- 'local-path-provisioner'
- 'single-sign-on'
+ # Monitoring components
+ - 'prometheus'
+ - 'loki-stack'
# The backup system Velero is disabled by default, see settings under `backup` above.
# - 'velero'
#
@@ -101,12 +104,10 @@ enabled_applications:
#
# Applications.
# - 'grafana'
- # - 'loki-stack'
# - 'eventrouter'
# - 'nextcloud'
- # - 'prometheus'
- # 'rocketchat'
- # - 'wordpress'
+ # - 'rocketchat'
+ # - 'wordpress'
prometheus_enable_ingress: false
diff --git a/ansible/roles/apps/templates/settings/grafana.yaml b/ansible/roles/apps/templates/settings/grafana.yaml
index 518e07505..f1e34b94c 100644
--- a/ansible/roles/apps/templates/settings/grafana.yaml
+++ b/ansible/roles/apps/templates/settings/grafana.yaml
@@ -1,3 +1,4 @@
+---
adminPassword: "{{ grafana_admin_password }}"
grafana.ini:
server:
@@ -43,36 +44,33 @@ dashboardProviders:
dashboardproviders.yaml:
apiVersion: 1
providers:
- - name: 'default'
- orgId: 1
- folder: ''
- type: file
- disableDeletion: false
- editable: true
- options:
- path: /var/lib/grafana/dashboards
+ - name: 'default'
+ orgId: 1
+ folder: ''
+ type: file
+ disableDeletion: false
+ editable: true
+ options:
+ path: /var/lib/grafana/dashboards
dashboards:
default:
- kubernetes-cluster-monitoring:
- gnetId: 315
- revision: 3
- datasource: Prometheus
- node-exporter-full:
- gnetId: 1860
- revision: 22
- datasource: Prometheus
+ k8s-resources-pod:
+ url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/kubernetes/dashboards/k8s-resources-pod.json
+ token: ''
+ k8s-resources-node:
+ url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/kubernetes/dashboards/k8s-resources-node.json
loki-dash:
gnetId: 13639
revision: 1
datasource: Loki
datasources:
- datasources.yaml:
- apiVersion: 1
- datasources:
- - name: Prometheus
- type: prometheus
- url: http://prometheus-server
- access: proxy
- isDefault: true
+ datasources.yaml:
+ apiVersion: 1
+ datasources:
+ - name: Prometheus
+ type: prometheus
+ url: http://prometheus-server
+ access: proxy
+ isDefault: true
--
GitLab