Skip to content

OU-1389: restructure folders#1038

Open
PeterYurkovich wants to merge 3 commits into
openshift:mainfrom
PeterYurkovich:ou-1389-1
Open

OU-1389: restructure folders#1038
PeterYurkovich wants to merge 3 commits into
openshift:mainfrom
PeterYurkovich:ou-1389-1

Conversation

@PeterYurkovich

@PeterYurkovich PeterYurkovich commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

This PR looks to update the folder structure of the proposed monitoring-plugin monorepo setup: https://github.com/observability-ui/harness/pull/4/changes

This PR performs as minimal changes as possible to the actual files, and only looks to move the files and create the new folder structure. Further work to do things like split files, refactor to fit the new structure, ect. are left to future PRs.

This PR is independant of #1034 and they can be merged in either order

Summary by CodeRabbit

  • Bug Fixes

    • Improved proxy startup validation to reject reserved ports that conflict with monitoring service ports.
    • Aligned proxy routing and handler behavior with the monitoring routing flow.
  • Refactor

    • Consolidated backend/server and frontend module wiring to shared locations to standardize routing and component loading.
  • Chores / Tests

    • Updated Cypress specs and helpers to use shared data-test constants.
    • Simplified web build/dev scripts and removed standalone e2e/standalone build assets/config.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 7, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 7, 2026

Copy link
Copy Markdown

@PeterYurkovich: This pull request references OU-1389 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

This PR looks to update the folder structure of the proposed monitoring-plugin monorepo setup: https://github.com/observability-ui/harness/pull/4/changes

This PR performs as minimal changes as possible to the actual files, and only looks to move the files and create the new folder structure. Further work to do things like split files, refactor to fit the new structure, ect. are left to future PRs.

This PR is independant of #1034 and they can be merged in either order

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot requested review from etmurasaki and zhuje July 7, 2026 18:09
@openshift-ci

openshift-ci Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: PeterYurkovich

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 7, 2026
@coderabbitai

coderabbitai Bot commented Jul 7, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 6a644c8e-617b-40aa-a6c1-2d423aaa3901

📥 Commits

Reviewing files that changed from the base of the PR and between 38d8b55 and d168459.

📒 Files selected for processing (3)
  • web/src/features/alerts/pages/alert-rules-page/filter-rules.spec.ts
  • web/src/features/alerts/pages/alerts-page/filter-alerts.spec.ts
  • web/src/features/incidents/utils/api.spec.ts
🚧 Files skipped from review as they are similar to previous changes (3)
  • web/src/features/incidents/utils/api.spec.ts
  • web/src/features/alerts/pages/alert-rules-page/filter-rules.spec.ts
  • web/src/features/alerts/pages/alerts-page/filter-alerts.spec.ts

Walkthrough

The PR renames the Go proxy package to monitoring and updates server wiring to use the new package. The web app reorganizes imports and module paths across shared, alerts, incidents, legacy dashboards, metrics, perses dashboards, targets, and Cypress code, plus updates package scripts and exposed modules.

Changes

Backend package rename

Layer / File(s) Summary
Package and server updates
cmd/plugin-backend.go, pkg/monitoring/proxy.go, pkg/monitoring/sanitize.go, pkg/server/server.go
Go package declarations change to monitoring, and server routing, validation, and proxy startup now use monitoring types, ports, and handler construction.

Frontend reorganization

Layer / File(s) Summary
Build and exposed modules
web/package.json, web/src/e2e-tests-app.tsx, web/src/e2e-tests-index.html, web/webpack.standalone.config.ts, web/src/components/ols-tool-ui/index.ts
Scripts change to ts-node-based build/start/dev commands, exposed module paths move to features and shared, and standalone e2e/webpack entrypoints are removed.
Shared module rewires
web/src/shared/**/*
Shared components, hooks, contexts, store, utils, and console helpers update their internal import sources to the new shared and feature locations.
Alerts and incidents imports
web/src/features/alerts/**/*, web/src/features/incidents/**/*
Alerts and incidents components, pages, and utilities repoint their imports to shared hooks, types, constants, and relocated helpers.
Legacy dashboards, metrics, and targets
web/src/features/legacy-dashboards/**/*, web/src/features/metrics/**/*, web/src/features/targets/**/*
Legacy dashboards, metrics, and targets modules update import paths to the reorganized shared and feature modules.
Perses dashboards imports
web/src/features/perses-dashboards/**/*
Perses dashboards components, hooks, pages, and helpers update import paths, and the perses hook adds a missing-project guard.
Cypress import updates
web/cypress/**/*
Cypress component tests, support commands, and page objects switch data-test and feature imports to the new module locations.

Estimated code review effort: 4 (Complex) | ~60 minutes

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

coderabbitai[bot]

This comment was marked as resolved.

@PeterYurkovich

Copy link
Copy Markdown
Contributor Author

All coderabbit nitpick's are explicitly out of this PR's scope of work as stated in the description

@PeterYurkovich

Copy link
Copy Markdown
Contributor Author

/test?

@PeterYurkovich

Copy link
Copy Markdown
Contributor Author

/test ?

@PeterYurkovich

Copy link
Copy Markdown
Contributor Author

/test e2e-monitoring e2e-coo

@openshift-ci

openshift-ci Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

@PeterYurkovich: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-monitoring d168459 link false /test e2e-monitoring
ci/prow/e2e-coo d168459 link false /test e2e-coo

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants