Merge remote-tracking branch 'origin/develop' into ent-9662-second-round

pandora_agents/pc/AIX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, AIX version
+# Version 7.0NG.770, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/FreeBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, FreeBSD Version
+# Version 7.0NG.770, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/HP-UX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, HP-UX Version
+# Version 7.0NG.770, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/Linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, GNU/Linux
+# Version 7.0NG.770, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/NT4/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, GNU/Linux
+# Version 7.0NG.770, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/SunOS/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, Solaris Version
+# Version 7.0NG.770, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/Win32/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2021 Artica Soluciones Tecnologicas 
-# Version 7.0NG.769
+# Version 7.0NG.770
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
 # Foundation; either version 2 of the Licence or any later version

pandora_agents/shellscript/aix/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.769, AIX version
+# Version 7.0NG.770, AIX version
 
 # General Parameters
 # ==================

pandora_agents/shellscript/bsd-ipso/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.769
+# Version 7.0NG.770
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena
 

pandora_agents/shellscript/hp-ux/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.769, HPUX Version
+# Version 7.0NG.770, HPUX Version
 
 # General Parameters
 # ==================

pandora_agents/shellscript/linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769
+# Version 7.0NG.770
 # Licensed under GPL license v2,
 # (c) 2003-2021 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net

pandora_agents/shellscript/mac_osx/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769
+# Version 7.0NG.770
 # Licensed under GPL license v2,
 # (c) 2003-2021 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net

pandora_agents/shellscript/openWRT/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769
+# Version 7.0NG.770
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net
 

pandora_agents/shellscript/solaris/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.769, Solaris version
+# Version 7.0NG.770, Solaris version
 
 # General Parameters
 # ==================

pandora_agents/unix/AIX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, AIX version
+# Version 7.0NG.770, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.769-230327
+Version: 7.0NG.770
 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.769-230327"
+pandora_version="7.0NG.770"
 
 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/Darwin/dmg/build_darwin_dmg.sh

@@ -31,7 +31,7 @@ fi
 if [ "$#" -ge 2 ]; then
 	VERSION="$2"
 else
-	VERSION="7.0NG.769"
+	VERSION="7.0NG.770"
 fi
 
 # Path for the generated DMG file

pandora_agents/unix/Darwin/dmg/extras/distribution.xml

@@ -19,11 +19,11 @@
     <choice id="com.pandorafms.pandorafms_src" visible="false">
         <pkg-ref id="com.pandorafms.pandorafms_src"/>
     </choice>
-    <pkg-ref id="com.pandorafms.pandorafms_src" version="7.0NG.769" onConclusion="none">pandorafms_src.pdk</pkg-ref>
+    <pkg-ref id="com.pandorafms.pandorafms_src" version="7.0NG.770" onConclusion="none">pandorafms_src.pdk</pkg-ref>
     <choice id="com.pandorafms.pandorafms_uninstall" visible="true" customLocation="/Applications">
         <pkg-ref id="com.pandorafms.pandorafms_uninstall"/>
     </choice>
-    <pkg-ref id="com.pandorafms.pandorafms_uninstall" version="7.0NG.769" onConclusion="none">pandorafms_uninstall.pdk</pkg-ref>
+    <pkg-ref id="com.pandorafms.pandorafms_uninstall" version="7.0NG.770" onConclusion="none">pandorafms_uninstall.pdk</pkg-ref>
 <!-- <installation-check script="check()" />
 	<script>
 	<![CDATA[

pandora_agents/unix/Darwin/dmg/files/pandorafms_uninstall/PandoraFMS agent uninstaller.app/Contents/Info.plist

@@ -5,9 +5,9 @@
 	<key>CFBundleIconFile</key>                  <string>pandorafms.icns</string>
     <key>CFBundleIdentifier</key> <string>com.pandorafms.pandorafms_uninstall</string>
 
-    <key>CFBundleVersion</key>            <string>7.0NG.769</string>
+    <key>CFBundleVersion</key>            <string>7.0NG.770</string>
-    <key>CFBundleGetInfoString</key>      <string>7.0NG.769 Pandora FMS Agent uninstaller for MacOS by Artica ST on Aug 2020</string>
+    <key>CFBundleGetInfoString</key>      <string>7.0NG.770 Pandora FMS Agent uninstaller for MacOS by Artica ST on Aug 2020</string>
-    <key>CFBundleShortVersionString</key> <string>7.0NG.769</string>
+    <key>CFBundleShortVersionString</key> <string>7.0NG.770</string>
 	
     <key>NSPrincipalClass</key><string>NSApplication</string>
     <key>NSMainNibFile</key><string>MainMenu</string>

pandora_agents/unix/Darwin/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, GNU/Linux
+# Version 7.0NG.770, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/FreeBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, FreeBSD Version
+# Version 7.0NG.770, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/HP-UX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, HP-UX Version
+# Version 7.0NG.770, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/Linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, GNU/Linux
+# Version 7.0NG.770, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/NT4/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, GNU/Linux
+# Version 7.0NG.770, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/NetBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, NetBSD Version
+# Version 7.0NG.770, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/SunOS/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.769, Solaris Version
+# Version 7.0NG.770, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/pandora_agent

@@ -1022,7 +1022,7 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.769';
+use constant AGENT_VERSION => '7.0NG.770';
 use constant AGENT_BUILD => '230327';
 
 # Agent log default file size maximum and instances

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,8 +3,8 @@
 #
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
-%define version     7.0NG.769
+%define version     7.0NG.770
-%define release     230327
+%define release     1
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,8 +3,8 @@
 #
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
-%define version     7.0NG.769
+%define version     7.0NG.770
-%define release     230327
+%define release     1
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -9,7 +9,7 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.769"
+PI_VERSION="7.0NG.770"
 PI_BUILD="230327"
 OS_NAME=`uname -s`
 

pandora_agents/win32/bin/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2021 Artica Soluciones Tecnologicas 
-# Version 7.0NG.769
+# Version 7.0NG.770
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
 # Foundation; either version 2 of the Licence or any later version

pandora_agents/win32/installer/pandora.mpi

@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent v7.0NG.769}
+{Pandora FMS Windows Agent v7.0NG.770}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
 {No}
 
 Windows,Executable
-{<%AppName%>-<%Version%>-Setup<%Ext%>}
+{<%AppName%>-Setup<%Ext%>}
 
 Windows,FileDescription
 {<%AppName%> <%Version%> Setup}

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.769 Build 230327")
+#define PANDORA_VERSION ("7.0NG.770 Build 230327")
 
 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.769(Build 230327))"
+      VALUE "ProductVersion", "(7.0NG.770(Build 230327))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

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

pandora_console/godmode/users/configure_user.php

@@ -1263,12 +1263,14 @@ if ($new_user) {
 
 if (is_metaconsole() === false) {
     // User only can change skins if has more than one group.
+    if (function_exists('skins_print_select')) {
         if (count($usr_groups) > 1) {
             if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
                 $skin = '<div class="label_select"><p class="edit_user_labels">'.__('Skin').'</p>';
                 $skin .= skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true).'</div>';
             }
         }
+    }
 }
 
 if (is_metaconsole() === true) {

pandora_console/godmode/users/user_management.php

@@ -572,8 +572,10 @@ if (is_metaconsole() === true) {
         $userManagementTable->data['line2_looknfeel'][1] = $outputMetaAccess[1];
     }
 } else {
+    if (function_exists('skins_print_select')) {
         $userManagementTable->data['line1_looknfeel'][1] = __('User color scheme');
         $userManagementTable->data['line2_looknfeel'][1] = skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true);
+    }
 }
 
 $userManagementTable->rowclass['captions_blocksize_eventfilter'] = 'field_half_width';

pandora_console/include/ajax/heatmap.ajax.php

@@ -26,6 +26,8 @@
  * ============================================================================
  */
 
+use PandoraFMS\Enterprise\Metaconsole\Node;
+
 if (is_ajax() === true) {
     global $config;
 
@@ -216,6 +218,12 @@ if (is_ajax() === true) {
     if ($getInfo === true) {
         enterprise_include_once('include/functions_agents.php');
         $id = get_parameter('id', 0);
+        $id_server = get_parameter('id_server', 0);
+        if (empty($id_server) === false) {
+            $nd = new Node($id_server);
+            $nd->connect();
+        }
+
         switch ($type) {
             case 3:
             case 2:
@@ -375,6 +383,10 @@ if (is_ajax() === true) {
                 }
             break;
         }
+
+        if (empty($id_server) === false) {
+            $nd->disconnect();
+        }
     }
 
     return;

pandora_console/include/class/Heatmap.class.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Heatmap class.
  *
@@ -14,7 +15,7 @@
  * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
  *
  * ============================================================================
- * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org for full contribution list
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,6 +26,11 @@
  * GNU General Public License for more details.
  * ============================================================================
  */
+
+namespace PandoraFMS;
+
+use PandoraFMS\Enterprise\Metaconsole\Node;
+
 class Heatmap
 {
 
@@ -95,6 +101,13 @@ class Heatmap
      */
     protected $group = null;
 
+    /**
+     * Heatmap group.
+     *
+     * @var boolean
+     */
+    protected $dashboard = null;
+
 
     /**
      * Constructor function
@@ -107,6 +120,7 @@ class Heatmap
      * @param integer $height    Height.
      * @param string  $search    Heatmap search.
      * @param integer $group     Heatmap group.
+     * @param boolean $dashboard Dashboard widget.
      */
     public function __construct(
         int $type=0,
@@ -116,7 +130,8 @@ class Heatmap
         int $width=0,
         int $height=0,
         string $search=null,
-        int $group=1
+        int $group=1,
+        bool $dashboard=false
     ) {
         $this->type = $type;
         $this->filter = $filter;
@@ -126,6 +141,7 @@ class Heatmap
         $this->height = $height;
         $this->search = $search;
         $this->group = $group;
+        $this->dashboard = $dashboard;
     }
 
 
@@ -156,19 +172,32 @@ class Heatmap
                 'refresh'   => $this->refresh,
                 'search'    => $this->search,
                 'group'     => $this->group,
+                'dashboard' => (int) $this->dashboard,
             ],
         ];
 
-        echo '<div id="div_'.$this->randomId.'" class="mainDiv">';
+        $style_dashboard = '';
+        if ($this->dashboard === true) {
+            $style_dashboard = 'min-height: 0px';
+        }
+
+        echo '<div id="div_'.$this->randomId.'" class="mainDiv" style="width: 100%;height: 100%;'.$style_dashboard.'">';
         ?>
         <script type="text/javascript">
             $(document).ready(function() {
                 const randomId = '<?php echo $this->randomId; ?>';
                 const refresh = '<?php echo $this->refresh; ?>';
+                const dashboard = '<?php echo $this->dashboard; ?>';
+
                 let setting = <?php echo json_encode($settings); ?>;
                 setting['data']['height'] = $(`#div_${randomId}`).height() + 10;
                 setting['data']['width'] = $(`#div_${randomId}`).width();
 
+                if (dashboard === '1') {
+                    setting['data']['width'] -= 10;
+                    setting['data']['height'] -= 10;
+                }
+
                 var totalModules = 0;
 
                 // Initial charge.
@@ -183,7 +212,7 @@ class Heatmap
                         let cont = 0;
                         while (cont < Math.ceil(totalModules / 10)) {
                             oneSquare(getRandomInteger(1, 10), getRandomInteger(100, 900));
-                                cont ++;
+                            cont++;
                         }
                     }
                 });
@@ -197,11 +226,13 @@ class Heatmap
                     let target = $(`#${randomId}_${randomPoint}`);
                     setTimeout(function() {
                         let class_name = target.attr('class');
+                        if (typeof class_name !== 'undefined') {
                             class_name = class_name.split(' ')[0];
                             const newClassName = class_name.split('_')[0];
                             target.removeClass(`${class_name} hover`);
                             target.addClass(`${newClassName}_${solid} hover`);
                             oneSquare(getRandomInteger(1, 10), getRandomInteger(100, 900));
+                        }
                     }, time);
                 }
 
@@ -234,7 +265,9 @@ class Heatmap
                                 // Object to array.
                                 let lista = Object.values(data);
                                 // randomly sort.
-                                    lista = lista.sort(function() {return Math.random() - 0.5});
+                                lista = lista.sort(function() {
+                                    return Math.random() - 0.5
+                                });
 
                                 let countPerSecond = total / refresh;
                                 if (countPerSecond < 1) {
@@ -249,6 +282,7 @@ class Heatmap
                                         while (cont <= limit) {
                                             if (typeof lista[cont] !== 'undefined') {
                                                 const rect = document.getElementsByName(`${lista[cont]['id']}`);
+                                                console.log(rect[0]);
                                                 $(`#${rect[0].id}`).removeClass();
                                                 $(`#${rect[0].id}`).addClass(`${lista[cont]['status']} hover`);
                                             }
@@ -261,7 +295,7 @@ class Heatmap
                                 );
 
                                 setTimeout(
-                                        function(){
+                                    function() {
                                         clearInterval(timer);
                                     },
                                     (refresh * 1000)
@@ -336,6 +370,8 @@ class Heatmap
      */
     protected function getAllAgents()
     {
+        global $config;
+
         $filter['disabled'] = 0;
 
         $alias = '';
@@ -343,8 +379,16 @@ class Heatmap
             $alias = ' AND alias LIKE "%'.$this->search.'%"';
         }
 
+        $id_user_groups = '';
+        if (users_is_admin() === false) {
+            $user_groups = array_keys(users_get_groups($config['user'], 'AR', false));
+            if (empty($user_groups) === false) {
+                $id_user_groups = ' AND id_grupo IN ('.implode(',', $user_groups).')';
+            }
+        }
+
         $id_grupo = '';
-        if (empty($this->filter) === false && current($this->filter) != 0) {
+        if (empty($this->filter) === false && empty(current($this->filter)) === false) {
             $id_grupo = ' AND id_grupo IN ('.implode(',', $this->filter).')';
         }
 
@@ -354,14 +398,78 @@ class Heatmap
             unknown_count,notinit_count,total_count,fired_count,
             (SELECT last_status_change FROM tagente_estado WHERE id_agente = tagente.id_agente
             ORDER BY last_status_change DESC LIMIT 1) AS last_status_change
-            FROM tagente WHERE `disabled` = 0 %s %s ORDER BY id_grupo,id_agente ASC',
+            FROM tagente WHERE `disabled` = 0 %s %s %s ORDER BY id_grupo,id_agente ASC',
             $alias,
+            $id_user_groups,
             $id_grupo
         );
 
+        $agents = [];
+        if (is_metaconsole() === true) {
+            $nodes = metaconsole_get_connections();
+            $cont = 0;
+            foreach ($nodes as $node) {
+                try {
+                    $nd = new Node($node['id']);
+                    $nd->connect();
+
+                    $result = db_get_all_rows_sql($sql);
+                    // Agent status.
+                    foreach ($result as $agent) {
+                        if ($agent['total_count'] === 0 || $agent['total_count'] === $agent['notinit_count']) {
+                            $status = 'notinit';
+                        } else if ($agent['critical_count'] > 0) {
+                            $status = 'critical';
+                        } else if ($agent['warning_count'] > 0) {
+                            $status = 'warning';
+                        } else if ($agent['unknown_count'] > 0) {
+                            $status = 'unknown';
+                        } else {
+                            $status = 'normal';
+                        }
+
+                        if ($agent['last_status_change'] != 0) {
+                            $seconds = (time() - $agent['last_status_change']);
+
+                            if ($seconds >= SECONDS_1DAY) {
+                                $status .= '_10';
+                            } else if ($seconds >= 77760) {
+                                $status .= '_9';
+                            } else if ($seconds >= 69120) {
+                                $status .= '_8';
+                            } else if ($seconds >= 60480) {
+                                $status .= '_7';
+                            } else if ($seconds >= 51840) {
+                                $status .= '_6';
+                            } else if ($seconds >= 43200) {
+                                $status .= '_5';
+                            } else if ($seconds >= 34560) {
+                                $status .= '_4';
+                            } else if ($seconds >= 25920) {
+                                $status .= '_3';
+                            } else if ($seconds >= 17280) {
+                                $status .= '_2';
+                            } else if ($seconds >= 8640) {
+                                $status .= '_1';
+                            }
+                        }
+
+                        $agents[$cont] = $agent;
+                        $agents[$cont]['status'] = $status;
+                        $agents[$cont]['server'] = $node['id'];
+
+                        ++$cont;
+                    }
+                } catch (\Exception $e) {
+                    $nd->disconnect();
+                    $agents = [];
+                } finally {
+                    $nd->disconnect();
+                }
+            }
+        } else {
             $result = db_get_all_rows_sql($sql);
 
-        $agents = [];
             // Agent status.
             foreach ($result as $key => $agent) {
                 if ($agent['total_count'] === 0 || $agent['total_count'] === $agent['notinit_count']) {
@@ -405,6 +513,7 @@ class Heatmap
                 $agents[$key] = $agent;
                 $agents[$key]['status'] = $status;
             }
+        }
 
         return $agents;
     }
@@ -417,6 +526,8 @@ class Heatmap
      */
     protected function getAllModulesByGroup()
     {
+        global $config;
+
         $filter_group = '';
         if (empty($this->filter) === false && current($this->filter) != -1) {
             $filter_group = 'AND am.id_module_group IN ('.implode(',', $this->filter).')';
@@ -427,16 +538,115 @@ class Heatmap
             $filter_name = 'AND nombre LIKE "%'.$this->search.'%"';
         }
 
+        $id_user_groups = '';
+        if (users_is_admin() === false) {
+            $user_groups = array_keys(users_get_groups($config['user'], 'AR', false));
+            if (empty($user_groups) === false) {
+                $id_user_groups = sprintf(
+                    'INNER JOIN tagente a ON a.id_agente = ae.id_agente
+                    AND a.id_grupo IN (%s)',
+                    implode(',', $user_groups)
+                );
+            }
+        }
+
         // All modules.
         $sql = sprintf(
             'SELECT am.id_agente_modulo AS id, ae.estado AS `status`, am.id_module_group AS id_grupo,
             ae.last_status_change FROM tagente_modulo am
             INNER JOIN tagente_estado ae ON am.id_agente_modulo = ae.id_agente_modulo
+            %s
             WHERE am.disabled = 0 %s %s GROUP BY am.id_module_group, am.id_agente_modulo',
+            $id_user_groups,
             $filter_group,
             $filter_name
         );
 
+        if (is_metaconsole() === true) {
+            $nodes = metaconsole_get_connections();
+            $cont = 0;
+            $result = [];
+            foreach ($nodes as $node) {
+                try {
+                    $nd = new Node($node['id']);
+                    $nd->connect();
+
+                    $modules = db_get_all_rows_sql($sql);
+
+                    // Module status.
+                    foreach ($modules as $key => $module) {
+                        $status = '';
+                        switch ($module['status']) {
+                            case AGENT_MODULE_STATUS_CRITICAL_BAD:
+                            case AGENT_MODULE_STATUS_CRITICAL_ALERT:
+                            case 1:
+                            case 100:
+                                $status = 'critical';
+                            break;
+
+                            case AGENT_MODULE_STATUS_NORMAL:
+                            case AGENT_MODULE_STATUS_NORMAL_ALERT:
+                            case 0:
+                            case 300:
+                                $status = 'normal';
+                            break;
+
+                            case AGENT_MODULE_STATUS_WARNING:
+                            case AGENT_MODULE_STATUS_WARNING_ALERT:
+                            case 2:
+                            case 200:
+                                $status = 'warning';
+                            break;
+
+                            default:
+                            case AGENT_MODULE_STATUS_UNKNOWN:
+                            case 3:
+                                $status = 'unknown';
+                            break;
+                            case AGENT_MODULE_STATUS_NOT_INIT:
+                            case 5:
+                                $status = 'notinit';
+                            break;
+                        }
+
+                        if ($module['last_status_change'] != 0) {
+                            $seconds = (time() - $module['last_status_change']);
+
+                            if ($seconds >= SECONDS_1DAY) {
+                                $status .= '_10';
+                            } else if ($seconds >= 77760) {
+                                $status .= '_9';
+                            } else if ($seconds >= 69120) {
+                                $status .= '_8';
+                            } else if ($seconds >= 60480) {
+                                $status .= '_7';
+                            } else if ($seconds >= 51840) {
+                                $status .= '_6';
+                            } else if ($seconds >= 43200) {
+                                $status .= '_5';
+                            } else if ($seconds >= 34560) {
+                                $status .= '_4';
+                            } else if ($seconds >= 25920) {
+                                $status .= '_3';
+                            } else if ($seconds >= 17280) {
+                                $status .= '_2';
+                            } else if ($seconds >= 8640) {
+                                $status .= '_1';
+                            }
+                        }
+
+                        $result[$cont] = $module;
+                        $result[$cont]['status'] = $status;
+                        $result[$cont]['server'] = $node['id'];
+                        ++$cont;
+                    }
+                } catch (\Exception $e) {
+                    $nd->disconnect();
+                } finally {
+                    $nd->disconnect();
+                }
+            }
+        } else {
             $result = db_get_all_rows_sql($sql);
 
             // Module status.
@@ -503,6 +713,7 @@ class Heatmap
 
                 $result[$key]['status'] = $status;
             }
+        }
 
         return $result;
     }
@@ -515,6 +726,8 @@ class Heatmap
      */
     protected function getAllModulesByTag()
     {
+        global $config;
+
         $filter_tag = '';
         if (empty($this->filter) === false && $this->filter[0] !== '0') {
             $tags = implode(',', $this->filter);
@@ -526,16 +739,115 @@ class Heatmap
             $filter_name = 'AND nombre LIKE "%'.$this->search.'%"';
         }
 
+        $id_user_groups = '';
+        if (users_is_admin() === false) {
+            $user_groups = array_keys(users_get_groups($config['user'], 'AR', false));
+            if (empty($user_groups) === false) {
+                $id_user_groups = sprintf(
+                    'INNER JOIN tagente a ON a.id_agente = ae.id_agente
+                    AND a.id_grupo IN (%s)',
+                    implode(',', $user_groups)
+                );
+            }
+        }
+
         // All modules.
         $sql = sprintf(
             'SELECT ae.id_agente_modulo AS id, ae.estado AS `status`, tm.id_tag AS id_grupo,
             ae.last_status_change FROM tagente_estado ae
+            %s
             INNER JOIN ttag_module tm ON tm.id_agente_modulo = ae.id_agente_modulo
-            WHERE 1=1 %s %s GROUP BY tm.id_tag, ae.id_agente_modulo',
+            WHERE 1=1 %s %s GROUP BY ae.id_agente_modulo',
+            $id_user_groups,
             $filter_tag,
             $filter_name
         );
 
+        if (is_metaconsole() === true) {
+            $nodes = metaconsole_get_connections();
+            $result = [];
+            $cont = 0;
+            foreach ($nodes as $node) {
+                try {
+                    $nd = new Node($node['id']);
+                    $nd->connect();
+
+                    $modules = db_get_all_rows_sql($sql);
+
+                    // Module status.
+                    foreach ($modules as $key => $module) {
+                        $status = '';
+                        switch ($module['status']) {
+                            case AGENT_MODULE_STATUS_CRITICAL_BAD:
+                            case AGENT_MODULE_STATUS_CRITICAL_ALERT:
+                            case 1:
+                            case 100:
+                                $status = 'critical';
+                            break;
+
+                            case AGENT_MODULE_STATUS_NORMAL:
+                            case AGENT_MODULE_STATUS_NORMAL_ALERT:
+                            case 0:
+                            case 300:
+                                $status = 'normal';
+                            break;
+
+                            case AGENT_MODULE_STATUS_WARNING:
+                            case AGENT_MODULE_STATUS_WARNING_ALERT:
+                            case 2:
+                            case 200:
+                                $status = 'warning';
+                            break;
+
+                            default:
+                            case AGENT_MODULE_STATUS_UNKNOWN:
+                            case 3:
+                                $status = 'unknown';
+                            break;
+                            case AGENT_MODULE_STATUS_NOT_INIT:
+                            case 5:
+                                $status = 'notinit';
+                            break;
+                        }
+
+                        if ($module['last_status_change'] != 0) {
+                            $seconds = (time() - $module['last_status_change']);
+
+                            if ($seconds >= SECONDS_1DAY) {
+                                $status .= '_10';
+                            } else if ($seconds >= 77760) {
+                                $status .= '_9';
+                            } else if ($seconds >= 69120) {
+                                $status .= '_8';
+                            } else if ($seconds >= 60480) {
+                                $status .= '_7';
+                            } else if ($seconds >= 51840) {
+                                $status .= '_6';
+                            } else if ($seconds >= 43200) {
+                                $status .= '_5';
+                            } else if ($seconds >= 34560) {
+                                $status .= '_4';
+                            } else if ($seconds >= 25920) {
+                                $status .= '_3';
+                            } else if ($seconds >= 17280) {
+                                $status .= '_2';
+                            } else if ($seconds >= 8640) {
+                                $status .= '_1';
+                            }
+                        }
+
+                        $result[$cont] = $module;
+                        $result[$cont]['status'] = $status;
+                        $result[$cont]['server'] = $node['id'];
+                        ++$cont;
+                    }
+                } catch (\Exception $e) {
+                    $nd->disconnect();
+                } finally {
+                    $nd->disconnect();
+                }
+            }
+        } else {
             $result = db_get_all_rows_sql($sql);
 
             // Module status.
@@ -602,6 +914,7 @@ class Heatmap
 
                 $result[$key]['status'] = $status;
             }
+        }
 
         return $result;
     }
@@ -614,20 +927,121 @@ class Heatmap
      */
     protected function getAllModulesByAgents()
     {
+        global $config;
+
         $filter_name = '';
         if (empty($this->search) === false) {
             $filter_name = 'AND nombre LIKE "%'.$this->search.'%"';
         }
 
+        $id_user_groups = '';
+        if (users_is_admin() === false) {
+            $user_groups = array_keys(users_get_groups($config['user'], 'AR', false));
+            if (empty($user_groups) === false) {
+                $id_user_groups = sprintf(
+                    'INNER JOIN tagente a ON a.id_agente = ae.id_agente
+                    AND a.id_grupo IN (%s)',
+                    implode(',', $user_groups)
+                );
+            }
+        }
+
         // All modules.
         $sql = sprintf(
             'SELECT am.id_agente_modulo AS id, ae.estado AS `status`, am.id_agente AS id_grupo,
             ae.last_status_change FROM tagente_modulo am
             INNER JOIN tagente_estado ae ON am.id_agente_modulo = ae.id_agente_modulo
+            %s
             WHERE am.disabled = 0 %s GROUP BY ae.id_agente_modulo ORDER BY id_grupo',
+            $id_user_groups,
             $filter_name
         );
 
+        if (is_metaconsole() === true) {
+            $result = [];
+            $nodes = metaconsole_get_connections();
+            $cont = 0;
+            foreach ($nodes as $node) {
+                try {
+                    $nd = new Node($node['id']);
+                    $nd->connect();
+
+                    $modules = db_get_all_rows_sql($sql);
+                    // Module status.
+                    foreach ($modules as $key => $module) {
+                        $status = '';
+                        switch ($module['status']) {
+                            case AGENT_MODULE_STATUS_CRITICAL_BAD:
+                            case AGENT_MODULE_STATUS_CRITICAL_ALERT:
+                            case 1:
+                            case 100:
+                                $status = 'critical';
+                            break;
+
+                            case AGENT_MODULE_STATUS_NORMAL:
+                            case AGENT_MODULE_STATUS_NORMAL_ALERT:
+                            case 0:
+                            case 300:
+                                $status = 'normal';
+                            break;
+
+                            case AGENT_MODULE_STATUS_WARNING:
+                            case AGENT_MODULE_STATUS_WARNING_ALERT:
+                            case 2:
+                            case 200:
+                                $status = 'warning';
+                            break;
+
+                            default:
+                            case AGENT_MODULE_STATUS_UNKNOWN:
+                            case 3:
+                                $status = 'unknown';
+                            break;
+                            case AGENT_MODULE_STATUS_NOT_INIT:
+                            case 5:
+                                $status = 'notinit';
+                            break;
+                        }
+
+                        if ($module['last_status_change'] != 0) {
+                            $seconds = (time() - $module['last_status_change']);
+
+                            if ($seconds >= SECONDS_1DAY) {
+                                $status .= '_10';
+                            } else if ($seconds >= 77760) {
+                                $status .= '_9';
+                            } else if ($seconds >= 69120) {
+                                $status .= '_8';
+                            } else if ($seconds >= 60480) {
+                                $status .= '_7';
+                            } else if ($seconds >= 51840) {
+                                $status .= '_6';
+                            } else if ($seconds >= 43200) {
+                                $status .= '_5';
+                            } else if ($seconds >= 34560) {
+                                $status .= '_4';
+                            } else if ($seconds >= 25920) {
+                                $status .= '_3';
+                            } else if ($seconds >= 17280) {
+                                $status .= '_2';
+                            } else if ($seconds >= 8640) {
+                                $status .= '_1';
+                            }
+                        }
+
+                        $result[$cont] = $module;
+                        $result[$cont]['status'] = $status;
+                        $result[$cont]['server'] = $node['id'];
+                        ++$cont;
+                    }
+                } catch (\Exception $e) {
+                    $nd->disconnect();
+                    $result = [];
+                } finally {
+                    $nd->disconnect();
+                }
+            }
+        } else {
             $result = db_get_all_rows_sql($sql);
 
             // Module status.
@@ -694,6 +1108,7 @@ class Heatmap
 
                 $result[$key]['status'] = $status;
             }
+        }
 
         return $result;
     }
@@ -790,7 +1205,6 @@ class Heatmap
     {
         $yAxis = sqrt(($total / $relation));
         return $yAxis;
-
     }
 
 
@@ -801,7 +1215,7 @@ class Heatmap
      *
      * @return boolean True allowed, false not.
      */
-    public function ajaxMethod(string $method):bool
+    public function ajaxMethod(string $method): bool
     {
         return in_array($method, $this->AJAXMethods);
     }
@@ -847,8 +1261,13 @@ class Heatmap
         $contY = 0;
         $cont = 1;
         foreach ($result as $value) {
+            $name = $value['id'];
+            if (empty($value['server']) === false) {
+                $name .= '|'.$value['server'];
+            }
+
             echo '<rect id="'.$this->randomId.'_'.$cont.'" class="'.$value['status'].' hover"
-                width="1" height="1" x ="'.$contX.' "y="'.$contY.'" name="'.$value['id'].'" />';
+                width="1" height="1" x ="'.$contX.' "y="'.$contY.'" name="'.$name.'" />';
 
             $contX++;
             if ($contX >= $Xaxis) {
@@ -869,7 +1288,9 @@ class Heatmap
         <script type="text/javascript">
             $('rect').click(function() {
                 const type = <?php echo $this->type; ?>;
-                    const id = $(`#${this.id}`).attr("name");
+                const name = $(`#${this.id}`).attr("name");
+                const id = name.split('|')[0];
+                const server = name.split('|')[1];
 
                 $("#info_dialog").dialog({
                     resizable: true,
@@ -888,6 +1309,7 @@ class Heatmap
                                 getInfo: 1,
                                 type: type,
                                 id: id,
+                                id_server: server,
                             },
                             dataType: 'html',
                             success: function(data) {
@@ -900,7 +1322,7 @@ class Heatmap
             });
         </script>
         <?php
-        if (count($groups) > 1 && $this->group === 1) {
+        if (count($groups) > 1 && $this->group === 1 && $this->dashboard === false) {
             $x_back = 0;
             $y_back = 0;
 
@@ -1099,7 +1521,7 @@ class Heatmap
         echo '</svg>';
 
         // Dialog.
-        echo '<div id="info_dialog" style="padding:15px" class="invisible"></div>';
+        echo '<div id="info_dialog"></div>';
     }
 
 

pandora_console/include/config_process.php

@@ -21,7 +21,7 @@
  * Pandora build version and version
  */
 $build_version = 'PC230327';
-$pandora_version = 'v7.0NG.769';
+$pandora_version = 'v7.0NG.770';
 
 // Do not overwrite default timezone set if defined.
 $script_tz = @date_default_timezone_get();

pandora_console/include/functions_menu.php

@@ -281,6 +281,7 @@ function menu_print_menu(&$menu)
             if (($sec2 == $subsec2 || $allsec2 == $subsec2
                 || $selected_submenu2) && isset($sub[$subsec2]['options'])
                 && (get_parameter_get($sub[$subsec2]['options']['name']) == $sub[$subsec2]['options']['value'])
+                && $main['id'] !== 'fav-menu'
             ) {
                 // If the subclass is selected and there are options and that options value is true.
                 $class .= 'submenu_selected selected';
@@ -288,7 +289,7 @@ function menu_print_menu(&$menu)
                 $menu2_selected = $sub['id'];
                 $selected = true;
                 $visible = true;
-            } else if (($sec2 === $subsec2 || $allsec2 === $subsec2 || $selected_submenu2 === true) && isset($sub[$subsec2]['options']) === false) {
+            } else if (($sec2 === $subsec2 || $allsec2 === $subsec2 || $selected_submenu2 === true) && isset($sub[$subsec2]['options']) === false && $main['id'] !== 'fav-menu') {
                 $class .= 'submenu_selected selected';
                 $selected = true;
                 $menu_selected = true;
@@ -410,7 +411,7 @@ function menu_print_menu(&$menu)
 
                     $class = 'sub_subMenu';
 
-                    if ($key == $sec2) {
+                    if ($key == $sec2 && $main['id'] !== 'fav-menu') {
                         $class .= ' selected';
                     }
 

pandora_console/include/javascript/pandora_dashboards.js

@@ -1562,3 +1562,36 @@ function showManualThresholds(element) {
     $(".dashboard-input-threshold-critical").addClass("invisible_important");
   }
 }
+
+/**
+ * @return {void}
+ */
+// eslint-disable-next-line no-unused-vars
+function type_change() {
+  var type = document.getElementById("type").value;
+
+  switch (type) {
+    case "3":
+      $("#li_tags").hide();
+      $("#li_groups").hide();
+      $("#li_module_groups").hide();
+      break;
+    case "2":
+      $("#li_tags").hide();
+      $("#li_groups").hide();
+      $("#li_module_groups").show();
+      break;
+    case "1":
+      $("#li_tags").show();
+      $("#li_groups").hide();
+      $("#li_module_groups").hide();
+      break;
+
+    default:
+    case "0":
+      $("#li_tags").hide();
+      $("#li_groups").show();
+      $("#li_module_groups").hide();
+      break;
+  }
+}

pandora_console/include/lib/Dashboard/Widget.php

@@ -426,6 +426,10 @@ class Widget
                     $className .= '\\'.$name;
                 break;
 
+                case 'heatmap':
+                    $className .= '\HeatmapWidget';
+                break;
+
                 default:
                     $className = false;
                 break;

pandora_console/include/lib/Dashboard/Widgets/heatmap.php

@@ -0,0 +1,478 @@
+<?php
+/**
+ * Widget Heatmap Pandora FMS Console
+ *
+ * @category   Console Class
+ * @package    Pandora FMS
+ * @subpackage Widget Heatmap
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * 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.
+ * ============================================================================
+ */
+
+namespace PandoraFMS\Dashboard;
+
+global $config;
+
+require_once $config['homedir'].'/include/class/Heatmap.class.php';
+
+use PandoraFMS\Heatmap;
+
+/**
+ * Heatmap Widgets.
+ */
+class HeatmapWidget extends Widget
+{
+
+    /**
+     * Name widget.
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Title widget.
+     *
+     * @var string
+     */
+    protected $title;
+
+    /**
+     * Page widget;
+     *
+     * @var string
+     */
+    protected $page;
+
+    /**
+     * Class name widget.
+     *
+     * @var [type]
+     */
+    protected $className;
+
+    /**
+     * Values options for each widget.
+     *
+     * @var [type]
+     */
+    protected $values;
+
+    /**
+     * Configuration required.
+     *
+     * @var boolean
+     */
+    protected $configurationRequired;
+
+    /**
+     * Error load widget.
+     *
+     * @var boolean
+     */
+    protected $loadError;
+
+    /**
+     * Width.
+     *
+     * @var integer
+     */
+    protected $width;
+
+    /**
+     * Heigth.
+     *
+     * @var integer
+     */
+    protected $height;
+
+    /**
+     * Dashboard ID.
+     *
+     * @var integer
+     */
+    protected $dashboardId;
+
+    /**
+     * Cell ID.
+     *
+     * @var integer
+     */
+    protected $cellId;
+
+
+    /**
+     * Construct.
+     *
+     * @param integer      $cellId      Cell ID.
+     * @param integer      $dashboardId Dashboard ID.
+     * @param integer      $widgetId    Widget ID.
+     * @param integer|null $width       New width.
+     * @param integer|null $height      New height.
+     */
+    public function __construct(
+        int $cellId,
+        int $dashboardId=0,
+        int $widgetId=0,
+        ?int $width=0,
+        ?int $height=0
+    ) {
+        global $config;
+
+        // Includes.
+        // WARNING: Do not edit. This chunk must be in the constructor.
+        parent::__construct(
+            $cellId,
+            $dashboardId,
+            $widgetId
+        );
+
+        // Width.
+        $this->width = $width;
+
+        // Height.
+        $this->height = $height;
+
+        // Cell Id.
+        $this->cellId = $cellId;
+
+        // Widget ID.
+        $this->widgetId = $widgetId;
+
+        // Dashboard ID.
+        $this->dashboardId = $dashboardId;
+
+        // Options.
+        $this->values = $this->decoders($this->getOptionsWidget());
+
+        // Page.
+        $this->page = basename(__FILE__);
+
+        // ClassName.
+        $class = new \ReflectionClass($this);
+        $this->className = $class->getShortName();
+
+        // Title.
+        $this->title = __('Heatmap');
+
+        // Name.
+        if (empty($this->name) === true) {
+            $this->name = 'heatmap';
+        }
+    }
+
+
+    /**
+     * Decoders hack for retrocompability.
+     *
+     * @param array $decoder Values.
+     *
+     * @return array Returns the values ​​with the correct key.
+     */
+    public function decoders(array $decoder): array
+    {
+        $values = [];
+        // Retrieve global - common inputs.
+        $values = parent::decoders($decoder);
+
+        if (isset($decoder['search']) === true) {
+            $values['search'] = $decoder['search'];
+        }
+
+        if (isset($decoder['type']) === true) {
+            $values['type'] = $decoder['type'];
+        }
+
+        if (isset($decoder['groups']) === true) {
+            $values['groups'] = $decoder['groups'];
+        }
+
+        if (isset($decoder['tags']) === true) {
+            $values['tags'] = $decoder['tags'];
+        }
+
+        if (isset($decoder['module_groups']) === true) {
+            $values['module_groups'] = $decoder['module_groups'];
+        }
+
+        return $values;
+    }
+
+
+    /**
+     * Generates inputs for form (specific).
+     *
+     * @return array Of inputs.
+     *
+     * @throws Exception On error.
+     */
+    public function getFormInputs(): array
+    {
+        global $config;
+        // Retrieve global - common inputs.
+        $inputs = parent::getFormInputs();
+
+        $values = $this->values;
+
+        // Search.
+        $inputs[] = [
+            'label'     => \__('Search'),
+            'arguments' => [
+                'name'   => 'search',
+                'type'   => 'text',
+                'class'  => 'event-widget-input',
+                'value'  => $values['search'],
+                'return' => true,
+                'size'   => 30,
+            ],
+        ];
+
+        $inputs[] = [
+            'label'     => __('Type'),
+            'arguments' => [
+                'type'     => 'select',
+                'fields'   => [
+                    0 => __('Group agents'),
+                    1 => __('Group modules by tag'),
+                    2 => __('Group modules by module group'),
+                    3 => __('Group modules by agents'),
+                ],
+                'name'     => 'type',
+                'selected' => $values['type'],
+                'script'   => 'type_change()',
+                'return'   => true,
+            ],
+        ];
+
+        // Filters.
+        $inputs[] = [
+            'label'     => __('Groups'),
+            'style'     => ($values['type'] === '0') ? '' : 'display:none',
+            'id'        => 'li_groups',
+            'arguments' => [
+                'type'           => 'select_groups',
+                'name'           => 'groups[]',
+                'returnAllGroup' => true,
+                'privilege'      => 'AR',
+                'selected'       => explode(',', $values['groups'][0]),
+                'return'         => true,
+                'multiple'       => true,
+            ],
+        ];
+
+        if (tags_has_user_acl_tags($config['id_user']) === false) {
+            $tags = db_get_all_rows_sql(
+                'SELECT id_tag, name FROM ttag WHERE id_tag ORDER BY name'
+            );
+        } else {
+            $user_tags = tags_get_user_tags($config['id_user'], 'AR');
+            if (empty($user_tags) === false) {
+                $id_user_tags = array_keys($user_tags);
+                $tags = db_get_all_rows_sql(
+                    'SELECT id_tag, name FROM ttag
+                    WHERE id_tag IN ('.implode(',', $id_user_tags).')
+                    ORDER BY name'
+                );
+            } else {
+                $tags = db_get_all_rows_sql(
+                    'SELECT id_tag, name FROM ttag WHERE id_tag ORDER BY name'
+                );
+            }
+        }
+
+        $inputs[] = [
+            'label'     => __('Tag'),
+            'style'     => ($values['type'] === '1') ? '' : 'display:none',
+            'id'        => 'li_tags',
+            'arguments' => [
+                'type'     => 'select',
+                'fields'   => $tags,
+                'name'     => 'tags[]',
+                'selected' => explode(',', $values['tags'][0]),
+                'return'   => true,
+                'multiple' => true,
+            ],
+        ];
+
+        $module_groups_aux = db_get_all_rows_sql(
+            'SELECT id_mg, name FROM tmodule_group ORDER BY name'
+        );
+
+        $module_groups = [];
+        foreach ($module_groups_aux as $key => $module_group) {
+            $module_groups[$module_group['id_mg']] = $module_group['name'];
+        }
+
+        $inputs[] = [
+            'label'     => __('Module group'),
+            'style'     => ($values['type'] === '2') ? '' : 'display:none',
+            'id'        => 'li_module_groups',
+            'arguments' => [
+                'type'          => 'select',
+                'fields'        => $module_groups,
+                'name'          => 'module_groups[]',
+                'selected'      => explode(',', $values['module_groups'][0]),
+                'return'        => true,
+                'multiple'      => true,
+                'nothing'       => __('Not assigned'),
+                'nothing_value' => 0,
+            ],
+        ];
+
+        return $inputs;
+    }
+
+
+    /**
+     * Get Post for widget.
+     *
+     * @return array
+     */
+    public function getPost(): array
+    {
+        // Retrieve global - common inputs.
+        $values = parent::getPost();
+
+        $values['search'] = \get_parameter('search', '');
+        $values['type'] = \get_parameter('type', 0);
+
+        switch ((int) $values['type']) {
+            case 2:
+                $values['module_groups'] = \get_parameter('module_groups', 0);
+            break;
+
+            case 1:
+                $values['tags'] = \get_parameter('tags', 0);
+            break;
+
+            case 0:
+                $values['groups'] = \get_parameter('groups', 0);
+            break;
+
+            default:
+                // Do nothing.
+            break;
+        }
+
+        return $values;
+    }
+
+
+    /**
+     * Get description.
+     *
+     * @return string.
+     */
+    public static function getDescription()
+    {
+        return __('Heatmap');
+    }
+
+
+    /**
+     * Get Name.
+     *
+     * @return string.
+     */
+    public static function getName()
+    {
+        return 'heatmap';
+    }
+
+
+    /**
+     * Get size Modal Configuration.
+     *
+     * @return array
+     */
+    public function getSizeModalConfiguration(): array
+    {
+        $size = [
+            'width'  => 500,
+            'height' => 300,
+        ];
+
+        return $size;
+    }
+
+
+    /**
+     * Draw widget.
+     *
+     * @return string;
+     */
+    public function load()
+    {
+        global $config;
+
+        \ui_require_css_file('heatmap', 'include/styles/', true);
+
+        $values = $this->values;
+        $search = (empty($values['search']) === false) ? $values['search'] : '';
+        $type = (empty($values['type']) === false) ? $values['type'] : 0;
+        $filter = [];
+        if (isset($values['groups'])) {
+            $filter = explode(',', $values['groups'][0]);
+        }
+
+        if (isset($values['tags'])) {
+            $filter = explode(',', $values['tags'][0]);
+        }
+
+        if (isset($values['module_groups'])) {
+            $filter = explode(',', $values['module_groups'][0]);
+        }
+
+        // Control call flow.
+        $heatmap = new Heatmap($type, $filter, null, 300, 400, 200, $search, 0, true);
+        // AJAX controller.
+        if (is_ajax() === true) {
+            $method = get_parameter('method');
+
+            if ($method === 'drawWidget') {
+                // Run.
+                $heatmap->run();
+            } else {
+                if (method_exists($heatmap, $method) === true) {
+                    if ($heatmap->ajaxMethod($method) === true) {
+                        $heatmap->{$method}();
+                    } else {
+                        echo 'Unavailable method';
+                    }
+                } else {
+                    echo 'Method not found';
+                }
+
+                // Stop any execution.
+                exit;
+            }
+        } else {
+            // Run.
+            $heatmap->run();
+
+            // Dialog.
+            echo '<div id="config_dialog" style="padding:15px" class="invisible"></div>';
+        }
+
+        return '';
+    }
+
+
+}

pandora_console/install.php

@@ -130,7 +130,7 @@
         </div>
         <div style='padding-bottom: 50px'>
             <?php
-            $version = '7.0NG.769';
+            $version = '7.0NG.770';
             $build = '230327';
             $banner = "v$version Build $build";
             error_reporting(0);

pandora_console/operation/heatmap.php

@@ -41,6 +41,7 @@ if ($agent_a === false && $agent_w === false) {
 }
 
 require_once $config['homedir'].'/include/class/Heatmap.class.php';
+use PandoraFMS\Heatmap;
 
 $pure = (bool) get_parameter('pure', false);
 $type = get_parameter('type', 0);
@@ -61,6 +62,8 @@ if ($group_sent === true) {
     $group = (int) get_parameter('group', true);
 }
 
+$dashboard = (bool) get_parameter('dashboard', false);
+
 $is_ajax = is_ajax();
 if ($is_ajax === false && $pure === false) {
     $viewtab['config'] = '<a id="config" href="">'.html_print_image(
@@ -191,6 +194,7 @@ if ($is_ajax === false && $pure === true) {
     html_print_input_hidden('type', $type);
     html_print_input_hidden('search', $search);
     html_print_input_hidden('filter', implode(',', $filter));
+    html_print_input_hidden('dashboard', $dashboard);
     echo '</form>';
     echo '</div>';
     echo '</div>';
@@ -229,7 +233,7 @@ if ($is_ajax === false && $pure === true) {
 // Control call flow.
 try {
     // Heatmap construct.
-    $heatmap = new Heatmap($type, $filter, $randomId, $refresh, $width, $height, $search, $group);
+    $heatmap = new Heatmap($type, $filter, $randomId, $refresh, $width, $height, $search, $group, $dashboard);
 } catch (Exception $e) {
     if (is_ajax() === true) {
         echo json_encode(['error' => '[Heatmap]'.$e->getMessage() ]);

pandora_console/operation/menu.php

@@ -618,7 +618,7 @@ if ($favorite_menu !== false) {
         $sub[$section]['text'] = __(str_replace('_', ' ', $section));
         $sub[$section]['type'] = 'direct';
         $sub[$section]['subtype'] = 'nolink';
-        $sub[$section]['id'] = $row['section'];
+        $sub[$section]['id'] = $row['section'].'-fav-menu';
 
         $sub2[$row['url']]['text'] = io_safe_output($row['label']);
         $sub[$section]['sub2'] = $sub2;

pandora_console/pandora_console.redhat.spec

@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.769
+%define version     7.0NG.770
-%define release     230327
+%define release     1
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.rhel7.spec

@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.769
+%define version     7.0NG.770
-%define release     230327
+%define release     1
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.769
+%define version     7.0NG.770
-%define release     230327
+%define release     1
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandora_console_install

@@ -9,7 +9,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.769"
+PI_VERSION="7.0NG.770"
 FORCE=0
 DESTDIR=""
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.769-230327
+Version: 7.0NG.770
 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.769-230327"
+pandora_version="7.0NG.770"
 
 package_cpan=0
 package_pandora=1

pandora_server/conf/pandora_server.conf.new

@@ -1,7 +1,7 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
-# Version 7.0NG.769
+# Version 7.0NG.770
 # Licensed under GPL license v2,
 # (c) 2003-2021 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

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.769";
+my $pandora_version = "7.0NG.770";
 my $pandora_build = "230327";
 our $VERSION = $pandora_version." ".$pandora_build;
 

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -33,7 +33,7 @@ use base 'Exporter';
 our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.769";
+my $pandora_version = "7.0NG.770";
 my $pandora_build = "230327";
 our $VERSION = $pandora_version." ".$pandora_build;
 

pandora_server/pandora_server.redhat.spec

@@ -3,8 +3,8 @@
 #
 %global __os_install_post %{nil}
 %define name        pandorafms_server
-%define version     7.0NG.769
+%define version     7.0NG.770
-%define release     230327
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,8 +3,8 @@
 #
 %global __os_install_post %{nil}
 %define name        pandorafms_server
-%define version     7.0NG.769
+%define version     7.0NG.770
-%define release     230327
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -8,7 +8,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.769"
+PI_VERSION="7.0NG.770"
 PI_BUILD="230327"
 
 MODE=$1

pandora_server/util/pandora_db.pl

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