Revert "Moved cluster monitoring to its own section"

This reverts commit 498f103a60.

public/controllers/index.js

@@ -16,4 +16,3 @@ import './agent';
 import './settings';
 import './dev-tools';
 import './misc';
-import './monitoring';

public/services/routes.js

@@ -32,7 +32,6 @@ import discoverTemplate from '../templates/discover/discover.pug';
 import settingsTemplate from '../templates/settings/settings.pug';
 import blankScreenTemplate from '../templates/error-handler/blank-screen.html';
 import devToolsTemplate from '../templates/dev-tools/dev-tools.html';
-import monitoringTemplate from '../templates/monitoring/monitoring.pug';
 
 const assignPreviousLocation = ($rootScope, $location) => {
   const path = $location.path();
@@ -155,10 +154,6 @@ routes
   })
   .when('/manager/:tab?/', {
     template: managementTemplate,
-    resolve: { nestedResolve }
-  })
-  .when('/wazuh-monitoring', {
-    template: monitoringTemplate,
     resolve: { nestedResolve, ip, savedSearch, clearRuleId }
   })
   .when('/overview/', {

public/templates/management/monitoring/monitoring.head

@@ -1,9 +1,27 @@
-<div layout="column" ng-controller="clusterController">
-
-    <wz-menu ng-init="menuNavItem = 'wazuh-monitoring'"></wz-menu>
-
+<div layout="column" ng-controller="clusterController" ng-if="tab === 'monitoring'">
     <div flex layout="column" ng-show="!isClusterEnabled || !isClusterRunning">
 
+        <!-- Cluster disabled breadcrumbs -->
+        <div layout="row" layout-align="start center">
+            <div layout="row" layout-padding>
+                <div>
+                    <span class="wz-text-link cursor-pointer" ng-click="switchTab('welcome')">Management</span>
+                    <span> / </span>
+                    <span>{{ tabNames[tab] }}</span>
+                </div>
+            </div>
+        </div>
+        <!-- End cluster disabled breadcrumbs -->
+
+        <!-- Status and reports navigation bar -->
+        <md-nav-bar class="wz-nav-bar" ng-show="tab !== 'welcome'" md-selected-nav-item="tab" nav-bar-aria-label="Status and reports navigation links">
+            <md-nav-item class="wz-nav-item" md-nav-click="switchTab('status')" name="status">Status</md-nav-item>
+            <md-nav-item class="wz-nav-item" md-nav-click="switchTab('logs')" name="logs">Logs</md-nav-item>
+            <md-nav-item class="wz-nav-item" md-nav-click="switchTab('monitoring')" name="monitoring">Monitoring</md-nav-item>
+            <md-nav-item class="wz-nav-item" md-nav-click="switchTab('reporting')" name="reporting">Reporting</md-nav-item>
+        </md-nav-bar>
+        <!-- End status and reports navigation bar -->
+
         <!-- Headline -->
         <div layout="column" layout-padding>
             <span class="font-size-18"><i class="fa fa-fw fa-search" aria-hidden="true"></i> Monitoring</span>
@@ -57,25 +75,33 @@
         <div layout="row" layout-align="start center" ng-if="!loading">
             <div layout="row" layout-padding>
                 <div ng-if="!showConfig && !showNodes">
-                    <span class="wz-text-link cursor-pointer" ng-click="goBack()">Monitoring</span>
+                    <span class="wz-text-link cursor-pointer" ng-click="switchTab('welcome')">Management</span>
+                    <span> / </span>
+                    <span>{{ tabNames[tab] }}</span>
                     <span> / </span>
                     <span>{{ currentAPI }}</span>
                 </div>
                 <div ng-if="showConfig">
-                    <span class="wz-text-link cursor-pointer" ng-click="goBack()">Monitoring</span>
+                    <span class="wz-text-link cursor-pointer" ng-click="switchTab('welcome')">Management</span>
+                    <span> / </span>
+                    <span class="wz-text-link cursor-pointer" ng-click="goBack()">{{ tabNames[tab] }}</span>
                     <span> / </span>
                     <span class="wz-text-link cursor-pointer" ng-click="goBack()">{{ currentAPI }}</span>
                     <span> / Overview</span>
                 </div>
                 <div ng-if="showNodes && !currentNode">
-                    <span class="wz-text-link cursor-pointer" ng-click="goBack()">Monitoring</span>
+                    <span class="wz-text-link cursor-pointer" ng-click="switchTab('welcome')">Management</span>
+                    <span> / </span>
+                    <span class="wz-text-link cursor-pointer" ng-click="goBack()">{{ tabNames[tab] }}</span>
                     <span> / </span>
                     <span class="wz-text-link cursor-pointer" ng-click="goBack()">{{ currentAPI }}</span>
                     <span> / </span>
                     <span>Nodes</span>
                 </div>
                 <div ng-if="currentNode">
-                    <span class="wz-text-link cursor-pointer" ng-click="goBack()">Monitoring</span>
+                    <span class="wz-text-link cursor-pointer" ng-click="switchTab('welcome')">Management</span>
+                    <span> / </span>
+                    <span class="wz-text-link cursor-pointer" ng-click="goBack()">{{ tabNames[tab] }}</span>
                     <span> / </span>
                     <span class="wz-text-link cursor-pointer" ng-click="goBack()">{{ currentAPI }}</span>
                     <span> / </span>
@@ -87,6 +113,16 @@
         </div>
         <!-- End navigation section -->
 
+        <!-- Status and reports navigation bar -->
+        <md-nav-bar ng-if="!loading" class="wz-nav-bar" ng-show="tab !== 'welcome'" md-selected-nav-item="tab"
+            nav-bar-aria-label="Status and reports navigation links">
+            <md-nav-item class="wz-nav-item" md-nav-click="switchTab('status')" name="status">Status</md-nav-item>
+            <md-nav-item class="wz-nav-item" md-nav-click="switchTab('logs')" name="logs">Logs</md-nav-item>
+            <md-nav-item class="wz-nav-item" md-nav-click="switchTab('monitoring')" name="monitoring">Monitoring</md-nav-item>
+            <md-nav-item class="wz-nav-item" md-nav-click="switchTab('reporting')" name="reporting">Reporting</md-nav-item>
+        </md-nav-bar>
+        <!-- End status and reports navigation bar -->
+
         <!-- Headline -->
         <div ng-show="!loading" layout="column" layout-padding>
             <span class="font-size-18"><i class="fa fa-fw fa-search" aria-hidden="true"></i> Monitoring</span>

public/templates/management/monitoring/monitoring.jade

@@ -0,0 +1,7 @@
+include ./monitoring.head
+include ./main.html
+include ./main-timelions.html
+include ./configuration.html
+include ./nodes-list.html
+include ./nodes-detail.html
+include ../../footer.foot

public/templates/overview/overview.head

@@ -57,9 +57,9 @@
         ng-show="octrl.tab !== 'welcome'"
         md-selected-nav-item="octrl.tab"
         nav-bar-aria-label="Host monitoring navigation links">
-        <md-nav-item class="wz-nav-item" md-nav-click="octrl.switchTab('general','nav')" name="general">{{ octrl.tabNames['general'] }}</md-nav-item>
-        <md-nav-item class="wz-nav-item" md-nav-click="octrl.switchTab('fim','nav')" name="fim">{{ octrl.tabNames['fim'] }}</md-nav-item>
-        <md-nav-item ng-show="octrl.extensions.aws" class="wz-nav-item" md-nav-click="octrl.switchTab('aws','nav')" name="aws">{{ octrl.tabNames['aws'] }}</md-nav-item>
+        <md-nav-item class="wz-nav-item" md-nav-click="octrl.switchTab('general',true)" name="general">{{ octrl.tabNames['general'] }}</md-nav-item>
+        <md-nav-item class="wz-nav-item" md-nav-click="octrl.switchTab('fim',true)" name="fim">{{ octrl.tabNames['fim'] }}</md-nav-item>
+        <md-nav-item ng-show="octrl.extensions.aws" class="wz-nav-item" md-nav-click="octrl.switchTab('aws',true)" name="aws">{{ octrl.tabNames['aws'] }}</md-nav-item>
     </md-nav-bar>
     <!-- End Host monitoring navigation bar -->
 
@@ -70,10 +70,10 @@
         ng-show="octrl.tab !== 'welcome'"
         md-selected-nav-item="octrl.tab"
         nav-bar-aria-label="System audit navigation links">
-        <md-nav-item class="wz-nav-item" md-nav-click="octrl.switchTab('pm','nav')" name="pm">{{ octrl.tabNames['pm'] }}</md-nav-item>
-        <md-nav-item ng-show="octrl.extensions.audit" class="wz-nav-item" md-nav-click="octrl.switchTab('audit','nav')" name="audit">{{ octrl.tabNames['audit'] }}</md-nav-item>
-        <md-nav-item ng-show="octrl.extensions.oscap" class="wz-nav-item" md-nav-click="octrl.switchTab('oscap','nav')" name="oscap">{{ octrl.tabNames['oscap'] }}</md-nav-item>
-        <md-nav-item ng-show="octrl.extensions.ciscat" class="wz-nav-item" md-nav-click="octrl.switchTab('ciscat','nav')" name="ciscat">{{ octrl.tabNames['ciscat'] }}</md-nav-item>
+        <md-nav-item class="wz-nav-item" md-nav-click="octrl.switchTab('pm',true)" name="pm">{{ octrl.tabNames['pm'] }}</md-nav-item>
+        <md-nav-item ng-show="octrl.extensions.audit" class="wz-nav-item" md-nav-click="octrl.switchTab('audit',true)" name="audit">{{ octrl.tabNames['audit'] }}</md-nav-item>
+        <md-nav-item ng-show="octrl.extensions.oscap" class="wz-nav-item" md-nav-click="octrl.switchTab('oscap',true)" name="oscap">{{ octrl.tabNames['oscap'] }}</md-nav-item>
+        <md-nav-item ng-show="octrl.extensions.ciscat" class="wz-nav-item" md-nav-click="octrl.switchTab('ciscat',true)" name="ciscat">{{ octrl.tabNames['ciscat'] }}</md-nav-item>
     </md-nav-bar>
     <!-- End System audit navigation bar -->
 
@@ -84,9 +84,9 @@
         ng-show="octrl.tab !== 'welcome'"
         md-selected-nav-item="octrl.tab"
         nav-bar-aria-label="Security navigation links">
-        <md-nav-item class="wz-nav-item" md-nav-click="octrl.switchTab('vuls','nav')" name="vuls">{{ octrl.tabNames['vuls'] }}</md-nav-item>
-        <md-nav-item ng-show="octrl.extensions.virustotal" class="wz-nav-item" md-nav-click="octrl.switchTab('virustotal','nav')" name="virustotal">{{ octrl.tabNames['virustotal'] }}</md-nav-item>
-        <md-nav-item ng-show="octrl.extensions.osquery" class="wz-nav-item" md-nav-click="octrl.switchTab('osquery','nav')" name="osquery">{{ octrl.tabNames['osquery'] }}</md-nav-item>
+        <md-nav-item class="wz-nav-item" md-nav-click="octrl.switchTab('vuls',true)" name="vuls">{{ octrl.tabNames['vuls'] }}</md-nav-item>
+        <md-nav-item ng-show="octrl.extensions.virustotal" class="wz-nav-item" md-nav-click="octrl.switchTab('virustotal',true)" name="virustotal">{{ octrl.tabNames['virustotal'] }}</md-nav-item>
+        <md-nav-item ng-show="octrl.extensions.osquery" class="wz-nav-item" md-nav-click="octrl.switchTab('osquery',true)" name="osquery">{{ octrl.tabNames['osquery'] }}</md-nav-item>
     </md-nav-bar>
     <!-- End Security navigation bar -->
 
@@ -97,8 +97,8 @@
         ng-show="octrl.tab !== 'welcome'"
         md-selected-nav-item="octrl.tab"
         nav-bar-aria-label="Compliance navigation links">
-        <md-nav-item ng-show="octrl.extensions.pci" class="wz-nav-item" md-nav-click="octrl.switchTab('pci','nav')" name="pci">{{ octrl.tabNames['pci'] }}</md-nav-item>
-        <md-nav-item ng-show="octrl.extensions.gdpr" class="wz-nav-item" md-nav-click="octrl.switchTab('gdpr','nav')" name="gdpr">{{ octrl.tabNames['gdpr'] }}</md-nav-item>
+        <md-nav-item ng-show="octrl.extensions.pci" class="wz-nav-item" md-nav-click="octrl.switchTab('pci',true)" name="pci">{{ octrl.tabNames['pci'] }}</md-nav-item>
+        <md-nav-item ng-show="octrl.extensions.gdpr" class="wz-nav-item" md-nav-click="octrl.switchTab('gdpr',true)" name="gdpr">{{ octrl.tabNames['gdpr'] }}</md-nav-item>
     </md-nav-bar>
     <!-- End Compliance navigation bar -->