Merge pull request #465 from zhuje/horitzontalnav-incidents-backup

OU-594: [Incidents] UI is not embedded in the Alerting section

Author: openshift-merge-bot[bot]

config/acm-alerting.patch.json

@@ -20,9 +20,7 @@
       "properties": {
         "exact": false,
         "path": [
-          "/multicloud/monitoring/alerts",
-          "/multicloud/monitoring/silences",
-          "/multicloud/monitoring/alertrules"
+          "/multicloud/monitoring"
         ],
         "component": { "$codeRef": "AlertingPage" }
       }
@@ -88,22 +86,6 @@
       }
     }
   },
-  {
-    "op": "add",
-    "path": "/extensions/1",
-    "value": {
-      "type": "console.page/route",
-      "properties": {
-        "exact": false,
-        "path": [
-          "/multicloud/monitoring/alerts",
-          "/multicloud/monitoring/silences",
-          "/multicloud/monitoring/alertrules"
-        ],
-        "component": { "$codeRef": "AlertingPage" }
-      }
-    }
-  },
   {
     "op": "add",
     "path": "/extensions/1",

config/incidents.patch.json

@@ -3,29 +3,14 @@
     "op": "add",
     "path": "/extensions/1",
     "value": {
-      "type": "console.page/route",
+      "type": "console.tab",
       "properties": {
-        "exact": false,
-        "path": "/monitoring/incidents",
-        "component": { "$codeRef": "IncidentsPage" }
-      }
-    }
-  },
-  {
-    "op": "add",
-    "path": "/extensions/1",
-    "value": {
-      "type": "console.navigation/href",
-      "flags": {
-        "required": ["PROMETHEUS", "MONITORING", "CAN_GET_NS"]
-      },
-      "properties": {
-        "id": "incidents",
+        "contextId": "admin-alerts-nav",
         "name": "%plugin__monitoring-console-plugin~Incidents%",
-        "href": "/monitoring/incidents",
-        "perspective": "admin",
-        "section": "observe",
-        "insertAfter": "targets"
+        "href": "incidents",
+        "component": {
+          "$codeRef": "IncidentsPage"
+        }
       }
     }
   }

web/console-extensions.json

@@ -181,7 +181,7 @@
     "type": "console.page/route",
     "properties": {
       "exact": false,
-      "path": ["/monitoring/alerts", "/monitoring/silences", "/monitoring/alertrules"],
+      "path": "/monitoring",
       "component": { "$codeRef": "AlertingPage" }
     }
   },
@@ -262,9 +262,7 @@
     "properties": {
       "exact": false,
       "path": [
-        "/virt-monitoring/alerts",
-        "/virt-monitoring/silences",
-        "/virt-monitoring/alertrules"
+        "/virt-monitoring"
       ],
       "component": { "$codeRef": "AlertingPage" }
     }