From aa205a6731d7b00b850bef727eafa2336190d097 Mon Sep 17 00:00:00 2001 From: Ricardo Dias Date: Thu, 15 Mar 2018 08:50:22 +0000 Subject: [PATCH] mgr/dashboard: renamed dashboard_v2 to dashboard Signed-off-by: Ricardo Dias --- CMakeLists.txt | 2 +- ceph.spec.in | 2 +- debian/rules | 2 +- make-dist | 4 +- qa/suites/rados/mgr/tasks/dashboard.yaml | 34 +++++++++++++ qa/suites/rados/mgr/tasks/dashboard_v2.yaml | 34 ------------- .../{dashboard_v2 => dashboard}/__init__.py | 0 .../mgr/{dashboard_v2 => dashboard}/helper.py | 6 +-- .../{dashboard_v2 => dashboard}/test_auth.py | 0 .../test_cephfs.py | 0 .../test_cluster_configuration.py | 0 .../test_dashboard.py | 0 .../{dashboard_v2 => dashboard}/test_host.py | 0 .../test_monitor.py | 0 .../{dashboard_v2 => dashboard}/test_osd.py | 0 .../test_perf_counters.py | 0 .../{dashboard_v2 => dashboard}/test_pool.py | 0 .../{dashboard_v2 => dashboard}/test_rbd.py | 0 .../{dashboard_v2 => dashboard}/test_rgw.py | 0 .../test_summary.py | 0 ...test_dashboard_v2.py => test_dashboard.py} | 14 +++--- src/pybind/mgr/CMakeLists.txt | 2 +- .../{dashboard_v2 => dashboard}/.coveragerc | 0 .../{dashboard_v2 => dashboard}/.editorconfig | 0 .../{dashboard_v2 => dashboard}/.gitignore | 0 .../mgr/{dashboard_v2 => dashboard}/.pylintrc | 0 .../CMakeLists.txt | 45 +++++++++--------- .../{dashboard_v2 => dashboard}/HACKING.rst | 10 ++-- .../{dashboard_v2 => dashboard}/README.rst | 4 +- .../{dashboard_v2 => dashboard}/__init__.py | 0 .../controllers/__init__.py | 0 .../controllers/auth.py | 0 .../controllers/cephfs.py | 0 .../controllers/cluster_configuration.py | 0 .../controllers/dashboard.py | 0 .../controllers/host.py | 0 .../controllers/monitor.py | 0 .../controllers/osd.py | 0 .../controllers/perf_counters.py | 0 .../controllers/pool.py | 0 .../controllers/rbd.py | 0 .../controllers/rbd_mirroring.py | 0 .../controllers/rgw.py | 0 .../controllers/summary.py | 0 .../controllers/tcmu_iscsi.py | 0 .../frontend/.angular-cli.json | 0 .../frontend/.editorconfig | 0 .../frontend/.gitignore | 0 .../frontend/e2e/app.e2e-spec.ts | 0 .../frontend/e2e/app.po.ts | 0 .../frontend/e2e/tsconfig.e2e.json | 0 .../frontend/karma.conf.js | 2 +- .../frontend/package.json | 0 .../frontend/protractor.conf.js | 0 .../frontend/proxy.conf.json.sample | 0 .../frontend/src/app/app-routing.module.ts | 0 .../frontend/src/app/app.component.html | 0 .../frontend/src/app/app.component.scss | 0 .../frontend/src/app/app.component.spec.ts | 0 .../frontend/src/app/app.component.ts | 0 .../frontend/src/app/app.module.ts | 0 .../src/app/ceph/block/block.module.ts | 0 .../app/ceph/block/iscsi/iscsi.component.html | 0 .../app/ceph/block/iscsi/iscsi.component.scss | 0 .../ceph/block/iscsi/iscsi.component.spec.ts | 0 .../app/ceph/block/iscsi/iscsi.component.ts | 0 .../block/mirror-health-color.pipe.spec.ts | 0 .../ceph/block/mirror-health-color.pipe.ts | 0 .../block/mirroring/mirroring.component.html | 0 .../block/mirroring/mirroring.component.scss | 0 .../mirroring/mirroring.component.spec.ts | 0 .../block/mirroring/mirroring.component.ts | 0 .../pool-detail/pool-detail.component.html | 0 .../pool-detail/pool-detail.component.scss | 0 .../pool-detail/pool-detail.component.spec.ts | 0 .../pool-detail/pool-detail.component.ts | 0 .../frontend/src/app/ceph/ceph.module.ts | 0 .../cephfs-chart/cephfs-chart.component.html | 0 .../cephfs-chart/cephfs-chart.component.scss | 0 .../cephfs-chart.component.spec.ts | 0 .../cephfs-chart/cephfs-chart.component.ts | 0 .../src/app/ceph/cephfs/cephfs.module.ts | 0 .../app/ceph/cephfs/cephfs.service.spec.ts | 0 .../src/app/ceph/cephfs/cephfs.service.ts | 0 .../ceph/cephfs/cephfs/cephfs.component.html | 0 .../ceph/cephfs/cephfs/cephfs.component.scss | 0 .../cephfs/cephfs/cephfs.component.spec.ts | 0 .../ceph/cephfs/cephfs/cephfs.component.ts | 0 .../cephfs/clients/clients.component.html | 0 .../cephfs/clients/clients.component.scss | 0 .../cephfs/clients/clients.component.spec.ts | 0 .../ceph/cephfs/clients/clients.component.ts | 0 .../src/app/ceph/cluster/cluster.module.ts | 0 .../configuration.component.html | 0 .../configuration.component.scss | 0 .../configuration.component.spec.ts | 0 .../configuration/configuration.component.ts | 0 .../ceph/cluster/hosts/hosts.component.html | 0 .../ceph/cluster/hosts/hosts.component.scss | 0 .../cluster/hosts/hosts.component.spec.ts | 0 .../app/ceph/cluster/hosts/hosts.component.ts | 0 .../app/ceph/cluster/monitor.service.spec.ts | 0 .../src/app/ceph/cluster/monitor.service.ts | 0 .../cluster/monitor/monitor.component.html | 0 .../cluster/monitor/monitor.component.scss | 0 .../cluster/monitor/monitor.component.spec.ts | 0 .../ceph/cluster/monitor/monitor.component.ts | 0 .../osd-details/osd-details.component.html | 0 .../osd-details/osd-details.component.scss | 0 .../osd-details/osd-details.component.spec.ts | 0 .../osd/osd-details/osd-details.component.ts | 0 .../osd/osd-list/osd-list.component.html | 0 .../osd/osd-list/osd-list.component.scss | 0 .../osd/osd-list/osd-list.component.spec.ts | 0 .../osd/osd-list/osd-list.component.ts | 0 .../osd-performance-histogram.component.html | 0 .../osd-performance-histogram.component.scss | 0 ...sd-performance-histogram.component.spec.ts | 0 .../osd-performance-histogram.component.ts | 0 .../app/ceph/cluster/osd/osd.service.spec.ts | 0 .../src/app/ceph/cluster/osd/osd.service.ts | 0 .../app/ceph/dashboard/dashboard.module.ts | 0 .../ceph/dashboard/dashboard.service.spec.ts | 0 .../app/ceph/dashboard/dashboard.service.ts | 0 .../dashboard/dashboard.component.html | 0 .../dashboard/dashboard.component.scss | 0 .../dashboard/dashboard.component.spec.ts | 0 .../dashboard/dashboard.component.ts | 0 .../health-pie/health-pie.component.html | 0 .../health-pie/health-pie.component.scss | 0 .../health-pie/health-pie.component.spec.ts | 0 .../health-pie/health-pie.component.ts | 0 .../dashboard/health/health.component.html | 0 .../dashboard/health/health.component.scss | 0 .../dashboard/health/health.component.spec.ts | 0 .../ceph/dashboard/health/health.component.ts | 0 .../app/ceph/dashboard/log-color.pipe.spec.ts | 0 .../src/app/ceph/dashboard/log-color.pipe.ts | 0 .../ceph/dashboard/mds-summary.pipe.spec.ts | 0 .../app/ceph/dashboard/mds-summary.pipe.ts | 0 .../ceph/dashboard/mgr-summary.pipe.spec.ts | 0 .../app/ceph/dashboard/mgr-summary.pipe.ts | 0 .../ceph/dashboard/mon-summary.pipe.spec.ts | 0 .../app/ceph/dashboard/mon-summary.pipe.ts | 0 .../ceph/dashboard/osd-summary.pipe.spec.ts | 0 .../app/ceph/dashboard/osd-summary.pipe.ts | 0 .../dashboard/pg-status-style.pipe.spec.ts | 0 .../ceph/dashboard/pg-status-style.pipe.ts | 0 .../app/ceph/dashboard/pg-status.pipe.spec.ts | 0 .../src/app/ceph/dashboard/pg-status.pipe.ts | 0 .../performance-counter.module.ts | 0 .../performance-counter.component.html | 0 .../performance-counter.component.scss | 0 .../performance-counter.component.spec.ts | 0 .../performance-counter.component.ts | 0 .../table-performance-counter.service.spec.ts | 0 .../table-performance-counter.service.ts | 0 .../table-performance-counter.component.html | 0 .../table-performance-counter.component.scss | 0 ...able-performance-counter.component.spec.ts | 0 .../table-performance-counter.component.ts | 0 .../rgw-daemon-details.component.html | 0 .../rgw-daemon-details.component.scss | 0 .../rgw-daemon-details.component.spec.ts | 0 .../rgw-daemon-details.component.ts | 0 .../rgw-daemon-list.component.html | 0 .../rgw-daemon-list.component.scss | 0 .../rgw-daemon-list.component.spec.ts | 0 .../rgw-daemon-list.component.ts | 0 .../frontend/src/app/ceph/rgw/rgw.module.ts | 0 .../rgw/services/rgw-daemon.service.spec.ts | 0 .../ceph/rgw/services/rgw-daemon.service.ts | 0 .../frontend/src/app/core/auth/auth.module.ts | 0 .../app/core/auth/login/login.component.html | 0 .../app/core/auth/login/login.component.scss | 0 .../core/auth/login/login.component.spec.ts | 0 .../app/core/auth/login/login.component.ts | 0 .../core/auth/logout/logout.component.html | 0 .../core/auth/logout/logout.component.scss | 0 .../core/auth/logout/logout.component.spec.ts | 0 .../app/core/auth/logout/logout.component.ts | 0 .../frontend/src/app/core/core.module.ts | 0 .../app/core/navigation/navigation.module.ts | 0 .../navigation/navigation.component.html | 0 .../navigation/navigation.component.scss | 0 .../navigation/navigation.component.spec.ts | 0 .../navigation/navigation.component.ts | 0 .../core/not-found/not-found.component.html | 0 .../core/not-found/not-found.component.scss | 0 .../not-found/not-found.component.spec.ts | 0 .../app/core/not-found/not-found.component.ts | 0 .../shared/components/components.module.ts | 0 .../sparkline/sparkline.component.html | 0 .../sparkline/sparkline.component.scss | 0 .../sparkline/sparkline.component.spec.ts | 0 .../sparkline/sparkline.component.ts | 0 .../view-cache/view-cache.component.html | 0 .../view-cache/view-cache.component.scss | 0 .../view-cache/view-cache.component.spec.ts | 0 .../view-cache/view-cache.component.ts | 0 .../app/shared/datatable/datatable.module.ts | 0 .../table-key-value.component.html | 0 .../table-key-value.component.scss | 0 .../table-key-value.component.spec.ts | 0 .../table-key-value.component.ts | 0 .../datatable/table/table.component.html | 0 .../datatable/table/table.component.scss | 0 .../datatable/table/table.component.spec.ts | 0 .../shared/datatable/table/table.component.ts | 0 .../password-button.directive.spec.ts | 0 .../directives/password-button.directive.ts | 0 .../src/app/shared/enum/cell-template.enum.ts | 0 .../app/shared/enum/view-cache-status.enum.ts | 0 .../src/app/shared/models/cd-table-column.ts | 0 .../app/shared/models/cd-table-selection.ts | 0 .../src/app/shared/models/chart-tooltip.ts | 0 .../src/app/shared/models/credentials.ts | 0 .../pipes/ceph-short-version.pipe.spec.ts | 0 .../shared/pipes/ceph-short-version.pipe.ts | 0 .../shared/pipes/dimless-binary.pipe.spec.ts | 0 .../app/shared/pipes/dimless-binary.pipe.ts | 0 .../src/app/shared/pipes/dimless.pipe.spec.ts | 0 .../src/app/shared/pipes/dimless.pipe.ts | 0 .../src/app/shared/pipes/filter.pipe.spec.ts | 0 .../src/app/shared/pipes/filter.pipe.ts | 0 .../shared/pipes/health-color.pipe.spec.ts | 0 .../src/app/shared/pipes/health-color.pipe.ts | 0 .../src/app/shared/pipes/list.pipe.spec.ts | 0 .../src/app/shared/pipes/list.pipe.ts | 0 .../src/app/shared/pipes/pipes.module.ts | 0 .../shared/pipes/relative-date.pipe.spec.ts | 0 .../app/shared/pipes/relative-date.pipe.ts | 0 .../app/shared/services/auth-guard.service.ts | 0 .../services/auth-interceptor.service.ts | 0 .../shared/services/auth-storage.service.ts | 0 .../src/app/shared/services/auth.service.ts | 0 .../services/configuration.service.spec.ts | 0 .../shared/services/configuration.service.ts | 0 .../shared/services/formatter.service.spec.ts | 0 .../app/shared/services/formatter.service.ts | 0 .../src/app/shared/services/host.service.ts | 0 .../src/app/shared/services/pool.service.ts | 0 .../services/rbd-mirroring.service.spec.ts | 0 .../shared/services/rbd-mirroring.service.ts | 0 .../app/shared/services/services.module.ts | 0 .../shared/services/summary.service.spec.ts | 0 .../app/shared/services/summary.service.ts | 0 .../app/shared/services/tcmu-iscsi.service.ts | 0 .../frontend/src/app/shared/shared.module.ts | 0 .../frontend/src/assets/.gitkeep | 0 .../src/assets/1280px-Mimic_Octopus2.jpg | Bin ...go_Stacked_RGB_White_120411_fa_256x256.png | Bin ...Ceph_Logo_Standard_RGB_White_120411_fa.png | Bin .../frontend/src/assets/loading.gif | Bin .../frontend/src/assets/logo-mini.png | Bin .../src/assets/notification-icons.png | Bin .../frontend/src/defaults.scss | 0 .../src/environments/environment.prod.ts | 0 .../frontend/src/environments/environment.ts | 0 .../frontend/src/favicon.ico | Bin .../frontend/src/index.html | 0 .../frontend/src/main.ts | 0 .../frontend/src/openattic-theme.scss | 0 .../frontend/src/polyfills.ts | 0 .../frontend/src/styles.scss | 0 .../frontend/src/styles/chart-tooltip.scss | 0 .../frontend/src/test.ts | 0 .../frontend/src/tsconfig.app.json | 0 .../frontend/src/tsconfig.spec.json | 0 .../frontend/src/typings.d.ts | 0 .../frontend/tsconfig.json | 0 .../frontend/tslint.json | 0 .../mgr/{dashboard_v2 => dashboard}/module.py | 0 .../requirements.txt | 0 .../run-backend-api-tests.sh | 4 +- .../run-frontend-unittests.sh | 2 +- .../{dashboard_v2 => dashboard}/run-tox.sh | 6 +-- .../services/__init__.py | 0 .../services/ceph_service.py | 0 .../{dashboard_v2 => dashboard}/settings.py | 0 .../tests/__init__.py | 0 .../tests/helper.py | 0 .../tests/test_notification.py | 0 .../tests/test_rbd_mirroring.py | 4 +- .../tests/test_settings.py | 0 .../tests/test_tcmu_iscsi.py | 0 .../tests/test_tools.py | 0 .../mgr/{dashboard_v2 => dashboard}/tools.py | 2 +- .../mgr/{dashboard_v2 => dashboard}/tox.ini | 0 src/test/CMakeLists.txt | 8 ++-- src/test/mgr/CMakeLists.txt | 9 ++-- ...ard_v2-smoke.sh => mgr-dashboard-smoke.sh} | 12 ++--- src/vstart.sh | 29 +++++------ 293 files changed, 116 insertions(+), 121 deletions(-) create mode 100644 qa/suites/rados/mgr/tasks/dashboard.yaml delete mode 100644 qa/suites/rados/mgr/tasks/dashboard_v2.yaml rename qa/tasks/mgr/{dashboard_v2 => dashboard}/__init__.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/helper.py (96%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_auth.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_cephfs.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_cluster_configuration.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_dashboard.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_host.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_monitor.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_osd.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_perf_counters.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_pool.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_rbd.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_rgw.py (100%) rename qa/tasks/mgr/{dashboard_v2 => dashboard}/test_summary.py (100%) rename qa/tasks/mgr/{test_dashboard_v2.py => test_dashboard.py} (81%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/.coveragerc (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/.editorconfig (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/.gitignore (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/.pylintrc (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/CMakeLists.txt (53%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/HACKING.rst (98%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/README.rst (96%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/__init__.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/__init__.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/auth.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/cephfs.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/cluster_configuration.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/dashboard.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/host.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/monitor.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/osd.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/perf_counters.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/pool.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/rbd.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/rbd_mirroring.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/rgw.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/summary.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/controllers/tcmu_iscsi.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/.angular-cli.json (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/.editorconfig (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/.gitignore (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/e2e/app.e2e-spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/e2e/app.po.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/e2e/tsconfig.e2e.json (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/karma.conf.js (97%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/package.json (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/protractor.conf.js (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/proxy.conf.json.sample (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/app-routing.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/app.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/app.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/app.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/app.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/app.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/block.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/iscsi/iscsi.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/iscsi/iscsi.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/iscsi/iscsi.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/mirror-health-color.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/mirror-health-color.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/mirroring/mirroring.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/mirroring/mirroring.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/mirroring/mirroring.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/mirroring/mirroring.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/pool-detail/pool-detail.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/pool-detail/pool-detail.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/pool-detail/pool-detail.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/block/pool-detail/pool-detail.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/ceph.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/cephfs.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/cephfs.service.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/cephfs.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/clients/clients.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/clients/clients.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/clients/clients.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cephfs/clients/clients.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/cluster.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/configuration/configuration.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/configuration/configuration.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/configuration/configuration.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/hosts/hosts.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/hosts/hosts.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/hosts/hosts.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/monitor.service.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/monitor.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/monitor/monitor.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/monitor/monitor.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/monitor/monitor.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd.service.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/cluster/osd/osd.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/dashboard.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/dashboard.service.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/dashboard.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/health/health.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/health/health.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/health/health.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/health/health.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/log-color.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/log-color.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/mds-summary.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/mds-summary.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/mgr-summary.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/mgr-summary.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/mon-summary.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/mon-summary.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/osd-summary.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/pg-status-style.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/pg-status-style.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/pg-status.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/dashboard/pg-status.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/performance-counter/performance-counter.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/rgw/rgw.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/rgw/services/rgw-daemon.service.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/ceph/rgw/services/rgw-daemon.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/auth/auth.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/auth/login/login.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/auth/login/login.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/auth/login/login.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/auth/login/login.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/auth/logout/logout.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/auth/logout/logout.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/auth/logout/logout.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/auth/logout/logout.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/core.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/navigation/navigation.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/navigation/navigation/navigation.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/navigation/navigation/navigation.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/navigation/navigation/navigation.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/not-found/not-found.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/not-found/not-found.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/not-found/not-found.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/core/not-found/not-found.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/components/components.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/components/sparkline/sparkline.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/components/sparkline/sparkline.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/components/sparkline/sparkline.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/components/view-cache/view-cache.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/components/view-cache/view-cache.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/components/view-cache/view-cache.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/components/view-cache/view-cache.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/datatable/datatable.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/datatable/table/table.component.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/datatable/table/table.component.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/datatable/table/table.component.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/datatable/table/table.component.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/directives/password-button.directive.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/directives/password-button.directive.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/enum/cell-template.enum.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/enum/view-cache-status.enum.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/models/cd-table-column.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/models/cd-table-selection.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/models/chart-tooltip.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/models/credentials.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/ceph-short-version.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/ceph-short-version.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/dimless-binary.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/dimless-binary.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/dimless.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/dimless.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/filter.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/filter.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/health-color.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/health-color.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/list.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/list.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/pipes.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/relative-date.pipe.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/pipes/relative-date.pipe.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/auth-guard.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/auth-interceptor.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/auth-storage.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/auth.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/configuration.service.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/configuration.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/formatter.service.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/formatter.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/host.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/pool.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/rbd-mirroring.service.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/rbd-mirroring.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/services.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/summary.service.spec.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/summary.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/services/tcmu-iscsi.service.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/app/shared/shared.module.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/assets/.gitkeep (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/assets/1280px-Mimic_Octopus2.jpg (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/assets/Ceph_Logo_Stacked_RGB_White_120411_fa_256x256.png (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/assets/Ceph_Logo_Standard_RGB_White_120411_fa.png (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/assets/loading.gif (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/assets/logo-mini.png (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/assets/notification-icons.png (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/defaults.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/environments/environment.prod.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/environments/environment.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/favicon.ico (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/index.html (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/main.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/openattic-theme.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/polyfills.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/styles.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/styles/chart-tooltip.scss (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/test.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/tsconfig.app.json (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/tsconfig.spec.json (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/src/typings.d.ts (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/tsconfig.json (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/frontend/tslint.json (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/module.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/requirements.txt (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/run-backend-api-tests.sh (93%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/run-frontend-unittests.sh (69%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/run-tox.sh (73%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/services/__init__.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/services/ceph_service.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/settings.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/tests/__init__.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/tests/helper.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/tests/test_notification.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/tests/test_rbd_mirroring.py (95%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/tests/test_settings.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/tests/test_tcmu_iscsi.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/tests/test_tools.py (100%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/tools.py (99%) rename src/pybind/mgr/{dashboard_v2 => dashboard}/tox.ini (100%) rename src/test/mgr/{mgr-dashboard_v2-smoke.sh => mgr-dashboard-smoke.sh} (89%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b521b9cec6ee0..a0eb77b741497 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -613,7 +613,7 @@ endif() set(Boost_USE_MULTITHREADED ON) # dashboard angular2 frontend -option(WITH_MGR_DASHBOARD_V2_FRONTEND "Build the mgr/dashboard_v2 frontend using `npm`" ON) +option(WITH_MGR_DASHBOARD_FRONTEND "Build the mgr/dashboard frontend using `npm`" ON) include_directories(SYSTEM ${PROJECT_BINARY_DIR}/include) diff --git a/ceph.spec.in b/ceph.spec.in index 5e890c4c6187c..cc4d0ee5da508 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -899,7 +899,7 @@ cmake .. \ -DWITH_EMBEDDED=OFF \ -DWITH_MANPAGE=ON \ -DWITH_PYTHON3=ON \ - -DWITH_MGR_DASHBOARD_V2_FRONTEND=OFF \ + -DWITH_MGR_DASHBOARD_FRONTEND=OFF \ %if %{with python2} -DWITH_PYTHON2=ON \ %else diff --git a/debian/rules b/debian/rules index 17a0d804b306e..f1e150035fa21 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ export DESTDIR=$(CURDIR)/debian/tmp export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -extraopts += -DUSE_CRYPTOPP=OFF -DWITH_OCF=ON -DWITH_LTTNG=ON -DWITH_PYTHON3=ON -DWITH_EMBEDDED=OFF -DWITH_MGR_DASHBOARD_V2_FRONTEND=OFF +extraopts += -DUSE_CRYPTOPP=OFF -DWITH_OCF=ON -DWITH_LTTNG=ON -DWITH_PYTHON3=ON -DWITH_EMBEDDED=OFF -DWITH_MGR_DASHBOARD_FRONTEND=OFF extraopts += -DWITH_CEPHFS_JAVA=ON extraopts += -DWITH_SYSTEMD=ON -DCEPH_SYSTEMD_ENV_DIR=/etc/default # assumes that ceph is exmpt from multiarch support, so we override the libdir. diff --git a/make-dist b/make-dist index e492fae93e0f0..607caf3f9c7be 100755 --- a/make-dist +++ b/make-dist @@ -63,11 +63,11 @@ download_boost() { build_dashboard_frontend() { CURR_DIR=`pwd` - cd src/pybind/mgr/dashboard_v2/frontend + cd src/pybind/mgr/dashboard/frontend npm install npm run build -- --prod cd $CURR_DIR - tar cf dashboard_frontend.tar $outfile/src/pybind/mgr/dashboard_v2/frontend/dist + tar cf dashboard_frontend.tar $outfile/src/pybind/mgr/dashboard/frontend/dist } # clean out old cruft... diff --git a/qa/suites/rados/mgr/tasks/dashboard.yaml b/qa/suites/rados/mgr/tasks/dashboard.yaml new file mode 100644 index 0000000000000..8570eaff1a401 --- /dev/null +++ b/qa/suites/rados/mgr/tasks/dashboard.yaml @@ -0,0 +1,34 @@ + +tasks: + - install: + - ceph: + # tests may leave mgrs broken, so don't try and call into them + # to invoke e.g. pg dump during teardown. + wait-for-scrub: false + log-whitelist: + - overall HEALTH_ + - \(MGR_DOWN\) + - \(PG_ + - replacing it with standby + - No standby daemons available + - \(FS_DEGRADED\) + - \(MDS_FAILED\) + - \(MDS_DEGRADED\) + - \(FS_WITH_FAILED_MDS\) + - \(MDS_DAMAGE\) + - rgw: [client.0] + - cephfs_test_runner: + modules: + - tasks.mgr.test_dashboard + - tasks.mgr.dashboard.test_auth + - tasks.mgr.dashboard.test_cephfs + - tasks.mgr.dashboard.test_cluster_configuration + - tasks.mgr.dashboard.test_dashboard + - tasks.mgr.dashboard.test_host + - tasks.mgr.dashboard.test_monitor + - tasks.mgr.dashboard.test_osd + - tasks.mgr.dashboard.test_perf_counters + - tasks.mgr.dashboard.test_summary + - tasks.mgr.dashboard.test_rgw + - tasks.mgr.dashboard.test_rbd + - tasks.mgr.dashboard.test_pool diff --git a/qa/suites/rados/mgr/tasks/dashboard_v2.yaml b/qa/suites/rados/mgr/tasks/dashboard_v2.yaml deleted file mode 100644 index cd5e347a8bb40..0000000000000 --- a/qa/suites/rados/mgr/tasks/dashboard_v2.yaml +++ /dev/null @@ -1,34 +0,0 @@ - -tasks: - - install: - - ceph: - # tests may leave mgrs broken, so don't try and call into them - # to invoke e.g. pg dump during teardown. - wait-for-scrub: false - log-whitelist: - - overall HEALTH_ - - \(MGR_DOWN\) - - \(PG_ - - replacing it with standby - - No standby daemons available - - \(FS_DEGRADED\) - - \(MDS_FAILED\) - - \(MDS_DEGRADED\) - - \(FS_WITH_FAILED_MDS\) - - \(MDS_DAMAGE\) - - rgw: [client.0] - - cephfs_test_runner: - modules: - - tasks.mgr.test_dashboard_v2 - - tasks.mgr.dashboard_v2.test_auth - - tasks.mgr.dashboard_v2.test_cephfs - - tasks.mgr.dashboard_v2.test_cluster_configuration - - tasks.mgr.dashboard_v2.test_dashboard - - tasks.mgr.dashboard_v2.test_host - - tasks.mgr.dashboard_v2.test_monitor - - tasks.mgr.dashboard_v2.test_osd - - tasks.mgr.dashboard_v2.test_perf_counters - - tasks.mgr.dashboard_v2.test_summary - - tasks.mgr.dashboard_v2.test_rgw - - tasks.mgr.dashboard_v2.test_rbd - - tasks.mgr.dashboard_v2.test_pool diff --git a/qa/tasks/mgr/dashboard_v2/__init__.py b/qa/tasks/mgr/dashboard/__init__.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/__init__.py rename to qa/tasks/mgr/dashboard/__init__.py diff --git a/qa/tasks/mgr/dashboard_v2/helper.py b/qa/tasks/mgr/dashboard/helper.py similarity index 96% rename from qa/tasks/mgr/dashboard_v2/helper.py rename to qa/tasks/mgr/dashboard/helper.py index f43970f110c4f..3e0c836e8b058 100644 --- a/qa/tasks/mgr/dashboard_v2/helper.py +++ b/qa/tasks/mgr/dashboard/helper.py @@ -34,9 +34,9 @@ class DashboardTestCase(MgrTestCase): @classmethod def setUpClass(cls): super(DashboardTestCase, cls).setUpClass() - cls._assign_ports("dashboard_v2", "server_port") - cls._load_module("dashboard_v2") - cls.base_uri = cls._get_uri("dashboard_v2").rstrip('/') + cls._assign_ports("dashboard", "server_port") + cls._load_module("dashboard") + cls.base_uri = cls._get_uri("dashboard").rstrip('/') if cls.CEPHFS: cls.mds_cluster.clear_firewall() diff --git a/qa/tasks/mgr/dashboard_v2/test_auth.py b/qa/tasks/mgr/dashboard/test_auth.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_auth.py rename to qa/tasks/mgr/dashboard/test_auth.py diff --git a/qa/tasks/mgr/dashboard_v2/test_cephfs.py b/qa/tasks/mgr/dashboard/test_cephfs.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_cephfs.py rename to qa/tasks/mgr/dashboard/test_cephfs.py diff --git a/qa/tasks/mgr/dashboard_v2/test_cluster_configuration.py b/qa/tasks/mgr/dashboard/test_cluster_configuration.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_cluster_configuration.py rename to qa/tasks/mgr/dashboard/test_cluster_configuration.py diff --git a/qa/tasks/mgr/dashboard_v2/test_dashboard.py b/qa/tasks/mgr/dashboard/test_dashboard.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_dashboard.py rename to qa/tasks/mgr/dashboard/test_dashboard.py diff --git a/qa/tasks/mgr/dashboard_v2/test_host.py b/qa/tasks/mgr/dashboard/test_host.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_host.py rename to qa/tasks/mgr/dashboard/test_host.py diff --git a/qa/tasks/mgr/dashboard_v2/test_monitor.py b/qa/tasks/mgr/dashboard/test_monitor.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_monitor.py rename to qa/tasks/mgr/dashboard/test_monitor.py diff --git a/qa/tasks/mgr/dashboard_v2/test_osd.py b/qa/tasks/mgr/dashboard/test_osd.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_osd.py rename to qa/tasks/mgr/dashboard/test_osd.py diff --git a/qa/tasks/mgr/dashboard_v2/test_perf_counters.py b/qa/tasks/mgr/dashboard/test_perf_counters.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_perf_counters.py rename to qa/tasks/mgr/dashboard/test_perf_counters.py diff --git a/qa/tasks/mgr/dashboard_v2/test_pool.py b/qa/tasks/mgr/dashboard/test_pool.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_pool.py rename to qa/tasks/mgr/dashboard/test_pool.py diff --git a/qa/tasks/mgr/dashboard_v2/test_rbd.py b/qa/tasks/mgr/dashboard/test_rbd.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_rbd.py rename to qa/tasks/mgr/dashboard/test_rbd.py diff --git a/qa/tasks/mgr/dashboard_v2/test_rgw.py b/qa/tasks/mgr/dashboard/test_rgw.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_rgw.py rename to qa/tasks/mgr/dashboard/test_rgw.py diff --git a/qa/tasks/mgr/dashboard_v2/test_summary.py b/qa/tasks/mgr/dashboard/test_summary.py similarity index 100% rename from qa/tasks/mgr/dashboard_v2/test_summary.py rename to qa/tasks/mgr/dashboard/test_summary.py diff --git a/qa/tasks/mgr/test_dashboard_v2.py b/qa/tasks/mgr/test_dashboard.py similarity index 81% rename from qa/tasks/mgr/test_dashboard_v2.py rename to qa/tasks/mgr/test_dashboard.py index 750ef911b54c3..79aebee4eabfd 100644 --- a/qa/tasks/mgr/test_dashboard_v2.py +++ b/qa/tasks/mgr/test_dashboard.py @@ -13,17 +13,17 @@ class TestDashboard(MgrTestCase): MGRS_REQUIRED = 3 def test_standby(self): - self._assign_ports("dashboard_v2", "server_port") - self._load_module("dashboard_v2") + self._assign_ports("dashboard", "server_port") + self._load_module("dashboard") original_active = self.mgr_cluster.get_active_id() - original_uri = self._get_uri("dashboard_v2") + original_uri = self._get_uri("dashboard") log.info("Originally running at {0}".format(original_uri)) self.mgr_cluster.mgr_fail(original_active) - failed_over_uri = self._get_uri("dashboard_v2") + failed_over_uri = self._get_uri("dashboard") log.info("After failover running at {0}".format(failed_over_uri)) self.assertNotEqual(original_uri, failed_over_uri) @@ -35,10 +35,10 @@ class TestDashboard(MgrTestCase): self.assertEqual(r.headers['Location'], failed_over_uri) def test_urls(self): - self._assign_ports("dashboard_v2", "server_port") - self._load_module("dashboard_v2") + self._assign_ports("dashboard", "server_port") + self._load_module("dashboard") - base_uri = self._get_uri("dashboard_v2") + base_uri = self._get_uri("dashboard") # This is a very simple smoke test to check that the dashboard can # give us a 200 response to requests. We're not testing that diff --git a/src/pybind/mgr/CMakeLists.txt b/src/pybind/mgr/CMakeLists.txt index acd0da46c18a2..360a923847e43 100644 --- a/src/pybind/mgr/CMakeLists.txt +++ b/src/pybind/mgr/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(dashboard_v2) +add_subdirectory(dashboard) diff --git a/src/pybind/mgr/dashboard_v2/.coveragerc b/src/pybind/mgr/dashboard/.coveragerc similarity index 100% rename from src/pybind/mgr/dashboard_v2/.coveragerc rename to src/pybind/mgr/dashboard/.coveragerc diff --git a/src/pybind/mgr/dashboard_v2/.editorconfig b/src/pybind/mgr/dashboard/.editorconfig similarity index 100% rename from src/pybind/mgr/dashboard_v2/.editorconfig rename to src/pybind/mgr/dashboard/.editorconfig diff --git a/src/pybind/mgr/dashboard_v2/.gitignore b/src/pybind/mgr/dashboard/.gitignore similarity index 100% rename from src/pybind/mgr/dashboard_v2/.gitignore rename to src/pybind/mgr/dashboard/.gitignore diff --git a/src/pybind/mgr/dashboard_v2/.pylintrc b/src/pybind/mgr/dashboard/.pylintrc similarity index 100% rename from src/pybind/mgr/dashboard_v2/.pylintrc rename to src/pybind/mgr/dashboard/.pylintrc diff --git a/src/pybind/mgr/dashboard_v2/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt similarity index 53% rename from src/pybind/mgr/dashboard_v2/CMakeLists.txt rename to src/pybind/mgr/dashboard/CMakeLists.txt index 15e2f27ca2907..512034c9793d6 100644 --- a/src/pybind/mgr/dashboard_v2/CMakeLists.txt +++ b/src/pybind/mgr/dashboard/CMakeLists.txt @@ -1,34 +1,35 @@ -set(MGR_DASHBOARD_V2_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard_v2-virtualenv) +set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv) -add_custom_target(mgr-dashboard_v2-test-venv +add_custom_target(mgr-dashboard-test-venv COMMAND - ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh ${MGR_DASHBOARD_V2_VIRTUALENV} && - ${MGR_DASHBOARD_V2_VIRTUALENV}/bin/pip install --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard_v2/wheelhouse -r requirements.txt - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard_v2 - COMMENT "dashboard_v2 tests virtualenv is being created") -add_dependencies(tests mgr-dashboard_v2-test-venv) + ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh ${MGR_DASHBOARD_VIRTUALENV} && + ${MGR_DASHBOARD_VIRTUALENV}/bin/pip install --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/wheelhouse -r requirements.txt + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard + COMMENT "dashboard tests virtualenv is being created") +add_dependencies(tests mgr-dashboard-test-venv) -if(WITH_MGR_DASHBOARD_V2_FRONTEND AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") +if(WITH_MGR_DASHBOARD_FRONTEND AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") find_program(NPM_BIN NAMES npm HINTS $ENV{NPM_ROOT}/bin) if(NOT NPM_BIN) - message(FATAL_ERROR "WITH_MGR_DASHBOARD_V2_FRONTEND set, but npm not found") + message(FATAL_ERROR "WITH_MGR_DASHBOARD_FRONTEND set, but npm not found") endif() add_custom_command( - OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard_v2/frontend/node_modules" + OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules" COMMAND ${NPM_BIN} install DEPENDS frontend/package.json - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard_v2/frontend - COMMENT "dashboard_v2 frontend dependencies are being installed" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend + COMMENT "dashboard frontend dependencies are being installed" ) -add_custom_target(mgr-dashboard_v2-frontend-deps +add_custom_target(mgr-dashboard-frontend-deps DEPENDS frontend/node_modules - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard_v2/frontend + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend ) + # Glob some frontend files. With CMake 3.6, this can be simplified # to *.ts *.html. Just add: # list(FILTER frontend_src INCLUDE REGEX "frontend/src") @@ -54,15 +55,15 @@ else() endif() add_custom_command( - OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard_v2/frontend/dist" + OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist" COMMAND ${npm_command} DEPENDS ${frontend_src} frontend/node_modules - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard_v2/frontend - COMMENT "dashboard_v2 frontend is being created" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend + COMMENT "dashboard frontend is being created" ) -add_custom_target(mgr-dashboard_v2-frontend-build - DEPENDS frontend/dist mgr-dashboard_v2-frontend-deps - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard_v2/frontend +add_custom_target(mgr-dashboard-frontend-build + DEPENDS frontend/dist mgr-dashboard-frontend-deps + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend ) -add_dependencies(ceph-mgr mgr-dashboard_v2-frontend-build) -endif(WITH_MGR_DASHBOARD_V2_FRONTEND AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") +add_dependencies(ceph-mgr mgr-dashboard-frontend-build) +endif(WITH_MGR_DASHBOARD_FRONTEND AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") diff --git a/src/pybind/mgr/dashboard_v2/HACKING.rst b/src/pybind/mgr/dashboard/HACKING.rst similarity index 98% rename from src/pybind/mgr/dashboard_v2/HACKING.rst rename to src/pybind/mgr/dashboard/HACKING.rst index 610e117ba12bc..f8d5e2bcd6fe5 100644 --- a/src/pybind/mgr/dashboard_v2/HACKING.rst +++ b/src/pybind/mgr/dashboard/HACKING.rst @@ -1,4 +1,4 @@ -Dashboard v2 Developer Documentation +Dashboard Developer Documentation ==================================== Frontend Development @@ -15,7 +15,7 @@ The build process is based on `Node.js `_ and requires the Prerequisites ~~~~~~~~~~~~~ -Run ``npm install`` in directory ``src/pybind/mgr/dashboard_v2/frontend`` to +Run ``npm install`` in directory ``src/pybind/mgr/dashboard/frontend`` to install the required packages locally. .. note:: @@ -112,7 +112,7 @@ The Python backend code of this module requires a number of Python modules to be installed. They are listed in file ``requirements.txt``. Using `pip `_ you may install all required dependencies by issuing ``pip install -r requirements.txt`` in directory -``src/pybind/mgr/dashboard_v2``. +``src/pybind/mgr/dashboard``. If you're using the `ceph-dev-docker development environment `_, simply run @@ -175,13 +175,13 @@ a Ceph cluster:: $ PATH=../../../../build/bin:$PATH tox -e ceph-cluster-start The command above uses ``vstart.sh`` script to start a Ceph cluster and -automatically enables the ``dashboard_v2`` module, and configures its cherrypy +automatically enables the ``dashboard`` module, and configures its cherrypy web server to listen in port ``9865``. After starting the Ceph cluster we can run our test file using ``py.test`` like this:: - DASHBOARD_V2_PORT=9865 UNITTEST=true py.test -s tests/test_mycontroller.py + DASHBOARD_PORT=9865 UNITTEST=true py.test -s tests/test_mycontroller.py You can run tests multiple times without having to start and stop the Ceph cluster. diff --git a/src/pybind/mgr/dashboard_v2/README.rst b/src/pybind/mgr/dashboard/README.rst similarity index 96% rename from src/pybind/mgr/dashboard_v2/README.rst rename to src/pybind/mgr/dashboard/README.rst index 6ee5984892aec..22368188138bc 100644 --- a/src/pybind/mgr/dashboard_v2/README.rst +++ b/src/pybind/mgr/dashboard/README.rst @@ -1,4 +1,4 @@ -Dashboard and Administration Module for Ceph Manager (aka "Dashboard v2") +Dashboard and Administration Module for Ceph Manager ========================================================================= Overview @@ -54,7 +54,7 @@ development environment. From within a running Ceph cluster, you can start the Dashboard module by running the following command:: - $ ceph mgr module enable dashboard_v2 + $ ceph mgr module enable dashboard You can see currently enabled Manager modules with:: diff --git a/src/pybind/mgr/dashboard_v2/__init__.py b/src/pybind/mgr/dashboard/__init__.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/__init__.py rename to src/pybind/mgr/dashboard/__init__.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/__init__.py b/src/pybind/mgr/dashboard/controllers/__init__.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/__init__.py rename to src/pybind/mgr/dashboard/controllers/__init__.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/auth.py b/src/pybind/mgr/dashboard/controllers/auth.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/auth.py rename to src/pybind/mgr/dashboard/controllers/auth.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/cephfs.py b/src/pybind/mgr/dashboard/controllers/cephfs.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/cephfs.py rename to src/pybind/mgr/dashboard/controllers/cephfs.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/cluster_configuration.py b/src/pybind/mgr/dashboard/controllers/cluster_configuration.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/cluster_configuration.py rename to src/pybind/mgr/dashboard/controllers/cluster_configuration.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/dashboard.py b/src/pybind/mgr/dashboard/controllers/dashboard.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/dashboard.py rename to src/pybind/mgr/dashboard/controllers/dashboard.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/host.py b/src/pybind/mgr/dashboard/controllers/host.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/host.py rename to src/pybind/mgr/dashboard/controllers/host.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/monitor.py b/src/pybind/mgr/dashboard/controllers/monitor.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/monitor.py rename to src/pybind/mgr/dashboard/controllers/monitor.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/osd.py b/src/pybind/mgr/dashboard/controllers/osd.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/osd.py rename to src/pybind/mgr/dashboard/controllers/osd.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/perf_counters.py b/src/pybind/mgr/dashboard/controllers/perf_counters.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/perf_counters.py rename to src/pybind/mgr/dashboard/controllers/perf_counters.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/pool.py b/src/pybind/mgr/dashboard/controllers/pool.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/pool.py rename to src/pybind/mgr/dashboard/controllers/pool.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/rbd.py b/src/pybind/mgr/dashboard/controllers/rbd.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/rbd.py rename to src/pybind/mgr/dashboard/controllers/rbd.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/rbd_mirroring.py b/src/pybind/mgr/dashboard/controllers/rbd_mirroring.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/rbd_mirroring.py rename to src/pybind/mgr/dashboard/controllers/rbd_mirroring.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/rgw.py b/src/pybind/mgr/dashboard/controllers/rgw.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/rgw.py rename to src/pybind/mgr/dashboard/controllers/rgw.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/summary.py b/src/pybind/mgr/dashboard/controllers/summary.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/summary.py rename to src/pybind/mgr/dashboard/controllers/summary.py diff --git a/src/pybind/mgr/dashboard_v2/controllers/tcmu_iscsi.py b/src/pybind/mgr/dashboard/controllers/tcmu_iscsi.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/controllers/tcmu_iscsi.py rename to src/pybind/mgr/dashboard/controllers/tcmu_iscsi.py diff --git a/src/pybind/mgr/dashboard_v2/frontend/.angular-cli.json b/src/pybind/mgr/dashboard/frontend/.angular-cli.json similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/.angular-cli.json rename to src/pybind/mgr/dashboard/frontend/.angular-cli.json diff --git a/src/pybind/mgr/dashboard_v2/frontend/.editorconfig b/src/pybind/mgr/dashboard/frontend/.editorconfig similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/.editorconfig rename to src/pybind/mgr/dashboard/frontend/.editorconfig diff --git a/src/pybind/mgr/dashboard_v2/frontend/.gitignore b/src/pybind/mgr/dashboard/frontend/.gitignore similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/.gitignore rename to src/pybind/mgr/dashboard/frontend/.gitignore diff --git a/src/pybind/mgr/dashboard_v2/frontend/e2e/app.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/app.e2e-spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/e2e/app.e2e-spec.ts rename to src/pybind/mgr/dashboard/frontend/e2e/app.e2e-spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/e2e/app.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/app.po.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/e2e/app.po.ts rename to src/pybind/mgr/dashboard/frontend/e2e/app.po.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/e2e/tsconfig.e2e.json b/src/pybind/mgr/dashboard/frontend/e2e/tsconfig.e2e.json similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/e2e/tsconfig.e2e.json rename to src/pybind/mgr/dashboard/frontend/e2e/tsconfig.e2e.json diff --git a/src/pybind/mgr/dashboard_v2/frontend/karma.conf.js b/src/pybind/mgr/dashboard/frontend/karma.conf.js similarity index 97% rename from src/pybind/mgr/dashboard_v2/frontend/karma.conf.js rename to src/pybind/mgr/dashboard/frontend/karma.conf.js index 95969e05ce41a..f86ab20aa5fd6 100644 --- a/src/pybind/mgr/dashboard_v2/frontend/karma.conf.js +++ b/src/pybind/mgr/dashboard/frontend/karma.conf.js @@ -27,7 +27,7 @@ module.exports = function (config) { reporters: ['progress', 'kjhtml', 'junit'], junitReporter: { 'outputFile': 'junit.frontend.xml', - 'suite': 'dashboard_v2', + 'suite': 'dashboard', 'useBrowserName': false }, port: 9876, diff --git a/src/pybind/mgr/dashboard_v2/frontend/package.json b/src/pybind/mgr/dashboard/frontend/package.json similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/package.json rename to src/pybind/mgr/dashboard/frontend/package.json diff --git a/src/pybind/mgr/dashboard_v2/frontend/protractor.conf.js b/src/pybind/mgr/dashboard/frontend/protractor.conf.js similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/protractor.conf.js rename to src/pybind/mgr/dashboard/frontend/protractor.conf.js diff --git a/src/pybind/mgr/dashboard_v2/frontend/proxy.conf.json.sample b/src/pybind/mgr/dashboard/frontend/proxy.conf.json.sample similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/proxy.conf.json.sample rename to src/pybind/mgr/dashboard/frontend/proxy.conf.json.sample diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/app-routing.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/app-routing.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/app.component.html b/src/pybind/mgr/dashboard/frontend/src/app/app.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/app.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/app.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/app.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/app.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/app.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/app.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/app.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/app.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/app.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/app.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/app.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/app.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/app.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/app.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/app.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/app.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/app.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/block.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/block.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/block.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/block.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/iscsi/iscsi.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/iscsi/iscsi.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/iscsi/iscsi.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/iscsi/iscsi.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/iscsi/iscsi.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/iscsi/iscsi.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirror-health-color.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirror-health-color.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirror-health-color.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirror-health-color.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirror-health-color.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirror-health-color.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirror-health-color.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirror-health-color.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirroring/mirroring.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirroring/mirroring.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirroring/mirroring.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirroring/mirroring.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirroring/mirroring.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirroring/mirroring.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirroring/mirroring.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/mirroring/mirroring.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/pool-detail/pool-detail.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/pool-detail/pool-detail.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/pool-detail/pool-detail.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/pool-detail/pool-detail.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/pool-detail/pool-detail.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/pool-detail/pool-detail.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/pool-detail/pool-detail.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/pool-detail/pool-detail.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/pool-detail/pool-detail.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/pool-detail/pool-detail.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/pool-detail/pool-detail.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/pool-detail/pool-detail.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/pool-detail/pool-detail.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/pool-detail/pool-detail.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/block/pool-detail/pool-detail.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/block/pool-detail/pool-detail.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/ceph.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/ceph.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/ceph.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/ceph.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs.service.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs.service.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs.service.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/clients/clients.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/clients/clients.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/clients/clients.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/clients/clients.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/clients/clients.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/clients/clients.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/clients/clients.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cephfs/clients/clients.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/cluster.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/cluster.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/configuration/configuration.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/configuration/configuration.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/configuration/configuration.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/configuration/configuration.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/configuration/configuration.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/configuration/configuration.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/hosts/hosts.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/hosts/hosts.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/hosts/hosts.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/hosts/hosts.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/hosts/hosts.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/hosts/hosts.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor.service.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor.service.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor.service.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor/monitor.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor/monitor.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor/monitor.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor/monitor.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor/monitor.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/monitor/monitor.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd.service.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd.service.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd.service.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/cluster/osd/osd.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard.service.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard.service.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard.service.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health/health.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health/health.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health/health.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health/health.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health/health.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health/health.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health/health.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/health/health.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/log-color.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/log-color.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/log-color.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/log-color.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/log-color.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/log-color.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/log-color.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/log-color.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mds-summary.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mds-summary.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mds-summary.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mds-summary.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mds-summary.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mds-summary.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mds-summary.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mds-summary.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mgr-summary.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mgr-summary.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mgr-summary.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mgr-summary.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mgr-summary.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mgr-summary.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mgr-summary.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mgr-summary.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mon-summary.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mon-summary.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mon-summary.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mon-summary.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mon-summary.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mon-summary.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/mon-summary.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mon-summary.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/osd-summary.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/osd-summary.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/pg-status-style.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/pg-status-style.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/pg-status-style.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/pg-status-style.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/pg-status-style.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/pg-status-style.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/pg-status-style.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/pg-status-style.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/pg-status.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/pg-status.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/pg-status.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/pg-status.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/pg-status.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/pg-status.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/dashboard/pg-status.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/pg-status.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/performance-counter.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/performance-counter.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/rgw.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/services/rgw-daemon.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/services/rgw-daemon.service.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/services/rgw-daemon.service.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/services/rgw-daemon.service.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/services/rgw-daemon.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/services/rgw-daemon.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/rgw/services/rgw-daemon.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/services/rgw-daemon.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/auth.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/auth.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/auth.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/core/auth/auth.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/login/login.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/login/login.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/login/login.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/login/login.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/login/login.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/login/login.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/login/login.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/login/login.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/logout/logout.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/logout/logout.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/logout/logout.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/logout/logout.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/logout/logout.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/logout/logout.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/logout/logout.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/auth/logout/logout.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/core.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/core.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/core.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/core/core.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/navigation/navigation.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/navigation/navigation.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/navigation/navigation/navigation.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/navigation/navigation/navigation.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/navigation/navigation/navigation.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/navigation/navigation/navigation.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/navigation/navigation/navigation.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/navigation/navigation/navigation.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/not-found/not-found.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/not-found/not-found.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/not-found/not-found.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/not-found/not-found.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/not-found/not-found.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/not-found/not-found.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/core/not-found/not-found.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/core/not-found/not-found.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/components.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/components.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/sparkline/sparkline.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/sparkline/sparkline.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/sparkline/sparkline.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/sparkline/sparkline.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/sparkline/sparkline.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/sparkline/sparkline.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/view-cache/view-cache.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/view-cache/view-cache.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/view-cache/view-cache.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/view-cache/view-cache.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/view-cache/view-cache.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/view-cache/view-cache.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/view-cache/view-cache.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/components/view-cache/view-cache.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/datatable.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/datatable.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/datatable.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/datatable.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table/table.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table/table.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table/table.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table/table.component.scss rename to src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table/table.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table/table.component.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table/table.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/datatable/table/table.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/directives/password-button.directive.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/password-button.directive.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/directives/password-button.directive.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/directives/password-button.directive.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/directives/password-button.directive.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/password-button.directive.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/directives/password-button.directive.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/directives/password-button.directive.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/enum/cell-template.enum.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/cell-template.enum.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/enum/cell-template.enum.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/enum/cell-template.enum.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/enum/view-cache-status.enum.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/view-cache-status.enum.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/enum/view-cache-status.enum.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/enum/view-cache-status.enum.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/models/cd-table-column.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/models/cd-table-column.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/models/cd-table-column.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/models/cd-table-column.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/models/cd-table-selection.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/models/cd-table-selection.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/models/cd-table-selection.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/models/cd-table-selection.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/models/chart-tooltip.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/models/chart-tooltip.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/models/chart-tooltip.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/models/chart-tooltip.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/models/credentials.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/models/credentials.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/models/credentials.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/models/credentials.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/ceph-short-version.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-short-version.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/ceph-short-version.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-short-version.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/ceph-short-version.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-short-version.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/ceph-short-version.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-short-version.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/dimless-binary.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/dimless-binary.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/dimless-binary.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/dimless-binary.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/dimless-binary.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/dimless-binary.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/dimless-binary.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/dimless-binary.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/dimless.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/dimless.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/dimless.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/dimless.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/filter.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/filter.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/filter.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/filter.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/filter.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/filter.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/filter.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/filter.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/health-color.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/health-color.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/health-color.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/health-color.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/health-color.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/health-color.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/health-color.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/health-color.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/list.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/list.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/list.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/list.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/pipes.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/pipes.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/pipes.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/pipes.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/relative-date.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/relative-date.pipe.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/relative-date.pipe.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/relative-date.pipe.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/relative-date.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/relative-date.pipe.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/pipes/relative-date.pipe.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/relative-date.pipe.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/auth-guard.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-guard.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/auth-guard.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-guard.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/auth-interceptor.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-interceptor.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/auth-interceptor.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-interceptor.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/auth-storage.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-storage.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/auth-storage.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-storage.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/auth.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/auth.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/configuration.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/configuration.service.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/configuration.service.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/configuration.service.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/configuration.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/configuration.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/configuration.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/configuration.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/formatter.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/formatter.service.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/formatter.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/formatter.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/host.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/host.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/host.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/host.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/pool.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/pool.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/pool.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/pool.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/rbd-mirroring.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/rbd-mirroring.service.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/rbd-mirroring.service.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/rbd-mirroring.service.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/rbd-mirroring.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/rbd-mirroring.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/rbd-mirroring.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/rbd-mirroring.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/services.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/services.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/services.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/services.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/summary.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/summary.service.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/summary.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/summary.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/tcmu-iscsi.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/tcmu-iscsi.service.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/services/tcmu-iscsi.service.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/services/tcmu-iscsi.service.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/shared/shared.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/shared.module.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/app/shared/shared.module.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/shared.module.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/assets/.gitkeep b/src/pybind/mgr/dashboard/frontend/src/assets/.gitkeep similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/assets/.gitkeep rename to src/pybind/mgr/dashboard/frontend/src/assets/.gitkeep diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/assets/1280px-Mimic_Octopus2.jpg b/src/pybind/mgr/dashboard/frontend/src/assets/1280px-Mimic_Octopus2.jpg similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/assets/1280px-Mimic_Octopus2.jpg rename to src/pybind/mgr/dashboard/frontend/src/assets/1280px-Mimic_Octopus2.jpg diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/assets/Ceph_Logo_Stacked_RGB_White_120411_fa_256x256.png b/src/pybind/mgr/dashboard/frontend/src/assets/Ceph_Logo_Stacked_RGB_White_120411_fa_256x256.png similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/assets/Ceph_Logo_Stacked_RGB_White_120411_fa_256x256.png rename to src/pybind/mgr/dashboard/frontend/src/assets/Ceph_Logo_Stacked_RGB_White_120411_fa_256x256.png diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/assets/Ceph_Logo_Standard_RGB_White_120411_fa.png b/src/pybind/mgr/dashboard/frontend/src/assets/Ceph_Logo_Standard_RGB_White_120411_fa.png similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/assets/Ceph_Logo_Standard_RGB_White_120411_fa.png rename to src/pybind/mgr/dashboard/frontend/src/assets/Ceph_Logo_Standard_RGB_White_120411_fa.png diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/assets/loading.gif b/src/pybind/mgr/dashboard/frontend/src/assets/loading.gif similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/assets/loading.gif rename to src/pybind/mgr/dashboard/frontend/src/assets/loading.gif diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/assets/logo-mini.png b/src/pybind/mgr/dashboard/frontend/src/assets/logo-mini.png similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/assets/logo-mini.png rename to src/pybind/mgr/dashboard/frontend/src/assets/logo-mini.png diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/assets/notification-icons.png b/src/pybind/mgr/dashboard/frontend/src/assets/notification-icons.png similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/assets/notification-icons.png rename to src/pybind/mgr/dashboard/frontend/src/assets/notification-icons.png diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/defaults.scss b/src/pybind/mgr/dashboard/frontend/src/defaults.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/defaults.scss rename to src/pybind/mgr/dashboard/frontend/src/defaults.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/environments/environment.prod.ts b/src/pybind/mgr/dashboard/frontend/src/environments/environment.prod.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/environments/environment.prod.ts rename to src/pybind/mgr/dashboard/frontend/src/environments/environment.prod.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/environments/environment.ts b/src/pybind/mgr/dashboard/frontend/src/environments/environment.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/environments/environment.ts rename to src/pybind/mgr/dashboard/frontend/src/environments/environment.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/favicon.ico b/src/pybind/mgr/dashboard/frontend/src/favicon.ico similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/favicon.ico rename to src/pybind/mgr/dashboard/frontend/src/favicon.ico diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/index.html b/src/pybind/mgr/dashboard/frontend/src/index.html similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/index.html rename to src/pybind/mgr/dashboard/frontend/src/index.html diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/main.ts b/src/pybind/mgr/dashboard/frontend/src/main.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/main.ts rename to src/pybind/mgr/dashboard/frontend/src/main.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/openattic-theme.scss b/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/openattic-theme.scss rename to src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/polyfills.ts b/src/pybind/mgr/dashboard/frontend/src/polyfills.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/polyfills.ts rename to src/pybind/mgr/dashboard/frontend/src/polyfills.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/styles.scss b/src/pybind/mgr/dashboard/frontend/src/styles.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/styles.scss rename to src/pybind/mgr/dashboard/frontend/src/styles.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/styles/chart-tooltip.scss b/src/pybind/mgr/dashboard/frontend/src/styles/chart-tooltip.scss similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/styles/chart-tooltip.scss rename to src/pybind/mgr/dashboard/frontend/src/styles/chart-tooltip.scss diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/test.ts b/src/pybind/mgr/dashboard/frontend/src/test.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/test.ts rename to src/pybind/mgr/dashboard/frontend/src/test.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/tsconfig.app.json b/src/pybind/mgr/dashboard/frontend/src/tsconfig.app.json similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/tsconfig.app.json rename to src/pybind/mgr/dashboard/frontend/src/tsconfig.app.json diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/tsconfig.spec.json b/src/pybind/mgr/dashboard/frontend/src/tsconfig.spec.json similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/tsconfig.spec.json rename to src/pybind/mgr/dashboard/frontend/src/tsconfig.spec.json diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/typings.d.ts b/src/pybind/mgr/dashboard/frontend/src/typings.d.ts similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/src/typings.d.ts rename to src/pybind/mgr/dashboard/frontend/src/typings.d.ts diff --git a/src/pybind/mgr/dashboard_v2/frontend/tsconfig.json b/src/pybind/mgr/dashboard/frontend/tsconfig.json similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/tsconfig.json rename to src/pybind/mgr/dashboard/frontend/tsconfig.json diff --git a/src/pybind/mgr/dashboard_v2/frontend/tslint.json b/src/pybind/mgr/dashboard/frontend/tslint.json similarity index 100% rename from src/pybind/mgr/dashboard_v2/frontend/tslint.json rename to src/pybind/mgr/dashboard/frontend/tslint.json diff --git a/src/pybind/mgr/dashboard_v2/module.py b/src/pybind/mgr/dashboard/module.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/module.py rename to src/pybind/mgr/dashboard/module.py diff --git a/src/pybind/mgr/dashboard_v2/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt similarity index 100% rename from src/pybind/mgr/dashboard_v2/requirements.txt rename to src/pybind/mgr/dashboard/requirements.txt diff --git a/src/pybind/mgr/dashboard_v2/run-backend-api-tests.sh b/src/pybind/mgr/dashboard/run-backend-api-tests.sh similarity index 93% rename from src/pybind/mgr/dashboard_v2/run-backend-api-tests.sh rename to src/pybind/mgr/dashboard/run-backend-api-tests.sh index 64ed636055e87..8f86401c67a67 100755 --- a/src/pybind/mgr/dashboard_v2/run-backend-api-tests.sh +++ b/src/pybind/mgr/dashboard/run-backend-api-tests.sh @@ -86,8 +86,8 @@ if [ "$#" -gt 0 ]; then TEST_CASES="$TESTS_CASES $t" done else - TEST_CASES=`for i in \`ls $BUILD_DIR/../qa/tasks/mgr/dashboard_v2/test_*\`; do F=$(basename $i); M="${F%.*}"; echo -n " tasks.mgr.dashboard_v2.$M"; done` - TEST_CASES="tasks.mgr.test_dashboard_v2 $TEST_CASES" + TEST_CASES=`for i in \`ls $BUILD_DIR/../qa/tasks/mgr/dashboard/test_*\`; do F=$(basename $i); M="${F%.*}"; echo -n " tasks.mgr.dashboard.$M"; done` + TEST_CASES="tasks.mgr.test_dashboard $TEST_CASES" fi export PATH=$BUILD_DIR/bin:$PATH diff --git a/src/pybind/mgr/dashboard_v2/run-frontend-unittests.sh b/src/pybind/mgr/dashboard/run-frontend-unittests.sh similarity index 69% rename from src/pybind/mgr/dashboard_v2/run-frontend-unittests.sh rename to src/pybind/mgr/dashboard/run-frontend-unittests.sh index 96f5db44d03a9..f2a50c4ac69de 100755 --- a/src/pybind/mgr/dashboard_v2/run-frontend-unittests.sh +++ b/src/pybind/mgr/dashboard/run-frontend-unittests.sh @@ -2,7 +2,7 @@ set -e -cd $CEPH_ROOT/src/pybind/mgr/dashboard_v2/frontend +cd $CEPH_ROOT/src/pybind/mgr/dashboard/frontend npm run build -- --prod npm run test -- --browsers PhantomJS --watch=false diff --git a/src/pybind/mgr/dashboard_v2/run-tox.sh b/src/pybind/mgr/dashboard/run-tox.sh similarity index 73% rename from src/pybind/mgr/dashboard_v2/run-tox.sh rename to src/pybind/mgr/dashboard/run-tox.sh index f5784fbba475a..5f24bb698d105 100755 --- a/src/pybind/mgr/dashboard_v2/run-tox.sh +++ b/src/pybind/mgr/dashboard/run-tox.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash # run from ./ or from ../ -: ${MGR_DASHBOARD_V2_VIRTUALENV:=/tmp/mgr-dashboard_v2-virtualenv} +: ${MGR_DASHBOARD_VIRTUALENV:=/tmp/mgr-dashboard-virtualenv} : ${WITH_PYTHON3:=ON} -test -d dashboard_v2 && cd dashboard_v2 +test -d dashboard && cd dashboard if [ -e tox.ini ]; then TOX_PATH=`readlink -f tox.ini` @@ -15,7 +15,7 @@ if [ -z $CEPH_BUILD_DIR ]; then export CEPH_BUILD_DIR=$(dirname ${TOX_PATH}) fi -source ${MGR_DASHBOARD_V2_VIRTUALENV}/bin/activate +source ${MGR_DASHBOARD_VIRTUALENV}/bin/activate if [ "$WITH_PYTHON3" = "ON" ]; then ENV_LIST="cov-init,py27,py3,cov-report,lint" diff --git a/src/pybind/mgr/dashboard_v2/services/__init__.py b/src/pybind/mgr/dashboard/services/__init__.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/services/__init__.py rename to src/pybind/mgr/dashboard/services/__init__.py diff --git a/src/pybind/mgr/dashboard_v2/services/ceph_service.py b/src/pybind/mgr/dashboard/services/ceph_service.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/services/ceph_service.py rename to src/pybind/mgr/dashboard/services/ceph_service.py diff --git a/src/pybind/mgr/dashboard_v2/settings.py b/src/pybind/mgr/dashboard/settings.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/settings.py rename to src/pybind/mgr/dashboard/settings.py diff --git a/src/pybind/mgr/dashboard_v2/tests/__init__.py b/src/pybind/mgr/dashboard/tests/__init__.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/tests/__init__.py rename to src/pybind/mgr/dashboard/tests/__init__.py diff --git a/src/pybind/mgr/dashboard_v2/tests/helper.py b/src/pybind/mgr/dashboard/tests/helper.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/tests/helper.py rename to src/pybind/mgr/dashboard/tests/helper.py diff --git a/src/pybind/mgr/dashboard_v2/tests/test_notification.py b/src/pybind/mgr/dashboard/tests/test_notification.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/tests/test_notification.py rename to src/pybind/mgr/dashboard/tests/test_notification.py diff --git a/src/pybind/mgr/dashboard_v2/tests/test_rbd_mirroring.py b/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py similarity index 95% rename from src/pybind/mgr/dashboard_v2/tests/test_rbd_mirroring.py rename to src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py index 7087ba63b4d4c..c283c947d84fe 100644 --- a/src/pybind/mgr/dashboard_v2/tests/test_rbd_mirroring.py +++ b/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py @@ -69,7 +69,7 @@ class RbdMirroringControllerTest(ControllerTestCase): cherrypy.tree.mount(RbdMirror(), '/api/test/rbdmirror') cherrypy.tree.mount(Summary(), '/api/test/summary') - @mock.patch('dashboard_v2.controllers.rbd_mirroring.rbd') + @mock.patch('dashboard.controllers.rbd_mirroring.rbd') def test_default(self, rbd_mock): # pylint: disable=W0613 self._get('/api/test/rbdmirror') result = self.jsonBody() @@ -78,7 +78,7 @@ class RbdMirroringControllerTest(ControllerTestCase): for k in ['daemons', 'pools', 'image_error', 'image_syncing', 'image_ready']: self.assertIn(k, result['content_data']) - @mock.patch('dashboard_v2.controllers.rbd_mirroring.rbd') + @mock.patch('dashboard.controllers.rbd_mirroring.rbd') def test_summary(self, rbd_mock): # pylint: disable=W0613 """We're also testing `summary`, as it also uses code from `rbd_mirroring.py`""" self._get('/api/test/summary') diff --git a/src/pybind/mgr/dashboard_v2/tests/test_settings.py b/src/pybind/mgr/dashboard/tests/test_settings.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/tests/test_settings.py rename to src/pybind/mgr/dashboard/tests/test_settings.py diff --git a/src/pybind/mgr/dashboard_v2/tests/test_tcmu_iscsi.py b/src/pybind/mgr/dashboard/tests/test_tcmu_iscsi.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/tests/test_tcmu_iscsi.py rename to src/pybind/mgr/dashboard/tests/test_tcmu_iscsi.py diff --git a/src/pybind/mgr/dashboard_v2/tests/test_tools.py b/src/pybind/mgr/dashboard/tests/test_tools.py similarity index 100% rename from src/pybind/mgr/dashboard_v2/tests/test_tools.py rename to src/pybind/mgr/dashboard/tests/test_tools.py diff --git a/src/pybind/mgr/dashboard_v2/tools.py b/src/pybind/mgr/dashboard/tools.py similarity index 99% rename from src/pybind/mgr/dashboard_v2/tools.py rename to src/pybind/mgr/dashboard/tools.py index f8013706ba3ea..8775a708730a2 100644 --- a/src/pybind/mgr/dashboard_v2/tools.py +++ b/src/pybind/mgr/dashboard/tools.py @@ -60,7 +60,7 @@ def load_controllers(): mods = [mod for _, mod, _ in pkgutil.iter_modules([ctrls_path])] for mod_name in mods: mod = importlib.import_module('.controllers.{}'.format(mod_name), - package='dashboard_v2') + package='dashboard') for _, cls in mod.__dict__.items(): # Controllers MUST be derived from the class BaseController. if inspect.isclass(cls) and issubclass(cls, BaseController) and \ diff --git a/src/pybind/mgr/dashboard_v2/tox.ini b/src/pybind/mgr/dashboard/tox.ini similarity index 100% rename from src/pybind/mgr/dashboard_v2/tox.ini rename to src/pybind/mgr/dashboard/tox.ini diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 660158e62d37a..eb3d82b987773 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -579,19 +579,19 @@ add_ceph_test(unittest_bufferlist.sh ${CMAKE_SOURCE_DIR}/src/unittest_bufferlist add_test(NAME run-tox-ceph-disk COMMAND bash ${CMAKE_SOURCE_DIR}/src/ceph-disk/run-tox.sh) add_test(NAME run-tox-ceph-detect-init COMMAND bash ${CMAKE_SOURCE_DIR}/src/ceph-detect-init/run-tox.sh) if(WITH_MGR) - add_test(NAME run-tox-mgr-dashboard_v2 COMMAND bash ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard_v2/run-tox.sh) + add_test(NAME run-tox-mgr-dashboard COMMAND bash ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/run-tox.sh) endif(WITH_MGR) set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv) set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv) if(WITH_MGR) - set(MGR_DASHBOARD_V2_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard_v2-virtualenv) + set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv) endif(WITH_MGR) set_property(TEST run-tox-ceph-disk run-tox-ceph-detect-init - run-tox-mgr-dashboard_v2 + run-tox-mgr-dashboard PROPERTY ENVIRONMENT CEPH_BUILD_DIR=${CMAKE_BINARY_DIR} CEPH_ROOT=${CMAKE_SOURCE_DIR} @@ -600,7 +600,7 @@ set_property(TEST CEPH_BUILD_VIRTUALENV=${CEPH_BUILD_VIRTUALENV} CEPH_DISK_VIRTUALENV=${CEPH_DISK_VIRTUALENV} CEPH_DETECT_INIT_VIRTUALENV=${CEPH_DETECT_INIT_VIRTUALENV} - MGR_DASHBOARD_V2_VIRTUALENV=${MGR_DASHBOARD_V2_VIRTUALENV} + MGR_DASHBOARD_VIRTUALENV=${MGR_DASHBOARD_VIRTUALENV} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib PATH=$ENV{PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src PYTHONPATH=${CMAKE_SOURCE_DIR}/src/pybind diff --git a/src/test/mgr/CMakeLists.txt b/src/test/mgr/CMakeLists.txt index 08b50288963a8..c212b5419245c 100644 --- a/src/test/mgr/CMakeLists.txt +++ b/src/test/mgr/CMakeLists.txt @@ -1,10 +1,9 @@ #scripts -if(WITH_MGR_DASHBOARD_V2_FRONTEND) - +if(WITH_MGR_DASHBOARD_FRONTEND) if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") - add_ceph_test(mgr-dashboard_v2-frontend-unittests ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard_v2/run-frontend-unittests.sh) + add_ceph_test(mgr-dashboard-frontend-unittests ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/run-frontend-unittests.sh) endif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") - add_ceph_test(mgr-dashboard_v2-smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/mgr-dashboard_v2-smoke.sh) -endif(WITH_MGR_DASHBOARD_V2_FRONTEND) + add_ceph_test(mgr-dashboard-smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/mgr-dashboard-smoke.sh) +endif(WITH_MGR_DASHBOARD_FRONTEND) diff --git a/src/test/mgr/mgr-dashboard_v2-smoke.sh b/src/test/mgr/mgr-dashboard-smoke.sh similarity index 89% rename from src/test/mgr/mgr-dashboard_v2-smoke.sh rename to src/test/mgr/mgr-dashboard-smoke.sh index b0eb325e8bcc5..582909a6ed545 100755 --- a/src/test/mgr/mgr-dashboard_v2-smoke.sh +++ b/src/test/mgr/mgr-dashboard-smoke.sh @@ -24,21 +24,21 @@ function run() { export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-initial-members=a --mon-host=$MON " - CEPH_ARGS+="--mgr-initial-modules=dashbaord_v2 " + CEPH_ARGS+="--mgr-initial-modules=dashboard " CEPH_ARGS+="--mon-host=$CEPH_MON" setup $dir || return 1 - TEST_dashboardv2 $dir || return 1 + TEST_dashboard $dir || return 1 teardown $dir || return 1 } -function TEST_dashboardv2() { +function TEST_dashboard() { local dir=$1 shift run_mon $dir a || return 1 timeout 30 ceph mon stat || return 1 - ceph config-key set mgr/dashboard_v2/x/server_port 7161 + ceph config-key set mgr/dashboard/x/server_port 7161 MGR_ARGS+="--mgr_module_path=${CEPH_ROOT}/src/pybind/mgr " run_mgr $dir x ${MGR_ARGS} || return 1 @@ -68,8 +68,8 @@ function TEST_dashboardv2() { done } -main mgr-dashboard_v2-smoke "$@" +main mgr-dashboard-smoke "$@" # Local Variables: -# compile-command: "cd ../.. ; make -j4 TESTS=test/mgr/mgr-dashboard_v2-smoke.sh check" +# compile-command: "cd ../.. ; make -j4 TESTS=test/mgr/mgr-dashboard-smoke.sh check" # End: diff --git a/src/vstart.sh b/src/vstart.sh index c5fee8d845226..e74f3d61e2622 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -136,7 +136,6 @@ VSTART_SEC="client.vstart.sh" MON_ADDR="" DASH_URLS="" -DASH_V2_URLS="" RESTFUL_URLS="" conf_fn="$CEPH_CONF_PATH/ceph.conf" @@ -503,7 +502,7 @@ $DAEMONOPTS $COSDSHORT $extra_conf [mon] - mgr initial modules = restful status balancer + mgr initial modules = dashboard restful status balancer $DAEMONOPTS $CMONDEBUG $extra_conf @@ -649,20 +648,19 @@ start_mgr() { host = $HOSTNAME EOF - ceph_adm config-key set mgr/restful/$name/server_port $MGR_PORT + ceph_adm config-key set mgr/dashboard/$name/server_port $MGR_PORT if [ $mgr -eq 1 ]; then - RESTFUL_URLS="https://$IP:$MGR_PORT" + DASH_URLS="http://$IP:$MGR_PORT" else - RESTFUL_URLS+=", https://$IP:$MGR_PORT" + DASH_URLS+=", http://$IP:$MGR_PORT" fi MGR_PORT=$(($MGR_PORT + 1000)) - # dashboard_v2 - ceph_adm config-key set mgr/dashboard_v2/$name/server_port $MGR_PORT + ceph_adm config-key set mgr/restful/$name/server_port $MGR_PORT if [ $mgr -eq 1 ]; then - DASH_V2_URLS="http://$IP:$MGR_PORT" + RESTFUL_URLS="https://$IP:$MGR_PORT" else - DASH_V2_URLS+=", http://$IP:$MGR_PORT" + RESTFUL_URLS+=", https://$IP:$MGR_PORT" fi MGR_PORT=$(($MGR_PORT + 1000)) @@ -672,6 +670,10 @@ EOF # use tell mgr here because the first mgr might not have activated yet # to register the python module commands. + + # setting login credentials for dashboard + ceph_adm tell mgr dashboard set-login-credentials admin admin + if ceph_adm tell mgr restful create-self-signed-cert; then SF=`mktemp` ceph_adm restful create-key admin -o $SF @@ -680,13 +682,6 @@ EOF else echo MGR Restful is not working, perhaps the package is not installed? fi - - # dashboard_v2 - sleep 5 # when running with more than 1 mgrs, if we enable dashboard_v2 - # immediately it will fail, so we just wait for a bit - ceph_adm mgr module enable dashboard_v2 - # setting login credentials for dashboard_v2 - ceph_adm tell mgr dashboard set-login-credentials admin admin } start_mds() { @@ -1063,7 +1058,7 @@ fi echo "started. stop.sh to stop. see out/* (e.g. 'tail -f out/????') for debug output." echo "" -echo "dashboard_v2 urls: $DASH_V2_URLS" +echo "dashboard urls: $DASH_URLS" echo " w/ user/pass: admin / admin" echo "restful urls: $RESTFUL_URLS" echo " w/ user/pass: admin / $RESTFUL_SECRET" -- 2.39.5