From 6ebbe544487b0fd57ac87bf89ef63586488693e7 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 27 Mar 2019 17:06:14 +0100 Subject: [PATCH 1/5] minor fix Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97 --- pandora_console/extras/mr/26.sql | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pandora_console/extras/mr/26.sql b/pandora_console/extras/mr/26.sql index 2f5dafed2f..d48f722f60 100644 --- a/pandora_console/extras/mr/26.sql +++ b/pandora_console/extras/mr/26.sql @@ -1,10 +1,5 @@ START TRANSACTION; -ALTER TABLE `treport_content` ADD COLUMN `show_extended_events` tinyint(1) default '0'; - --- ---------------------------------------------------------------------- --- Add column in table `tagent_custom_fields` --- ---------------------------------------------------------------------- ALTER TABLE tagent_custom_fields ADD COLUMN `combo_values` VARCHAR(255) DEFAULT ''; ALTER TABLE `treport_content` ADD COLUMN `show_extended_events` tinyint(1) default '0'; From 144cf1177dfa89f6d69c4973370b0f344e7e1d54 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 27 Mar 2019 17:12:38 +0100 Subject: [PATCH 2/5] fix tasklist map Former-commit-id: 4f1195c265f4298b7303597be43b3399fa32f4e3 --- pandora_console/include/ajax/task_list.ajax.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pandora_console/include/ajax/task_list.ajax.php b/pandora_console/include/ajax/task_list.ajax.php index 33dc3e6b5f..4f69ecaed0 100644 --- a/pandora_console/include/ajax/task_list.ajax.php +++ b/pandora_console/include/ajax/task_list.ajax.php @@ -167,6 +167,7 @@ if ($showmap) { [ 'id_task' => $id_task, 'pure' => 1, + 'widget' => true, ] ); $map->printMap(); From 128a97d254c27a19b83834e206e686555ae82ff1 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 27 Mar 2019 17:38:08 +0100 Subject: [PATCH 3/5] fix mr 26 Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef --- pandora_console/extras/mr/26.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/extras/mr/26.sql b/pandora_console/extras/mr/26.sql index aefaae76ae..591edd6499 100644 --- a/pandora_console/extras/mr/26.sql +++ b/pandora_console/extras/mr/26.sql @@ -12,11 +12,12 @@ CREATE TABLE IF NOT EXISTS `tnetwork_matrix` ( ) ENGINE = InnoDB DEFAULT CHARSET=utf8 ; ALTER TABLE `treport_content` ADD COLUMN `show_extended_events` tinyint(1) default '0'; + UPDATE `treport_content` SET type="netflow_summary" WHERE type="netflow_pie" OR type="netflow_statistics"; UPDATE `tnetflow_filter` SET aggregate="dstip" WHERE aggregate NOT IN ("dstip", "srcip", "dstport", "srcport"); -ALTER TABLE `treport_content` ADD COLUMN `show_extended_events` tinyint(1) default '0'; +ALTER TABLE tagent_custom_fields ADD COLUMN `combo_values` VARCHAR(255) DEFAULT ''; ALTER TABLE `trecon_task` ADD COLUMN `summary` text; From 086ee0620ec603e0f579ed859b91e5263ffafe97 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 27 Mar 2019 18:31:02 +0100 Subject: [PATCH 4/5] minor fix Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2 --- pandora_console/include/class/NetworkMap.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php index fb019bfa6f..17133d4d65 100644 --- a/pandora_console/include/class/NetworkMap.class.php +++ b/pandora_console/include/class/NetworkMap.class.php @@ -217,7 +217,7 @@ class NetworkMap * * @var boolean */ - public $isWidget; + public $fullSize; /** * Defines a custom method to parse Graphviz output and generate Graph. @@ -389,8 +389,9 @@ class NetworkMap // Initialize as widget? if (isset($options['widget'])) { - $this->isWidget = (bool) $options['widget']; - $this->isWidget = true; + $this->fullSize = (bool) $options['widget']; + } else { + $this->fullSize = true; } // Use a custom parser. @@ -3347,7 +3348,7 @@ class NetworkMap // Open networkconsole_id div. $output .= '
isWidget) { + if ($this->fullSize) { $output .= ' style="width: 100%; height: 100%;position: relative; overflow: hidden; background: #FAFAFA">'; } else { $output .= ' style="width: '.$this->mapOptions['width'].'px; height: '.$this->mapOptions['height'].'px;position: relative; overflow: hidden; background: #FAFAFA">'; From 98a9c62de983bcdb6918550e92b1ff9a3951b1cd Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 28 Mar 2019 00:01:30 +0100 Subject: [PATCH 5/5] Auto-updated build strings. Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088 --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 4 ++-- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 00bba31f75..305342f0d7 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.733 +Version: 7.0NG.733-190328 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 53591139bf..8b8ec904c5 100644 --- 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.733" +pandora_version="7.0NG.733-190328" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 6818cc90b7..093bc078f5 100755 --- a/pandora_agents/unix/pandora_agent +++ b/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 => '190327'; +use constant AGENT_BUILD => '190328'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 0cf4bc8449..d2597d9f3e 100644 --- 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.733 -%define release 1 +%define release 190328 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 171b9b5669..fe756636b4 100644 --- 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.733 -%define release 1 +%define release 190328 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 991399fb08..0e0229707f 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.733" -PI_BUILD="190327" +PI_BUILD="190328" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 449c6e9ec4..410edf850f 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190327} +{190328} ViewReadme {Yes} @@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives {No} Windows,Executable -{<%AppName%>-Setup<%Ext%>} +{<%AppName%>-<%Version%>-Setup<%Ext%>} Windows,FileDescription {<%AppName%> <%Version%> Setup} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 8e6b33dddd..4eca7665c2 100644 --- 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.733(Build 190327)") +#define PANDORA_VERSION ("7.0NG.733(Build 190328)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 17a14d6942..0e13be6bb3 100644 --- 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.733(Build 190327))" + VALUE "ProductVersion", "(7.0NG.733(Build 190328))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index d7d20f2bd6..1fd042be78 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.733 +Version: 7.0NG.733-190328 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index f23b9b5aa5..c4e5d98fa3 100644 --- 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.733" +pandora_version="7.0NG.733-190328" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 8bdf4572da..a1b9b6e302 100644 --- 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 = 'PC190327'; +$build_version = 'PC190328'; $pandora_version = 'v7.0NG.733'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 9ce9c8fc8f..6e6bbb4d77 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index a99d2963a4..63d1381dc3 100644 --- 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.733 -%define release 1 +%define release 190328 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index ae7863c306..04f8fad7d4 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.733 -%define release 1 +%define release 190328 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 151f0da31c..7624727189 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.733" -PI_BUILD="190327" +PI_BUILD="190328" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index c08dd06bab..7e968333d2 100644 --- a/pandora_server/util/pandora_db.pl +++ b/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 PS190327"; +my $version = "7.0NG.733 PS190328"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 5a2154aed2..76adf73359 100644 --- 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.733 PS190327"; +my $version = "7.0NG.733 PS190328"; # save program name for logging my $progname = basename($0);