Merge remote-tracking branch 'origin' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente

Former-commit-id: fa717670f0b841f81f0f8ee566be36203cd7eba6

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.731-190207
+Version: 7.0NG.731-190212
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.731-190207"
+pandora_version="7.0NG.731-190212"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/pandora_agent

@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.731';
-use constant AGENT_BUILD => '190207';
+use constant AGENT_BUILD => '190212';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.731
-%define release     190207
+%define release     190212
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.731
-%define release     190207
+%define release     190212
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.731"
-PI_BUILD="190207"
+PI_BUILD="190212"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190207}
+{190212}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.731(Build 190207)")
+#define PANDORA_VERSION ("7.0NG.731(Build 190212)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.731(Build 190207))"
+      VALUE "ProductVersion", "(7.0NG.731(Build 190212))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.731-190207
+Version: 7.0NG.731-190212
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.731-190207"
+pandora_version="7.0NG.731-190212"
 
 package_pear=0
 package_pandora=1

pandora_console/general/main_menu.php

@@ -320,6 +320,23 @@ $(document).ready( function() {
     }
     else {
         $('div#title_menu').hide();
+        if(!click_display){
+            $('#menu').mouseenter(function() {
+                handsInMenu = 1;
+                openTimeMenu = new Date().getTime();
+                $('ul.submenu').css('left', '44px');
+            }).mouseleave(function() {
+                handsInMenu = 0;
+                setTimeout(function() {
+                    openedMenu = new Date().getTime() - openTimeMenu;
+                    if(openedMenu > 1000 && handsInMenu == 0) {
+                        $('li.menu_icon').removeClass( " no_hidden_menu");
+                        $('li.menu_icon').find('li').removeClass( " no_hidden_menu" );
+                        $('ul.submenu').css('left', '44px');
+                    }
+                }, 2500);
+            });
+        }
     }
 });
 /* ]]> */
@@ -332,7 +349,6 @@ $(document).ready( function() {
     handsIn2 = 0;
 
     if(!click_display){
-        if (autohidden_menu) {
             $('.menu_icon').mouseenter(function() {
                 table_hover = $(this);
                 handsIn = 1;
@@ -352,7 +368,6 @@ $(document).ready( function() {
                     }
                 }, 2500);
             });
-        }
     }else{
         $(document).ready(function() {
             if (autohidden_menu) {

pandora_console/godmode/groups/group_list.php

@@ -11,7 +11,6 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-
 ui_require_css_file('tree');
 ui_require_css_file('fixed-bottom-box');
 
@@ -539,6 +538,7 @@ if ($tab == 'tree') {
             $url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo'];
             $table->data[$key][0] = $group['id_grupo'];
             $table->data[$key][1] = "<a href='$url'>".$group['nombre'].'</a>';
+            if ($group['icon'] != '') {
                 $table->data[$key][2] = html_print_image(
                     'images/groups_small/'.$group['icon'].'.png',
                     true,
@@ -550,6 +550,10 @@ if ($tab == 'tree') {
                         false, false, false, true
                     ]
                 );
+            } else {
+                $table->data[$key][2] = '';
+            }
+
 
             // reporting_get_group_stats
             $table->data[$key][3] = $group['disabled'] ? __('Disabled') : __('Enabled');

pandora_console/godmode/reporting/map_builder.php

@@ -42,6 +42,7 @@ if (!$is_metaconsole) {
     $url_visual_console_favorite        = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite';
     $url_visual_console_template        = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_template';
     $url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard';
+    $url_visual_console_manager         = 'index.php?sec=screen&sec2=enterprise/extensions/visual_console_manager';
 }
 
 $pure = (int) get_parameter('pure', 0);
@@ -70,6 +71,12 @@ if ($is_enterprise && $vconsoles_manage) {
         'active' => false,
         'text'   => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>',
     ];
+    if ($is_metaconsole) {
+        $buttons['visual_console_manager'] = [
+            'active' => false,
+            'text'   => '<a href="'.$url_visual_console_manager.'">'.html_print_image('images/builder.png', true, ['title' => __('Visual Console Manager')]).'</a>',
+        ];
+    }
 }
 
 if (!$is_metaconsole) {

pandora_console/godmode/reporting/visual_console_favorite.php

@@ -41,6 +41,7 @@ if (!$is_metaconsole) {
     $url_visual_console_favorite        = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite';
     $url_visual_console_template        = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_template';
     $url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard';
+    $url_visual_console_manager         = 'index.php?sec=screen&sec2=enterprise/extensions/visual_console_manager';
 }
 
 $buttons['visual_console'] = [
@@ -63,6 +64,13 @@ if ($is_enterprise && $vconsoles_manage) {
         'active' => false,
         'text'   => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>',
     ];
+
+    if ($is_metaconsole) {
+        $buttons['visual_console_manager'] = [
+            'active' => false,
+            'text'   => '<a href="'.$url_visual_console_manager.'">'.html_print_image('images/builder.png', true, ['title' => __('Visual Console Manager')]).'</a>',
+        ];
+    }
 }
 
 if (!$is_metaconsole) {

pandora_console/include/config_process.php

@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC190207';
+$build_version = 'PC190212';
 $pandora_version = 'v7.0NG.731';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions.php

@@ -1754,7 +1754,8 @@ function get_snmpwalk(
     $quick_print=0,
     $base_oid='',
     $snmp_port='',
-    $server_to_exec=0
+    $server_to_exec=0,
+    $extra_arguments=''
 ) {
     global $config;
 
@@ -1805,15 +1806,15 @@ function get_snmpwalk(
         case '3':
             switch ($snmp3_security_level) {
                 case 'authNoPriv':
-                    $command_str = $snmpwalk_bin.' -m ALL -Oa -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
+                    $command_str = $snmpwalk_bin.' -m ALL -Oa '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
                 break;
 
                 case 'noAuthNoPriv':
-                    $command_str = $snmpwalk_bin.' -m ALL -Oa -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
+                    $command_str = $snmpwalk_bin.' -m ALL -Oa '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
                 break;
 
                 default:
-                    $command_str = $snmpwalk_bin.' -m ALL -Oa -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
+                    $command_str = $snmpwalk_bin.' -m ALL -Oa '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
                 break;
             }
         break;
@@ -1822,7 +1823,7 @@ function get_snmpwalk(
         case '2c':
         case '1':
         default:
-            $command_str = $snmpwalk_bin.' -m ALL -Oa -v '.escapeshellarg($snmp_version).' -c '.escapeshellarg(io_safe_output($snmp_community)).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
+            $command_str = $snmpwalk_bin.' -m ALL '.$extra_arguments.' -Oa -v '.escapeshellarg($snmp_version).' -c '.escapeshellarg(io_safe_output($snmp_community)).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
         break;
     }
 

pandora_console/include/functions_api.php

@@ -14609,3 +14609,58 @@ function api_get_users($thrash1, $thrash2, $other, $returnType)
     }
 
 }
+
+/**
+ * Resets module counts and alert counts in the agents
+ * @param $id id of the agent you want to synchronize. Add "All" to synchronize all agents
+ * @param $trash1
+ * @param $trash2
+ * @param $trash3
+ * 
+ * Example: 
+ * api.php?op=set&op2=reset_agent_counts&apipass=1234&user=admin&pass=pandora&id=All
+ */
+function api_set_reset_agent_counts ($id, $thrash1, $thrash2, $thrash3)
+{
+	global $config;
+
+	if (!check_acl($config['id_user'], 0, "AW")) {
+		returnError('forbidden', 'string');
+		return;
+	}
+
+	if ($id == '' || !$id) {
+		returnError('error_parameter', __('Error. Agent cannot be left blank.'));
+		return;
+	}
+
+	if ($id != "All"){
+		$agent = db_get_row_filter('tagente', array('id_agente' => $id));
+		if (empty ($agent)){
+			returnError('error_agent', __('This agent does not exist.'));
+			return;
+		}else {
+			$return = db_process_sql_update ('tagente',
+				array ('update_module_count' => 1, 'update_alert_count' => 1),
+				array('id_agente' => $id)
+			);
+		}
+	}
+	else {
+		$return = db_process_sql_update ('tagente',
+		array ('update_module_count' => 1, 'update_alert_count' => 1)
+		);
+	}
+
+
+	$data = __('Successfully updated module/alert count in id agent %d.', $id);
+	if ($id == "All")
+		$data = __('Successfully updated module/alert count in all agents');
+
+	if ($return === false)
+		returnError('error_reset_agent_counts', 'Could not be updated module/alert counts in id agent %d.', $id);
+	else
+		returnData('string', array('type' => 'string', 'data' => $data));
+
+
+}

pandora_console/include/functions_menu.php

@@ -372,7 +372,7 @@ function menu_print_menu(&$menu)
         }
 
         // Print out the first level
-        $output .= '<li title="'.ucwords(str_replace(['oper-', 'god-'], '', $id)).'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">';
+        $output .= '<li title="'.$main['text'].'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">';
                         // onclick="location.href=\'index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'\'">';
         $length = strlen(__($main['text']));
         $padding_top = ( $length >= 18) ? 6 : 12;

pandora_console/include/functions_visual_map.php

@@ -3897,25 +3897,22 @@ function visual_map_get_user_layouts(
     return $retval;
 }
 
-
+function visual_map_translate_agent_status ($agent_status) {
-function visual_map_translate_agent_status($agent_status)
-{
 	switch ($agent_status) {
 		case AGENT_STATUS_NORMAL:
+		case AGENT_MODULE_STATUS_NORMAL_ALERT:
 		default:
 			return VISUAL_MAP_STATUS_NORMAL;
-
 		case AGENT_STATUS_CRITICAL:
+		case AGENT_MODULE_STATUS_CRITICAL_ALERT:
 			return VISUAL_MAP_STATUS_CRITICAL_BAD;
-
 		case AGENT_STATUS_WARNING:
+		case AGENT_MODULE_STATUS_WARNING_ALERT:
 			return VISUAL_MAP_STATUS_WARNING;
-
 		case AGENT_STATUS_NOT_INIT:
 		case AGENT_STATUS_UNKNOWN:
 		case -1:
 			return VISUAL_MAP_STATUS_UNKNOWN;
-
 		case AGENT_STATUS_ALERT_FIRED:
 			return VISUAL_MAP_STATUS_CRITICAL_ALERT;
 	}

pandora_console/include/styles/cluster_view.css

@@ -1,4 +1,3 @@
-
 /*
  * ---------------------------------------------------------------------
  * - CLUSTER VIEW 													-
@@ -90,7 +89,7 @@
 #cluster_status_button {
   float: left;
   width: 10%;
-	margin-left:5%;;
+  margin-left: 5%;
 }
 
 #last_contact_content {
@@ -121,7 +120,6 @@
   font-size: 14pt;
 }
 
-
 .balanced_module_item {
   float: left;
   margin-top: 11.5px;

pandora_console/include/styles/common.css

@@ -34,14 +34,21 @@ div.database_debug_title {
   width: 95%;
 }
 
-
 /* Common useful styles */
 .invisible {
   display: none;
 }
-.left { clear: left; float: left;}
+.left {
-.right { clear: right; float: right;}
+  clear: left;
-.clear { clear:both; }
+  float: left;
+}
+.right {
+  clear: right;
+  float: right;
+}
+.clear {
+  clear: both;
+}
 .top {
   vertical-align: top;
   margin-top: 0;

pandora_console/include/styles/js/calendar.css

@@ -23,7 +23,7 @@ td.scwWeek {
 /* Today selector */
 td.scwFootDisabled {
   background-color: #000;
-	color: #FFFFFF;
+  color: #ffffff;
 }
 
 tfoot.scwFoot {
@@ -31,7 +31,7 @@ tfoot.scwFoot {
 }
 
 .scwFoot :hover {
-    color: #3F3F3F !important;
+  color: #3f3f3f !important;
 }
 
 table.scwCells {

pandora_console/include/styles/js/jquery-ui_custom.css

@@ -1,4 +1,3 @@
-
 @import url(calendar.css);
 
 /* --- JQUERY-UI --- */
@@ -13,24 +12,26 @@
 .ui-button-text-only .ui-button-text {
   font-family: nunito;
   font-size: 9pt;
-	color: #82B92E
+  color: #82b92e;
 }
-.ui-datepicker .ui-datepicker-title *, .ui-datepicker th * {
+.ui-datepicker .ui-datepicker-title *,
+.ui-datepicker th * {
   color: white;
 }
-.ui-datepicker .ui-datepicker-title select, .ui-datepicker .ui-datepicker-title option {
+.ui-datepicker .ui-datepicker-title select,
+.ui-datepicker .ui-datepicker-title option {
   color: #111 !important;
 }
 .ui-dialog .ui-dialog-titlebar {
   display: inherit;
   text-align: center;
-	padding: .4em 1em;
+  padding: 0.4em 1em;
   height: 30px;
   position: relative;
 }
 .ui-dialog .ui-dialog-title {
   font-family: Nunito, sans-serif;
-	margin: .1em 0 !important;
+  margin: 0.1em 0 !important;
   white-space: nowrap !important;
   width: 100% !important;
   overflow: hidden !important;
@@ -53,7 +54,7 @@
 .ui-dialog .ui-dialog-content {
   position: relative !important;
   border: 0;
-	padding: .5em 1em !important;
+  padding: 0.5em 1em !important;
   background: none !important;
   overflow: auto !important;
   margin-bottom: 1em;
@@ -62,14 +63,14 @@
   text-align: left;
   border-width: 1px 0 0 0;
   background-image: none;
-	margin-top: .5em;
+  margin-top: 0.5em;
-	padding: .3em 1em .5em .4em;
+  padding: 0.3em 1em 0.5em 0.4em;
 }
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
   float: right;
 }
 .ui-dialog .ui-dialog-buttonpane button {
-	margin: .5em 1em .5em 0 !important;
+  margin: 0.5em 1em 0.5em 0 !important;
   cursor: pointer !important;
   background: white !important;
   background-color: white !important;
@@ -80,11 +81,13 @@
 .ui-widget-header .ui-icon {
   background-image: url(../images/ui-icons_444444_256x240.png) !important;
 }
-.ui-icon, .ui-widget-content .ui-icon {
+.ui-icon,
+.ui-widget-content .ui-icon {
   background-image: url(../images/ui-icons_444444_256x240.png) !important;
 }
 .ui-widget-content {
-	background: #ffffff url(../images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
+  background: #ffffff url(../images/ui-bg_flat_75_ffffff_40x100.png) 50% 50%
+    repeat-x;
 }
 .ui-state-default,
 .ui-widget-content .ui-state-default,
@@ -92,7 +95,8 @@
   margin-top: 3px;
   border: 1px solid #d3d3d3 !important;
   border-bottom: 0 !important;
-	background: #e6e6e6 url(../images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x !important;
+  background: #e6e6e6 url(../images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50%
+    repeat-x !important;
   font-weight: normal !important;
   color: #555555 !important;
 }
@@ -121,15 +125,15 @@
   border-bottom-right-radius: 0 !important;
 }
 #ui-datepicker-div {
-	border-color: #B1B1B1;
+  border-color: #b1b1b1;
   background: #ffffff;
 }
 .ui-widget-header {
-	background: #B1B1B1 !important;
+  background: #b1b1b1 !important;
   color: #ffffff !important;
 }
 .ui-datepicker-calendar th {
-	background-color: #3F3F3F;
+  background-color: #3f3f3f;
 }
 .ui-dialog .ui-widget-header {
   background-color: #82b92e;
@@ -138,7 +142,7 @@
 .ui_tpicker_minute,
 .ui_tpicker_second,
 .ui-slider-handle {
-	border: 1px solid #AAAAAA !important;
+  border: 1px solid #aaaaaa !important;
 }
 .ui-timepicker-div dd {
   margin: 0px 15px 0px 15px;
@@ -147,7 +151,7 @@
   color: white;
 }
 .ui-datepicker-buttonpane button {
-	border-color: #B1B1B1 !important;
+  border-color: #b1b1b1 !important;
 }
 .ui-datepicker-buttonpane .ui-datepicker-current {
   margin-left: 0.2em !important;
@@ -184,29 +188,39 @@
   font-family: Verdana, Arial, sans-serif !important;
 }
 
-a.ui-button:active, .ui-button:active,
+a.ui-button:active,
+.ui-button:active,
 .ui-button.ui-state-active:hover,
 .ui-state-focus .ui-widget-content,
 .ui-state-focus .ui-widget-header,
-.ui-state-focus .ui-button:hover, .ui-button:focus{
+.ui-state-focus .ui-button:hover,
+.ui-button:focus {
   background: transparent !important;
   border: none !important;
 }
 
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover{
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover {
   border: 1px solid #999999 !important;
   border-bottom: 0 !important;
-	background: #dadada url(../images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x !important;
+  background: #dadada url(../images/ui-bg_glass_75_dadada_1x400.png) 50% 50%
+    repeat-x !important;
 }
 
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active{
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active {
   border: 1px solid #aaaaaa !important;
   border-bottom: 0 !important;
-	background: #ffffff url(../images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x !important;
+  background: #ffffff url(../images/ui-bg_glass_65_ffffff_1x400.png) 50% 50%
+    repeat-x !important;
   font-weight: normal !important;
   color: #212121 !important;
 }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited{
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
   color: #212121 !important;
 }
 
@@ -236,8 +250,8 @@ ul.ui-front li a.ui-menu-item-wrapper:hover{
   text-decoration: none !important;
 }
 
-input[type=submit].ui-button-dialog{
+input[type="submit"].ui-button-dialog {
-	margin: .5em 1em .5em 0 !important;
+  margin: 0.5em 1em 0.5em 0 !important;
   cursor: pointer !important;
   background: white !important;
   background-color: white !important;
@@ -247,8 +261,3 @@ input[type=submit].ui-button-dialog{
   height: 30px !important;
   width: 90px !important;
 }
-
-
-
-
-

pandora_console/include/styles/js/jquery.contextMenu.css

@@ -21,9 +21,9 @@
   display: inline-block;
   position: absolute;
   list-style-type: none;
-    border: 1px solid #DDD;
+  border: 1px solid #ddd;
   border-radius: 4px;
-    background: #EEE;
+  background: #eee;
 
   -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
   -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
@@ -38,7 +38,7 @@
 
 .context-menu-item {
   padding: 0px 2px 0px 24px;
-    background-color: #EEE;
+  background-color: #eee;
   position: relative;
   border-radius: 4px;
   -webkit-user-select: none;
@@ -58,7 +58,7 @@
 
 .context-menu-separator {
   padding-bottom: 0;
-    border-bottom: 1px solid #DDD;
+  border-bottom: 1px solid #ddd;
 }
 
 .context-menu-item > label > input,
@@ -83,7 +83,7 @@
 .context-menu-input.hover,
 .context-menu-item.disabled.hover {
   cursor: default;
-    background-color: #EEE;
+  background-color: #eee;
 }
 
 .context-menu-submenu:after {
@@ -101,29 +101,73 @@
     http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement 
     .context-menu-item.icon:before {}
  */
-.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; }
+.context-menu-item.icon {
-.context-menu-item.icon-edit { background-image: url(../../images/page_white_edit.png); }
+  min-height: 18px;
-.context-menu-item.icon-cut { background-image: url(../../images/cut.png); }
+  background-repeat: no-repeat;
-.context-menu-item.icon-copy { background-image: url(../../images/page_white_copy.png); }
+  background-position: 4px 2px;
-.context-menu-item.icon-paste { background-image: url(../../images/page_white_paste.png); }
+}
-.context-menu-item.icon-delete { background-image: url(../../images/delete.png); }
+.context-menu-item.icon-edit {
-.context-menu-item.icon-add { background-image: url(../../images/page_white_add.png); }
+  background-image: url(../../images/page_white_edit.png);
-.context-menu-item.icon-quit { background-image: url(../../images/door.png); }
+}
-.context-menu-item.icon-refresh { background-image: url(../../images/refresh.png); }
+.context-menu-item.icon-cut {
-.context-menu-item.icon-center { background-image: url(../../images/set_center.png); }
+  background-image: url(../../images/cut.png);
-.context-menu-item.icon-details { background-image: url(../../images/show_details.png); }
+}
-.context-menu-item.icon-children { background-image: url(../../images/children.png); }
+.context-menu-item.icon-copy {
-.context-menu-item.icon-cancel_set_parent { background-image: url(../../images/link_delete.png); }
+  background-image: url(../../images/page_white_copy.png);
-.context-menu-item.icon-set_parent { background-image: url(../../images/father.png); }
+}
-.context-menu-item.icon-add_node { background-image: url(../../images/add.png); }
+.context-menu-item.icon-paste {
-.context-menu-item.icon-refresh_holding_area { background-image: url(../../images/refresh_holding_area.png); }
+  background-image: url(../../images/page_white_paste.png);
-.context-menu-item.icon-restart_map { background-image: url(../../images/reset.png); }
+}
-.context-menu-item.icon-interface_link_children { background-image: url(../../images/icono_link_hijo.png); }
+.context-menu-item.icon-delete {
-.context-menu-item.icon-interface_link_parent { background-image: url(../../images/icono_link_padre.png); }
+  background-image: url(../../images/delete.png);
-.context-menu-item.icon-interface_link_cancel { background-image: url(../../images/link_abortar.png); }
+}
+.context-menu-item.icon-add {
+  background-image: url(../../images/page_white_add.png);
+}
+.context-menu-item.icon-quit {
+  background-image: url(../../images/door.png);
+}
+.context-menu-item.icon-refresh {
+  background-image: url(../../images/refresh.png);
+}
+.context-menu-item.icon-center {
+  background-image: url(../../images/set_center.png);
+}
+.context-menu-item.icon-details {
+  background-image: url(../../images/show_details.png);
+}
+.context-menu-item.icon-children {
+  background-image: url(../../images/children.png);
+}
+.context-menu-item.icon-cancel_set_parent {
+  background-image: url(../../images/link_delete.png);
+}
+.context-menu-item.icon-set_parent {
+  background-image: url(../../images/father.png);
+}
+.context-menu-item.icon-add_node {
+  background-image: url(../../images/add.png);
+}
+.context-menu-item.icon-refresh_holding_area {
+  background-image: url(../../images/refresh_holding_area.png);
+}
+.context-menu-item.icon-restart_map {
+  background-image: url(../../images/reset.png);
+}
+.context-menu-item.icon-interface_link_children {
+  background-image: url(../../images/icono_link_hijo.png);
+}
+.context-menu-item.icon-interface_link_parent {
+  background-image: url(../../images/icono_link_padre.png);
+}
+.context-menu-item.icon-interface_link_cancel {
+  background-image: url(../../images/link_abortar.png);
+}
 
 /* vertically align inside labels */
-.context-menu-input > label > * { vertical-align: top; }
+.context-menu-input > label > * {
+  vertical-align: top;
+}
 
 /* position checkboxes and radios as icons */
 .context-menu-input > label > input[type="checkbox"],

pandora_console/include/styles/login.css

@@ -6,7 +6,7 @@
 h1#log_title {
   font-size: 18px;
   margin-bottom: 0px;
-	color: #FFF !important;
+  color: #fff !important;
   width: 300px;
 }
 
@@ -65,7 +65,7 @@ div#error_buttons a{
 }*/
 
 p.log_in {
-	color: #FFF !important;
+  color: #fff !important;
   padding: 0px 10px;
   width: 300px;
 }
@@ -104,13 +104,10 @@ div#login_f {
   width: 100%;
   position: absolute;
   bottom: 10px;
-	color: #FFF;
+  color: #fff;
   text-align: center;
 }
 
-
-
-
 /*
  * ---------------------------------------------------------------------
  * - LOGIN PAGE 													-
@@ -189,7 +186,7 @@ div.login_pass {
   margin: 0 auto;
   width: 70%;
   height: 40px;
-	background-color: rgba(255, 255, 255, 0.20) !important;
+  background-color: rgba(255, 255, 255, 0.2) !important;
   margin-bottom: 25px;
   min-width: 260px;
 }
@@ -202,7 +199,7 @@ div.login_pass img{
 
 div.login_nick input,
 div.login_pass input {
-    background-color: rgba(255, 255, 255, 0.00) !important;
+  background-color: rgba(255, 255, 255, 0) !important;
   border: 0px !important;
   color: white !important;
   border-radius: 0px;
@@ -288,13 +285,13 @@ div.text_banner_login span{
 
 span.span1 {
   font-size: 3vw;
-    font-family: 'lato-thin';
+  font-family: "lato-thin";
   color: white;
 }
 
 span.span2 {
   font-size: 3vw;
-    font-family: 'lato-bolder';
+  font-family: "lato-bolder";
   color: white;
 }
 
@@ -319,7 +316,6 @@ div.img_banner_login img{
   }
 }
 
-
 /* --- Login page - modal windows --- */
 div.content_alert {
   width: 98%;
@@ -330,7 +326,6 @@ div.icon_message_alert{
   float: left;
   width: 25%;
   text-align: center;
-
 }
 
 div.icon_message_alert img {
@@ -338,7 +333,6 @@ div.icon_message_alert img{
 }
 
 div.content_message_alert {
-	
   width: 75%;
   float: right;
 }

pandora_console/include/styles/menu.css

@@ -34,7 +34,7 @@
 }
 
 .menu li a {
-	color: #FFFFFF;
+  color: #ffffff;
   text-decoration: none;
 }
 
@@ -258,8 +258,6 @@ ul li a:hover {
 } /* Hover Styles */
 /*li ul li a { padding: 2px 5px; }  Sub Menu Styles */
 
-
-
 /*
  * ---------------------------------------------------------------------
  * - MAIN LEFT MENU and SUBMENU 									-
@@ -346,7 +344,7 @@ ul li a:hover {
 }
 
 .menu li.selected {
-	box-shadow: inset 4px 0 #80BA27;
+  box-shadow: inset 4px 0 #80ba27;
 }
 /* creo que no se usan
 .is_submenu2 li {
@@ -368,7 +366,8 @@ ul li a:hover {
   background-color: #585858 !important;
 }
 
-.menu li, .menu .li.not_selected {
+.menu li,
+.menu .li.not_selected {
   border-radius: 0px 0px 0px 0px;
   display: block;
   min-height: 35px;
@@ -376,7 +375,8 @@ ul li a:hover {
   vertical-align: middle;
 }
 
-.godmode, .menu_icon ul li{
+.godmode,
+.menu_icon ul li {
   background-color: #222;
 }
 .operation .menu_icon ul li {

pandora_console/install.php

@@ -113,7 +113,7 @@
         <div style='height: 10px'>
             <?php
 $version = '7.0NG.731';
-$build = '190207';
+$build = '190212';
             $banner = "v$version Build $build";
 
             error_reporting(0);

pandora_console/operation/tree.php

@@ -11,7 +11,6 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-
 ui_require_css_file('tree');
 ui_require_css_file('fixed-bottom-box');
 

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.731
-%define release     190207
+%define release     190212
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.731
-%define release     190207
+%define release     190212
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.731-190207
+Version: 7.0NG.731-190212
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.731-190207"
+pandora_version="7.0NG.731-190212"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.731";
-my $pandora_build = "190207";
+my $pandora_build = "190212";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.731";
-my $pandora_build = "190207";
+my $pandora_build = "190212";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.731
-%define release     190207
+%define release     190212
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.731
-%define release     190207
+%define release     190212
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.731"
-PI_BUILD="190207"
+PI_BUILD="190212"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.731 PS190207";
+my $version = "7.0NG.731 PS190212";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.731 PS190207";
+my $version = "7.0NG.731 PS190212";
 
 # save program name for logging
 my $progname = basename($0);
@@ -137,6 +137,7 @@ sub help_screen{
 	help_screen_line('--delete_cluster_item', '<id_item>', 'Deleting cluster item');
 	help_screen_line('--get_cluster_status', '<id_cluster>', 'Getting cluster status');
 	help_screen_line('--set_disabled_and_standby', '<id_agent> <id_node> <value>', 'Overwrite and disable and standby status');
+	help_screen_line('--reset_agent_counts', '<id_agent>', 'Resets module counts and alert counts in the agents');
 	print "\nMODULES:\n\n" unless $param ne '';
 	help_screen_line('--create_data_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t  <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <definition_file> <warning_str> <critical_str>\n\t  <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>]", 'Add data server module to agent');
 	help_screen_line('--create_web_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t  <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <retries> <requests> <agent_browser_id> <auth_server> <auth_realm> <definition_file>\n\t <proxy_url> <proxy_auth_login> <proxy_auth_password> <warning_str> <critical_str>\n\t  <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>].\n\t The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent');
@@ -6375,6 +6376,10 @@ sub pandora_manage_main ($$$) {
 			param_check($ltotal, 3, 1);
 			cli_set_disabled_and_standby();
 		}
+		elsif ($param eq '--reset_agent_counts') {
+			param_check($ltotal, 1, 0);
+			cli_reset_agent_counts();
+		}
 		else {
 			print_log "[ERROR] Invalid option '$param'.\n\n";
 			$param = '';
@@ -6979,3 +6984,16 @@ sub cli_set_disabled_and_standby() {
 	my $exit_code =  (defined($result) && "$result" eq "1") ? "1" : "0";
 	print "\n$exit_code\n";
 }
+
+##############################################################################
+# Resets module counts and alert counts in the agents.
+# Related option: --reset_agent_counts
+##############################################################################
+
+sub cli_reset_agent_counts() {
+	my $agent_id = @ARGV[2];
+
+	my $result = api_call(\%conf,'set', 'reset_agent_counts', $agent_id);
+	print "$result \n\n ";
+
+}