diff options
| author | Ernesto Puerta <37327689+epuertat@users.noreply.github.com> | 2022-01-20 21:21:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 21:21:17 +0100 |
| commit | 9af08f47d4cd27f1e7c268190cc0afd678bd2e6e (patch) | |
| tree | 1f4e02894f2071591b690e60df2420b9788ee4a5 | |
| parent | 79e812176b89f12ae2a2d129b3238fa9fca9eee6 (diff) | |
| parent | 3487ddac665b5e2b260bb5dbf32d8fdef8d3e82a (diff) | |
| download | ceph-9af08f47d4cd27f1e7c268190cc0afd678bd2e6e.tar.gz | |
Merge pull request #44685 from rhcs-dashboard/fix-53950-master
mgr/dashboard: remove feedback module as always-on
Reviewed-by: Alfonso MartÃnez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
| -rw-r--r-- | src/mon/MgrMonitor.cc | 3 | ||||
| -rw-r--r-- | src/pybind/mgr/dashboard/controllers/feedback.py | 4 | ||||
| -rw-r--r-- | src/pybind/mgr/dashboard/openapi.yaml | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index 2b1b5cba3c1..86fa755bc5a 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -106,7 +106,6 @@ const static std::map<uint32_t, std::set<std::string>> always_on_modules = { "progress", "balancer", "devicehealth", - "feedback", "orchestrator", "rbd_support", "volumes", @@ -462,7 +461,7 @@ public: mm(a), op(c) {} void finish(int r) override { if (r >= 0) { - // Success + // Success } else if (r == -ECANCELED) { mm->mon.no_reply(op); } else { diff --git a/src/pybind/mgr/dashboard/controllers/feedback.py b/src/pybind/mgr/dashboard/controllers/feedback.py index 3b3474d39ea..c75ffa94a89 100644 --- a/src/pybind/mgr/dashboard/controllers/feedback.py +++ b/src/pybind/mgr/dashboard/controllers/feedback.py @@ -8,7 +8,7 @@ from ._version import APIVersion @APIRouter('/feedback', Scope.CONFIG_OPT) -@APIDoc("Feedback", "Report") +@APIDoc("Feedback API", "Report") class FeedbackController(RESTController): @RESTController.MethodMap(version=APIVersion.EXPERIMENTAL) @@ -52,7 +52,7 @@ class FeedbackController(RESTController): @APIRouter('/feedback/api_key', Scope.CONFIG_OPT) -@APIDoc("Feedback API", "Report") +@APIDoc(group="Report") class FeedbackApiController(RESTController): @RESTController.MethodMap(version=APIVersion.EXPERIMENTAL) diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml index bc4292876a9..c05831eb77f 100644 --- a/src/pybind/mgr/dashboard/openapi.yaml +++ b/src/pybind/mgr/dashboard/openapi.yaml @@ -10517,7 +10517,7 @@ tags: name: RbdSnapshot - description: RBD Trash Management API name: RbdTrash -- description: Feedback +- description: Feedback API name: Report - description: RGW Management API name: Rgw |