Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps

Conflicts: pandora_console/extras/mr/37.sql pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2020-04-14 12:00:15 +02:00 · 2020-04-14 12:00:15 +02:00 · 36daf76cc5
parent 3b71297d56 0e6b1ab713
commit 36daf76cc5
35 changed files with 76 additions and 48 deletions
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.744-200408
+Version: 7.0NG.744-200414
 Architecture: all
 Priority: optional
 Section: admin
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/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.744-200408"
+pandora_version="7.0NG.744-200414"

 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@ -55,7 +55,7 @@ my $Sem = undef;
 my $ThreadSem = undef;

 use constant AGENT_VERSION => '7.0NG.744';
-use constant AGENT_BUILD => '200408';
+use constant AGENT_BUILD => '200414';

 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.744
-%define release     200408
+%define release     200414

 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.744
-%define release     200408
+%define release     200414

 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@ -10,7 +10,7 @@
 # **********************************************************************

 PI_VERSION="7.0NG.744"
-PI_BUILD="200408"
+PI_BUILD="200414"
 OS_NAME=`uname -s`

 FORCE=0
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@ -186,7 +186,7 @@ UpgradeApplicationID
 {}

 Version
-{200408}
+{200414}

 ViewReadme
 {Yes}
--- a/pandora_agents/win32/pandora.cc
+++ b/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.744(Build 200408)")
+#define PANDORA_VERSION ("7.0NG.744(Build 200414)")

 string pandora_path;
 string pandora_dir;
--- a/pandora_agents/win32/versioninfo.rc
+++ b/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.744(Build 200408))"
+      VALUE "ProductVersion", "(7.0NG.744(Build 200414))"
      VALUE "FileVersion", "1.0.0.0"
    END
  END
--- a/pandora_console/.htaccess
+++ b/pandora_console/.htaccess
@ -1,2 +1,8 @@
 # pandora disable listing
-Options -Indexes
+Options -Indexes
+
+<Files ~ "\.log$"> 
+Order Allow,Deny
+Deny from All
+</Files>
+
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.744-200408
+Version: 7.0NG.744-200414
 Architecture: all
 Priority: optional
 Section: admin
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/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.744-200408"
+pandora_version="7.0NG.744-200414"

 package_pear=0
 package_pandora=1
--- a/pandora_console/extras/mr/37.sql
+++ b/pandora_console/extras/mr/37.sql
@ -57,6 +57,10 @@ ALTER TABLE `talert_templates` ADD COLUMN `disable_event` tinyint(1) DEFAULT 0;
 ALTER TABLE `tevent_alert` ADD COLUMN `disable_event` tinyint(1) DEFAULT 0;
 ALTER TABLE `talert_snmp` ADD COLUMN `disable_event` tinyint(1) DEFAULT 0;

+UPDATE twidget SET description='Show a visual console' WHERE class_name='MapsMadeByUser';
+UPDATE twidget SET description='Clock' WHERE class_name='ClockWidget';
+UPDATE twidget SET description='Group status' WHERE class_name='SystemGroupStatusWidget';
+
 INSERT IGNORE INTO `tpen` VALUES (9,'cisco','Cisco&#x20;System'),(11,'hp','Hewlett&#x20;Packard'),(2021,'general_snmp','U.C.&#x20;Davis,&#x20;ECE&#x20;Dept.&#x20;Tom'),(2636,'juniper','Juniper&#x20;Networks'),(3375,'f5','F5&#x20;Labs'),(8072,'general_snmp','Net&#x20;SNMP'),(12356,'fortinet','Fortinet');

 SET @template_name = 'Network&#x20;Management';
@ -158,4 +162,6 @@ SET @template_name = 'Windows&#x20;Antivirus';
 SET @template_description = 'Windows antivirus monitoring template (WMI)';

 INSERT INTO tnetwork_profile (id_np, name, description) SELECT * FROM (SELECT '' id_np, @template_name name, @template_description description) AS tmp WHERE NOT EXISTS (SELECT id_np FROM tnetwork_profile WHERE name = @template_name);
-INSERT INTO tnetwork_profile_component (id_nc, id_np) SELECT * FROM (SELECT c.id_nc id_nc, p.id_np id_np FROM tnetwork_profile p, tnetwork_component c, tnetwork_component_group g WHERE g.id_sg = c.id_group AND p.name = @template_name AND (g.name = 'Norton' OR g.name = 'Panda' OR g.name = 'McAfee' OR g.name = 'Bitdefender' OR g.name = 'BullGuard' OR g.name = 'AVG' OR g.name = 'Kaspersky')) AS tmp WHERE NOT EXISTS (SELECT pc.id_np FROM tnetwork_profile p, tnetwork_profile_component pc WHERE p.id_np = pc.id_np AND p.name = @template_name);
+INSERT INTO tnetwork_profile_component (id_nc, id_np) SELECT * FROM (SELECT c.id_nc id_nc, p.id_np id_np FROM tnetwork_profile p, tnetwork_component c, tnetwork_component_group g WHERE g.id_sg = c.id_group AND p.name = @template_name AND (g.name = 'Norton' OR g.name = 'Panda' OR g.name = 'McAfee' OR g.name = 'Bitdefender' OR g.name = 'BullGuard' OR g.name = 'AVG' OR g.name = 'Kaspersky')) AS tmp WHERE NOT EXISTS (SELECT pc.id_np FROM tnetwork_profile p, tnetwork_profile_component pc WHERE p.id_np = pc.id_np AND p.name = @template_name);
+
+COMMIT;
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@ -2711,4 +2711,13 @@ SET @template_name = 'Windows&#x20;Antivirus';
 SET @template_description = 'Windows antivirus monitoring template (WMI)';

 INSERT INTO tnetwork_profile (id_np, name, description) SELECT * FROM (SELECT '' id_np, @template_name name, @template_description description) AS tmp WHERE NOT EXISTS (SELECT id_np FROM tnetwork_profile WHERE name = @template_name);
-INSERT INTO tnetwork_profile_component (id_nc, id_np) SELECT * FROM (SELECT c.id_nc id_nc, p.id_np id_np FROM tnetwork_profile p, tnetwork_component c, tnetwork_component_group g WHERE g.id_sg = c.id_group AND p.name = @template_name AND (g.name = 'Norton' OR g.name = 'Panda' OR g.name = 'McAfee' OR g.name = 'Bitdefender' OR g.name = 'BullGuard' OR g.name = 'AVG' OR g.name = 'Kaspersky')) AS tmp WHERE NOT EXISTS (SELECT pc.id_np FROM tnetwork_profile p, tnetwork_profile_component pc WHERE p.id_np = pc.id_np AND p.name = @template_name);
+INSERT INTO tnetwork_profile_component (id_nc, id_np) SELECT * FROM (SELECT c.id_nc id_nc, p.id_np id_np FROM tnetwork_profile p, tnetwork_component c, tnetwork_component_group g WHERE g.id_sg = c.id_group AND p.name = @template_name AND (g.name = 'Norton' OR g.name = 'Panda' OR g.name = 'McAfee' OR g.name = 'Bitdefender' OR g.name = 'BullGuard' OR g.name = 'AVG' OR g.name = 'Kaspersky')) AS tmp WHERE NOT EXISTS (SELECT pc.id_np FROM tnetwork_profile p, tnetwork_profile_component pc WHERE p.id_np = pc.id_np AND p.name = @template_name);
+
+
+-- Update widget.
+
+UPDATE twidget SET description='Show a visual console' WHERE class_name='MapsMadeByUser';
+UPDATE twidget SET description='Clock' WHERE class_name='ClockWidget';
+UPDATE twidget SET description='Group status' WHERE class_name='SystemGroupStatusWidget';
+
+
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@ -20,7 +20,7 @@
 /**
 * Pandora build version and version
 */
-$build_version = 'PC200408';
+$build_version = 'PC200414';
 $pandora_version = 'v7.0NG.744';

 // Do not overwrite default timezone set if defined.
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@ -2439,7 +2439,13 @@ function graphic_agentaccess(
    if ($return === true) {
        return vbar_graph($data_array, $options, 1);
    } else {
-        echo vbar_graph($data_array, $options, 1);
+        $options['generals']['pdf']['width'] = 350;
+        $options['generals']['pdf']['height'] = 125;
+
+        $imgbase64 = '<img src="data:image/jpg;base64,';
+        $imgbase64 .= vbar_graph($data_array, $options, 2);
+        $imgbase64 .= '" />';
+        return $imgbase64;
    }
 }

--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@ -123,11 +123,11 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals
    $row['data'] = $module_group;
    $table->data['module_group'] = $row;

-    // Description
+    // Description.
    $row = [];
    $row['title'] = __('Description');
    $row['data'] = ui_print_truncate_text(
-        $module['descripcion'];,
+        $module['descripcion'],
        'description',
        true,
        true,
@ -761,21 +761,25 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
        }
    }

-    // End of table advanced
+    // End of table advanced.
    $table_advanced = html_print_table($table, true);
    $table_advanced .= '<br>';

    ui_toggle($table_advanced, __('Advanced information'));

    if ($config['agentaccess']) {
-        $access_graph = '<div style="width:100%; height:130px;">';
+        $access_graph = '<div style="width:100%; height:130px; text-align:center;">';
        $access_graph .= graphic_agentaccess(
            $id_agente,
            SECONDS_1DAY,
-            true
+            false
        );
        $access_graph .= '</div>';
-        ui_toggle($access_graph, __('Agent access rate (24h)'));
+
+        ui_toggle(
+            $access_graph,
+            __('Agent access rate (24h)')
+        );
    }

    $events_graph = '<div style="width: 100%; height: 90px; display: flex; flex-direction: row; justify-content: center;">';
--- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
@ -416,7 +416,12 @@ class EventsListWidget extends Widget
        $filter['limit'] = $this->values['limit'];
        $filter['order'] = '`utimestamp` DESC';

-        if ((int) $this->values['severity'] !== -1) {
+        if ((int) $this->values['severity'] === 20) {
+            $filter['criticity'] = [
+                EVENT_CRIT_WARNING,
+                EVENT_CRIT_CRITICAL,
+            ];
+        } else if ((int) $this->values['severity'] !== -1) {
            $filter['criticity'] = $this->values['severity'];
        }

--- a/pandora_console/include/lib/Dashboard/Widgets/graph_module_histogram.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/graph_module_histogram.php
@ -309,12 +309,6 @@ class GraphModuleHistogramWidget extends Widget
        $size = parent::getSize();

        // Desactive scroll bars only this item.
-        $output .= '<style type="text/css">
-        .grid-stack-item .grid-stack-item-content .content-widget {
-            overflow-x: hidden;
-            overflow-y: hidden;
-          }
-        </style>';
        $id_agent = $this->values['agentId'];
        $id_module = $this->values['moduleId'];
        $period = $this->values['period'];
--- a/pandora_console/include/lib/Dashboard/Widgets/maps_made_by_user.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/maps_made_by_user.php
@ -206,9 +206,9 @@ class MapsMadeByUser extends Widget

        $fields = \visual_map_get_user_layouts($config['id_user'], true);

-        // Event Type.
+        // Visual console.
        $inputs[] = [
-            'label'     => __('Event type'),
+            'label'     => __('Visual console'),
            'arguments' => [
                'type'     => 'select',
                'fields'   => $fields,
--- a/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
@ -439,7 +439,7 @@ class SystemGroupStatusWidget extends Widget
            }
        }

-        $height = (count($result_groups) * 30);
+        $height = (count($table->data) * 30);
        $style = 'min-width:200px; min-height:'.$height.'px;';
        $output = '<div class="container-center" style="'.$style.'">';
        if ($flag_groups === true) {
--- a/pandora_console/include/styles/dashboards.css
+++ b/pandora_console/include/styles/dashboards.css
@ -339,10 +339,8 @@ table.widget_maps_status tr td:first-child {
 table.widget_maps_status tr td a {
  font-family: "lato-lighter", "Open Sans", sans-serif;
  letter-spacing: 0.03pt;
-  font-size: 11pt;
+  font-size: 9pt;
  text-decoration: none;
-  color: #3f3f3f;
-  font-weight: bolder;
 }

 table.widget_maps_status tr td img {
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@ -129,7 +129,7 @@
        <div style='height: 10px'>
            <?php
            $version = '7.0NG.744';
-            $build = '200408';
+            $build = '200414';
            $banner = "v$version Build $build";

            error_reporting(0);
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.744
-%define release     200408
+%define release     200414

 # User and Group under which Apache is running
 %define httpd_name  httpd
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.744
-%define release     200408
+%define release     200414

 # User and Group under which Apache is running
 %define httpd_name  httpd
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.744
-%define release     200408
+%define release     200414
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.744-200408
+Version: 7.0NG.744-200414
 Architecture: all
 Priority: optional
 Section: admin
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/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.744-200408"
+pandora_version="7.0NG.744-200414"

 package_cpan=0
 package_pandora=1
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/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.744";
-my $pandora_build = "200408";
+my $pandora_build = "200414";
 our $VERSION = $pandora_version." ".$pandora_build;

 # Setup hash
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@ -33,7 +33,7 @@ our @ISA = qw(Exporter);

 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.744";
-my $pandora_build = "200408";
+my $pandora_build = "200414";
 our $VERSION = $pandora_version." ".$pandora_build;

 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.744
-%define release     200408
+%define release     200414

 Summary:            Pandora FMS Server
 Name:               %{name}
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.744
-%define release     200408
+%define release     200414

 Summary:            Pandora FMS Server
 Name:               %{name}
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@ -9,7 +9,7 @@
 # **********************************************************************

 PI_VERSION="7.0NG.744"
-PI_BUILD="200408"
+PI_BUILD="200414"

 MODE=$1
 if [ $# -gt 1 ]; then
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;

 # version: define current version
-my $version = "7.0NG.744 PS200408";
+my $version = "7.0NG.744 PS200414";

 # Pandora server configuration
 my %conf;
--- a/pandora_server/util/pandora_manage.pl
+++ b/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.744 PS200408";
+my $version = "7.0NG.744 PS200414";

 # save program name for logging
 my $progname = basename($0);