From 5671055e423bcf9b87ea371a73387293dbd68440 Mon Sep 17 00:00:00 2001 From: Igor Gaponenko Date: Wed, 9 Aug 2023 16:56:49 +0000 Subject: [PATCH] Web Dashboard: rearranged pages for intuitive search --- src/www/dashboard.html | 2 +- src/www/qserv/js/QservMonitoringDashboard.js | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/www/dashboard.html b/src/www/dashboard.html index a97b6e9d5..c8b950a6c 100644 --- a/src/www/dashboard.html +++ b/src/www/dashboard.html @@ -4,7 +4,7 @@ Qserv monitoring dashboard - + diff --git a/src/www/qserv/js/QservMonitoringDashboard.js b/src/www/qserv/js/QservMonitoringDashboard.js index 2facd2a45..3e94a2cdc 100644 --- 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,13 +161,12 @@ 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'), @@ -175,8 +174,13 @@ function(CSSLoader, 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') ] } ];