Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop

Former-commit-id: e28ec3130ff14c662953b33490c5525e257b0288

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.733-190421
+Version: 7.0NG.733-190423
 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.733-190421"
+pandora_version="7.0NG.733-190423"
 
 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.733';
-use constant AGENT_BUILD => '190421';
+use constant AGENT_BUILD => '190423';
 
 # 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.733
-%define release     190421
+%define release     190423
 
 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.733
-%define release     190421
+%define release     190423
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190421"
+PI_BUILD="190423"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190421}
+{190423}
 
 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.733(Build 190421)")
+#define PANDORA_VERSION ("7.0NG.733(Build 190423)")
 
 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.733(Build 190421))"
+      VALUE "ProductVersion", "(7.0NG.733(Build 190423))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

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

pandora_console/extras/mr/27.sql

@@ -39,4 +39,12 @@ ALTER TABLE `treport_content_template` ADD COLUMN `unknown_checks` TINYINT(1) DE
 ALTER TABLE `treport_content_template` ADD COLUMN `agent_max_value` TINYINT(1) DEFAULT '1';
 ALTER TABLE `treport_content_template` ADD COLUMN `agent_min_value` TINYINT(1) DEFAULT '1';
 
+ALTER TABLE `trecon_script` ADD COLUMN `type` int NOT NULL default 0;
+ALTER TABLE `trecon_task` ADD COLUMN `type` int NOT NULL default 0;
+
+UPDATE `trecon_script` SET `type` = 1 WHERE `name`="Discovery.Application.VMware";
+UPDATE `trecon_script` SET `type` = 2 WHERE `name`="Discovery.Cloud";
+UPDATE `trecon_script` SET `type` = 3 WHERE `name` LIKE "IPAM%Recon";
+UPDATE `trecon_script` SET `type` = 4 WHERE `name` LIKE "IPMI%Recon";
+
 COMMIT;

pandora_console/godmode/wizards/DiscoveryTaskList.class.php

@@ -96,8 +96,20 @@ class DiscoveryTaskList extends Wizard
             ]
         );
 
-        // Header
+        // Header.
-        ui_print_page_header(__('Task list'), '', false, '', true, '', false, '', GENERIC_SIZE_TEXT, '', $this->printHeader(true));
+        ui_print_page_header(
+            __('Task list'),
+            '',
+            false,
+            '',
+            true,
+            '',
+            false,
+            '',
+            GENERIC_SIZE_TEXT,
+            '',
+            $this->printHeader(true)
+        );
 
         // Show redirected messages from discovery.php.
         if ($status === 0) {
@@ -464,15 +476,45 @@ class DiscoveryTaskList extends Wizard
                 }
 
                 if ($task['id_recon_script'] == 0) {
+                    switch ($task['type']) {
+                        case DISCOVERY_APP_MYSQL:
+                            // Discovery Applications MySQL.
+                            $data[6] = html_print_image(
+                                'images/network.png',
+                                true,
+                                ['title' => __('Discovery Applications MySQL')]
+                            ).'  ';
+                            $data[6] .= __('Discovery.App.MySQL');
+                        break;
+
+                        case DISCOVERY_APP_ORACLE:
+                            // Discovery Applications Oracle.
+                            $data[6] = html_print_image(
+                                'images/network.png',
+                                true,
+                                ['title' => __('Discovery Applications Oracle')]
+                            ).'  ';
+                            $data[6] .= __('Discovery.App.Oracle');
+                        break;
+
+                        case DISCOVERY_HOSTDEVICES:
+                        default:
                             // Discovery NetScan.
                             $data[6] = html_print_image(
                                 'images/network.png',
                                 true,
                                 ['title' => __('Discovery NetScan')]
                             ).'  ';
-                    $data[6] .= network_profiles_get_name(
+                            $str = network_profiles_get_name(
                                 $task['id_network_profile']
                             );
+                            if (!empty($str)) {
+                                $data[6] .= $str;
+                            } else {
+                                $data[6] .= __('Discovery.NetScan');
+                            }
+                        break;
+                    }
                 } else {
                     // APP recon task.
                     $data[6] = html_print_image(
@@ -512,7 +554,11 @@ class DiscoveryTaskList extends Wizard
                     $data[9] .= '</a>';
                 }
 
-                if ($task['disabled'] != 2 && $task['utimestamp'] > 0) {
+                if ($task['disabled'] != 2 && $task['utimestamp'] > 0
+                    && $task['type'] != DISCOVERY_APP_MYSQL
+                    && $task['type'] != DISCOVERY_APP_ORACLE
+                    && $task['type'] != DISCOVERY_CLOUD_AWS_RDS
+                ) {
                     $data[9] .= '<a href="#" onclick="show_map('.$task['id_rt'].',\''.$task['name'].'\')">';
                     $data[9] .= html_print_image(
                         'images/dynamic_network_icon.png',
@@ -614,19 +660,27 @@ class DiscoveryTaskList extends Wizard
      */
     public function getTargetWiz($task)
     {
-        // TODO: Do not use description. Use recon_script ID instead.
+        switch ($task['type']) {
-        switch ($task['description']) {
+            case DISCOVERY_APP_MYSQL:
-            case 'Discovery.Application.VMware':
+            return 'wiz=app&mode=mysql&page=0';
+
+            case DISCOVERY_APP_ORACLE:
+            return 'wiz=app&mode=oracle&page=0';
+
+            case DISCOVERY_APP_VMWARE:
             return 'wiz=app&mode=vmware&page=0';
 
-            case CLOUDWIZARD_AWS_DESCRIPTION:
+            case DISCOVERY_CLOUD_AWS:
             return 'wiz=cloud&mode=amazonws&page=1';
 
+            case DISCOVERY_CLOUD_AWS_RDS:
+            return 'wiz=cloud&mode=amazonws&sub=rds&page=0';
+
             case 'console_task':
             return 'wiz=ctask';
 
             default:
-                if ($task['id_recon_script'] === null) {
+                if (empty($task['id_recon_script']) === true) {
                     return 'wiz=hd&mode=netscan';
                 } else {
                     return 'wiz=hd&mode=customnetscan';

pandora_console/godmode/wizards/HostDevices.class.php

@@ -149,7 +149,8 @@ class HostDevices extends Wizard
                         ),
                         'label' => __('Discovery'),
                     ],
-                ]
+                ],
+                true
             );
 
             ui_print_page_header(__('Host & devices'), '', false, '', true, '', false, '', GENERIC_SIZE_TEXT, '', $this->printHeader(true));
@@ -533,7 +534,19 @@ class HostDevices extends Wizard
         if ($this->page < $this->maxPagesNetScan) {
             // Avoid to print header out of wizard.
             $this->prepareBreadcrum($breadcrum);
-            ui_print_page_header(__('NetScan'), '', false, '', true, '', false, '', GENERIC_SIZE_TEXT, '', $this->printHeader(true));
+            ui_print_page_header(
+                __('NetScan'),
+                '',
+                false,
+                '',
+                true,
+                '',
+                false,
+                '',
+                GENERIC_SIZE_TEXT,
+                '',
+                $this->printHeader(true)
+            );
         }
 
         if (isset($this->page) === true

pandora_console/godmode/wizards/Wizard.main.php

@@ -191,21 +191,19 @@ class Wizard
      * Builder for breadcrum
      *
      * @param array   $urls Array of urls to be stored in breadcrum.
-     * @param boolean $add  True if breadcrum should be added instead of
+     * @param boolean $add  True if breadcrum should be added
-     *      overwrite it.
+     *                      instead of overwrite it.
      *
      * @return void
      */
-    public function prepareBreadcrum(array $urls, bool $add=false, bool $separator_beginning=false)
+    public function prepareBreadcrum(
-    {
+        array $urls,
+        bool $add=false
+    ) {
         $bc = [];
         $i = 0;
-        $count = 0;
-        $array_size = count($urls);
 
         foreach ($urls as $url) {
-            $count++;
-
             if ($url['selected'] == 1) {
                 $class = 'selected';
             } else {
@@ -213,20 +211,10 @@ class Wizard
             }
 
             $bc[$i] = '';
-
-            if ($separator_beginning === true) {
-                $bc[$i] .= '<span class="breadcrumb_link">&nbsp/&nbsp</span>';
-            }
-
             $bc[$i] .= '<span><a class="breadcrumb_link '.$class.'" href="'.$url['link'].'">';
             $bc[$i] .= $url['label'];
             $bc[$i] .= '</a>';
-            if ($count < $array_size) {
-                $bc[$i] .= '<span class="breadcrumb_link">&nbsp/&nbsp</span>';
-            }
-
             $bc[$i] .= '</span>';
-
             $i++;
         }
 
@@ -235,7 +223,6 @@ class Wizard
         } else {
             $this->setBreadcrum($bc);
         }
-
     }
 
 
@@ -275,7 +262,10 @@ class Wizard
      */
     public function printBreadcrum()
     {
-        return implode('', $this->breadcrum);
+        return implode(
+            '<span class="breadcrumb_link">&nbsp/&nbsp</span>',
+            $this->breadcrum
+        );
     }
 
 

pandora_console/include/class/NetworkMap.class.php

@@ -34,9 +34,9 @@ enterprise_include_once('include/functions_networkmap.php');
 enterprise_include_once('include/functions_discovery.php');
 
 // Avoid node overlapping.
-define('GRAPHVIZ_RADIUS_CONVERSION_FACTOR', 20);
+define('GRAPHVIZ_CONVERSION_FACTOR', 30);
-define('MAP_X_CORRECTION', 600);
+define('MAP_X_CORRECTION', 0);
-define('MAP_Y_CORRECTION', 150);
+define('MAP_Y_CORRECTION', 0);
 
 
 /**
@@ -191,6 +191,20 @@ class NetworkMap
      */
     public $relations;
 
+    /**
+     * Private nodes converted to JS.
+     *
+     * @var array
+     */
+    private $nodesJS;
+
+    /**
+     * Private relations converted to JS.
+     *
+     * @var array
+     */
+    private $relationsJS;
+
     /**
      * Include a Pandora (or vendor) node or not.
      *
@@ -319,6 +333,8 @@ class NetworkMap
         // Default mapOptions values.
         // Defines the command to generate positions.
         $this->mapOptions['generation_method'] = LAYOUT_SPRING1;
+        // Use fixed positions defined (X,Y) per node.
+        $this->mapOptions['fixed_positions'] = 0;
         $this->mapOptions['width'] = $config['networkmap_max_width'];
         $this->mapOptions['height'] = $config['networkmap_max_width'];
         $this->mapOptions['simple'] = 0;
@@ -999,9 +1015,10 @@ class NetworkMap
             case NODE_GENERIC:
                 // Handmade ones.
                 // Add also parent relationship.
+                if (isset($node['id_parent'])) {
                     $parent_id = $node['id_parent'];
 
-                if ((int) $parent_id > 0) {
+                    if ((int) $parent_id >= 0) {
                         $parent_node = $this->getNodeData(
                             (int) $parent_id,
                             'id_node'
@@ -1009,7 +1026,7 @@ class NetworkMap
                     }
 
                     // Store relationship.
-                if ($parent_node) {
+                    if ($parent_node !== null) {
                         $relations[] = [
                             'id_parent'   => $parent_node,
                             'parent_type' => NODE_GENERIC,
@@ -1017,6 +1034,7 @@ class NetworkMap
                             'child_type'  => NODE_GENERIC,
                         ];
                     }
+                }
             break;
 
             case NODE_PANDORA:
@@ -1224,6 +1242,11 @@ class NetworkMap
             return '';
         }
 
+        if ($this->mapOptions['fixed_positions']) {
+            // Ignore.
+            return;
+        }
+
         $dot_str = '';
 
         // Color is being printed by D3, not graphviz.
@@ -1233,8 +1256,22 @@ class NetworkMap
         $url = 'none';
         $parent = $data['parent'];
         $font_size = $this->mapOptions['font_size'];
+        if (isset($data['radius'])) {
+            $radius = $data['radius'];
+        } else {
             $radius = $this->mapOptions['map_filter']['node_radius'];
-        $radius /= GRAPHVIZ_RADIUS_CONVERSION_FACTOR;
+        }
+
+        $radius /= GRAPHVIZ_CONVERSION_FACTOR;
+
+        if (is_array($label)) {
+            $label = array_reduce(
+                function ($carry, $item) {
+                    $carry .= $item;
+                    return $carry;
+                }
+            );
+        }
 
         if (strlen($label) > 16) {
             $label = ui_print_truncate_text($label, 16, false, true, false);
@@ -1593,6 +1630,21 @@ class NetworkMap
 
             if (is_array($node['style']) === false) {
                 $node['style'] = json_decode($node['style'], true);
+
+                // Add styles.
+                if (isset($source_data['style']) === true
+                    && is_array($source_data['style']) === true
+                ) {
+                    $node['style'] = array_merge(
+                        $node['style'],
+                        $source_data['style']
+                    );
+                }
+            }
+
+            // Propagate styles.
+            foreach ($node['style'] as $k => $v) {
+                $item[$k] = $v;
             }
 
             $item['type'] = $node['type'];
@@ -1632,9 +1684,15 @@ class NetworkMap
                         $node[$k] = $v;
                     }
 
-                    $node['style']['label'] = $node['name'];
+                    $node['style']['label'] = $node['label'];
                     $node['style']['shape'] = 'circle';
-                    $item['color'] = self::getColorByStatus($node['status']);
+                    if (isset($source_data['color'])) {
+                        $item['color'] = $source_data['color'];
+                    } else {
+                        $item['color'] = self::getColorByStatus(
+                            $node['status']
+                        );
+                    }
                 break;
             }
 
@@ -1679,6 +1737,7 @@ class NetworkMap
             $item['text'] = io_safe_output($node['style']['label']);
             $item['shape'] = $node['style']['shape'];
             $item['map_id'] = $node['id_map'];
+
             if (!isset($node['style']['id_networkmap'])
                 || $node['style']['id_networkmap'] == ''
                 || $node['style']['id_networkmap'] == 0
@@ -1694,8 +1753,6 @@ class NetworkMap
                 $item['image'] = $item['image_url'];
                 $item['image_height'] = 52;
                 $item['image_width'] = 52;
-                $item['width'] = $this->mapOptions['map_filter']['node_radius'];
-                $item['height'] = $this->mapOptions['map_filter']['node_radius'];
             }
 
             $return[] = $item;
@@ -2036,6 +2093,10 @@ class NetworkMap
                         'id_source' => $id_source,
                         'label'     => $label,
                         'image'     => null,
+                        'radius'    => max(
+                            $node['width'],
+                            $node['height']
+                        ),
                     ]
                 );
 
@@ -2148,8 +2209,8 @@ class NetworkMap
             if (preg_match('/^graph.*$/', $line) != 0) {
                 // Graph definition.
                 $fields = explode(' ', $line);
-                $this->map['width'] = ($fields[2] * 10 * GRAPHVIZ_RADIUS_CONVERSION_FACTOR);
+                $this->map['width'] = ($fields[2] * GRAPHVIZ_CONVERSION_FACTOR);
-                $this->map['height'] = ($fields[3] * 10 * GRAPHVIZ_RADIUS_CONVERSION_FACTOR);
+                $this->map['height'] = ($fields[3] * GRAPHVIZ_CONVERSION_FACTOR);
 
                 if ($this->map['width'] > $config['networkmap_max_width']) {
                     $this->map['width'] = $config['networkmap_max_width'];
@@ -2162,8 +2223,8 @@ class NetworkMap
                 // Node.
                 $fields = explode(' ', $line);
                 $id = $fields[1];
-                $nodes[$id]['x'] = (($fields[2] * $this->mapOptions['map_filter']['node_radius']) - $this->mapOptions['map_filter']['rank_sep'] * GRAPHVIZ_RADIUS_CONVERSION_FACTOR);
+                $nodes[$id]['x'] = ($fields[2] * GRAPHVIZ_CONVERSION_FACTOR);
-                $nodes[$id]['y'] = (($fields[3] * $this->mapOptions['map_filter']['node_radius']) - $this->mapOptions['map_filter']['rank_sep'] * GRAPHVIZ_RADIUS_CONVERSION_FACTOR);
+                $nodes[$id]['y'] = ($fields[3] * GRAPHVIZ_CONVERSION_FACTOR);
             } else if (preg_match('/^edge.*$/', $line) != 0
                 && empty($this->relations) === true
             ) {
@@ -2401,7 +2462,17 @@ class NetworkMap
          * Calculate X,Y positions.
          */
 
+        if (!$this->mapOptions['fixed_positions']) {
             $graph = $this->calculateCoords();
+        } else {
+            // Set by user.
+            $graph['nodes'] = $this->rawNodes;
+            $graph['relations'] = $this->relations;
+            $this->map['width'] = $this->mapOptions['width'];
+            $this->map['height'] = $this->mapOptions['height'];
+        }
+
+        $this->map['filter']['z_dash'] = $this->mapOptions['z_dash'];
 
         if (is_array($graph) === true) {
             $nodes = $graph['nodes'];
@@ -2501,6 +2572,10 @@ class NetworkMap
             $style['image'] = $node_tmp['image'];
             $style['width'] = $node_tmp['width'];
             $style['height'] = $node_tmp['height'];
+            $style['radius'] = max(
+                $style['width'],
+                $style['height']
+            );
             $style['label'] = $node_tmp['text'];
 
             $node_tmp['style'] = json_encode($style);
@@ -2658,6 +2733,10 @@ class NetworkMap
             $output .= "var z_dash = null;\n";
         }
 
+        if (empty($networkmap['filter']['node_radius']) === true) {
+            $networkmap['filter']['node_radius'] = $this->mapOptions['map_filter']['node_radius'];
+        }
+
         $output .= 'var networkmap_refresh_time = 1000 * '.$networkmap['source_period'].";\n";
         $output .= 'var networkmap_center = [ '.$networkmap['center_x'].', '.$networkmap['center_y']."];\n";
         $output .= 'var networkmap_dimensions = [ '.$networkmap['width'].', '.$networkmap['height']."];\n";
@@ -2676,8 +2755,14 @@ class NetworkMap
             $nodes = [];
         }
 
-        $nodes_js = $this->nodesToJS($nodes);
+        $this->nodesJS = $this->nodesToJS($nodes);
-        $output .= 'networkmap.nodes = ('.json_encode($nodes_js).");\n";
+
+        $output .= 'networkmap.nodes = ('.json_encode($this->nodesJS).");\n";
+
+        // Clean.
+        unset($this->nodes);
+        unset($this->rawNodes);
+        unset($this->nodeMapping);
 
         // Translate edges to js links.
         $relations = $this->graph['relations'];
@@ -2685,8 +2770,11 @@ class NetworkMap
             $relations = [];
         }
 
-        $links_js = $this->edgeToJS($relations);
+        $this->relationsJS = $this->edgeToJS($relations);
-        $output .= 'networkmap.links = ('.json_encode($links_js).");\n";
+        $output .= 'networkmap.links = ('.json_encode($this->relationsJS).");\n";
+
+        // Clean.
+        unset($this->relations);
 
         $output .= '
         ////////////////////////////////////////////////////////////////////
@@ -3221,16 +3309,21 @@ class NetworkMap
             && $this->useTooltipster
         ) {
             $output .= '<script type="text/javascript">
-                var nodes = networkmap.nodes;
-                var arrows = networkmap.links;
-                var width = networkmap_dimensions[0];
-                var height = networkmap_dimensions[1];
-                var font_size = '.$this->mapOptions['font_size'].';
-                var custom_params = '.json_encode($this->tooltipParams).';
-                var controller = null;
-                var homedir = "'.ui_get_full_url(false).'"
                 $(function() {
-                    controller = new SimpleMapController("#simple_map");
+                    controller = new SimpleMapController({
+                        map_width: '.$this->map['width'].',
+                        map_height: '.$this->map['height'].',
+                        id: "'.$this->idMap.'",
+                        target: "#simple_map",
+                        nodes: '.json_encode($this->nodesJS).',
+                        arrows: '.json_encode($this->relationsJS).',
+                        center_x: '.$this->map['center_x'].',
+                        center_y: '.$this->map['center_y'].',
+                        z_dash: '.$this->map['filter']['z_dash'].',
+                        font_size: '.$this->mapOptions['font_size'].',
+                        homedir: "'.ui_get_full_url(false).'",
+                        custom_params: '.json_encode($this->tooltipParams).'
+                    });
                     controller.init_map();
                 });
             </script>';
@@ -3315,9 +3408,17 @@ class NetworkMap
 
             $output .= '<div id="simple_map" data-id="'.$this->idMap.'" ';
             $output .= 'style="border: 1px #ddd solid;';
-            $output .= ' width:'.$this->mapOptions['width'];
+
-            $output .= ' ;height:'.$this->mapOptions['height'].'">';
+            if ($this->fullSize) {
+                $output .= ' width:100%';
+                $output .= ' ;height: 100%">';
+                $output .= '<svg id="svg'.$this->idMap.'" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" pointer-events="all" width="100%" height="100%">';
+            } else {
+                $output .= ' width:'.$this->mapOptions['width'].'px';
+                $output .= ' ;height:'.$this->mapOptions['height'].'px">';
                 $output .= '<svg id="svg'.$this->idMap.'" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" pointer-events="all" width="'.$this->mapOptions['width'].'" height="'.$this->mapOptions['height'].'px">';
+            }
+
             $output .= '</svg>';
             $output .= '</div>';
         } else {

pandora_console/include/config_process.php

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

pandora_console/include/constants.php

@@ -583,8 +583,22 @@ define('NETWORKMAP_DEFAULT_HEIGHT', 800);
 // Discovery task types.
 define('DISCOVERY_HOSTDEVICES', 0);
 define('DISCOVERY_HOSTDEVICES_CUSTOM', 1);
-define('DISCOVERY_CLOUD_AWS', 10);
+define('DISCOVERY_CLOUD_AWS', 2);
-define('DISCOVERY_APP_VMWARE', 100);
+define('DISCOVERY_APP_VMWARE', 3);
+define('DISCOVERY_APP_MYSQL', 4);
+define('DISCOVERY_APP_ORACLE', 5);
+define('DISCOVERY_CLOUD_AWS_EC2', 6);
+define('DISCOVERY_CLOUD_AWS_RDS', 7);
+
+
+// Discovery types matching definition.
+define('DISCOVERY_SCRIPT_HOSTDEVICES_CUSTOM', 0);
+// Standard applications.
+define('DISCOVERY_SCRIPT_APP_VMWARE', 1);
+// Cloud environments.
+define('DISCOVERY_SCRIPT_CLOUD_AWS', 2);
+define('DISCOVERY_SCRIPT_IPAM_RECON', 3);
+define('DISCOVERY_SCRIPT_IPMI_RECON', 4);
 
 // Discovery task descriptions.
 define('CLOUDWIZARD_AWS_DESCRIPTION', 'Discovery.Cloud.AWS.EC2');

pandora_console/include/functions_snmp_browser.php

@@ -54,10 +54,15 @@ function snmp_browser_print_tree(
     $last=0,
     $last_array=[],
     $sufix=false,
-    $checked=[]
+    $checked=[],
+    $return=false,
+    $descriptive_ids=false,
+    $previous_id=''
 ) {
     static $url = false;
 
+    $output = '';
+
     // Get the base URL for images.
     if ($url === false) {
         $url = ui_get_full_url('operation/tree', false, false, false);
@@ -73,9 +78,9 @@ function snmp_browser_print_tree(
     $last_array[$depth] = $last;
 
     if ($depth > 0) {
-        echo "<ul id='ul_$id' style='margin: 0; padding: 0; display: none'>\n";
+        $output .= "<ul id='ul_$id' style='margin: 0; padding: 0; display: none'>\n";
     } else {
-        echo "<ul id='ul_$id' style='margin: 0; padding: 0;'>\n";
+        $output .= "<ul id='ul_$id' style='margin: 0; padding: 0;'>\n";
     }
 
     foreach ($tree['__LEAVES__'] as $level => $sub_level) {
@@ -83,73 +88,97 @@ function snmp_browser_print_tree(
         $sub_id = time().rand(0, getrandmax());
 
         // Display the branch.
-        echo "<li id='li_$sub_id' style='margin: 0; padding: 0;'>";
+        $output .= "<li id='li_$sub_id' style='margin: 0; padding: 0;'>";
 
         // Indent sub branches.
         for ($i = 1; $i <= $depth; $i++) {
             if ($last_array[$i] == 1) {
-                echo '<img src="'.$url.'/no_branch.png" style="vertical-align: middle;">';
+                $output .= '<img src="'.$url.'/no_branch.png" style="vertical-align: middle;">';
             } else {
-                echo '<img src="'.$url.'/branch.png" style="vertical-align: middle;">';
+                $output .= '<img src="'.$url.'/branch.png" style="vertical-align: middle;">';
             }
         }
 
         // Branch.
         if (! empty($sub_level['__LEAVES__'])) {
-            echo "<a id='anchor_$sub_id' onfocus='javascript: this.blur();' href='javascript: toggleTreeNode(\"$sub_id\", \"$id\");'>";
+            $output .= "<a id='anchor_$sub_id' onfocus='javascript: this.blur();' href='javascript: toggleTreeNode(\"$sub_id\", \"$id\");'>";
             if ($depth == 0 && $count == 0) {
                 if ($count == $total) {
-                    echo '<img src="'.$url.'/one_closed.png" style="vertical-align: middle;">';
+                    $output .= '<img src="'.$url.'/one_closed.png" style="vertical-align: middle;">';
                 } else {
-                    echo '<img src="'.$url.'/first_closed.png" style="vertical-align: middle;">';
+                    $output .= '<img src="'.$url.'/first_closed.png" style="vertical-align: middle;">';
                 }
             } else if ($count == $total) {
-                echo '<img src="'.$url.'/last_closed.png" style="vertical-align: middle;">';
+                $output .= '<img src="'.$url.'/last_closed.png" style="vertical-align: middle;">';
             } else {
-                echo '<img src="'.$url.'/closed.png" style="vertical-align: middle;">';
+                $output .= '<img src="'.$url.'/closed.png" style="vertical-align: middle;">';
             }
 
-            echo '</a>';
+            $output .= '</a>';
         }
+
         // Leave.
         else {
             if ($depth == 0 && $count == 0) {
                 if ($count == $total) {
-                    echo '<img src="'.$url.'/no_branch.png" style="vertical-align: middle;">';
+                    $output .= '<img src="'.$url.'/no_branch.png" style="vertical-align: middle;">';
                 } else {
-                    echo '<img src="'.$url.'/first_leaf.png" style="vertical-align: middle;">';
+                    $output .= '<img src="'.$url.'/first_leaf.png" style="vertical-align: middle;">';
                 }
             } else if ($count == $total) {
-                echo '<img src="'.$url.'/last_leaf.png" style="vertical-align: middle;">';
+                $output .= '<img src="'.$url.'/last_leaf.png" style="vertical-align: middle;">';
             } else {
-                echo '<img src="'.$url.'/leaf.png" style="vertical-align: middle;">';
+                $output .= '<img src="'.$url.'/leaf.png" style="vertical-align: middle;">';
             }
         }
 
         // Branch or leave with branches!
         if (isset($sub_level['__OID__'])) {
-            echo "<a onfocus='javascript: this.blur();' href='javascript: snmpGet(\"".addslashes($sub_level['__OID__'])."\");'>";
+            $output .= "<a onfocus='javascript: this.blur();' href='javascript: snmpGet(\"".addslashes($sub_level['__OID__'])."\");'>";
-            echo '<img src="'.$url.'/../../images/eye.png" style="vertical-align: middle;">';
+            $output .= '<img src="'.$url.'/../../images/eye.png" style="vertical-align: middle;">';
-            echo '</a>';
+            $output .= '</a>';
         }
 
         $checkbox_name_sufix = ($sufix === true) ? '_'.$level : '';
+        if ($descriptive_ids === true) {
+            $checkbox_name = 'create_'.$sub_id.$previous_id.$checkbox_name_sufix;
+        } else {
             $checkbox_name = 'create_'.$sub_id.$checkbox_name_sufix;
-        $status = (!empty($checked) && isset($checked[$level]));
-        echo html_print_checkbox($checkbox_name, 0, $status, true, false, '').'&nbsp;<span>'.$level.'</span>';
-        if (isset($sub_level['__VALUE__'])) {
-            echo '<span class="value" style="display: none;">&nbsp;=&nbsp;'.$sub_level['__VALUE__'].'</span>';
         }
 
-        echo '</li>';
+        $previous_id = $checkbox_name_sufix;
+        $status = (!empty($checked) && isset($checked[$level]));
+        $output .= html_print_checkbox($checkbox_name, 0, $status, true, false, '').'&nbsp;<span>'.$level.'</span>';
+        if (isset($sub_level['__VALUE__'])) {
+            $output .= '<span class="value" style="display: none;">&nbsp;=&nbsp;'.$sub_level['__VALUE__'].'</span>';
+        }
+
+        $output .= '</li>';
 
         // Recursively print sub levels.
-        snmp_browser_print_tree($sub_level, $sub_id, ($depth + 1), ($count == $total ? 1 : 0), $last_array, $sufix, $checked);
+        $output .= snmp_browser_print_tree(
+            $sub_level,
+            $sub_id,
+            ($depth + 1),
+            ($count == $total ? 1 : 0),
+            $last_array,
+            $sufix,
+            $checked,
+            $return,
+            $descriptive_ids,
+            $previous_id
+        );
 
         $count++;
     }
 
-    echo '</ul>';
+    $output .= '</ul>';
+
+    if ($return == false) {
+        echo $output;
+    }
+
+    return $output;
 }
 
 

pandora_console/include/styles/wizard.css

@@ -16,8 +16,10 @@ ul.wizard li > label:not(.p-switch) {
 }
 
 ul.wizard li > textarea {
-  width: 250px;
+  width: 600px;
+  height: 15em;
   display: inline-block;
+  font-family: monospace;
 }
 
 .hidden {

pandora_console/install.php

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

pandora_console/operation/agentes/alerts_status.php

@@ -497,6 +497,7 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
         if (!is_metaconsole()) {
             $table->size[7] = '5%';
             if (check_acl_one_of_groups($config['id_user'], $all_groups, 'LW') || check_acl_one_of_groups($config['id_user'], $all_groups, 'LM')) {
+                $table->head[8] = __('Validate');
                 $table->align[8] = 'left';
                 $table->size[8] = '5%';
             }
@@ -532,6 +533,7 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
         if (!is_metaconsole()) {
             $table->size[7] = '5%';
             if (check_acl($config['id_user'], $id_group, 'LW') || check_acl($config['id_user'], $id_group, 'LM')) {
+                $table->head[8] = __('Validate');
                 $table->align[8] = 'left';
                 $table->size[8] = '5%';
             }
@@ -563,6 +565,7 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
         if (!is_metaconsole()) {
             $table->size[6] = '5%';
             if (check_acl($config['id_user'], $id_group, 'LW') || check_acl($config['id_user'], $id_group, 'LM')) {
+                $table->head[7] = __('Validate');
                 $table->align[7] = 'left';
                 $table->size[7] = '5%';
             }

pandora_console/operation/menu.php

@@ -492,12 +492,6 @@ if (is_array($config['extensions'])) {
         $sub['godmode/agentes/planned_downtime.list']['id'] = 'Scheduled downtime';
     }
 
-    if (check_acl($config['id_user'], 0, 'AW')) {
-        $sub['operation/servers/recon_view']['text'] = __('Recon view');
-        $sub['operation/servers/recon_view']['id'] = 'Recon view';
-        $sub['operation/servers/recon_view']['refr'] = 0;
-    }
-
     foreach ($config['extensions'] as $extension) {
         // If no operation_menu is a godmode extension.
         if ($extension['operation_menu'] == '') {

pandora_console/pandora_console.redhat.spec

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

pandora_console/pandora_console.rhel7.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.733
-%define release     190421
+%define release     190423
 
 # 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.733
-%define release     190421
+%define release     190423
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb.sql

@@ -790,6 +790,7 @@ CREATE TABLE IF NOT EXISTS `trecon_task` (
 	`auth_strings` text,
 	`autoconfiguration_enabled` tinyint(1) unsigned default '0',
 	`summary` text,
+	`type` int NOT NULL default 0,
 	PRIMARY KEY  (`id_rt`),
 	KEY `recon_task_daemon` (`id_recon_server`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
@@ -967,6 +968,7 @@ CREATE TABLE IF NOT EXISTS `trecon_script` (
 	`description` TEXT,
 	`script` varchar(250) default '',
 	`macros` TEXT,
+	`type` int NOT NULL default 0,
 	PRIMARY KEY  (`id_recon_script`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

pandora_console/pandoradb_data.sql

@@ -1135,10 +1135,10 @@ INSERT INTO `treport_custom_sql` (`id`, `name`, `sql`) VALUES (3, 'Monitoring&#x
 INSERT INTO `treport_custom_sql` (`id`, `name`, `sql`) VALUES (4, 'Group view', 'select t1.nombre, (select count(t3.id_agente) from tagente as t3 where t1.id_grupo = t3.id_grupo) as agents, (SELECT COUNT(t4.id_agente) FROM tagente as t4 WHERE t4.id_grupo = t1.id_grupo AND t4.disabled = 0 AND t4.ultimo_contacto < NOW() - (intervalo / (1/2))) as agent_unknown, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND utimestamp > 0 AND tagente_modulo.id_tipo_modulo NOT IN(21,22,23,24,100) AND (UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) >= (tagente_estado.current_interval / (1/2))) as monitor_unknow, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND tagente_modulo.id_tipo_modulo NOT IN (21,22,23,24) AND utimestamp = 0) as monitor_no_init, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente_estado.id_agente = tagente.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND estado = 0 AND ((UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) < (tagente_estado.current_interval / (1/2)) OR (tagente_modulo.id_tipo_modulo IN(21,22,23,24,100))) AND (utimestamp > 0 OR (tagente_modulo.id_tipo_modulo IN(21,22,23,24)))) as monitor_ok, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente_estado.id_agente = tagente.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND estado = 1 AND ((UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) < (tagente_estado.current_interval / (1/2)) OR (tagente_modulo.id_tipo_modulo IN(21,22,23,24,100))) AND utimestamp > 0) as monitor_critical, (SELECT COUNT(talert_template_modules.id) FROM talert_template_modules, tagente_modulo, tagente_estado, tagente WHERE tagente.id_grupo = t1.id_grupo AND tagente_modulo.id_agente = tagente.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND tagente.disabled = 0 AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo AND times_fired > 0) as monitor_alert_fired from tgrupo as t1 where 0 < (select count(t2.id_agente) from tagente as t2 where t1.id_grupo = t2.id_grupo)');
 
 -- trecon scripts
-INSERT INTO `trecon_script` VALUES (2,'IPMI Recon','Specific Pandora FMS Intel DCM Discovery (c) Artica ST 2011 <info@artica.es>

Usage: ./ipmi-recon.pl <task_id> <group_id> <create_incident_flag> <custom_field1> <custom_field2> <custom_field3> <custom_field4>

* custom_field1 = Network i.e.: 192.168.100.0/24
* custom_field2 = Username
* custom_field3 = Password
* custom_field4 = Additional parameters i.e.: -D LAN_2_0','/usr/share/pandora_server/util/recon_scripts/ipmi-recon.pl','{\"1\":{\"macro\":\"_field1_\",\"desc\":\"Network\",\"help\":\"i.e.: 192.168.100.0/24\",\"value\":\"\",\"hide\":\"\"},\"2\":{\"macro\":\"_field2_\",\"desc\":\"Username\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"},\"3\":{\"macro\":\"_field3_\",\"desc\":\"Password\",\"help\":\"\",\"value\":\"\",\"hide\":\"1\"},\"4\":{\"macro\":\"_field4_\",\"desc\":\"Additional parameters\",\"help\":\"Optional additional parameters such as -D LAN_2_0 to use IPMI ver 2.0 instead of 1.5.  These options will also be passed to the IPMI plugin when the current values are read.\",\"value\":\"\",\"hide\":\"\"}}');
+INSERT INTO `trecon_script` (`type`,`name`,`description`,`script`,`macros`) VALUES (1, 'Discovery.Application.VMware', 'Discovery Application script to monitor VMware technologies (ESXi, VCenter, VSphere)', '/usr/share/pandora_server/util/recon_scripts/vmware-plugin.pl', '{"1":{"macro":"_field1_","desc":"Configuration file","help":"","value":"","hide":""}}');
-INSERT INTO `trecon_script` VALUES (5,'WMI Recon Script','This script is used to automatically gather host information via WMI.
Available parameters:

* Network = network to scan (e.g. 192.168.100.0/24).
* WMI auth = comma separated list of WMI authentication tokens in the format username%password (e.g. Administrador%pass).

See the documentation for more information.','/usr/share/pandora_server/util/recon_scripts/wmi-recon.pl','{\"1\":{\"macro\":\"_field1_\",\"desc\":\"Network\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"},\"2\":{\"macro\":\"_field2_\",\"desc\":\"WMI auth\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"}}');
+INSERT INTO `trecon_script` (`type`,`name`,`description`,`script`,`macros`) VALUES (2, 'Discovery.Cloud', 'Discovery Cloud script to monitor Cloud technologies (AWS.EC2, AWS.S3, AWS.RDS,&#x20RDS,&#x20AWS.EKS)', '/usr/share/pandora_server/util/recon_scripts/pcm_client.pl', '{"1":{"macro":"_field1_","desc":"Configuration file","help":"","value":"","hide":""}}');
-INSERT INTO `trecon_script` (`name`,`description`,`script`,`macros`) VALUES ('Discovery.Application.VMware', 'Discovery Application script to monitor VMware technologies (ESXi, VCenter, VSphere)', '/usr/share/pandora_server/util/recon_scripts/vmware-plugin.pl', '{"1":{"macro":"_field1_","desc":"Configuration file","help":"","value":"","hide":""}}');
+-- IPAM is 3.
-INSERT INTO `trecon_script` (`name`,`description`,`script`,`macros`) VALUES ('Discovery.Cloud', 'Discovery Cloud script to monitor Cloud technologies (AWS.EC2, AWS.S3, AWS.RDS,&#x20RDS,&#x20AWS.EKS)', '/usr/share/pandora_server/util/recon_scripts/pcm_client.pl', '{"1":{"macro":"_field1_","desc":"Configuration file","help":"","value":"","hide":""}}');
+INSERT INTO `trecon_script` (`type`,`name`,`description`,`script`,`macros`) VALUES (4, 'IPMI Recon','Specific Pandora FMS Intel DCM Discovery (c) Artica ST 2011 <info@artica.es>

Usage: ./ipmi-recon.pl <task_id> <group_id> <create_incident_flag> <custom_field1> <custom_field2> <custom_field3> <custom_field4>

* custom_field1 = Network i.e.: 192.168.100.0/24
* custom_field2 = Username
* custom_field3 = Password
* custom_field4 = Additional parameters i.e.: -D LAN_2_0','/usr/share/pandora_server/util/recon_scripts/ipmi-recon.pl','{\"1\":{\"macro\":\"_field1_\",\"desc\":\"Network\",\"help\":\"i.e.: 192.168.100.0/24\",\"value\":\"\",\"hide\":\"\"},\"2\":{\"macro\":\"_field2_\",\"desc\":\"Username\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"},\"3\":{\"macro\":\"_field3_\",\"desc\":\"Password\",\"help\":\"\",\"value\":\"\",\"hide\":\"1\"},\"4\":{\"macro\":\"_field4_\",\"desc\":\"Additional parameters\",\"help\":\"Optional additional parameters such as -D LAN_2_0 to use IPMI ver 2.0 instead of 1.5.  These options will also be passed to the IPMI plugin when the current values are read.\",\"value\":\"\",\"hide\":\"\"}}');
 
 INSERT INTO `tplugin` (`id`, `name`, `description`, `max_timeout`, `execute`, `plugin_type`, `macros`, `parameters`) VALUES (1,'IPMI Plugin','Plugin to get IPMI monitors from a IPMI Device.',0,'/usr/share/pandora_server/util/plugin/ipmi-plugin.pl',0,'{\"1\":{\"macro\":\"_field1_\",\"desc\":\"Target IP\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"},\"2\":{\"macro\":\"_field2_\",\"desc\":\"Username\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"},\"3\":{\"macro\":\"_field3_\",\"desc\":\"Password\",\"help\":\"\",\"value\":\"\",\"hide\":\"true\"},\"4\":{\"macro\":\"_field4_\",\"desc\":\"Sensor\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"},\"5\":{\"macro\":\"_field5_\",\"desc\":\"Additional Options\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"}}','-h _field1_ -u _field2_ -p _field3_ -s _field4_ -- _field5_');
 

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.733-190421
+Version: 7.0NG.733-190423
 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.733-190421"
+pandora_version="7.0NG.733-190423"
 
 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.733";
-my $pandora_build = "190421";
+my $pandora_build = "190423";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
@@ -1200,7 +1200,7 @@ sub pandora_get_tconfig_token ($$$) {
 	my ($dbh, $token, $default_value) = @_;
 	
 	my $token_value = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = ?", $token);
-	if (defined ($token_value)) {
+	if (defined ($token_value) && $token_value ne '') {
 		return safe_output ($token_value);
 	}
 	

pandora_server/lib/PandoraFMS/DiscoveryServer.pm

@@ -53,9 +53,19 @@ my $Sem :shared;
 my $TaskSem :shared;
 
 # IDs from tconfig_os.
-use constant OS_OTHER => 10;
+use constant {
-use constant OS_ROUTER => 17;
+    OS_OTHER => 10,
-use constant OS_SWITCH => 18;
+    OS_ROUTER => 17,
+    OS_SWITCH => 18,
+    DISCOVERY_HOSTDEVICES => 0,
+    DISCOVERY_HOSTDEVICES_CUSTOM => 1,
+    DISCOVERY_CLOUD_AWS => 2,
+    DISCOVERY_APP_VMWARE => 3,
+    DISCOVERY_APP_MYSQL => 4,
+    DISCOVERY_APP_ORACLE => 5,
+    DISCOVERY_CLOUD_AWS_EC2 => 6,
+    DISCOVERY_CLOUD_AWS_RDS => 7
+};
 
 ########################################################################################
 # Discovery Server class constructor.
@@ -98,10 +108,15 @@ sub new ($$$$$$) {
 sub run ($) {
     my $self = shift;
     my $pa_config = $self->getConfig ();
+    my $dbh = $self->getDBH();
     
     print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " Discovery Server.", 1);
     my $threads = $pa_config->{'recon_threads'};
 
+    # Prepare some environmental variables.
+    $ENV{'AWS_ACCESS_KEY_ID'} = pandora_get_config_value($dbh, 'aws_access_key_id');
+    $ENV{'AWS_SECRET_ACCESS_KEY'} = pandora_get_config_value($dbh, 'aws_secret_access_key');
+
     # Use hightest value
     if ($pa_config->{'discovery_threads'}  > $pa_config->{'recon_threads'}) {
         $threads = $pa_config->{'discovery_threads'};
@@ -150,6 +165,9 @@ sub data_consumer ($$) {
     my ($self, $task_id) = @_;
     my ($pa_config, $dbh) = ($self->getConfig (), $self->getDBH ());
 
+    # Get server id.
+    my $server_id = get_server_id($dbh, $pa_config->{'servername'}, $self->getServerType());
+
     # Get recon task data	
     my $task = get_db_single_row ($dbh, 'SELECT * FROM trecon_task WHERE id_rt = ?', $task_id);	
     return -1 unless defined ($task);
@@ -172,6 +190,48 @@ sub data_consumer ($$) {
 
         my $main_event = pandora_event($pa_config, "[Discovery] Execution summary",$task->{'id_group'}, 0, 0, 0, 0, 'system', 0, $dbh);
 
+        my %cnf_extra;
+        if ($task->{'type'} == DISCOVERY_CLOUD_AWS_EC2
+        || $task->{'type'} == DISCOVERY_CLOUD_AWS_RDS) {
+            $cnf_extra{'aws_access_key_id'} = pandora_get_config_value($dbh, 'aws_access_key_id');
+            $cnf_extra{'aws_secret_access_key'} = pandora_get_config_value($dbh, 'aws_secret_access_key');
+            $cnf_extra{'cloud_util_path'} = pandora_get_config_value($dbh, 'cloud_util_path');
+
+            if (!defined($ENV{'AWS_ACCESS_KEY_ID'}) || !defined($ENV{'AWS_SECRET_ACCESS_KEY'})
+            || $cnf_extra{'aws_secret_access_key'} ne $ENV{'AWS_ACCESS_KEY_ID'}
+            || $cnf_extra{'cloud_util_path'} ne $ENV{'AWS_SECRET_ACCESS_KEY'}) {
+                # Environmental data is out of date. Create a tmp file to manage
+                # credentials. Perl limitation. We cannot update ENV here.
+                $cnf_extra{'creds_file'} = $pa_config->{'temporal'} . '/tmp_discovery.' . md5($task->{'id_rt'} . $task->{'name'} . time());
+                eval {
+                    open(my $__file_cfg, '> '. $cnf_extra{'creds_file'}) or die($!);
+                    print $__file_cfg $cnf_extra{'aws_access_key_id'} . "\n";
+                    print $__file_cfg $cnf_extra{'aws_secret_access_key'} . "\n";
+                    close($__file_cfg);
+                    set_file_permissions(
+                        $pa_config,
+                        $cnf_extra{'creds_file'},
+                        "0600"
+                    );
+                };
+                if ($@) {
+                    logger(
+                        $pa_config,
+                        'Cannot instantiate configuration file for task: ' . safe_output($task->{'name'}),
+                        5
+                    );
+                    # A server restart will override ENV definition (see run)
+                    logger(
+                        $pa_config,
+                        'Cannot execute Discovery task: ' . safe_output($task->{'name'}) . '. Please restart the server.',
+                        1
+                    );
+                    # Skip this task.
+                    return;
+                }
+            }
+        }
+
         my $recon = new PandoraFMS::Recon::Base(
             communities => \@communities,
             dbh => $dbh,
@@ -201,12 +261,26 @@ sub data_consumer ($$) {
             auth_strings_array => \@auth_strings,
             autoconfiguration_enabled => $task->{'autoconfiguration_enabled'},
             main_event_id => $main_event,
-			%{$pa_config}
+            server_id => $server_id,
+            %{$pa_config},
+            task_data => $task,
+            %cnf_extra
         );
 
         $recon->scan();
+
+        # Clean tmp file.
+        if (defined($cnf_extra{'creds_file'})
+        && -f $cnf_extra{'creds_file'}) {
+			unlink($cnf_extra{'creds_file'});
+		}
     };
     if ($@) {
+        logger(
+            $pa_config,
+            'Cannot execute Discovery task: ' . safe_output($task->{'name'}) . $@,
+            10
+        );
         update_recon_task ($dbh, $task_id, -1);
         return;
     }
@@ -413,6 +487,109 @@ sub PandoraFMS::Recon::Base::connect_agents($$$$$) {
     }
 }
 
+
+##########################################################################
+# Create agents from db_scan. Uses DataServer methods.
+# data = [
+#	'agent_data' => {},
+#	'module_data' => []
+# ]
+##########################################################################
+sub PandoraFMS::Recon::Base::create_agents($$) {
+    my ($self, $data) = @_;
+
+    my $pa_config = $self->{'pa_config'};
+    my $dbh = $self->{'dbh'};
+    my $server_id = $self->{'server_id'};
+
+    return undef if (ref($data) ne "ARRAY");
+
+    foreach my $information (@{$data}) {
+        my $agent = $information->{'agent_data'};
+        my $modules = $information->{'module_data'};
+        my $force_processing = 0;
+
+        # Search agent
+        my $current_agent = PandoraFMS::Core::locate_agent(
+            $pa_config, $dbh, $agent->{'agent_name'}
+        );
+
+        my $parent_id;
+        if (defined($agent->{'parent_agent_name'})) {
+            $parent_id = PandoraFMS::Core::locate_agent(
+                $pa_config, $dbh, $agent->{'parent_agent_name'}
+            );
+            if ($parent_id) {
+                $parent_id = $parent_id->{'id_agente'};
+            }
+        }
+
+        my $agent_id;
+        my $os_id = get_os_id($dbh, $agent->{'os'});
+
+        if ($os_id < 0) {
+            $os_id = get_os_id($dbh, 'Other');
+        }
+
+        if (!$current_agent) {
+            # Create agent.
+            $agent_id = pandora_create_agent(
+                $pa_config, $pa_config->{'servername'}, $agent->{'agent_name'},
+                $agent->{'address'}, $agent->{'id_group'}, $parent_id,
+                $os_id, $agent->{'description'},
+                $agent->{'interval'}, $dbh, $agent->{'timezone_offset'}
+            );
+
+            $current_agent = $parent_id = PandoraFMS::Core::locate_agent(
+                $pa_config, $dbh, $agent->{'agent_name'}
+            );
+
+            $force_processing = 1;
+
+        } else {
+            $agent_id = $current_agent->{'id_agente'};
+        }
+
+        if (!defined($agent_id)) {
+            return undef;
+        }
+
+        if ($agent->{'address'} ne '') {
+            pandora_add_agent_address(
+                $pa_config, $agent_id, $agent->{'agent_name'},
+                $agent->{'address'}, $dbh
+            );
+        }
+
+        # Update agent information
+        pandora_update_agent(
+            $pa_config, strftime("%Y-%m-%d %H:%M:%S", localtime()), $agent_id,
+            $agent->{'os_version'}, $agent->{'agent_version'},
+            $agent->{'interval'}, $dbh, undef, $parent_id
+        );
+
+        # Add modules.
+        if (ref($modules) eq "ARRAY") {
+            foreach my $module (@{$modules}) {
+                # Translate data structure to simulate XML parser return.
+                my %data_translated = map { $_ => [ $module->{$_} ] } keys %{$module};
+
+                # Process modules.
+                PandoraFMS::DataServer::process_module_data (
+                    $pa_config, \%data_translated,
+                    $server_id, $current_agent,
+                    $module->{'name'}, $module->{'type'},
+                    $agent->{'interval'},
+                    strftime ("%Y/%m/%d %H:%M:%S", localtime()),
+                    $dbh, $force_processing
+                );
+            }
+        }
+    }
+
+}
+
+
 ##########################################################################
 # Create an agent for the given device. Returns the ID of the new (or
 # existing) agent, undef on error.

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.733";
-my $pandora_build = "190421";
+my $pandora_build = "190423";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/lib/PandoraFMS/Recon/Base.pm

@@ -20,7 +20,18 @@ use constant {
 	STEP_SCANNING => 1,
 	STEP_AFT => 2,
 	STEP_TRACEROUTE => 3,
-	STEP_GATEWAY => 4
+	STEP_GATEWAY => 4,
+	STEP_STATISTICS => 1,
+	STEP_DATABASE_SCAN => 2,
+	STEP_CUSTOM_QUERIES => 3,
+	DISCOVERY_HOSTDEVICES => 0,
+	DISCOVERY_HOSTDEVICES_CUSTOM => 1,
+	DISCOVERY_CLOUD_AWS => 2,
+	DISCOVERY_APP_VMWARE => 3,
+	DISCOVERY_APP_MYSQL => 4,
+	DISCOVERY_APP_ORACLE => 5,
+	DISCOVERY_CLOUD_AWS_EC2 => 6,
+	DISCOVERY_CLOUD_AWS_RDS => 7
 };
 
 # /dev/null
@@ -194,6 +205,8 @@ sub new {
 	# Perform some sanity checks.
 	die("No subnet was specified.") unless defined($self->{'subnets'});
 
+	$self = bless($self, $class);
+
 	# Check SNMP params id SNMP is enabled
 	if ($self->{'snmp_enabled'}) {
 
@@ -240,7 +253,7 @@ sub new {
 			# Disable SNMP scans if no community was given.
 			if (ref($self->{'communities'}) ne "ARRAY" || scalar(@{$self->{'communities'}}) == 0) {
 				$self->{'snmp_enabled'} = 0;
-				$self->call('message', "There is not any SNMP community configured.", 5);
+				$self->call('message', "There is no SNMP community configured.", 5);
 
 			}
 		}
@@ -270,7 +283,7 @@ sub new {
 		$self->{'snmp_security_level'} = '';
 	}
 
-	return bless($self, $class);
+	return $self;
 }
 
 ########################################################################################
@@ -1415,6 +1428,210 @@ sub scan_subnet($) {
 	}
 }
 
+
+##########################################################################
+# Perform a Cloud scan
+##########################################################################
+sub cloud_scan($) {
+	my $self = shift;
+	my ($progress, $step);
+
+	my $type = '';
+
+	if ($self->{'task_data'}->{'type'} == DISCOVERY_CLOUD_AWS_EC2
+	|| $self->{'task_data'}->{'type'} == DISCOVERY_CLOUD_AWS_RDS) {
+		$type = 'Aws';
+	} else {
+		# Unrecognized task type.
+		call('message', 'Unrecognized task type', 1);
+		$self->call('update_progress', -1);
+		return;
+	}
+
+	# Initialize cloud object.
+	my $cloudObj = PandoraFMS::Recon::Util::enterprise_new(
+		'PandoraFMS::Recon::Cloud::'.$type,
+		[
+			task_data => $self->{'task_data'},
+			aws_access_key_id => $self->{'aws_access_key_id'},
+			aws_secret_access_key => $self->{'aws_secret_access_key'},
+			cloud_util_path => $self->{'cloud_util_path'},
+			creds_file => $self->{'creds_file'},
+			parent => $self
+		]
+
+	);
+
+	if (!$cloudObj) {
+		# Failed to initialize, check Cloud credentials or anything.
+		call('message', 'Unable to initialize PandoraFMS::Recon::Cloud::'.$type, 3);
+	} else {
+		# Let Cloud object manage scan.
+		$cloudObj->scan();
+	}
+
+	# Update progress.
+	# Done!
+	$self->{'step'} = '';
+	$self->call('update_progress', -1);
+}
+
+
+##########################################################################
+# Perform an Application scan.
+##########################################################################
+sub app_scan($) {
+	my ($self) = @_;
+	my ($progress, $step);
+
+	my $type = '';
+
+	if ($self->{'task_data'}->{'type'} == DISCOVERY_APP_MYSQL) {
+		$type = 'MySQL';
+	} elsif ($self->{'task_data'}->{'type'} == DISCOVERY_APP_ORACLE) {
+		$type = 'Oracle';
+	} else {
+		# Unrecognized task type.
+		call('message', 'Unrecognized task type', 1);
+		$self->call('update_progress', -1);
+		return;
+	}
+
+	my @targets = split /,/, $self->{'task_data'}->{'subnet'};
+
+	my $global_step = 100 / (scalar @targets);
+	my $global_percent = 0;
+	my $i = 0;
+	foreach my $target (@targets) {
+		my @data;
+		my @modules;
+
+		$self->{'step'} = STEP_DATABASE_SCAN;
+		$self->{'c_network_name'} = $target;
+		$self->{'c_network_percent'} = 0;
+
+		# Send message
+		call('message', 'Checking target ' . $target, 10);
+
+		# Force target acquirement.
+		$self->{'task_data'}->{'dbhost'} = $target;
+		$self->{'task_data'}->{'target_index'} = $i++;
+
+		# Update progress
+		$self->{'c_network_percent'} = 10;
+		$self->call('update_progress', $global_percent + (10 / (scalar @targets)));
+
+		# Connect to target.
+		my $dbObj = PandoraFMS::Recon::Util::enterprise_new(
+			'PandoraFMS::Recon::Applications::'.$type,
+			$self->{'task_data'}
+		);
+
+		if (!$dbObj->is_connected()) {
+			call('message', 'Cannot connect to target ' . $target, 3);
+			$global_percent += $global_step;
+			$self->{'c_network_percent'} = 90;
+			# Update progress
+			$self->call('update_progress', $global_percent + (90 / (scalar @targets)));
+			$self->{'summary'}->{'not_alive'} += 1;
+			push @modules, {
+				name => $type . ' connection',
+				type => 'generic_proc',
+				data => 0,
+				description => $type . ' availability'
+			};
+
+		} else {
+			my $dbObjCfg = $dbObj->get_config();
+
+			$self->{'summary'}->{'discovered'} += 1;
+			$self->{'summary'}->{'alive'} += 1;
+
+			push @modules, {
+				name => $type . ' connection',
+				type => 'generic_proc',
+				data => 1,
+				description => $type . ' availability'
+			};
+
+			# Analyze.
+			$self->{'step'} = STEP_STATISTICS;
+			$self->{'c_network_percent'} = 30;
+			$self->call('update_progress', $global_percent + (30 / (scalar @targets)));
+			$self->{'c_network_name'} = $dbObj->get_host();
+
+			# Retrieve connection statistics.
+			# Retrieve uptime statistics
+			# Retrieve query stats
+			# Retrieve connections
+			# Retrieve innodb
+			# Retrieve cache
+			$self->{'c_network_percent'} = 50;
+			$self->call('update_progress', $global_percent + (50 / (scalar @targets)));
+			push @modules, $dbObj->get_statistics();
+
+			# Custom queries.
+			$self->{'step'} = STEP_CUSTOM_QUERIES;
+			$self->{'c_network_percent'} = 80;
+			$self->call('update_progress', $global_percent + (80 / (scalar @targets)));
+			push @modules, $dbObj->execute_custom_queries();
+
+			if (defined($dbObjCfg->{'scan_databases'})
+			&& $dbObjCfg->{'scan_databases'} == 1) {
+				# Skip database scan in Oracle tasks
+				next if $self->{'type'} == DISCOVERY_APP_ORACLE;
+
+				my $__data = $dbObj->scan_databases();
+
+				if (ref($__data) eq "ARRAY") {
+					if (defined($dbObjCfg->{'agent_per_database'})
+					&& $dbObjCfg->{'agent_per_database'} == 1) {
+						# Agent per database detected.
+						push @data, @{$__data};
+					} else {
+						# Merge modules into engine agent.
+						my @_modules = map { 
+							map { $_ } @{$_->{'module_data'}}
+						} @{$__data};
+
+						push @modules, @_modules;
+					}
+				}
+			}
+		}
+
+		# Put engine agent at the beginning of the list.
+		my $version = $dbObj->get_version();
+		unshift @data,{
+			'agent_data' => {
+				'agent_name' => $dbObj->get_agent_name(),
+				'os' => $type,
+				'os_version' => (defined($version) ? $version : 'Discovery'),
+				'interval' => $self->{'task_data'}->{'interval_sweep'},
+				'id_group' => $self->{'task_data'}->{'id_group'},
+				'address' => $dbObj->get_host(),
+				'description' => '',
+			},
+			'module_data' => \@modules,
+		};
+
+		$self->call('create_agents', \@data);
+
+		# Destroy item.
+		undef($dbObj);
+
+		$global_percent += $global_step;
+		$self->{'c_network_percent'} = 100;
+		$self->call('update_progress', $global_percent);
+	}
+
+	# Update progress.
+	# Done!
+	$self->{'step'} = '';
+	$self->call('update_progress', -1);
+
+}
+
 ##########################################################################
 # Perform a network scan.
 ##########################################################################
@@ -1425,6 +1642,19 @@ sub scan($) {
 	# 1%
 	$self->call('update_progress', 1);
 
+	if (defined($self->{'task_data'})) {
+		if ($self->{'task_data'}->{'type'} == DISCOVERY_APP_MYSQL
+		||  $self->{'task_data'}->{'type'} == DISCOVERY_APP_ORACLE) {
+			# Database scan.
+			return $self->app_scan();
+		}
+
+		if ($self->{'task_data'}->{'type'} == DISCOVERY_CLOUD_AWS_RDS) {
+			# Cloud scan.
+			return $self->cloud_scan();
+		}
+	}
+
 	# Find devices.
 	$self->call('message', "[1/5] Scanning the network...", 3);
 	$self->{'step'} = STEP_SCANNING;
@@ -1540,7 +1770,7 @@ sub snmp_get($$$) {
 		my %output_hash;
 		foreach my $vlan (@vlans) {
 			my $command = $self->snmp_get_command($device, $oid, $community, $vlan);
-			foreach my $line (`$vlan`) {
+			foreach my $line (`$command`) {
 				$output_hash{$line} = 1;
 			}
 		}

pandora_server/lib/PandoraFMS/Recon/Util.pm

@@ -12,9 +12,10 @@ use lib '/usr/lib/perl5';
 use Socket qw/inet_aton/;
 
 our @ISA = ("Exporter");
-our %EXPORT_TAGS = ( 'all' => [ qw( ) ] );
+our %EXPORT_TAGS = ( 'all' => [qw( )] );
 our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
 our @EXPORT = qw(
+  enterprise_new
   ip_to_long
   mac_matches
   mac_to_dec
@@ -22,6 +23,36 @@ our @EXPORT = qw(
   subnet_matches
 );
 
+########################################################################################
+# Return an Enterprise Recon object.
+########################################################################################
+sub enterprise_new($$) {
+	my ($class, $arguments) = @_;
+
+	my @args;
+	if (ref($arguments) eq "HASH") {
+		@args = %{$arguments};
+	}
+	if (ref($arguments) eq "ARRAY") {
+		@args = @{$arguments};
+	}
+
+	# Try to load the module
+	if ($^O eq 'MSWin32') {
+		# If the Windows service dies the service is stopped, even inside an eval ($RUN is set to 0)!
+		eval 'local $SIG{__DIE__}; require '.$class.';';
+	}else {
+		eval 'require '.$class.';';
+	}
+	if ($@) {
+		# Not loaded.
+		return undef;
+	}
+
+	return new $class(@args);
+}
+
+
 ########################################################################################
 # Return the numeric representation of the given IP address.
 ########################################################################################
@@ -53,7 +84,7 @@ sub mac_to_dec($) {
 	my $dec_mac = '';
 	my @elements = split(/:/, $mac);
 	foreach my $element (@elements) {
-        $dec_mac .= unpack('s', pack 's', hex($element)) .  '.'
+		$dec_mac .= unpack('s', pack 's', hex($element)) .  '.';
 	}
 	chop($dec_mac);
 
@@ -95,6 +126,7 @@ sub subnet_matches($$;$) {
 		$netaddr = $subnet;
 		$netmask = ip_to_long($mask);
 	}
+
 	# CIDR notation.
 	else {
 		($netaddr, $netmask) = split('/', $subnet);

pandora_server/lib/PandoraFMS/Tools.pm

@@ -120,6 +120,7 @@ our @EXPORT = qw(
 	month_have_days
 	translate_obj
 	valid_regex
+	read_file
 	set_file_permissions
 	uri_encode
 	check_server_threads
@@ -330,6 +331,28 @@ my @ServerThreads;
 # Keep threads running.
 our $THRRUN :shared = 1;
 
+##########################################################################
+## Reads a file and returns entire content or undef if error.
+##########################################################################
+sub read_file {
+	my $path = shift;
+
+	my $_FILE;
+	if( !open($_FILE, "<", $path) ) {
+		# failed to open, return undef
+		return undef;
+	}
+
+	# Slurp configuration file content.
+	my $content = do { local $/; <$_FILE> };
+
+	# Close file
+	close($_FILE);
+
+	return $content;
+}
+
+
 ###############################################################################
 # Sets user:group owner for the given file
 ###############################################################################

pandora_server/pandora_server.redhat.spec

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

pandora_server/pandora_server.spec

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

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190421"
+PI_BUILD="190423"
 
 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.733 PS190421";
+my $version = "7.0NG.733 PS190423";
 
 # 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.733 PS190421";
+my $version = "7.0NG.733 PS190423";
 
 # save program name for logging
 my $progname = basename($0);