Skip to content

Commit cffc064

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #754 from jgbernalp/mark-alerting-menu-for-incidents
OU-1062: feat: mark alert menu active for incidents tab
2 parents 1cc531b + 2414ca9 commit cffc064

1 file changed

Lines changed: 139 additions & 44 deletions

File tree

‎web/console-extensions.json‎

Lines changed: 139 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
"href": "/monitoring/alerts",
88
"perspective": "admin",
99
"section": "observe",
10-
"startsWith": ["monitoring/alertrules", "monitoring/silences"]
10+
"startsWith": [
11+
"monitoring/alertrules",
12+
"monitoring/silences",
13+
"monitoring/incidents"
14+
]
1115
}
1216
},
1317
{
@@ -16,7 +20,10 @@
1620
"data-quickstart-id": "qs-nav-monitoring"
1721
},
1822
"id": "observe-virt-perspective",
19-
"insertBefore": ["compute-virt-perspective", "usermanagement-virt-perspective"],
23+
"insertBefore": [
24+
"compute-virt-perspective",
25+
"usermanagement-virt-perspective"
26+
],
2027
"name": "%console-app~Observe%",
2128
"perspective": "virtualization-perspective"
2229
},
@@ -30,7 +37,11 @@
3037
"href": "/virt-monitoring/alerts",
3138
"perspective": "virtualization-perspective",
3239
"section": "observe-virt-perspective",
33-
"startsWith": ["virt-monitoring/alertrules", "virt-monitoring/silences"]
40+
"startsWith": [
41+
"virt-monitoring/alertrules",
42+
"virt-monitoring/silences",
43+
"virt-monitoring/incidents"
44+
]
3445
}
3546
},
3647
{
@@ -103,215 +114,299 @@
103114
"type": "console.redux-reducer",
104115
"properties": {
105116
"scope": "mp",
106-
"reducer": { "$codeRef": "MonitoringReducer" }
117+
"reducer": {
118+
"$codeRef": "MonitoringReducer"
119+
}
107120
}
108121
},
109122
{
110123
"type": "console.page/route",
111124
"properties": {
112125
"exact": false,
113126
"path": "/monitoring",
114-
"component": { "$codeRef": "AlertingPage.MpCmoAlertingPage" }
127+
"component": {
128+
"$codeRef": "AlertingPage.MpCmoAlertingPage"
129+
}
115130
}
116131
},
117132
{
118133
"type": "console.page/route",
119134
"properties": {
120135
"exact": false,
121136
"path": "/monitoring/silences/~new",
122-
"component": { "$codeRef": "SilenceCreatePage.MpCmoCreateSilencePage" }
137+
"component": {
138+
"$codeRef": "SilenceCreatePage.MpCmoCreateSilencePage"
139+
}
123140
}
124141
},
125142
{
126143
"type": "console.page/route",
127144
"properties": {
128145
"exact": false,
129146
"path": "/monitoring/silences/:id",
130-
"component": { "$codeRef": "SilencesDetailsPage.MpCmoSilencesDetailsPage" }
147+
"component": {
148+
"$codeRef": "SilencesDetailsPage.MpCmoSilencesDetailsPage"
149+
}
131150
}
132151
},
133152
{
134153
"type": "console.page/route",
135154
"properties": {
136155
"exact": false,
137156
"path": "/monitoring/silences/:id/edit",
138-
"component": { "$codeRef": "SilenceEditPage.MpCmoSilenceEditPage" }
157+
"component": {
158+
"$codeRef": "SilenceEditPage.MpCmoSilenceEditPage"
159+
}
139160
}
140161
},
141162
{
142163
"type": "console.page/route",
143164
"properties": {
144165
"exact": false,
145-
"path": ["/monitoring/targets", "/monitoring/targets/:scrapeUrl"],
146-
"component": { "$codeRef": "TargetsPage.MpCmoTargetsPage" }
166+
"path": [
167+
"/monitoring/targets",
168+
"/monitoring/targets/:scrapeUrl"
169+
],
170+
"component": {
171+
"$codeRef": "TargetsPage.MpCmoTargetsPage"
172+
}
147173
}
148174
},
149175
{
150176
"type": "console.page/route",
151177
"properties": {
152178
"exact": false,
153-
"path": ["/monitoring/query-browser"],
154-
"component": { "$codeRef": "MetricsPage.MpCmoMetricsPage" }
179+
"path": [
180+
"/monitoring/query-browser"
181+
],
182+
"component": {
183+
"$codeRef": "MetricsPage.MpCmoMetricsPage"
184+
}
155185
}
156186
},
157187
{
158188
"type": "console.page/route",
159189
"properties": {
160190
"exact": false,
161-
"path": ["/monitoring/graph"],
162-
"component": { "$codeRef": "PrometheusRedirectPage" }
191+
"path": [
192+
"/monitoring/graph"
193+
],
194+
"component": {
195+
"$codeRef": "PrometheusRedirectPage"
196+
}
163197
}
164198
},
165199
{
166200
"type": "console.page/route",
167201
"properties": {
168202
"exact": false,
169-
"path": ["/monitoring/dashboards", "/monitoring/dashboards/:dashboardName"],
170-
"component": { "$codeRef": "LegacyDashboardsPage.MpCmoLegacyDashboardsPage" }
203+
"path": [
204+
"/monitoring/dashboards",
205+
"/monitoring/dashboards/:dashboardName"
206+
],
207+
"component": {
208+
"$codeRef": "LegacyDashboardsPage.MpCmoLegacyDashboardsPage"
209+
}
171210
}
172211
},
173212
{
174213
"type": "console.page/route",
175214
"properties": {
176215
"exact": false,
177-
"path": ["/monitoring/alertrules/:id"],
178-
"component": { "$codeRef": "AlertRulesDetailsPage.MpCmoAlertRulesDetailsPage" }
216+
"path": [
217+
"/monitoring/alertrules/:id"
218+
],
219+
"component": {
220+
"$codeRef": "AlertRulesDetailsPage.MpCmoAlertRulesDetailsPage"
221+
}
179222
}
180223
},
181224
{
182225
"type": "console.page/route",
183226
"properties": {
184227
"exact": false,
185-
"path": ["/monitoring/alerts/:ruleID"],
186-
"component": { "$codeRef": "AlertsDetailsPage.MpCmoAlertsDetailsPage" }
228+
"path": [
229+
"/monitoring/alerts/:ruleID"
230+
],
231+
"component": {
232+
"$codeRef": "AlertsDetailsPage.MpCmoAlertsDetailsPage"
233+
}
187234
}
188235
},
189236
{
190237
"type": "console.page/route",
191238
"properties": {
192239
"exact": false,
193-
"path": ["/virt-monitoring"],
194-
"component": { "$codeRef": "AlertingPage.MpCmoAlertingPage" }
240+
"path": [
241+
"/virt-monitoring"
242+
],
243+
"component": {
244+
"$codeRef": "AlertingPage.MpCmoAlertingPage"
245+
}
195246
}
196247
},
197248
{
198249
"type": "console.page/route",
199250
"properties": {
200251
"exact": false,
201252
"path": "/virt-monitoring/silences/~new",
202-
"component": { "$codeRef": "SilenceCreatePage.MpCmoCreateSilencePage" }
253+
"component": {
254+
"$codeRef": "SilenceCreatePage.MpCmoCreateSilencePage"
255+
}
203256
}
204257
},
205258
{
206259
"type": "console.page/route",
207260
"properties": {
208261
"exact": false,
209262
"path": "/virt-monitoring/silences/:id",
210-
"component": { "$codeRef": "SilencesDetailsPage.MpCmoSilencesDetailsPage" }
263+
"component": {
264+
"$codeRef": "SilencesDetailsPage.MpCmoSilencesDetailsPage"
265+
}
211266
}
212267
},
213268
{
214269
"type": "console.page/route",
215270
"properties": {
216271
"exact": false,
217272
"path": "/virt-monitoring/silences/:id/edit",
218-
"component": { "$codeRef": "SilenceEditPage.MpCmoSilenceEditPage" }
273+
"component": {
274+
"$codeRef": "SilenceEditPage.MpCmoSilenceEditPage"
275+
}
219276
}
220277
},
221278
{
222279
"type": "console.page/route",
223280
"properties": {
224281
"exact": false,
225-
"path": ["/virt-monitoring/targets", "/virt-monitoring/targets/:scrapeUrl"],
226-
"component": { "$codeRef": "TargetsPage.MpCmoTargetsPage" }
282+
"path": [
283+
"/virt-monitoring/targets",
284+
"/virt-monitoring/targets/:scrapeUrl"
285+
],
286+
"component": {
287+
"$codeRef": "TargetsPage.MpCmoTargetsPage"
288+
}
227289
}
228290
},
229291
{
230292
"type": "console.page/route",
231293
"properties": {
232294
"exact": false,
233-
"path": ["/virt-monitoring/query-browser"],
234-
"component": { "$codeRef": "MetricsPage.MpCmoMetricsPage" }
295+
"path": [
296+
"/virt-monitoring/query-browser"
297+
],
298+
"component": {
299+
"$codeRef": "MetricsPage.MpCmoMetricsPage"
300+
}
235301
}
236302
},
237303
{
238304
"type": "console.page/route",
239305
"properties": {
240306
"exact": false,
241-
"path": ["/virt-monitoring/graph"],
242-
"component": { "$codeRef": "PrometheusRedirectPage" }
307+
"path": [
308+
"/virt-monitoring/graph"
309+
],
310+
"component": {
311+
"$codeRef": "PrometheusRedirectPage"
312+
}
243313
}
244314
},
245315
{
246316
"type": "console.page/route",
247317
"properties": {
248318
"exact": false,
249-
"path": ["/virt-monitoring/dashboards", "/virt-monitoring/dashboards/:dashboardName"],
250-
"component": { "$codeRef": "LegacyDashboardsPage.MpCmoLegacyDashboardsPage" }
319+
"path": [
320+
"/virt-monitoring/dashboards",
321+
"/virt-monitoring/dashboards/:dashboardName"
322+
],
323+
"component": {
324+
"$codeRef": "LegacyDashboardsPage.MpCmoLegacyDashboardsPage"
325+
}
251326
}
252327
},
253328
{
254329
"type": "console.page/route",
255330
"properties": {
256331
"exact": false,
257-
"path": ["/virt-monitoring/alertrules/:id"],
258-
"component": { "$codeRef": "AlertRulesDetailsPage.MpCmoAlertRulesDetailsPage" }
332+
"path": [
333+
"/virt-monitoring/alertrules/:id"
334+
],
335+
"component": {
336+
"$codeRef": "AlertRulesDetailsPage.MpCmoAlertRulesDetailsPage"
337+
}
259338
}
260339
},
261340
{
262341
"type": "console.page/route",
263342
"properties": {
264343
"exact": false,
265-
"path": ["/virt-monitoring/alerts/:ruleID"],
266-
"component": { "$codeRef": "AlertsDetailsPage.MpCmoAlertsDetailsPage" }
344+
"path": [
345+
"/virt-monitoring/alerts/:ruleID"
346+
],
347+
"component": {
348+
"$codeRef": "AlertsDetailsPage.MpCmoAlertsDetailsPage"
349+
}
267350
}
268351
},
269352
{
270353
"type": "console.page/route",
271354
"properties": {
272355
"exact": false,
273356
"path": "/dev-monitoring/ns/:ns/alerts/:ruleID",
274-
"component": { "$codeRef": "DevRedirects.AlertRedirect" }
357+
"component": {
358+
"$codeRef": "DevRedirects.AlertRedirect"
359+
}
275360
}
276361
},
277362
{
278363
"type": "console.page/route",
279364
"properties": {
280365
"exact": false,
281366
"path": "/dev-monitoring/ns/:ns/rules/:id",
282-
"component": { "$codeRef": "DevRedirects.RulesRedirect" }
367+
"component": {
368+
"$codeRef": "DevRedirects.RulesRedirect"
369+
}
283370
}
284371
},
285372
{
286373
"type": "console.page/route",
287374
"properties": {
288375
"exact": false,
289376
"path": "/dev-monitoring/ns/:ns/silences/:id",
290-
"component": { "$codeRef": "DevRedirects.SilenceRedirect" }
377+
"component": {
378+
"$codeRef": "DevRedirects.SilenceRedirect"
379+
}
291380
}
292381
},
293382
{
294383
"type": "console.page/route",
295384
"properties": {
296385
"exact": false,
297386
"path": "/dev-monitoring/ns/:ns/silences/:id/edit",
298-
"component": { "$codeRef": "DevRedirects.SilenceEditRedirect" }
387+
"component": {
388+
"$codeRef": "DevRedirects.SilenceEditRedirect"
389+
}
299390
}
300391
},
301392
{
302393
"type": "console.page/route",
303394
"properties": {
304395
"exact": false,
305396
"path": "/dev-monitoring/ns/:ns/silences/~new",
306-
"component": { "$codeRef": "DevRedirects.SilenceNewRedirect" }
397+
"component": {
398+
"$codeRef": "DevRedirects.SilenceNewRedirect"
399+
}
307400
}
308401
},
309402
{
310403
"type": "console.page/route",
311404
"properties": {
312405
"exact": false,
313406
"path": "/dev-monitoring/ns/:ns/metrics",
314-
"component": { "$codeRef": "DevRedirects.MetricsRedirect" }
407+
"component": {
408+
"$codeRef": "DevRedirects.MetricsRedirect"
409+
}
315410
}
316411
}
317-
]
412+
]

0 commit comments

Comments
 (0)