From: Ricardo Dias <rdias@suse.com>
Date: Thu, 8 Mar 2018 13:49:17 +0000 (+0000)
Subject: mgr/dashboard: added tasks info to summary controller
X-Git-Tag: v13.1.0~469^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=067b86eb42b98e69cef0179e91f9263964250e7d;p=ceph.git

mgr/dashboard: added tasks info to summary controller

Signed-off-by: Ricardo Dias <rdias@suse.com>
---

diff --git a/qa/tasks/mgr/dashboard/test_summary.py b/qa/tasks/mgr/dashboard/test_summary.py
index df7cbaf282e..bbd85a394f3 100644
--- a/qa/tasks/mgr/dashboard/test_summary.py
+++ b/qa/tasks/mgr/dashboard/test_summary.py
@@ -17,6 +17,8 @@ class SummaryTest(DashboardTestCase):
         self.assertIn('mgr_id', data)
         self.assertIn('have_mon_connection', data)
         self.assertIn('rbd_mirroring', data)
+        self.assertIn('executing_tasks', data)
+        self.assertIn('finished_tasks', data)
         self.assertIsNotNone(data['filesystems'])
         self.assertIsNotNone(data['health_status'])
         self.assertIsNotNone(data['rbd_pools'])
diff --git a/src/pybind/mgr/dashboard/controllers/summary.py b/src/pybind/mgr/dashboard/controllers/summary.py
index d589195f609..0f92d8f6bbd 100644
--- a/src/pybind/mgr/dashboard/controllers/summary.py
+++ b/src/pybind/mgr/dashboard/controllers/summary.py
@@ -7,7 +7,7 @@ import cherrypy
 
 from .. import logger, mgr
 from ..controllers.rbd_mirroring import get_daemons_and_pools
-from ..tools import AuthRequired, ApiController, BaseController
+from ..tools import AuthRequired, ApiController, BaseController, TaskManager
 from ..services.ceph_service import CephService
 
 
@@ -59,11 +59,14 @@ class Summary(BaseController):
     @cherrypy.expose
     @cherrypy.tools.json_out()
     def default(self, *_vpath, **_params):
+        executing_t, finished_t = TaskManager.list_serializable()
         return {
             'rbd_pools': self._rbd_pool_data(),
             'health_status': self._health_status(),
             'filesystems': self._filesystems(),
             'rbd_mirroring': self._rbd_mirroring(),
             'mgr_id': mgr.get_mgr_id(),
-            'have_mon_connection': mgr.have_mon_connection()
+            'have_mon_connection': mgr.have_mon_connection(),
+            'executing_tasks': executing_t,
+            'finished_tasks': finished_t
         }