Skip to content

Commit 010af7f

Browse files
authored
Merge pull request #11769 from chrischdi/pr-obs-grafana-split-dashboard-configmap
🌱 observability: split up grafana configmap to not exceed the size limits on reoccuring apply
2 parents 6d98f39 + cc138ef commit 010af7f

File tree

2 files changed

+42
-3
lines changed

2 files changed

+42
-3
lines changed

hack/observability/grafana/chart/values.yaml

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,37 @@ dashboardProviders:
8888
options:
8989
path: /var/lib/grafana/dashboards/default
9090

91-
dashboardsConfigMaps:
92-
default: grafana-dashboards
91+
extraConfigmapMounts:
92+
- name: grafana-dashboard-cluster-api-mgmt-apiserver-requests
93+
configMap: grafana-dashboard-cluster-api-mgmt-apiserver-requests
94+
mountPath: /var/lib/grafana/dashboards/default/cluster-api-mgmt-apiserver-requests.json
95+
subPath: cluster-api-mgmt-apiserver-requests.json
96+
optional: false
97+
- name: grafana-dashboard-cluster-api-performance
98+
configMap: grafana-dashboard-cluster-api-performance
99+
mountPath: /var/lib/grafana/dashboards/default/cluster-api-performance.json
100+
subPath: cluster-api-performance.json
101+
optional: false
102+
- name: grafana-dashboard-cluster-api-state
103+
configMap: grafana-dashboard-cluster-api-state
104+
mountPath: /var/lib/grafana/dashboards/default/cluster-api-state.json
105+
subPath: cluster-api-state.json
106+
optional: false
107+
- name: grafana-dashboard-cluster-api-wl-apiserver-requests
108+
configMap: grafana-dashboard-cluster-api-wl-apiserver-requests
109+
mountPath: /var/lib/grafana/dashboards/default/cluster-api-wl-apiserver-requests.json
110+
subPath: cluster-api-wl-apiserver-requests.json
111+
optional: false
112+
- name: grafana-dashboard-controller-runtime
113+
configMap: grafana-dashboard-controller-runtime
114+
mountPath: /var/lib/grafana/dashboards/default/controller-runtime.json
115+
subPath: controller-runtime.json
116+
optional: false
117+
- name: grafana-dashboard-runtime-extensions
118+
configMap: grafana-dashboard-runtime-extensions
119+
mountPath: /var/lib/grafana/dashboards/default/runtime-extensions.json
120+
subPath: runtime-extensions.json
121+
optional: false
93122

94123
# Disable grafana test framework
95124
testFramework:

hack/observability/grafana/kustomization.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,21 @@ resources:
1010
namespace: observability
1111

1212
configMapGenerator:
13-
- name: grafana-dashboards
13+
- name: grafana-dashboard-cluster-api-mgmt-apiserver-requests
1414
files:
1515
- dashboards/cluster-api-mgmt-apiserver-requests.json
16+
- name: grafana-dashboard-cluster-api-performance
17+
files:
1618
- dashboards/cluster-api-performance.json
19+
- name: grafana-dashboard-cluster-api-state
20+
files:
1721
- dashboards/cluster-api-state.json
22+
- name: grafana-dashboard-cluster-api-wl-apiserver-requests
23+
files:
1824
- dashboards/cluster-api-wl-apiserver-requests.json
25+
- name: grafana-dashboard-controller-runtime
26+
files:
1927
- dashboards/controller-runtime.json
28+
- name: grafana-dashboard-runtime-extensions
29+
files:
2030
- dashboards/runtime-extensions.json

0 commit comments

Comments
 (0)