From 3de82e38661d75bdfd2d96543b76a96b8664ea9e Mon Sep 17 00:00:00 2001 From: Afreen Misbah Date: Tue, 26 Aug 2025 20:58:05 +0530 Subject: [PATCH] mgr/dashboard: minor fixes - purge css got added by mistake while testing in pr https://github.com/ceph/ceph/pull/65019/ - updated helath snaphost schema to include num_hosts Signed-off-by: Afreen Misbah --- .../mgr/dashboard/controllers/health.py | 1 + .../mgr/dashboard/frontend/package-lock.json | 56 ------------------- .../mgr/dashboard/frontend/package.json | 1 - src/pybind/mgr/dashboard/openapi.yaml | 4 ++ 4 files changed, 5 insertions(+), 57 deletions(-) diff --git a/src/pybind/mgr/dashboard/controllers/health.py b/src/pybind/mgr/dashboard/controllers/health.py index 1457ab494c19..866a656afc78 100644 --- a/src/pybind/mgr/dashboard/controllers/health.py +++ b/src/pybind/mgr/dashboard/controllers/health.py @@ -157,6 +157,7 @@ HEALTH_SNAPSHOT_SCHEMA = ({ 'up': (int, 'Count of iSCSI gateways running'), 'down': (int, 'Count of iSCSI gateways not running') }, 'Iscsi gateways status'), + 'num_hosts': (int, 'Count of hosts') }) diff --git a/src/pybind/mgr/dashboard/frontend/package-lock.json b/src/pybind/mgr/dashboard/frontend/package-lock.json index be631f2f3c33..74d99510fe6f 100644 --- a/src/pybind/mgr/dashboard/frontend/package-lock.json +++ b/src/pybind/mgr/dashboard/frontend/package-lock.json @@ -112,7 +112,6 @@ "postcss-scss": "4.0.9", "prettier": "2.1.2", "pretty-quick": "3.0.2", - "purgecss": "7.0.2", "start-server-and-test": "2.0.3", "stylelint": "16.20.0", "stylelint-config-standard": "38.0.0", @@ -34186,61 +34185,6 @@ ], "license": "MIT" }, - "node_modules/purgecss": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-7.0.2.tgz", - "integrity": "sha512-4Ku8KoxNhOWi9X1XJ73XY5fv+I+hhTRedKpGs/2gaBKU8ijUiIKF/uyyIyh7Wo713bELSICF5/NswjcuOqYouQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "commander": "^12.1.0", - "glob": "^11.0.0", - "postcss": "^8.4.47", - "postcss-selector-parser": "^6.1.2" - }, - "bin": { - "purgecss": "bin/purgecss.js" - } - }, - "node_modules/purgecss/node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.11", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/purgecss/node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/qs": { "version": "6.10.4", "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz", diff --git a/src/pybind/mgr/dashboard/frontend/package.json b/src/pybind/mgr/dashboard/frontend/package.json index b158a580c3ab..7be85c37bb16 100644 --- a/src/pybind/mgr/dashboard/frontend/package.json +++ b/src/pybind/mgr/dashboard/frontend/package.json @@ -142,7 +142,6 @@ "postcss-scss": "4.0.9", "prettier": "2.1.2", "pretty-quick": "3.0.2", - "purgecss": "7.0.2", "start-server-and-test": "2.0.3", "stylelint": "16.20.0", "stylelint-config-standard": "38.0.0", diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml index 4752bc7b3ae2..7915cbaebf7e 100755 --- a/src/pybind/mgr/dashboard/openapi.yaml +++ b/src/pybind/mgr/dashboard/openapi.yaml @@ -5527,6 +5527,9 @@ paths: required: - num_mons type: object + num_hosts: + description: Count of hosts + type: integer num_iscsi_gateways: description: Iscsi gateways status properties: @@ -5607,6 +5610,7 @@ paths: - fsmap - num_rgw_gateways - num_iscsi_gateways + - num_hosts type: object description: OK '400': -- 2.47.3