Merge pull request #463 from jgbernalp/sync-0.4-with-0.5

NO-JIRA: Sync 0.4 with 0.5

Author: openshift-merge-bot[bot]

README.md

@@ -114,7 +114,7 @@ Feature flags are used by the mcp mode to dictate the specific features which ar
 |-------------------|-------------|
 | acm-alerting      | 4.14+       |
 | perses-dashboards | 4.14+       |
-| incidents         | 4.17+       |
+| incidents         | 4.19+       |
 | dev-config        |             |
 
 #### ACM

cmd/plugin-backend.go

@@ -14,7 +14,7 @@ var (
 	portArg             = flag.Int("port", 0, "server port to listen on (default: 9443)\nports 9444 and 9445 reserved for other use")
 	certArg             = flag.String("cert", "", "cert file path to enable TLS (disabled by default)")
 	keyArg              = flag.String("key", "", "private key file path to enable TLS (disabled by default)")
-	featuresArg         = flag.String("features", "", "enabled features, comma separated.\noptions: ['acm-alerting', 'incidents', 'dev-config', 'perses-dashboards']")
+	featuresArg         = flag.String("features", "", "enabled features, comma separated.\noptions: ['acm-alerting', 'dev-config', 'perses-dashboards']")
 	staticPathArg       = flag.String("static-path", "", "static files path to serve frontend (default: './web/dist')")
 	configPathArg       = flag.String("config-path", "", "config files path (default: './config')")
 	pluginConfigArg     = flag.String("plugin-config-path", "", "plugin yaml configuration")

config/incidents.patch.json

@@ -45,7 +45,6 @@ type Feature string
 
 const (
 	AcmAlerting      Feature = "acm-alerting"
-	Incidents        Feature = "incidents"
 	DevConfig        Feature = "dev-config"
 	PersesDashboards Feature = "perses-dashboards"
 )

pkg/server.go

@@ -20,6 +20,9 @@ if [[ "$OSTYPE" == "darwin"* ]] && [[ "$DOCKER_FILE_NAME" == "Dockerfile.mcp" ]]
     make update-plugin-name
     export I18N_NAMESPACE='plugin__monitoring-console-plugin'
 
+    printf "${YELLOW}Installing Frontend${ENDCOLOR}\n"
+    make install-frontend
+
     printf "${YELLOW}Building Frontend${ENDCOLOR}\n"
     make build-frontend
 fi

scripts/build-image.sh

@@ -46,11 +46,11 @@
     "@patternfly/react-core": "5.4.0",
     "@patternfly/react-icons": "^5.4.0",
     "@patternfly/react-table": "5.4.13",
-    "@perses-dev/components": "^0.50.0",
-    "@perses-dev/dashboards": "^0.50.0",
-    "@perses-dev/panels-plugin": "^0.50.0",
-    "@perses-dev/plugin-system": "^0.50.0",
-    "@perses-dev/prometheus-plugin": "^0.50.0",
+    "@perses-dev/components": "^0.50.3",
+    "@perses-dev/dashboards": "^0.50.3",
+    "@perses-dev/panels-plugin": "^0.50.3",
+    "@perses-dev/plugin-system": "^0.50.3",
+    "@perses-dev/prometheus-plugin": "^0.50.3",
     "@prometheus-io/codemirror-promql": "^0.37.0",
     "@tanstack/react-query": "^4.36.1",
     "classnames": "2.x",
@@ -110,7 +110,8 @@
     "tough-cookie": "^4.1.3",
     "sanitize-html": "^2.12.1",
     "path-to-regexp": "^1.9.0",
-    "cross-spawn": "^7.0.5"
+    "cross-spawn": "^7.0.5",
+    "notistack": "^3.0.2"
   },
   "resolutions": {
     "@types/react": "17.0.83"
@@ -122,8 +123,7 @@
     "description": "This plugin adds the monitoring UI to the OpenShift web console",
     "exposedModules": {
       "MonitoringRouter": "./components/router",
-      "MonitoringReducer": "./reducers/observe",
-      "IncidentsPage": "./components/Incidents/IncidentsPage"
+      "MonitoringReducer": "./reducers/observe"
     },
     "dependencies": {
       "@console/pluginAPI": "*"