Web Dashboard: rearranged pages for intuitive search

lsst · Aug 9, 2023 · 5671055 · 5671055
1 parent b6285f7
commit 5671055
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/www/dashboard.html b/src/www/dashboard.html
@@ -4,7 +4,7 @@
 <title>Qserv monitoring dashboard</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<script data-main="qserv/js/QservMonitoringDashboard.js?bust=67" src="https://requirejs.org/docs/release/2.3.6/minified/require.js"></script>
+<script data-main="qserv/js/QservMonitoringDashboard.js?bust=68" src="https://requirejs.org/docs/release/2.3.6/minified/require.js"></script>
 </head>
 <body></body>
 </html>
diff --git a/src/www/qserv/js/QservMonitoringDashboard.js b/src/www/qserv/js/QservMonitoringDashboard.js
@@ -143,12 +143,12 @@ function(CSSLoader,
             {   name: 'Replication',
                 apps: [
                     new ReplicationController('Controller'),
-                    new ReplicationTools('Tools'),
                     new ReplicationConfigGeneral('Config/General'),
                     new ReplicationConfigWorkers('Config/Workers'),
                     new ReplicationConfigCatalogs('Config/Catalogs'),
                     new ReplicationSchema('Schema'),
-                    new ReplicationTableIndexes('Table Indexes')
+                    new ReplicationTableIndexes('Table Indexes'),
+                    new ReplicationTools('Tools')
                 ]
             },
             {   name: 'Ingest',
@@ -161,22 +161,26 @@ function(CSSLoader,
                     new IngestContribInfo('Contribution Info')
                 ]
             },
-            {   name: 'Tools',
+            {   name: 'Czar',
                 apps: [
-                    new FwkTestApp('Query Qserv'),
-                    new ToolsSql('Query Worker Databases')
+                    new QservCss('CSS')
                 ]
             },
-            {   name: 'Qserv Monitor',
+            {   name: 'Workers',
                 apps: [
                     new QservMySQLConnections('MySQL Connections'),
                     new QservWorkerQueries('Queries in Worker Queues'),
                     new QservWorkerSchedulers('Schedulers'),
                     new QservWorkerSchedulerHist('Scheduler Histograms'),
                     new QservWorkerTasks('Tasks'),
                     new QservWorkerTaskHist('Task Histograms'),
-                    new QservWorkerResultsFilesystem('Results Filesystem'),
-                    new QservCss('CSS')
+                    new QservWorkerResultsFilesystem('Results Filesystem')
+                ]
+            },
+            {   name: 'Tools',
+                apps: [
+                    new FwkTestApp('Query Qserv'),
+                    new ToolsSql('Query Worker Databases')
                 ]
             }
         ];