Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.1

public/controllers/overview.js

@@ -104,7 +104,7 @@ app.controller('overviewController', function ($scope, appState, $window, generi
 	
 	// Watchers
 	$scope.$watch('tabView', function() {
-		$location.search('view', $scope.tabView);		
+		$location.search('view', $scope.tabView);
 	});
 	
 	// Watch for timefilter changes

public/directives/kibanaDiscoverDirective.js

@@ -57,7 +57,7 @@ SavedObjectRegistryProvider.register(savedSearchProvider);
 
 
 var app = uiModules.get('app/wazuh', [])
-    .directive('kbnDis', [function() {
+    .directive('kbnDis', [function() { 
         return {
             restrict: 'E',
             scope: {

public/less/main.less

@@ -7,6 +7,19 @@ body{
 	margin:18px 20px 0 0
 }
 
+.vis-editor-content text, h2.index-pattern-label{
+	font-weight: normal !important;
+}
+
+.wazuh-discover-searchbar{
+	margin-top: -50px !important;
+	z-index:9999;
+}
+
+.wazuh-searchbar navbar{
+	margin-top: -40px !important;
+}
+
 .no-legend visualize-legend{
     visibility: hidden;
     width: 0px;
@@ -54,7 +67,7 @@ span.md-headline {
 .md-headline-small{
 	font-size: 18px;
 }
-.h3, h3 {
+.wazuh-h3 {
 	font-size: 18px !important;
 	font-weight: 400 !important;
 }
@@ -448,7 +461,7 @@ md-toolbar.md-default-theme:not(.md-menu-toolbar), md-toolbar:not(.md-menu-toolb
 	border: none !important;
 }
 
-.md-toolbar-tools h1, .md-toolbar-tools h2, .md-toolbar-tools h3 {
+.md-toolbar-tools h1, .md-toolbar-tools .wazuh-h2, .md-toolbar-tools h3 {
     font-size: inherit;
     font-weight: 500;
     text-transform: uppercase;
@@ -595,6 +608,7 @@ md-autocomplete input:-ms-input-placeholder {
 .wazuh-h1 {
 	font-size: 24px !important;
 }
+
 md-chips.md-default-theme .md-chips, md-chips .md-chips {
 	box-shadow: none;
 }

public/templates/agents-audit.html

@@ -1,7 +1,7 @@
 <md-content ng-if="submenuNavItem == 'audit' && _agent" id="agents-audit" ng-controller="auditController">
 
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<!-- No results message -->
 	<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

public/templates/agents-fim.html

@@ -1,7 +1,7 @@
 <md-content ng-if="submenuNavItem == 'fim' && _agent" id="agents-fim" ng-controller="fimController">
 
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<!-- No results message -->
 	<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

public/templates/agents-oscap.html

@@ -1,7 +1,7 @@
 <md-content ng-if="submenuNavItem == 'oscap' && _agent" id="agents-oscap" ng-controller="oscapController">
 
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<!-- No results message -->
 	<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

public/templates/agents-overview.html

@@ -1,7 +1,7 @@
 <md-content ng-if="submenuNavItem == 'overview' && agentInfo" ng-controller="agentsOverviewController">
 
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<div ng-if="tabView == 'panels'">
 		<md-content layout="row">

public/templates/agents-pci.html

@@ -1,7 +1,7 @@
 <md-content ng-if="submenuNavItem == 'pci' && _agent" id="agents-pci" ng-controller="PCIController">
 
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<!-- No results message -->
 	<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

public/templates/agents-pm.html

@@ -1,7 +1,7 @@
 <md-content ng-if="submenuNavItem == 'policy_monitoring' && _agent" id="agents-pm" ng-controller="pmController">
 
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<!-- No results message -->
 	<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

public/templates/agents.head

@@ -39,7 +39,7 @@
 						</div>
 						
 						<div ng-if="!_agent"> 
-							<h2 style="text-transform: none; font-size: 20px;">
+							<h2 class="wazuh-h2" style="text-transform: none; font-size: 20px;">
 								<i style="margin-right: 5px; " class="fa fa-desktop" aria-hidden="true"></i> Agents overview
 							</h2>
 						</div>

public/templates/directives/dis-full-template.html

@@ -2,7 +2,9 @@
 
   <kbn-top-nav name="discover" config="topNavMenu">
     <!-- Transcluded elements. -->
-    <div data-transclude-slots>
+    
+  </kbn-top-nav>
+	<div data-transclude-slots class="wazuh-discover-searchbar">
       <!-- Breadcrumbs. -->
       <div data-transclude-slot="topLeftCorner" class="kuiLocalBreadcrumbs">
         <h1 tabindex="0" id="kui_local_breadcrumb" class="kuiLocalBreadcrumb">
@@ -16,54 +18,31 @@
       </div>
 	  
       <!-- Search. -->
-      <form
+      <navbar name="discover-search">
-        data-transclude-slot="bottomRow"
+		<form role="form" class="fill inline-form" ng-submit="fetch()" name="discoverSearch">
-        class="fullWidth"
+		  <div class="typeahead" kbn-typeahead="discover">
-        role="form"
+			<div class="input-group"
-        name="discoverSearch"
+			  ng-class="discoverSearch.$invalid ? 'has-error' : ''">
-        ng-submit="fetch()"
+			  <input
-      >
+				parse-query
-        <div class="typeahead" kbn-typeahead="discover" on-select="fetch()">
+				input-focus
-          <div class="kuiLocalSearch">
+				kbn-typeahead-input
-            <div class="kuiLocalSearchAssistedInput">
+				ng-model="stateQuery"
-              <input
+				placeholder="Search..."
-                parse-query
+				aria-label="Search input"
-                input-focus
+				type="text"
-                kbn-typeahead-input
+				class="form-control">
-                ng-model="state.query"
+			  <button type="submit"
-                placeholder="Search... (e.g. status:200 AND extension:PHP)"
+				ng-disabled="discoverSearch.$invalid"
-                aria-label="Search input"
+				aria-label="Search">
-                type="text"
+				<span aria-hidden="true" class="fa fa-search"></span></button>
-                class="kuiLocalSearchInput kuiLocalSearchInput--lucene"
+			</div>
-                ng-class="{'kuiLocalSearchInput-isInvalid': discoverSearch.$invalid}"
+			<kbn-typeahead-items></kbn-typeahead-items>
-              >
+		  </div>
-              <div class="kuiLocalSearchAssistedInput__assistance">
+		</form>
-                <p class="kuiText">
+		<div class="button-group" role="toolbar"></div>
-                  <a
+	  </navbar>
-                    class="kuiLink"
-                    ng-href="{{queryDocLinks.luceneQuerySyntax}}"
-                    target="_blank"
-                  >
-                    Uses lucene query syntax
-                  </a>
-                </p>
-              </div>
-            </div>
-            <button
-              type="submit"
-              aria-label="Search"
-              class="kuiLocalSearchButton"
-              ng-disabled="discoverSearch.$invalid"
-            >
-              <span class="kuiIcon fa-search" aria-hidden="true"></span>
-            </button>
-          </div>
-          <kbn-typeahead-items></kbn-typeahead-items>
-        </div>
-      </form>
     </div>
-  </kbn-top-nav>
-
 
   <div class="container-fluid" role="main">
   <div class="row">

public/templates/manager-status.html

@@ -48,7 +48,7 @@
 	  <div layout="row" layout-align="start start">
 		<md-card layout="column" flex="50">
 			<md-card-content>
-				<h3>Manager information</h3>
+				<h3 class="wazuh-h3">Manager information</h3>
 				<div layout="column">
 					<span layout="row">
 						<p style="font-weight: bold; min-width: 150px" >Version</p>
@@ -88,7 +88,7 @@
 		
 		<md-card layout="column" flex="50">
 			<md-card-content>
-				<h3>Last registered agent</h3>
+				<h3 class="wazuh-h3">Last registered agent</h3>
 				<div layout="column" flex>
 					<span layout="row">
 						<p style="font-weight: bold; min-width: 150px" >Name</p>

public/templates/overview-audit.html

@@ -1,7 +1,7 @@
 <md-content flex layout="column" ng-if="submenuNavItem == 'audit'" ng-controller="overviewAuditController" layout-align="space-around">
 
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<!-- No results message -->
 	<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

public/templates/overview-fim.html

@@ -1,7 +1,7 @@
 <md-content flex layout="column" ng-if="submenuNavItem == 'fim'" ng-controller="overviewFimController">
 
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<!-- No results message -->
 	<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

public/templates/overview-general.html

@@ -1,7 +1,7 @@
 <md-content flex layout="column" ng-if="submenuNavItem == 'general'" ng-controller="overviewGeneralController" layout-align="start">
 
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<!-- No results message -->
 	<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

public/templates/overview-oscap.html

@@ -1,7 +1,7 @@
 <md-content flex layout="column" ng-if="submenuNavItem == 'oscap'" ng-controller="overviewOSCAPController" layout-align="start">
 
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<!-- No results message -->
 	<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

public/templates/overview-pci.html

@@ -1,7 +1,7 @@
 <md-content flex layout="column" ng-if="submenuNavItem == 'pci'" ng-controller="overviewPCIController" layout-align="start"> 
 
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<!-- No results message -->
 	<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

public/templates/overview-pm.html

@@ -1,7 +1,7 @@
 <md-content flex layout="column" ng-if="submenuNavItem == 'pm'" ng-controller="overviewPMController"> 
 	
 	<!-- Kibana search bar -->
-	<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
+	<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
 	
 	<!-- No results message -->
 	<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

public/templates/ruleset-rules.html

@@ -150,7 +150,7 @@
 					
 						<md-card flex layout="column" ng-if="rule.groups.length  > 0">
 							<md-card-content>
-								<h3>Groups</h3>
+								<h3 class="wazuh-h3">Groups</h3>
 								<span ng-repeat="group in rule.groups">
 									<span class="listHover" ng-click="rulesApplyFilter({type: 'group', value: group})" layout="row" layout-align="space-between center"><p>{{ group }}</p></span>
 									<md-divider ng-if="!$last"></md-divider>
@@ -160,7 +160,7 @@
 						
 						<md-card flex layout="column" ng-if="rule.pci.length  > 0">
 							<md-card-content>
-								<h3>PCI DSS </h3>
+								<h3 class="wazuh-h3">PCI DSS </h3>
 								<span ng-repeat="pci in rule.pci">
 									<span class="listHover" ng-click="rulesApplyFilter({type: 'pci', value: pci})" layout="row" layout-align="space-between center"><p>{{ pci }}</p></span>
 									<md-divider ng-if="!$last"></md-divider>
@@ -170,7 +170,7 @@
 						
 						<md-card flex layout="column">
 							<md-card-content>
-								<h3>Extra settings</h3>
+								<h3 class="wazuh-h3">Extra settings</h3>
 								<span ng-repeat="(detailk, detailv) in rule.details">
 									<span layout="row" layout-align="space-between center">
 										<p>{{detailk}}</p>