Repository navigation
Commit 1095d68
feat(monitoring): use upstream-maintained CNPG dashboard, drop workarounds (#311)
Reverts the misdirected workaround stack from #309 and #310, replaces
with the actual fix: load the upstream-maintained Grafana dashboard
from cloudnative-pg/grafana-dashboards (the standalone dashboards
repo, NOT the operator-chart-bundled snapshot).
Background
CNPG 1.27+ moved backup metric reporting from operator-emitted
cnpg_collector_* into plugin-emitted barman_cloud_cloudnative_pg_io_*
(plugin-barman-cloud 0.7.0+). The deprecated cnpg_collector_* metrics
stay at 0 by design — they're not coming back.
The operator's Helm chart (cloudnative-pg/charts) bundles a snapshot
of the Grafana dashboard from before the rename. The standalone repo
cloudnative-pg/grafana-dashboards has the maintained version with
regex-based panel queries that match BOTH metric names:
max({__name__=~"cnpg_collector_first_recoverability_point|barman_cloud_cloudnative_pg_io_first_recoverability_point", ...})
So loading the standalone-repo dashboard just works: it picks up our
existing barman_cloud_* series (already flowing — verified 1779542651
unix timestamp matches the latest Backup CR's stoppedAt).
Changes
- Drop kube-state-metrics customResourceState block (#309 was working
around a non-issue — the data is exposed under a different name, not
missing).
- Drop cnpg-backup-shim recording rules (#310 same reason).
- Set cnpg-operator monitoring.grafanaDashboard.create=false so the
chart-bundled stale dashboard is not created.
- Add grafana.dashboards.default.cnpg-cluster URL pointer:
pinned to commit 19f534b2 ("fix: support backup metrics from
plugin-barman-cloud"), SHA256 integrity check.
- Add Renovate customManager for raw.githubusercontent.com SHA pins so
the dashboard SHA gets auto-tracked against the main branch of
cloudnative-pg/grafana-dashboards. Pattern is generic — any future
raw.githubusercontent.com pin in apps/values.yaml gets the same
treatment.
Net -21 lines across the two files. Upstream tracker for the chart
dashboard not being synced with the standalone repo: filed/relevant
issues are at cloudnative-pg/cloudnative-pg#7812, #8902, #10456
(all CLOSED — upstream considers the rename "done", chart-dashboard
sync is not actively tracked).
Co-authored-by: Claude Opus 4.7 <[email protected]>1 parent 93e065b commit 1095d68
2 files changed
Lines changed: 30 additions & 51 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
73 | 82 | | |
74 | 83 | | |
75 | 84 | | |
| |||
103 | 112 | | |
104 | 113 | | |
105 | 114 | | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | 115 | | |
124 | 116 | | |
125 | 117 | | |
| |||
136 | 128 | | |
137 | 129 | | |
138 | 130 | | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | 131 | | |
173 | 132 | | |
174 | 133 | | |
| |||
782 | 741 | | |
783 | 742 | | |
784 | 743 | | |
785 | | - | |
| 744 | + | |
| 745 | + | |
| 746 | + | |
| 747 | + | |
| 748 | + | |
| 749 | + | |
786 | 750 | | |
787 | 751 | | |
788 | 752 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
104 | 119 | | |
105 | 120 | | |
0 commit comments