Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado

2022-06-14 07:57:18 +02:00 · 2022-06-14 07:57:18 +02:00 · 3b3e964cf9
parent 90013603a7 c7b8c55284
commit 3b3e964cf9
30 changed files with 98035 additions and 77440 deletions
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.762-220613
+Version: 7.0NG.762-220614
 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.762-220613"
+pandora_version="7.0NG.762-220614"

 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
@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;

 use constant AGENT_VERSION => '7.0NG.762';
-use constant AGENT_BUILD => '220613';
+use constant AGENT_BUILD => '220614';

 # 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.762
-%define release     220613
+%define release     220614

 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.762
-%define release     220613
+%define release     220614

 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.762"
-PI_BUILD="220613"
+PI_BUILD="220614"
 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
-{220613}
+{220614}

 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.762 Build 220613")
+#define PANDORA_VERSION ("7.0NG.762 Build 220614")

 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.762(Build 220613))"
+      VALUE "ProductVersion", "(7.0NG.762(Build 220614))"
      VALUE "FileVersion", "1.0.0.0"
    END
  END
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.762-220613
+Version: 7.0NG.762-220614
 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.762-220613"
+pandora_version="7.0NG.762-220614"

 package_pear=0
 package_pandora=1
--- 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 = 'PC220613';
+$build_version = 'PC220614';
 $pandora_version = 'v7.0NG.762';

 // Do not overwrite default timezone set if defined.
--- a/pandora_console/include/languages/es.mo
+++ b/pandora_console/include/languages/es.mo
--- a/pandora_console/include/languages/es.po
+++ b/pandora_console/include/languages/es.po
--- a/pandora_console/include/languages/index.pot
+++ b/pandora_console/include/languages/index.pot
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@ -33,7 +33,6 @@ form.flex-row ul {
  display: flex;
  flex-direction: row;
  align-items: center;
-  flex-wrap: wrap;
  align-content: center;
  justify-content: space-between;
  flex: 1;
@ -316,3 +315,31 @@ div.multi-response-buttons {
 .event_detail_tab_menu li {
  max-width: 160px;
 }
+
+.select_tags {
+  width: 200px;
+}
+
+@media screen and (max-width: 1400px) {
+  .select_tags {
+    width: 165px;
+  }
+}
+
+@media screen and (max-width: 1250px) {
+  .select_tags {
+    width: 125px;
+  }
+}
+
+@media screen and (max-width: 1100px) {
+  .select_tags {
+    width: 100px;
+  }
+
+  form.flex-row div.filter_input.large {
+    flex: 1;
+    min-width: 600px;
+    max-width: 100%;
+  }
+}
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@ -129,7 +129,7 @@
        <div style='height: 10px'>
            <?php
            $version = '7.0NG.762';
-            $build = '220613';
+            $build = '220614';
            $banner = "v$version Build $build";

            error_reporting(0);
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@ -644,9 +644,8 @@ $data[0] = html_print_select(
    true,
    true,
    true,
-    '',
-    false,
-    'width: 200px;'
+    'select_tags',
+    false
 );

 $data[1] = html_print_image(
@ -687,9 +686,8 @@ $data[2] = html_print_select(
    true,
    true,
    true,
-    '',
-    false,
-    'width: 200px;'
+    'select_tags',
+    false
 );

 $tabletags_with->data[] = $data;
@ -721,9 +719,8 @@ $data[0] = html_print_select(
    true,
    true,
    true,
-    '',
-    false,
-    'width: 200px;'
+    'select_tags',
+    false
 );
 $data[1] = html_print_image(
    'images/darrowright.png',
@ -760,9 +757,8 @@ $data[2] = html_print_select(
    true,
    true,
    true,
-    '',
-    false,
-    'width: 200px;'
+    'select_tags',
+    false
 );
 $tabletags_without->data[] = $data;
 $tabletags_without->rowclass[] = '';
@ -1189,7 +1185,10 @@ $data = html_print_select(
    true,
    true,
    '',
-    false
+    false,
+    false,
+    false,
+    3
 );
 $in = '<div class="filter_input"><label>'.__('Severity').'</label>';
 $in .= $data.'</div>';
--- 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.762
-%define release     220613
+%define release     220614

 # 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.762
-%define release     220613
+%define release     220614

 # 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.762
-%define release     220613
+%define release     220614
 %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.762-220613
+Version: 7.0NG.762-220614
 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.762-220613"
+pandora_version="7.0NG.762-220614"

 package_cpan=0
 package_pandora=1
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@ -46,7 +46,7 @@ our @EXPORT = qw(

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

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

 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.762";
-my $pandora_build = "220613";
+my $pandora_build = "220614";
 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.762
-%define release     220613
+%define release     220614

 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.762
-%define release     220613
+%define release     220614

 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.762"
-PI_BUILD="220613"
+PI_BUILD="220614"

 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.762 Build 220613";
+my $version = "7.0NG.762 Build 220614";

 # 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.762 Build 220613";
+my $version = "7.0NG.762 Build 220614";

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