Commit 58f9ae2
committed
Adjust K8up metrics scraping to respect exported
This is required in order to make the K8up metrics usable in OpenShift's
user workload monitoring (UWM). Without this, the backup namespace is
scraped as `exported_namespace` and `namespace` is the K8up namespace
for all timeseries. This makes the metrics useless for UWM users, since
UWM automatically restricts all queries with `namespace="<query source
namespace>"` which can't match backups in the source namespace, if the
backup namespace is exported as `exported_namespace`.
The commit also adjusts the component-managed alerting rules to work
with the new namespace label setup. Additionally, the commit also fixes
the alert expression for the `K8upBackupNotRunning` alert to actually
fire for individual namespaces.namespace label1 parent 53411c3 commit 58f9ae2
3 files changed
Lines changed: 28 additions & 10 deletions
File tree
- class
- component
- tests/golden/defaults/backup-k8up/backup-k8up
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
163 | 163 | | |
164 | 164 | | |
165 | 165 | | |
166 | | - | |
167 | | - | |
| 166 | + | |
| 167 | + | |
168 | 168 | | |
169 | 169 | | |
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
173 | | - | |
| 173 | + | |
174 | 174 | | |
175 | 175 | | |
176 | 176 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
30 | 43 | | |
31 | 44 | | |
32 | 45 | | |
| |||
Lines changed: 12 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | | - | |
| 27 | + | |
29 | 28 | | |
30 | 29 | | |
31 | 30 | | |
| |||
127 | 126 | | |
128 | 127 | | |
129 | 128 | | |
130 | | - | |
| 129 | + | |
| 130 | + | |
131 | 131 | | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
132 | 137 | | |
133 | 138 | | |
134 | 139 | | |
| |||
0 commit comments