From 2fd37b531ed3c605a82c7e1f19a4288961334c35 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Mon, 27 May 2019 17:37:57 +0200 Subject: [PATCH 1/3] Visual changes in module graph - #4104 --- pandora_console/include/styles/pandora.css | 13 +++++++------ .../operation/agentes/estado_generalagente.php | 2 +- .../agentes/interface_traffic_graph_win.php | 4 ++-- pandora_console/operation/agentes/stat_win.php | 16 ++++++++-------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 86a461485e..751b557225 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -3640,14 +3640,15 @@ table.events_show_more_table tr:nth-child(odd) td { background-color: #ffffff; } table.events_show_more_table tr:nth-child(even) td { - background-color: #f5f5f5; - border-top: 1px solid #cacaca; - border-bottom: 1px solid #cacaca; + background-color: #f9f9f9; + border-top: 1px solid #e0e0e0; + border-bottom: 1px solid #e0e0e0; } table.events_show_more_table tr td { - height: 22px; - padding: 4px; + height: 33px; + max-height: 33px; + min-height: 33px; } table.events_show_more_table tr td:first-child { @@ -5828,7 +5829,7 @@ a#qr_code_agent_view { .module_graph_menu_content, .module_graph_menu_header { - width: 92%; + width: 95%; border: 1px solid #e2e2e2; margin: 0 auto; box-sizing: border-box; diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 30705e7267..78b850b241 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -499,7 +499,7 @@ if (!empty($network_interfaces)) { $params_json = json_encode($params); $params_encoded = base64_encode($params_json); $win_handle = dechex(crc32($interface['status_module_id'].$interface_name)); - $graph_link = "".html_print_image('images/chart_curve.png', true, ['title' => __('Interface traffic')]).''; + $graph_link = "".html_print_image('images/chart_curve.png', true, ['title' => __('Interface traffic')]).''; } else { $graph_link = ''; } diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php index e00ed0d254..ea75e4e1b9 100644 --- a/pandora_console/operation/agentes/interface_traffic_graph_win.php +++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php @@ -214,7 +214,7 @@ if ($date > $now) { $data = []; $data[0] = __('Show percentil'); - $data[1] = html_print_checkbox('show_percentil', 1, (bool) $show_percentil, true); + $data[1] = html_print_checkbox_switch('show_percentil', 1, (bool) $show_percentil, true); $table->data[] = $data; $table->rowclass[] = ''; @@ -225,7 +225,7 @@ if ($date > $now) { 'images/tip.png', true ); - $data[1] = html_print_checkbox('fullscale', 1, (bool) $fullscale, true); + $data[1] = html_print_checkbox_switch('fullscale', 1, (bool) $fullscale, true); $table->data[] = $data; $table->rowclass[] = ''; diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index ef4a448360..3384dc6a20 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -304,7 +304,7 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent); } } - $data[1] = html_print_checkbox( + $data[1] = html_print_checkbox_switch( 'draw_events', 1, (bool) $draw_events, @@ -323,14 +323,14 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent); $data = []; $data[0] = __('Show alerts'); - $data[1] = html_print_checkbox('draw_alerts', 1, (bool) $draw_alerts, true); + $data[1] = html_print_checkbox_switch('draw_alerts', 1, (bool) $draw_alerts, true); $table->data[] = $data; $table->rowclass[] = ''; /* $data = array(); $data[0] = __('Show event graph'); - $data[1] = html_print_checkbox ("show_events_graph", 1, (bool) $show_events_graph, true); + $data[1] = html_print_checkbox_switch ("show_events_graph", 1, (bool) $show_events_graph, true); $table->data[] = $data; $table->rowclass[] = ''; */ @@ -340,25 +340,25 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent); case 'sparse': $data = []; $data[0] = __('Show percentil'); - $data[1] = html_print_checkbox('show_percentil', 1, (bool) $show_percentil, true); + $data[1] = html_print_checkbox_switch('show_percentil', 1, (bool) $show_percentil, true); $table->data[] = $data; $table->rowclass[] = ''; $data = []; $data[0] = __('Time compare (Overlapped)'); - $data[1] = html_print_checkbox('time_compare_overlapped', 1, (bool) $time_compare_overlapped, true); + $data[1] = html_print_checkbox_switch('time_compare_overlapped', 1, (bool) $time_compare_overlapped, true); $table->data[] = $data; $table->rowclass[] = ''; $data = []; $data[0] = __('Time compare (Separated)'); - $data[1] = html_print_checkbox('time_compare_separated', 1, (bool) $time_compare_separated, true); + $data[1] = html_print_checkbox_switch('time_compare_separated', 1, (bool) $time_compare_separated, true); $table->data[] = $data; $table->rowclass[] = ''; $data = []; $data[0] = __('Show unknown graph'); - $data[1] = html_print_checkbox('unknown_graph', 1, (bool) $unknown_graph, true); + $data[1] = html_print_checkbox_switch('unknown_graph', 1, (bool) $unknown_graph, true); $table->data[] = $data; $table->rowclass[] = ''; break; @@ -366,7 +366,7 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent); $data = []; $data[0] = __('Show full scale graph (TIP)'); - $data[1] = html_print_checkbox( + $data[1] = html_print_checkbox_switch( 'fullscale', 1, (bool) $fullscale, From 58d0dc5dbc8bf545cf7f9d7988187952b0a004a5 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Mon, 27 May 2019 18:31:20 +0200 Subject: [PATCH 2/3] fix minor bug in reporting functions --- pandora_console/include/functions_reporting.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index aa29bec33e..b0303ee8a3 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -5518,7 +5518,6 @@ function reporting_advanced_sla( } else if ($agentmodule_info['id_tipo_modulo'] == '100') { $max_value = 0.9; $min_value = 0; - $inverse_interval = 1; } } } From 11e5a4ce18e58e4cece9989388467015bb951d74 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 28 May 2019 00:01:07 +0200 Subject: [PATCH 3/3] Auto-updated build strings. --- 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 | 2 +- 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.rhel7.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index bf5df0c125..851f8fa7bf 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.735-190527 +Version: 7.0NG.735-190528 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 08bb79494c..2a1b599629 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.735-190527" +pandora_version="7.0NG.735-190528" 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 c134985c2a..268072a564 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.735'; -use constant AGENT_BUILD => '190527'; +use constant AGENT_BUILD => '190528'; # 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 006f14dec5..df4c6faeb9 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.735 -%define release 190527 +%define release 190528 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 9570f76a61..61868bc875 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.735 -%define release 190527 +%define release 190528 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 09dee41bfc..fd75bc82bb 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.735" -PI_BUILD="190527" +PI_BUILD="190528" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 8ed0a773a6..0c4a323881 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190527} +{190528} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 83f46ffda7..a07bee3f53 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.735(Build 190527)") +#define PANDORA_VERSION ("7.0NG.735(Build 190528)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index f7c288faef..951dbc54ed 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.735(Build 190527))" + VALUE "ProductVersion", "(7.0NG.735(Build 190528))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index f0c00292aa..77518ff5f8 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.735-190527 +Version: 7.0NG.735-190528 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 aef18cc75d..8ffdca36b7 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.735-190527" +pandora_version="7.0NG.735-190528" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index e0180374e9..12cbc65c39 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 = 'PC190527'; +$build_version = 'PC190528'; $pandora_version = 'v7.0NG.735'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 43c941b797..fc64097149 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 a75f57b68e..3d4b53d8c4 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.735 -%define release 190527 +%define release 190528 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 9b4eea12e0..fc1b149483 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.735 -%define release 190527 +%define release 190528 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index f04c4c0b18..127621a67d 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.735" -PI_BUILD="190527" +PI_BUILD="190528" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 368d559c82..87dc0d43fe 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.735 PS190527"; +my $version = "7.0NG.735 PS190528"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index a574d3fa54..f3d4a7e7e0 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.735 PS190527"; +my $version = "7.0NG.735 PS190528"; # save program name for logging my $progname = basename($0);