Skip to content

Commit b6be009

Browse files
committed
made kps default dashboards more configurable
1 parent d1c915e commit b6be009

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

ansible/roles/kube_prometheus_stack/defaults/main/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ prometheus_rules:
7373

7474
# ------------------------------------------------------------------------------------------
7575
grafana_image_tag: 11.2.2
76+
grafana_sidecar_image_tag: 1.26.1
77+
78+
grafana_exclude_default_dashboards: []
7679

7780
grafana_security:
7881
admin_user: grafana
@@ -92,7 +95,6 @@ grafana_datasources: []
9295
grafana_home_dashboard: slurm-jobs.json
9396

9497
alertmanager_image_tag: v0.27.0
95-
grafana_sidecar_image_tag: 1.26.1
9698

9799
node_exporter_image_tag: v1.8.2
98100
node_exporter_args:

ansible/roles/kube_prometheus_stack/tasks/main.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,4 @@
197197
definition:
198198
metadata:
199199
name: "{{ item }}"
200-
loop:
201-
- kube-prometheus-stack-nodes-darwin
202-
- kube-prometheus-stack-grafana-overview
203-
- kube-prometheus-stack-proxy
204-
- kube-prometheus-stack-etcd
205-
- kube-prometheus-stack-alertmanager-overview
206-
- kube-prometheus-stack-scheduler
200+
loop: "{{ grafana_exclude_default_dashboards }}"

docs/monitoring-and-logging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Note that if Open OnDemand is enabled, Grafana is only accessible through OOD's
109109

110110
### grafana dashboards
111111

112-
In addition to the default set of dashboards that are deployed by kube-prometheus-stack, the appliance ships with a default set of dashboards (listed below). The set of appliance-specific dashboards can be configured via the `grafana_dashboards` variable. The dashboards are either internal to the [grafana-dashboards role](../ansible/roles/grafana-dashboards/files/) or downloaded from grafana.com.
112+
In addition to the default set of dashboards that are deployed by kube-prometheus-stack, the appliance ships with a default set of dashboards (listed below). The set of appliance-specific dashboards can be configured via the `grafana_dashboards` variable. The dashboards are either internal to the [grafana-dashboards role](../ansible/roles/grafana-dashboards/files/) or downloaded from grafana.com. If you wish to selectively remove the default dashboards deployed by kube-prometheus-stack, this can be done by overriding the `grafana_exclude_default_dashboards` variable in [environments/common/inventory/group_vars/all/grafana.yml](../environments/common/inventory/group_vars/all/grafana.yml).
113113

114114
#### node exporter slurm
115115

environments/common/inventory/group_vars/all/grafana.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@ grafana_dashboards_default:
4040
revision_id: 3
4141
grafana_dashboards: "{{ grafana_dashboards_default + (openondemand_dashboard if groups.get('openondemand') else []) }}"
4242

43+
# Configmap names of kube prometheus stack's default dashboards to exclude
44+
grafana_exclude_default_dashboards:
45+
- kube-prometheus-stack-nodes-darwin
46+
- kube-prometheus-stack-grafana-overview
47+
- kube-prometheus-stack-proxy
48+
- kube-prometheus-stack-etcd
49+
- kube-prometheus-stack-alertmanager-overview
50+
- kube-prometheus-stack-scheduler
51+
4352
grafana_security:
4453
admin_user: grafana
4554
admin_password: "{{ vault_grafana_admin_password }}"

0 commit comments

Comments
 (0)