Skip to content

NO-JIRA: Sync 0.4 with 0.5 #463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 24, 2025
Merged

NO-JIRA: Sync 0.4 with 0.5 #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1a46af
rename metrics to metricsPage
jgbernalp Jul 15, 2025
6d6b80f
type URL poll response
jgbernalp Jul 15, 2025
949209c
move promql expression into metrics folder
jgbernalp Jul 15, 2025
9303da6
use stack layout instead of grid in metrics
jgbernalp Jul 15, 2025
8237ea7
rename targets page
jgbernalp Jul 15, 2025
a253d05
remove incidents
jgbernalp Jul 15, 2025
8f2bc1a
fix imports
jgbernalp Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/plugin-backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
32 changes: 0 additions & 32 deletions config/incidents.patch.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion pkg/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ type Feature string

const (
AcmAlerting Feature = "acm-alerting"
Incidents Feature = "incidents"
DevConfig Feature = "dev-config"
PersesDashboards Feature = "perses-dashboards"
)
Expand Down
3 changes: 3 additions & 0 deletions scripts/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
167 changes: 91 additions & 76 deletions web/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand All @@ -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": "*"
Expand Down
Loading