Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774-231219
+Version: 7.0NG.774-231220
 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.774-231219"
+pandora_version="7.0NG.774-231220"
 
 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

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

pandora_agents/unix/pandora_agent.redhat.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231219
+%define release     231220
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.redhat_bin.el8.spec

@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231219
+%define release     231220
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version

pandora_agents/unix/pandora_agent.redhat_bin.el9.spec

@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231219
+%define release     231220
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version

pandora_agents/unix/pandora_agent.redhat_bin.spec

@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231219
+%define release     231220
 
 Summary:            Pandora FMS Linux agent, binary version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231219
+%define release     231220
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231219"
+PI_BUILD="231220"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231219}
+{231220}
 
 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.774 Build 231219")
+#define PANDORA_VERSION ("7.0NG.774 Build 231220")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231219))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231220))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774-231219
+Version: 7.0NG.774-231220
 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.774-231219"
+pandora_version="7.0NG.774-231220"
 
 package_pear=0
 package_pandora=1

pandora_console/extensions/agents_modules.php

@@ -880,7 +880,7 @@ function mainAgentsModules()
         return;
     }
 
-    echo '<table cellpadding="4" cellspacing="4" border="0" class="info_table mrgn_btn_20px">';
+    echo '<table cellpadding="4" cellspacing="4" border="0" class="info_table mrgn_btn_20px" id="agents_modules_table">';
 
     echo '<tr>';
 

pandora_console/extensions/module_groups.php

@@ -345,6 +345,7 @@ function mainModuleGroups()
         $table = new StdClass();
         $table->class = 'info_table';
         $table->style[0] = 'font-weight: bolder; min-width: 230px;';
+        $table->id = 'agent_group_module_group';
         $table->width = '100%';
 
         $head[0] = __('Groups');

pandora_console/include/config_process.php

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

pandora_console/index.php

@@ -1685,6 +1685,16 @@ require 'include/php_to_js_values.php';
             $("#"+this.id+" > .subIcon.cog").addClass("rotation");
         });
 
+        // Easter egg think green.
+        let counter = 0;
+        $("#keywords").on("click", function(e) {
+            counter++;
+            let flagEasternEgg = $("#flagEasternEgg").val();
+            if (counter == 5 && flagEasternEgg == true) {
+                easterEggThinkGreen();
+            }
+        });
+    
         <?php if ($_GET['logged'] === '1' && enterprise_installed() === false) { ?>
             $('#header_table_inner').find('.header_left').trigger('click');
         <?php } ?>
@@ -1706,4 +1716,201 @@ require 'include/php_to_js_values.php';
 
     });
 
+    function easterEggThinkGreen() {
+        // Agent detail.
+        $('#agent_list > tbody > tr').each(function(index, fila) {
+            var divId = $(fila).find('td:eq(5)').attr('id');
+            var hasClassRed = $("#"+divId).children('b').children().next().hasClass('red');
+            var hasClassGrey = $("#"+divId).children('b').children().next().hasClass('grey');
+            if (hasClassRed === true || hasClassGrey === true) {
+                $("#"+divId).children('b').children().next().addClass('green');
+            }
+
+            var divStatus = $(fila).find('td:eq(6)').attr('id');
+            $("#"+divStatus).find('div').attr('style', 'background: #82b92e;');
+        });
+
+        // Agent main view.
+        const agentDetailsHeaderIcono = $('.agent_details_header > .icono_right').children('img');
+        const statusImg = $(agentDetailsHeaderIcono).attr('src');
+        if (statusImg !== undefined) {
+            if (statusImg.indexOf('critical') >= 0 || statusImg.indexOf('unknown') >= 0) {
+                $(agentDetailsHeaderIcono).attr('src', 'images/agent_ok.png');
+            }
+        }
+        // Agent details bullets.
+        const agentDetailsBullets = $('.agent_details_bullets > #bullets_modules').children('div').children('div').attr('id');
+        var hasClassRed = $("#"+agentDetailsBullets).hasClass('red_background');
+        var hasClassGrey = $("#"+agentDetailsBullets).hasClass('grey_background');
+        const elementChange = {
+            'hasClassRed': hasClassRed,
+            'hasClassGrey': hasClassGrey,
+            'elementID' : agentDetailsBullets,
+            'class' : true
+        }
+        setClassGreen(elementChange);
+        // Header list of modules
+        const headerList = $('.white_table_graph_header').children('span').children('div');
+        var hasClassRed = $(headerList[5]).children('div').children('div').hasClass('red_background');
+        var hasClassGrey = $(headerList[5]).children('div').children('div').hasClass('grey_background');
+        elementChange.hasClassRed = hasClassRed;
+        elementChange.hasClassGrey = hasClassGrey;
+        elementChange.elementID = $(headerList[5]).children('div').children('div').attr('id');
+        elementChange.class = true;
+        setClassGreen(elementChange);
+
+        // List of modules table.
+        $('#table1 > tbody > tr').each(function(index, fila) {
+            var divId = $(fila).find('td:eq(4)').attr('id');
+            var divStyle = $("#"+divId).children('div').attr('style');
+            if (divStyle !== undefined) {
+                let findedRed = divStyle.indexOf('background: #e63c52;')
+                let findedGrey = divStyle.indexOf('background: #B2B2B2;')
+                if (findedRed >= 0 || findedGrey >= 0) {
+                    elementChange.hasClassRed = true;
+                    elementChange.hasClassGrey = true;
+                    elementChange.elementID = $("#"+divId).children('div');
+                    elementChange.class = false;
+                    setClassGreen(elementChange);
+                }
+            }
+        });
+
+        // latest events table.
+        $('#latest_events_table > tbody > tr').each(function(index, fila) {
+            // Change status.
+            var divId = $(fila).find('td:eq(3)').attr('id');
+            var divStyle = $("#"+divId).children('div').attr('style');
+            if (divStyle !== undefined) {
+                let findedRed = divStyle.indexOf('background: #e63c52');
+                let findedGrey = divStyle.indexOf('background: #B2B2B2');
+                if (findedRed >= 0 || findedGrey >= 0) {
+                    elementChange.hasClassRed = true;
+                    elementChange.hasClassGrey = true;
+                    elementChange.elementID = $("#"+divId).children('div');
+                    elementChange.class = false;
+                    setClassGreen(elementChange);
+                    // Change Image
+                    const tdId = $(fila).find('td:eq(0)').attr('id');
+                    var img = $("#"+tdId).children('img');
+                    $(img).attr('src', 'images/module_ok.png');
+                }
+            }
+        });
+
+        // Group view.
+        //Summary status groups
+        $('#summary_status_groups > tbody > tr > td > span').each(function(index, fila) {
+            var hasClassRed = $(fila).hasClass('red_background');
+            if (hasClassRed) {
+                $(fila).removeClass('red_background').addClass('green_background');
+            }
+        });
+
+        $('#summary_status_groups_detail > tbody > tr >  td').each(function(index, fila) {
+            var hasClassRed = $(fila).hasClass('group_view_crit');
+            if (hasClassRed) {
+                $(fila).removeClass('group_view_crit').addClass('group_view_ok');
+                $(fila).children('a').removeClass('group_view_crit').addClass('group_view_ok');
+            }
+        });
+
+        // Monitor detail.
+        // Monitors view table
+        $('#monitors_view > tbody > tr').each(function(index, fila) {
+            // Change status.
+            var divId = $(fila).find('td:eq(6)').attr('id');
+            var divStyle = $("#"+divId).children('div').children('div').attr('style');
+            if (divStyle !== undefined) {
+                let findedRed = divStyle.indexOf('background: #e63c52');
+                let findedGrey = divStyle.indexOf('background: #B2B2B2');
+                if (findedRed >= 0 || findedGrey >= 0) {
+                    elementChange.hasClassRed = true;
+                    elementChange.hasClassGrey = true;
+                    elementChange.elementID = $("#"+divId).children('div').children('div');
+                    elementChange.class = false;
+                    setClassGreen(elementChange);
+                }
+            }
+        });
+
+        // Agents Modules.
+        $('#agents_modules_table > tbody > tr > td').each(function(index, fila) {
+            // Change status.
+            var hasClassRed = $(fila).hasClass('group_view_crit');
+            var hasClassGrey = $(fila).hasClass('group_view_unk');
+            if (hasClassRed == true) {
+                $(fila).removeClass('group_view_crit').addClass('group_view_ok');
+                $(fila).children('a').removeClass('group_view_crit').addClass('group_view_ok');
+            } else if (hasClassRed == false) {
+                var hasClassGroupRed = $(fila).children('a').children('div').attr('style');
+                if (hasClassGroupRed !== undefined) {
+                    let findedRed = hasClassGroupRed.indexOf('background: #e63c52');
+                    if (findedRed >= 0) {
+                        elementChange.hasClassRed = true;
+                        elementChange.hasClassGrey = false;
+                        elementChange.elementID = $(fila).children('a').children('div');
+                        elementChange.class = false;
+                        setClassGreen(elementChange);
+                    }
+                }
+            }
+
+            if (hasClassGrey == true) {
+                $(fila).removeClass('group_view_unk').addClass('group_view_ok');
+                $(fila).children('a').removeClass('group_view_unk').addClass('group_view_ok');
+            } else if (hasClassGrey == false) {
+                var hasClassGroupGrey = $(fila).children('a').children('div').attr('style');
+                if (hasClassGroupGrey !== undefined) {
+                    let findedGrey = hasClassGroupGrey.indexOf('background: #B2B2B2');
+                    if (findedGrey >= 0) {
+                        elementChange.hasClassRed = false;
+                        elementChange.hasClassGrey = true;
+                        elementChange.elementID = $(fila).children('a').children('div');
+                        elementChange.class = false;
+                        setClassGreen(elementChange);
+                    }
+                }
+            }
+        });
+
+        // Combined table of agent group and module group.
+        $('#agent_group_module_group > tbody > tr > td').each(function(index, fila) {
+            var hasClassGroupRed = $(fila).children('div').attr('style');
+            if (hasClassGroupRed !== undefined) {
+                let findedRed = hasClassGroupRed.indexOf('    background:#e63c52;');
+               if (findedRed >= 0) {
+                    elementChange.hasClassRed = true;
+                    elementChange.hasClassGrey = false;
+                    elementChange.elementID = $(fila).children('div');
+                    elementChange.class = false;
+                    setClassGreen(elementChange);
+                }
+            }
+
+            var hasClassGroupGrey = $(fila).children('div').attr('style');
+            if (hasClassGroupGrey !== undefined) {
+                let findedGrey = hasClassGroupGrey.indexOf('    background:#B2B2B2;');
+               if (findedGrey >= 0) {
+                    elementChange.hasClassRed = false;
+                    elementChange.hasClassGrey = true;
+                    elementChange.elementID = $(fila).children('div');
+                    elementChange.class = false;
+                    setClassGreen(elementChange);
+                }
+            }
+        });
+
+    }
+
+    function setClassGreen(element) {
+        // Class.
+        if ((element.hasClassRed === true || element.hasClassGrey === true) && element.class == true) {
+            $("#"+element.elementID).addClass('green_background');
+        }
+        // Element style.
+        if ((element.hasClassRed === true || element.hasClassGrey === true) && element.class == false) {
+            element.elementID.css('background', '#82b92e');
+        }
+    }
 </script>

pandora_console/install.php

@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231219';
+            $build = '231220';
             $banner = "v$version Build $build";
             error_reporting(0);
 

pandora_console/operation/agentes/group_view.php

@@ -175,7 +175,7 @@ if ($total_agentes > 0) {
     $total_not_init = format_numeric((($agents_notinit * 100) / $total_agentes), 2);
 }
 
-echo '<table width="100%" class="info_table">';
+echo '<table width="100%" class="info_table" id="summary_status_groups">';
     echo '<thead>';
     echo '<tr>';
         echo "<th colspan=2 class='center'>".__('Summary of the status groups').'</th>';
@@ -227,7 +227,7 @@ if (empty($result_groups) === false) {
         [ 'right_content' => $pagination ]
     );
 
-    echo '<table class="info_table mrgn_top_10px" border="0" width="100%">';
+    echo '<table class="info_table mrgn_top_10px" border="0" width="100%" id="summary_status_groups_detail">';
         echo '<thead>';
         echo '<tr>';
             echo '<th colspan=14>'.__('Total items').': '.$count.'</th>';

pandora_console/pandora_console.redhat.spec

@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231219
+%define release     231220
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.rhel7.spec

@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231219
+%define release     231220
 
 # 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.774
-%define release     231219
+%define release     231220
 %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.774-231219
+Version: 7.0NG.774-231220
 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.774-231219"
+pandora_version="7.0NG.774-231220"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

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

pandora_server/lib/PandoraFMS/PluginTools.pm

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

pandora_server/pandora_server.redhat.spec

@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231219
+%define release     231220
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231219
+%define release     231220
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

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

pandora_server/util/pandora_db.pl

@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231219";
+my $version = "7.0NG.774 Build 231220";
 
 # 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.774 Build 231219";
+my $version = "7.0NG.774 Build 231220";
 
 # save program name for logging
 my $progname = basename($0);