From d934c013db03821d4beb076c66e3930f10e5376f Mon Sep 17 00:00:00 2001 From: enriquecd Date: Tue, 24 Jan 2017 12:04:21 +0100 Subject: [PATCH 01/38] Escape quotes in str_warning and str_critical fields in agent editor / 6 - #26 --- .../godmode/agentes/module_manager_editor_common.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 0e3f4f78e5..8d10826a8f 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -251,7 +251,7 @@ if (!modules_is_string_type($id_module_type) || $edit) { } if (modules_is_string_type($id_module_type) || $edit) { $table_simple->data[2][1] .= ''.__('Str.').''; - $table_simple->data[2][1] .= html_print_input_text ('str_warning', $str_warning, + $table_simple->data[2][1] .= html_print_input_text ('str_warning', str_replace("\"","",$str_warning), '', 10, 255, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy).''; } @@ -270,7 +270,7 @@ if (!modules_is_string_type($id_module_type) || $edit) { } if (modules_is_string_type($id_module_type) || $edit) { $table_simple->data[2][3] .= ''.__('Str.').''; - $table_simple->data[2][3] .= html_print_input_text ('str_critical', $str_critical, + $table_simple->data[2][3] .= html_print_input_text ('str_critical', str_replace("\"","",$str_critical), '', 10, 255, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy).''; } From 4a0de807faa43a7d6248f8b29cf2f3775c2ea14a Mon Sep 17 00:00:00 2001 From: Enrique Camargo Date: Tue, 24 Jan 2017 15:07:39 +0100 Subject: [PATCH 02/38] Merge branch '28-modificar-etiqueta-de-boton-forzar-integria-4341' into 'develop' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolve "Modificar etiqueta de botón forzar [INTEGRIA: #4341]" See merge request !77 --- pandora_console/operation/agentes/estado_generalagente.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index f1c0284637..3f65c3ac26 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -617,7 +617,7 @@ $table->rowspan[1][0] = 0; $data[0][2] = '
'; $data[0][2] .= '' . html_print_image("images/refresh.png", true, array("border" => '0', "title" => __('Refresh data'), "alt" => "")) . '
'; if (check_acl ($config["id_user"], $agent["id_grupo"], "AW")) - $data[0][2] .= '' . html_print_image("images/target.png", true, array("border" => '0', "title" => __('Force'), "alt" => "")) . ''; + $data[0][2] .= '' . html_print_image("images/target.png", true, array("border" => '0', "title" => __('Force remote checks'), "alt" => "")) . ''; $data[0][2] .= '
'; $table->data = $data; From 0d87ac071fe1fc9aedcae38b83a25170ff3dbb89 Mon Sep 17 00:00:00 2001 From: Enrique Camargo Date: Thu, 26 Jan 2017 12:12:25 +0100 Subject: [PATCH 03/38] Merge branch '30-anadir-transicion-al-hover-de-los-botones-laterales-de-menu-y-de-la-ventana-de-alerta' into 'develop' Add transition to hover change color in alert windows and left menu bar buttons - #30 See merge request !82 --- pandora_console/include/styles/pandora.css | 155 ++++++++++++++++++ .../include/styles/pandora_black.css | 148 +++++++++++++++++ 2 files changed, 303 insertions(+) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 20b01d9091..f63097873e 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -1928,6 +1928,18 @@ div.warn { } .submenu_not_selected { + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; + -o-transition-timing-function: ease-out; font-weight: normal !important; } @@ -2277,16 +2289,79 @@ ul.operation li a:hover { #font-weight: bold; } +.menu_icon{ + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; + -o-transition-timing-function: ease-out; +} + .menu_icon:hover{ + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; + -o-transition-timing-function: ease-out; background-color: #585858 !important; } .submenu_not_selected:hover{ + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; + -o-transition-timing-function: ease-out; background-color: #585858 !important; } .submenu_selected:hover{ background-color: #585858 !important; } +.sub_subMenu{ + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; +} .sub_subMenu:hover{ + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; background-color: #585858 !important; } @@ -3516,6 +3591,13 @@ div.simple_value > a > span.text p margin-right:10px; margin-top:10px; } +.modalclosex:hover{ + cursor:pointer; + display:inline; + float:right; + margin-right:10px; + margin-top:10px; +} .modalcontent{ color:black; background:white; @@ -3537,6 +3619,13 @@ div.simple_value > a > span.text p margin-left:30px; } .modalokbutton{ + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; cursor:pointer; text-align:center; margin-right:45px; @@ -3547,16 +3636,82 @@ div.simple_value > a > span.text p border-radius: 3px;width:90px;height:30px;background-color:white;border: 1px solid #82b92e; } .modalokbuttontext{ + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px; } + +.modalokbutton:hover { + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + background-color:#82b92e; +} + +.modalokbutton:hover .modalokbuttontext { + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + color:white; +} + .modalgobutton{ + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; cursor:pointer;text-align:center;margin-right:15px;margin-bottom:30px;float:right;-moz-border-radius: 3px; -webkit-border-radius: 3px;border-radius: 3px;width:240px;height:30px;background-color:white;border: 1px solid #82b92e; } .modalgobuttontext{ + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px; } +.modalgobutton:hover { + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + background-color:#82b92e; +} + +.modalgobutton:hover .modalgobuttontext { + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + color:white; +} + #opacidad{ opacity:0.5; diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 508cb17f85..681f676fbf 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1906,6 +1906,18 @@ div.warn { } .submenu_not_selected { + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; + -o-transition-timing-function: ease-out; font-weight: normal !important; } @@ -2254,16 +2266,81 @@ ul.operation li a:hover { #font-weight: bold; } +.menu_icon{ + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; + -o-transition-timing-function: ease-out; +} + .menu_icon:hover{ + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; + -o-transition-timing-function: ease-out; background-color: #585858 !important; } .submenu_not_selected:hover{ + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; + -o-transition-timing-function: ease-out; background-color: #585858 !important; } + .submenu_selected:hover{ background-color: #585858 !important; } + +.sub_subMenu{ + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; +} .sub_subMenu:hover{ + transition-property: background-color; + transition-duration: 0.5s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-out; + -moz-transition-property: background-color; + -moz-transition-duration: 0.5s; + -moz-transition-timing-function: ease-out; + -o-transition-property: background-color; + -o-transition-duration: 0.5s; background-color: #585858 !important; } @@ -3171,6 +3248,13 @@ table#policy_modules td * { } .modalokbutton{ + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; cursor:pointer; text-align:center; margin-right:45px; @@ -3181,16 +3265,80 @@ table#policy_modules td * { border-radius: 3px;width:90px;height:30px;background-color:white;border: 1px solid #82b92e; } .modalokbuttontext{ + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px; } + +.modalokbutton:hover { + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + background-color:#82b92e; +} + +.modalokbutton:hover .modalokbuttontext { + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + color:white; +} .modalgobutton{ + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; cursor:pointer;text-align:center;margin-right:15px;margin-bottom:30px;float:right;-moz-border-radius: 3px; -webkit-border-radius: 3px;border-radius: 3px;width:240px;height:30px;background-color:white;border: 1px solid #82b92e; } .modalgobuttontext{ + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px; } +.modalgobutton:hover { + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + background-color:#82b92e; +} + +.modalgobutton:hover .modalgobuttontext { + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + color:white; +} #opacidad{ opacity:0.5; From 5bd8a00b079ca433147173399e10fb8c2371bd83 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Tue, 31 Jan 2017 09:35:29 +0100 Subject: [PATCH 04/38] Fixed a typo error. GitHub #78 --- pandora_agents/unix/plugins/pandora_mem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_agents/unix/plugins/pandora_mem b/pandora_agents/unix/plugins/pandora_mem index e207f032d3..998438d5b6 100755 --- a/pandora_agents/unix/plugins/pandora_mem +++ b/pandora_agents/unix/plugins/pandora_mem @@ -33,7 +33,7 @@ my $freemem=`cat /proc/meminfo | grep 'MemFree' | awk '{ print \$2 } '`; my $cached=`cat /proc/meminfo | grep '^Cached:' | awk '{ print \$2 } '`; my $cachedswap=`cat /proc/meminfo | grep '^SwapCached:' | awk '{ print \$2 }'`; my $total_meminfo=`cat /proc/meminfo | grep 'MemTotal:' | awk '{ print \$2 }'`; -my $available=$freemem+$cached+$cachedwap; +my $available=$freemem+$cached+$cachedswap; my $available_percent = floor(($available / $total_meminfo)*100); From 518dfb93b87342947a451498cc7f7d89414c27ed Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 31 Jan 2017 16:19:06 +0100 Subject: [PATCH 05/38] Merge branch '209-optimizar-widget-general-and-quick-group-status-report-integria-4401-open' into 'develop' fixed errors in widgets groups status See merge request !94 --- .../include/functions_reporting.php | 196 ++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 86856658b1..d6619be857 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -6653,6 +6653,202 @@ function reporting_get_group_stats ($id_group = 0, $access = 'AR') { return ($data); } +/** + * Get general statistical info on a group + * + * @param int Group Id to get info from. 0 = all + * + * @return array Group statistics + */ +function reporting_get_group_stats_resume ($id_group = 0, $access = 'AR') { + global $config; + + $data = array (); + $data["monitor_checks"] = 0; + $data["monitor_not_init"] = 0; + $data["monitor_unknown"] = 0; + $data["monitor_ok"] = 0; + $data["monitor_bad"] = 0; // Critical + Unknown + Warning + $data["monitor_warning"] = 0; + $data["monitor_critical"] = 0; + $data["monitor_not_normal"] = 0; + $data["monitor_alerts"] = 0; + $data["monitor_alerts_fired"] = 0; + $data["monitor_alerts_fire_count"] = 0; + $data["total_agents"] = 0; + $data["total_alerts"] = 0; + $data["total_checks"] = 0; + $data["alerts"] = 0; + $data["agents_unknown"] = 0; + $data["monitor_health"] = 100; + $data["alert_level"] = 100; + $data["module_sanity"] = 100; + $data["server_sanity"] = 100; + $data["total_not_init"] = 0; + $data["monitor_non_init"] = 0; + $data["agent_ok"] = 0; + $data["agent_warning"] = 0; + $data["agent_critical"] = 0; + $data["agent_unknown"] = 0; + $data["agent_not_init"] = 0; + + $cur_time = get_system_time (); + + //Check for access credentials using check_acl. More overhead, much safer + if (!check_acl ($config["id_user"], $id_group, $access)) { + return $data; + } + + if ($id_group == 0) { + $id_group = array_keys( + users_get_groups($config['id_user'], $access, false)); + } + + // ----------------------------------------------------------------- + // Server processed stats. NOT realtime (taken from tgroup_stat) + // ----------------------------------------------------------------- + if ($config["realtimestats"] == 0) { + + if (!is_array($id_group)) { + $my_group = $id_group; + $id_group = array(); + $id_group[0] = $my_group; + } + + foreach ($id_group as $group) { + $group_stat = db_get_all_rows_sql ("SELECT * + FROM tgroup_stat, tgrupo + WHERE tgrupo.id_grupo = tgroup_stat.id_group + AND tgroup_stat.id_group = $group + ORDER BY nombre"); + + $data["monitor_checks"] += $group_stat[0]["modules"]; + $data["agent_not_init"] += $group_stat[0]["non-init"]; + $data["agent_unknown"] += $group_stat[0]["unknown"]; + $data["agent_ok"] += $group_stat[0]["normal"]; + $data["agent_warning"] += $group_stat[0]["warning"]; + $data["agent_critical"] += $group_stat[0]["critical"]; + $data["monitor_alerts"] += $group_stat[0]["alerts"]; + $data["monitor_alerts_fired"] += $group_stat[0]["alerts_fired"]; + $data["monitor_alerts_fire_count"] += $group_stat[0]["alerts_fired"]; + $data["total_checks"] += $group_stat[0]["modules"]; + $data["total_alerts"] += $group_stat[0]["alerts"]; + $data["total_agents"] += $group_stat[0]["agents"]; + $data["agents_unknown"] += $group_stat[0]["agents_unknown"]; + $data["utimestamp"] = $group_stat[0]["utimestamp"]; + + // This fields are not in database + $data["monitor_ok"] += (int) groups_get_normal_monitors($group); + $data["monitor_warning"] += (int) groups_get_warning_monitors($group); + $data["monitor_critical"] += (int) groups_get_critical_monitors($group); + $data["monitor_unknown"] += (int) groups_get_unknown_monitors($group); + $data["monitor_not_init"] += (int) groups_get_not_init_monitors($group); + } + + // ------------------------------------------------------------------- + // Realtime stats, done by PHP Console + // ------------------------------------------------------------------- + } + else { + + if (!empty($id_group)) { + + $sql = "SELECT tg.id_grupo as id, tg.nombre as name, + SUM(ta.normal_count) as monitor_ok, + SUM(ta.warning_count) as monitor_warning, + SUM(ta.critical_count) as monitor_critical, + SUM(ta.unknown_count) as monitor_unknown, + SUM(ta.notinit_count) as monitor_not_init, + count(ta.nombre) as total_agents + FROM tagente ta, tgrupo tg + WHERE tg.id_grupo = ta.id_grupo + AND ta.id_grupo = ". $id_group ." + GROUP BY ta.id_grupo;"; + + $data_array = db_get_all_rows_sql($sql); + $data = $data_array[0]; + + // Get total count of monitors for this group, except disabled. + $data["monitor_checks"] = $data["monitor_not_init"] + $data["monitor_unknown"] + $data["monitor_warning"] + $data["monitor_critical"] + $data["monitor_ok"]; + + // Calculate not_normal monitors + $data["monitor_not_normal"] += $data["monitor_checks"] - $data["monitor_ok"]; + } + + // Get total count of monitors for this group, except disabled. + + $data["monitor_checks"] = $data["monitor_not_init"] + $data["monitor_unknown"] + $data["monitor_warning"] + $data["monitor_critical"] + $data["monitor_ok"]; + + } + + if ($data["monitor_unknown"] > 0 && $data["monitor_checks"] > 0) { + $data["monitor_health"] = format_numeric (100 - ($data["monitor_not_normal"] / ($data["monitor_checks"] / 100)), 1); + } + else { + $data["monitor_health"] = 100; + } + + if ($data["monitor_not_init"] > 0 && $data["monitor_checks"] > 0) { + $data["module_sanity"] = format_numeric (100 - ($data["monitor_not_init"] / ($data["monitor_checks"] / 100)), 1); + } + else { + $data["module_sanity"] = 100; + } + + if (isset($data["alerts"])) { + if ($data["monitor_alerts_fired"] > 0 && $data["alerts"] > 0) { + $data["alert_level"] = format_numeric (100 - ($data ["monitor_alerts_fired"] / ($data["alerts"] / 100)), 1); + } + else { + $data["alert_level"] = 100; + } + } + else { + $data["alert_level"] = 100; + $data["alerts"] = 0; + } + + $data["monitor_bad"] = $data["monitor_critical"] + $data["monitor_warning"]; + + if ($data["monitor_bad"] > 0 && $data["monitor_checks"] > 0) { + $data["global_health"] = format_numeric (100 - ($data["monitor_bad"] / ($data["monitor_checks"] / 100)), 1); + } + else { + $data["global_health"] = 100; + } + + $data["server_sanity"] = format_numeric (100 - $data["module_sanity"], 1); + + + $data['alert_fired'] = 0; + if ($data["monitor_alerts_fired"] > 0) { + $data['alert_fired'] = 1; + } + + + if ($data["monitor_critical"] > 0) { + $data['status'] = 'critical'; + } + elseif ($data["monitor_warning"] > 0) { + $data['status'] = 'warning'; + } + elseif (($data["monitor_unknown"] > 0) || ($data["agents_unknown"] > 0)) { + $data['status'] = 'unknown'; + } + elseif ($data["monitor_ok"] > 0) { + $data['status'] = 'ok'; + } + elseif ($data["agent_not_init"] > 0) { + $data['status'] = 'not_init'; + } + else { + $data['status'] = 'none'; + } + + return ($data); +} + + function reporting_get_stats_indicators($data, $width = 280, $height = 20, $html = true) { $table_ind = html_get_predefined_table(); From e867b332103c4861359858be658101d612f6c5ea Mon Sep 17 00:00:00 2001 From: Enrique Camargo Date: Tue, 31 Jan 2017 19:16:26 +0100 Subject: [PATCH 06/38] Merge branch '35-configurar-portada-de-informes-integria-4325' into 'develop' Show/hide front page custom report display or not in setup visual on click - #35 See merge request !98 --- .../godmode/setup/setup_visuals.php | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index f8ead5f576..7ec74f548d 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -745,23 +745,23 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/'); \ No newline at end of file diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 20b01d9091..489225db0b 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -2817,43 +2817,6 @@ td.empty_field { width: 96%; } -/* Shortcut bar */ - -#shortcut_container { - position: fixed; - margin: 0px !important; - bottom: 0px; - left: 0px; - z-index: 9001; -} - -#shortcut_bar { - background-color: #333; - border-top: 1px solid #808080; - border-right: 1px solid #808080; - border-top-right-radius: 5px; -} - -#shortcut_button { - display: inline-block; - background-color: #333; - border: 1px solid #808080; - border-bottom: none; - border-top-left-radius: 15px; - border-top-right-radius: 15px; -} - -.shortcut_item { - padding: 2px 10px; - text-decoration: none; -} - -.shortcut_item>span { - color: #eee; - font-weight: bold; - font-size: 9pt; -} - /* Policies styles */ table#policy_modules td * { diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 508cb17f85..4e5de500fc 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -2765,43 +2765,6 @@ td.empty_field { width: 96%; } -/* Shortcut bar */ - -#shortcut_container { - position: fixed; - margin: 0px !important; - bottom: 0px; - left: 0px; - z-index: 9001; -} - -#shortcut_bar { - background-color: #333; - border-top: 1px solid #808080; - border-right: 1px solid #808080; - border-top-right-radius: 5px; -} - -#shortcut_button { - display: inline-block; - background-color: #333; - border: 1px solid #808080; - border-bottom: none; - border-top-left-radius: 15px; - border-top-right-radius: 15px; -} - -.shortcut_item { - padding: 2px 10px; - text-decoration: none; -} - -.shortcut_item>span { - color: #eee; - font-weight: bold; - font-size: 9pt; -} - /* Policies styles */ table#policy_modules td * { diff --git a/pandora_console/include/styles/pandora_green_old.css b/pandora_console/include/styles/pandora_green_old.css index 6a627aba4d..2614737cbd 100644 --- a/pandora_console/include/styles/pandora_green_old.css +++ b/pandora_console/include/styles/pandora_green_old.css @@ -2846,43 +2846,6 @@ td.empty_field { width: 96%; } -/* Shortcut bar */ - -#shortcut_container { - position: fixed; - margin: 0px !important; - bottom: 0px; - left: 0px; - z-index: 9001; -} - -#shortcut_bar { - background-color: #333; - border-top: 1px solid #808080; - border-right: 1px solid #808080; - border-top-right-radius: 5px; -} - -#shortcut_button { - display: inline-block; - background-color: #333; - border: 1px solid #808080; - border-bottom: none; - border-top-left-radius: 15px; - border-top-right-radius: 15px; -} - -.shortcut_item { - padding: 2px 10px; - text-decoration: none; -} - -.shortcut_item>span { - color: #eee; - font-weight: bold; - font-size: 9pt; -} - /* Policies styles */ table#policy_modules td * { diff --git a/pandora_console/index.php b/pandora_console/index.php index 500b47d170..9acbafdde3 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -830,9 +830,6 @@ else { require("general/logon_ok.php"); } } - if ($config["pure"] == 0) { - require("general/shortcut_bar.php"); - } } if ($config["pure"] == 0) { diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index 1a36590935..2d206719a7 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -53,30 +53,6 @@ else { $view_mode = true; } -if (is_ajax ()) { - - $shortcut_update = get_parameter("shortcut_update", 0); - - // Update of user to show/don't show shortcut bar - if ($shortcut_update) { - - // First we get the actual state - $shortcut_value = db_get_value_filter('shortcut', 'tusuario', array('id_user' => $id)); - - //Deactivate shorcut var - if ($shortcut_value == 1) { - db_process_sql_update('tusuario', array('shortcut' => 0), array('id_user' => $id)); - } - // Activate shortcut var - else { - db_process_sql_update('tusuario', array('shortcut' => 1), array('id_user' => $id)); - } - - } - - return; -} - // Header if ($meta) { user_meta_print_header(); @@ -109,7 +85,6 @@ if (isset ($_GET["modified"]) && !$view_mode) { } $upd_info["flash_chart"] = get_parameter ("flash_charts", $config["flash_charts"]); - $upd_info["shortcut"] = get_parameter ("shortcut_bar", 0); $upd_info["section"] = get_parameter ("section", $user_info["section"]); $upd_info["data_section"] = get_parameter ("data_section", ''); $dashboard = get_parameter('dashboard', ''); @@ -295,10 +270,7 @@ $id_usr = $config['id_user']; if (!$meta) { $data = array(); - $data[0] = ''.__('Shortcut bar') . ui_print_help_tip(__('This will activate a shortcut bar with alerts, events, messages... information'), true).''; - $data[0] .= $jump . ''.html_print_checkbox('shortcut_bar', 1, $user_info["shortcut"], true).''; - - $data[1] = ''.__('Home screen'). ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true).''; + $data[0] = ''.__('Home screen'). ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true).''; $values = array ( 'Default' =>__('Default'), 'Visual console'=>__('Visual console'), @@ -311,7 +283,7 @@ if (!$meta) { $values['Dashboard'] = __('Dashboard'); } - $data[1] .= $jump . ''.html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false).''; + $data[0] .= $jump . ''.html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false).''; if (enterprise_installed()) { $dashboards = get_user_dashboards ($config['id_user']); @@ -324,7 +296,7 @@ if (!$meta) { $dashboards_aux[$dashboard['name']] = $dashboard['name']; } } - $data[1] .= html_print_select ($dashboards_aux, 'dashboard', $user_info["data_section"], '', '', '', true); + $data[0] .= html_print_select ($dashboards_aux, 'dashboard', $user_info["data_section"], '', '', '', true); } $layouts = visual_map_get_user_layouts ($config['id_user'], true); @@ -337,17 +309,17 @@ if (!$meta) { $layouts_aux[$layout] = $layout; } } - $data[1] .= html_print_select ($layouts_aux, 'visual_console', $user_info["data_section"], '', '', '', true); - $data[1] .= html_print_input_text ('data_section', $user_info["data_section"], '', 60, 255, true, false); + $data[0] .= html_print_select ($layouts_aux, 'visual_console', $user_info["data_section"], '', '', '', true); + $data[0] .= html_print_input_text ('data_section', $user_info["data_section"], '', 60, 255, true, false); // User only can change skins if has more than one group - $data[2] = ''; + $data[1] = ''; if (function_exists('skins_print_select')) { if (count($usr_groups) > 1) { - $data[2] = ''.__('Skin').''; - $data[2] .= $jump . skins_print_select($id_usr,'skin', $user_info['id_skin'], '', __('None'), 0, true); + $data[1] = ''.__('Skin').''; + $data[1] .= $jump . skins_print_select($id_usr,'skin', $user_info['id_skin'], '', __('None'), 0, true); } } $table->rowclass[] = ''; From c9bcce9c698c63d0c56fe467a9aa458d0b6bc5cf Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 4 Feb 2017 00:01:37 +0100 Subject: [PATCH 10/38] 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.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.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, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 32e7cc8d29..76f894b042 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0SP5-170203 +Version: 6.0SP5-170204 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 38f82a64d1..4e80263454 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="6.0SP5-170203" +pandora_version="6.0SP5-170204" 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 97e4b00bbf..778e721f0b 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0SP5'; -use constant AGENT_BUILD => '170203'; +use constant AGENT_BUILD => '170204'; # 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 56edde1390..d29bb85ebc 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 6.0SP5 -%define release 170203 +%define release 170204 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 b8e1846dce..80fd5057a6 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 6.0SP5 -%define release 170203 +%define release 170204 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 1432ebfb11..e08621fbd1 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.0SP5" -PI_BUILD="170203" +PI_BUILD="170204" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index d04bae42c5..23f09530ca 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170203} +{170204} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 8995922916..b3f987a929 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 ("6.0SP5(Build 170203)") +#define PANDORA_VERSION ("6.0SP5(Build 170204)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 7cb83b5c85..90461afd97 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", "(6.0SP5(Build 170203))" + VALUE "ProductVersion", "(6.0SP5(Build 170204))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index a1eac0c7e8..1c5d40178b 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0SP5-170203 +Version: 6.0SP5-170204 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 f49d035db9..b0b6388f6b 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="6.0SP5-170203" +pandora_version="6.0SP5-170204" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 84ff8f3b13..4a70d4a88c 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC170203'; +$build_version = 'PC170204'; $pandora_version = 'v6.0SP5'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index b1aedfa256..8550bfa507 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Sun, 5 Feb 2017 00:01:31 +0100 Subject: [PATCH 11/38] 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.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.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, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 76f894b042..17a0dd6f08 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0SP5-170204 +Version: 6.0SP5-170205 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 4e80263454..2ca8c4bd8e 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="6.0SP5-170204" +pandora_version="6.0SP5-170205" 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 778e721f0b..0feb2af60e 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0SP5'; -use constant AGENT_BUILD => '170204'; +use constant AGENT_BUILD => '170205'; # 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 d29bb85ebc..2c289d3409 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 6.0SP5 -%define release 170204 +%define release 170205 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 80fd5057a6..8d07cb2c9a 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 6.0SP5 -%define release 170204 +%define release 170205 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 e08621fbd1..f8b1b07813 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.0SP5" -PI_BUILD="170204" +PI_BUILD="170205" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 23f09530ca..53bad80379 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170204} +{170205} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index b3f987a929..21dc0b2c11 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 ("6.0SP5(Build 170204)") +#define PANDORA_VERSION ("6.0SP5(Build 170205)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 90461afd97..eea5973cf9 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", "(6.0SP5(Build 170204))" + VALUE "ProductVersion", "(6.0SP5(Build 170205))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 1c5d40178b..1a698e1c22 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0SP5-170204 +Version: 6.0SP5-170205 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 b0b6388f6b..2e4ff2fe00 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="6.0SP5-170204" +pandora_version="6.0SP5-170205" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 4a70d4a88c..a8c8aa1ee8 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC170204'; +$build_version = 'PC170205'; $pandora_version = 'v6.0SP5'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 8550bfa507..de93d8f4b7 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Mon, 6 Feb 2017 00:01:32 +0100 Subject: [PATCH 12/38] 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.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.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, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 17a0dd6f08..fafc4d645f 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0SP5-170205 +Version: 6.0SP5-170206 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 2ca8c4bd8e..df6924d318 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="6.0SP5-170205" +pandora_version="6.0SP5-170206" 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 0feb2af60e..70fc120635 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0SP5'; -use constant AGENT_BUILD => '170205'; +use constant AGENT_BUILD => '170206'; # 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 2c289d3409..aab53b1d41 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 6.0SP5 -%define release 170205 +%define release 170206 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 8d07cb2c9a..31b132f110 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 6.0SP5 -%define release 170205 +%define release 170206 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 f8b1b07813..dba683f5bc 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.0SP5" -PI_BUILD="170205" +PI_BUILD="170206" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 53bad80379..32494521e6 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170205} +{170206} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 21dc0b2c11..7922461dce 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 ("6.0SP5(Build 170205)") +#define PANDORA_VERSION ("6.0SP5(Build 170206)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index eea5973cf9..dfd763ffb3 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", "(6.0SP5(Build 170205))" + VALUE "ProductVersion", "(6.0SP5(Build 170206))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 1a698e1c22..9266fbb3b9 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0SP5-170205 +Version: 6.0SP5-170206 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 2e4ff2fe00..f7a278bffd 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="6.0SP5-170205" +pandora_version="6.0SP5-170206" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index a8c8aa1ee8..48533b4c66 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC170205'; +$build_version = 'PC170206'; $pandora_version = 'v6.0SP5'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index de93d8f4b7..3e026523e1 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Mon, 6 Feb 2017 11:58:30 +0100 Subject: [PATCH 13/38] Error Changing image for group item in visual console - #47 --- pandora_console/include/ajax/visual_console_builder.ajax.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index f6f000bc12..639cb4f3a5 100755 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -503,6 +503,9 @@ switch ($action) { break; case 'group_item': $values['id_group'] = $id_group; + $values['height'] = $height; + $values['width'] = $width; + $values['image'] = $image; break; case 'module_graph': if ($height_module_graph !== null) { From c6218ae393d0c83aaaa2e23f442257bede946df2 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 7 Feb 2017 00:01:30 +0100 Subject: [PATCH 14/38] 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.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.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, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index fafc4d645f..b1bc5a91f4 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0SP5-170206 +Version: 6.0SP5-170207 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 df6924d318..cbb602119c 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="6.0SP5-170206" +pandora_version="6.0SP5-170207" 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 70fc120635..a7df774e7e 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0SP5'; -use constant AGENT_BUILD => '170206'; +use constant AGENT_BUILD => '170207'; # 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 aab53b1d41..219faf0235 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 6.0SP5 -%define release 170206 +%define release 170207 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 31b132f110..2eab0adbb6 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 6.0SP5 -%define release 170206 +%define release 170207 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 dba683f5bc..870c83d645 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.0SP5" -PI_BUILD="170206" +PI_BUILD="170207" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 32494521e6..c3321b8d66 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170206} +{170207} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 7922461dce..bbf12767bc 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 ("6.0SP5(Build 170206)") +#define PANDORA_VERSION ("6.0SP5(Build 170207)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index dfd763ffb3..cdf2591b54 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", "(6.0SP5(Build 170206))" + VALUE "ProductVersion", "(6.0SP5(Build 170207))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 9266fbb3b9..348989c5d9 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0SP5-170206 +Version: 6.0SP5-170207 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 f7a278bffd..d4973c6444 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="6.0SP5-170206" +pandora_version="6.0SP5-170207" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 48533b4c66..28ecc99f57 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC170206'; +$build_version = 'PC170207'; $pandora_version = 'v6.0SP5'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 3e026523e1..7f2e41c846 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Tue, 7 Feb 2017 11:27:53 +0100 Subject: [PATCH 15/38] Add a basic .gitlab-ci.yml. (cherry picked from commit 0d28b1c3d71d275f47baa31cdf5b0ca4641c40a3) --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000..053434f53e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,3 @@ +test: + script: + - docker run --rm -h pandorafms -t -v "$CI_PROJECT_DIR:/tmp/pandorafms" pandorafms/pandorafms-base /tmp/pandorafms/tests/test.sh From edab97eac30a2bb75229add861e22e65438486f9 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 7 Feb 2017 12:11:54 +0100 Subject: [PATCH 16/38] Clone the repo from scratch for every GitLab CI job. (cherry picked from commit 559d7ca217c1b1bdee099ddfb592b70771c0c69c) --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 053434f53e..d9f41def67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +variables: + GIT_STRATEGY: clone + test: script: - docker run --rm -h pandorafms -t -v "$CI_PROJECT_DIR:/tmp/pandorafms" pandorafms/pandorafms-base /tmp/pandorafms/tests/test.sh From d8e10996f12e8dc3c91b68b73fff34c001c1d8cb Mon Sep 17 00:00:00 2001 From: Enrique Camargo Date: Tue, 7 Feb 2017 15:54:42 +0100 Subject: [PATCH 17/38] Merge branch '7-cambiar-color-de-grafica-de-acceso-integria-3271' into 'develop' Change water mark logo - #7 See merge request !129 --- .../images/logo_vertical_water.png | Bin 2654 -> 1280 bytes .../images/logo_vertical_water_2.png | Bin 0 -> 2654 bytes .../include/graphs/flot/pandora.flot.js | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 pandora_console/images/logo_vertical_water_2.png diff --git a/pandora_console/images/logo_vertical_water.png b/pandora_console/images/logo_vertical_water.png index 0de1e72b327e639eff887044cfe2f39cab0c6af4..5f00e736d4fd69ce459772cad3bbc9eecc28f887 100644 GIT binary patch literal 1280 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%0Dcp<=9F`B>sujin5O*t@ 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%0Dcp<=9F`B>sujin5O*t@ zb7Ct!m9=3lw=reK$siLcBw&aX;xY+!I>?M8b=MxvCk6RMlJlB+5<)vaoIB2SX7=ehEB`MGD0C53t{vd`rRLg3&7 zr9o|~w$QD()v3OT?YT;UN+7sHoSZ>OfCd#HVny=ZOmDxlV7bjmkpM#~!k8n7Tk+Z^ z3HMKq&b%NYlOcsGosT!%sh+YMCn=2E7lbF7jvz&9QG+C@c35qb2&9bQC5?^7$+1xp z^W Date: Wed, 8 Feb 2017 00:02:33 +0100 Subject: [PATCH 18/38] 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.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.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, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index b1bc5a91f4..ceee10815f 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0SP5-170207 +Version: 6.0SP5-170208 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 cbb602119c..6bc197e005 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="6.0SP5-170207" +pandora_version="6.0SP5-170208" 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 a7df774e7e..a58717ec25 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0SP5'; -use constant AGENT_BUILD => '170207'; +use constant AGENT_BUILD => '170208'; # 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 219faf0235..76334e245c 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 6.0SP5 -%define release 170207 +%define release 170208 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 2eab0adbb6..be32154ef6 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 6.0SP5 -%define release 170207 +%define release 170208 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 870c83d645..04ef0122c4 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.0SP5" -PI_BUILD="170207" +PI_BUILD="170208" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index c3321b8d66..da68d6a677 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170207} +{170208} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index bbf12767bc..e527bff4f7 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 ("6.0SP5(Build 170207)") +#define PANDORA_VERSION ("6.0SP5(Build 170208)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index cdf2591b54..de89c3801b 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", "(6.0SP5(Build 170207))" + VALUE "ProductVersion", "(6.0SP5(Build 170208))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 348989c5d9..616ecb7e63 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0SP5-170207 +Version: 6.0SP5-170208 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 d4973c6444..f412d518cc 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="6.0SP5-170207" +pandora_version="6.0SP5-170208" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 28ecc99f57..4e525c73e3 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC170207'; +$build_version = 'PC170208'; $pandora_version = 'v6.0SP5'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 7f2e41c846..bfe71a04b6 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Thu, 9 Feb 2017 00:01:32 +0100 Subject: [PATCH 19/38] 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.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.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, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index ceee10815f..1b2541bf0b 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0SP5-170208 +Version: 6.0SP5-170209 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 6bc197e005..f09c7bd085 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="6.0SP5-170208" +pandora_version="6.0SP5-170209" 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 a58717ec25..c015b4f0c1 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0SP5'; -use constant AGENT_BUILD => '170208'; +use constant AGENT_BUILD => '170209'; # 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 76334e245c..89381198de 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 6.0SP5 -%define release 170208 +%define release 170209 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 be32154ef6..828cc93306 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 6.0SP5 -%define release 170208 +%define release 170209 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 04ef0122c4..7988b00cf5 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.0SP5" -PI_BUILD="170208" +PI_BUILD="170209" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index da68d6a677..66e730df83 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170208} +{170209} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e527bff4f7..33523c9735 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 ("6.0SP5(Build 170208)") +#define PANDORA_VERSION ("6.0SP5(Build 170209)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index de89c3801b..b5290ebdbc 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", "(6.0SP5(Build 170208))" + VALUE "ProductVersion", "(6.0SP5(Build 170209))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 616ecb7e63..d4fd01fd6b 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0SP5-170208 +Version: 6.0SP5-170209 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 f412d518cc..1d84d6b87c 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="6.0SP5-170208" +pandora_version="6.0SP5-170209" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 4e525c73e3..a51c8122ad 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC170208'; +$build_version = 'PC170209'; $pandora_version = 'v6.0SP5'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index bfe71a04b6..e21013ba43 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Fri, 10 Feb 2017 00:01:30 +0100 Subject: [PATCH 20/38] 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.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.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, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 1b2541bf0b..70d0a46355 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0SP5-170209 +Version: 6.0SP5-170210 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 f09c7bd085..21435bd477 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="6.0SP5-170209" +pandora_version="6.0SP5-170210" 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 c015b4f0c1..7bf3c4f1c6 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0SP5'; -use constant AGENT_BUILD => '170209'; +use constant AGENT_BUILD => '170210'; # 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 89381198de..74ed40cdd0 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 6.0SP5 -%define release 170209 +%define release 170210 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 828cc93306..14d5b2e8d6 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 6.0SP5 -%define release 170209 +%define release 170210 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 7988b00cf5..7037e715b0 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.0SP5" -PI_BUILD="170209" +PI_BUILD="170210" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 66e730df83..a0a68c7bc8 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170209} +{170210} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 33523c9735..ed0e90b578 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 ("6.0SP5(Build 170209)") +#define PANDORA_VERSION ("6.0SP5(Build 170210)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index b5290ebdbc..c113071788 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", "(6.0SP5(Build 170209))" + VALUE "ProductVersion", "(6.0SP5(Build 170210))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index d4fd01fd6b..63a1f24855 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0SP5-170209 +Version: 6.0SP5-170210 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 1d84d6b87c..675dc7ebf3 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="6.0SP5-170209" +pandora_version="6.0SP5-170210" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index a51c8122ad..a31f079d16 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC170209'; +$build_version = 'PC170210'; $pandora_version = 'v6.0SP5'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index e21013ba43..08687eea39 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Fri, 10 Feb 2017 10:33:24 +0100 Subject: [PATCH 21/38] Merge branch '52-la-ventana-de-alertas-deberia-de-ser-arrastrable-y-con-zindex-3-cambiar-tambien-texto-para-desactivar-logo-en-graficas-en-setup-visual' into 'develop' Make alert messages window draggable, zindex 3, change disable logo in graph - #52 See merge request !143 --- pandora_console/godmode/setup/setup_visuals.php | 2 +- pandora_console/include/javascript/jquery.pandora.js | 3 +++ pandora_console/include/styles/pandora.css | 7 ++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index f8ead5f576..64dcd69bb3 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -193,7 +193,7 @@ $table_styles->data[$row][0] = __('Custom logo in login') . ui_print_help_icon(" $row++; -$table_styles->data[$row][0] = __('Disable Pandora FMS on graphs'); +$table_styles->data[$row][0] = __('Disable logo in graphs'); $table_styles->data[$row][1] = __('Yes') . ' ' . html_print_radio_button_extended ('fixed_graph', 1, '', $config["fixed_graph"], $open, '','',true) . '  '; diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js index e815122b35..eb0ec04217 100644 --- a/pandora_console/include/javascript/jquery.pandora.js +++ b/pandora_console/include/javascript/jquery.pandora.js @@ -213,6 +213,9 @@ $(document).ready (function () { $('#menu').css('top','80px'); } }); + +$("#alert_messages").draggable(); +$("#alert_messages").css({'left':+parseInt(screen.width/2)-parseInt($("#alert_messages").css('width'))/2+'px'}); }); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 489225db0b..3180cde37c 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -3449,13 +3449,10 @@ div.simple_value > a > span.text p -webkit-border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; - z-index:2; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); - -webkit-transform: translate(-50%, -50%); + z-index:3; position:fixed; width:650px; + top: 30%; background:white; } .modalheader{ From 33be446e1ff049367fa08eff3d823db58f97f2ef Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Fri, 10 Feb 2017 12:30:21 +0100 Subject: [PATCH 22/38] Fixed events query with like in tags field. Ticket #208 (cherry picked from commit 930304145031a3a74524500c0f55d1f0237ad41a) --- pandora_console/operation/events/events.build_query.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pandora_console/operation/events/events.build_query.php b/pandora_console/operation/events/events.build_query.php index 8bd79b7b3a..1d6cb59b73 100755 --- a/pandora_console/operation/events/events.build_query.php +++ b/pandora_console/operation/events/events.build_query.php @@ -192,7 +192,13 @@ if (!empty($tag_with)) { foreach ($tag_with as $id_tag) { if ($first) $first = false; else $sql_post .= " AND "; - $sql_post .= "tags LIKE '%" . tags_get_name($id_tag) . "%'"; + $sql_post .= "tags LIKE '" . tags_get_name($id_tag) . "'"; + $sql_post .= " OR "; + $sql_post .= "tags LIKE '" . tags_get_name($id_tag) . ",%'"; + $sql_post .= " OR "; + $sql_post .= "tags LIKE '%, " . tags_get_name($id_tag) . "'"; + $sql_post .= " OR "; + $sql_post .= "tags LIKE '%, " . tags_get_name($id_tag) . ",%'"; } $sql_post .= ' ) '; } From 8dafc0d1d668611d5831dcb15119934a1630650a Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Fri, 10 Feb 2017 13:23:43 +0100 Subject: [PATCH 23/38] Fixed netflow reports --- .../include/functions_reporting.php | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 04d73d49e7..1e14f722e8 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -299,44 +299,49 @@ function reporting_make_reporting_data($report = null, $id_report, $force_height_chart); break; case 'netflow_area': - $report['contents'][] = reporting_simple_baseline_graph( + $report['contents'][] = reporting_netflow( $report, $content, $type, $force_width_chart, - $force_height_chart); + $force_height_chart, + 'netflow_area'); break; case 'netflow_pie': - $report['contents'][] = reporting_netflow_pie( + $report['contents'][] = reporting_netflow( $report, $content, $type, $force_width_chart, - $force_height_chart); + $force_height_chart, + 'netflow_pie'); break; case 'netflow_data': - $report['contents'][] = reporting_netflow_data( + $report['contents'][] = reporting_netflow( $report, $content, $type, $force_width_chart, - $force_height_chart); + $force_height_chart, + 'netflow_data'); break; case 'netflow_statistics': - $report['contents'][] = reporting_netflow_statistics( + $report['contents'][] = reporting_netflow( $report, $content, $type, $force_width_chart, - $force_height_chart); + $force_height_chart, + 'netflow_statistics'); break; case 'netflow_summary': - $report['contents'][] = reporting_netflow_summary( + $report['contents'][] = reporting_netflow( $report, $content, $type, $force_width_chart, - $force_height_chart); + $force_height_chart, + 'netflow_summary'); break; case 'monitor_report': $report['contents'][] = reporting_monitor_report( From ea73a5dafb0854efcc81f28b1bd05aa6a037652a Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 11 Feb 2017 00:01:34 +0100 Subject: [PATCH 24/38] 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.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.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, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 70d0a46355..7ec37a9f7b 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0SP5-170210 +Version: 6.0SP5-170211 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 21435bd477..121f9d75f4 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="6.0SP5-170210" +pandora_version="6.0SP5-170211" 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 7bf3c4f1c6..8e3ee0ab98 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0SP5'; -use constant AGENT_BUILD => '170210'; +use constant AGENT_BUILD => '170211'; # 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 74ed40cdd0..e6cfa1005e 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 6.0SP5 -%define release 170210 +%define release 170211 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 14d5b2e8d6..38f9913680 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 6.0SP5 -%define release 170210 +%define release 170211 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 7037e715b0..d680d1809d 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.0SP5" -PI_BUILD="170210" +PI_BUILD="170211" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index a0a68c7bc8..32b38d0001 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170210} +{170211} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index ed0e90b578..063d8bdae0 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 ("6.0SP5(Build 170210)") +#define PANDORA_VERSION ("6.0SP5(Build 170211)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index c113071788..eafdc8af35 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", "(6.0SP5(Build 170210))" + VALUE "ProductVersion", "(6.0SP5(Build 170211))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 63a1f24855..bc3b0acb5b 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0SP5-170210 +Version: 6.0SP5-170211 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 675dc7ebf3..b7f3979866 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="6.0SP5-170210" +pandora_version="6.0SP5-170211" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index a31f079d16..ee1b718043 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC170210'; +$build_version = 'PC170211'; $pandora_version = 'v6.0SP5'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 08687eea39..299fbca0f8 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Sun, 12 Feb 2017 00:01:29 +0100 Subject: [PATCH 25/38] 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.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.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, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 7ec37a9f7b..0fe15ac16c 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0SP5-170211 +Version: 6.0SP5-170212 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 121f9d75f4..3369279e3b 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="6.0SP5-170211" +pandora_version="6.0SP5-170212" 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 8e3ee0ab98..f51f0c4be9 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0SP5'; -use constant AGENT_BUILD => '170211'; +use constant AGENT_BUILD => '170212'; # 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 e6cfa1005e..a877a92846 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 6.0SP5 -%define release 170211 +%define release 170212 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 38f9913680..bf56eaee49 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 6.0SP5 -%define release 170211 +%define release 170212 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 d680d1809d..282a438bab 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.0SP5" -PI_BUILD="170211" +PI_BUILD="170212" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 32b38d0001..dce370b260 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170211} +{170212} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 063d8bdae0..05e0b11f9e 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 ("6.0SP5(Build 170211)") +#define PANDORA_VERSION ("6.0SP5(Build 170212)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index eafdc8af35..ed6efd8ff0 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", "(6.0SP5(Build 170211))" + VALUE "ProductVersion", "(6.0SP5(Build 170212))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index bc3b0acb5b..668a2edf47 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0SP5-170211 +Version: 6.0SP5-170212 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 b7f3979866..c177a816c9 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="6.0SP5-170211" +pandora_version="6.0SP5-170212" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index ee1b718043..47fe191dd7 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC170211'; +$build_version = 'PC170212'; $pandora_version = 'v6.0SP5'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 299fbca0f8..aaab6000ab 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Mon, 13 Feb 2017 00:01:34 +0100 Subject: [PATCH 26/38] 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.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.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, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 0fe15ac16c..bdcf49cf97 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0SP5-170212 +Version: 6.0SP5-170213 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 3369279e3b..5f769804bc 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="6.0SP5-170212" +pandora_version="6.0SP5-170213" 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 f51f0c4be9..3c5252f74d 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0SP5'; -use constant AGENT_BUILD => '170212'; +use constant AGENT_BUILD => '170213'; # 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 a877a92846..c4643117e3 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 6.0SP5 -%define release 170212 +%define release 170213 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 bf56eaee49..04721ede3d 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 6.0SP5 -%define release 170212 +%define release 170213 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 282a438bab..1a79852149 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.0SP5" -PI_BUILD="170212" +PI_BUILD="170213" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index dce370b260..c0227c7f9a 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170212} +{170213} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 05e0b11f9e..81a472ee48 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 ("6.0SP5(Build 170212)") +#define PANDORA_VERSION ("6.0SP5(Build 170213)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index ed6efd8ff0..2e0bde7d6a 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", "(6.0SP5(Build 170212))" + VALUE "ProductVersion", "(6.0SP5(Build 170213))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 668a2edf47..160e156fb4 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0SP5-170212 +Version: 6.0SP5-170213 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 c177a816c9..c47e4d5d75 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="6.0SP5-170212" +pandora_version="6.0SP5-170213" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 47fe191dd7..c5c8b6907b 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC170212'; +$build_version = 'PC170213'; $pandora_version = 'v6.0SP5'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index aaab6000ab..e763cacad6 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Mon, 13 Feb 2017 16:06:17 +0100 Subject: [PATCH 27/38] Add changes of visual mobile version of pandora. Gitlab: #148 --- .../images/os_icons/so_big_icons/android.png | Bin 0 -> 1602 bytes .../images/os_icons/so_big_icons/embedded.png | Bin 0 -> 1151 bytes .../images/os_icons/so_big_icons/network.png | Bin 0 -> 2605 bytes .../os_icons/so_big_icons/satellite.png | Bin 0 -> 3099 bytes .../images/os_icons/so_big_icons/so_aix.png | Bin 0 -> 3938 bytes .../images/os_icons/so_big_icons/so_bsd.png | Bin 0 -> 2232 bytes .../images/os_icons/so_big_icons/so_cisco.png | Bin 0 -> 2041 bytes .../images/os_icons/so_big_icons/so_hpux.png | Bin 0 -> 2895 bytes .../images/os_icons/so_big_icons/so_linux.png | Bin 0 -> 7214 bytes .../images/os_icons/so_big_icons/so_mac.png | Bin 0 -> 2561 bytes .../os_icons/so_big_icons/so_mainframe.png | Bin 0 -> 900 bytes .../images/os_icons/so_big_icons/so_other.png | Bin 0 -> 3354 bytes .../os_icons/so_big_icons/so_router.png | Bin 0 -> 1642 bytes .../os_icons/so_big_icons/so_solaris.png | Bin 0 -> 2360 bytes .../os_icons/so_big_icons/so_switch.png | Bin 0 -> 2461 bytes .../os_icons/so_big_icons/so_vmware.png | Bin 0 -> 1574 bytes .../images/os_icons/so_big_icons/so_win.png | Bin 0 -> 1014 bytes pandora_console/include/functions_ui.php | 16 +- .../include/style/jquery.mobile-1.3.1.css | 64 +++++-- pandora_console/mobile/include/style/main.css | 156 +++++++++++++--- pandora_console/mobile/include/ui.class.php | 44 ++--- pandora_console/mobile/operation/agent.php | 176 +++++++++++------- pandora_console/mobile/operation/agents.php | 2 +- pandora_console/mobile/operation/events.php | 8 +- .../mobile/operation/module_graph.php | 27 ++- pandora_console/mobile/operation/modules.php | 115 ++++++++---- pandora_console/mobile/operation/tactical.php | 2 +- 27 files changed, 409 insertions(+), 201 deletions(-) create mode 100644 pandora_console/images/os_icons/so_big_icons/android.png create mode 100644 pandora_console/images/os_icons/so_big_icons/embedded.png create mode 100644 pandora_console/images/os_icons/so_big_icons/network.png create mode 100644 pandora_console/images/os_icons/so_big_icons/satellite.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_aix.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_bsd.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_cisco.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_hpux.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_linux.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_mac.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_mainframe.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_other.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_router.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_solaris.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_switch.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_vmware.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_win.png diff --git a/pandora_console/images/os_icons/so_big_icons/android.png b/pandora_console/images/os_icons/so_big_icons/android.png new file mode 100644 index 0000000000000000000000000000000000000000..73565a78baffa19b8ed8919e4e151660e40cb811 GIT binary patch literal 1602 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 Ra>4)r002ovPDHLkV1mS9{s;g7 literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/so_big_icons/network.png b/pandora_console/images/os_icons/so_big_icons/network.png new file mode 100644 index 0000000000000000000000000000000000000000..9b1aee5f717557282ec6104bbdec53111c3cbf38 GIT binary patch literal 2605 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 P00000NkvXXu0mjfrbo8x literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/so_big_icons/satellite.png b/pandora_console/images/os_icons/so_big_icons/satellite.png new file mode 100644 index 0000000000000000000000000000000000000000..8fba3d7ff0ad9fdba8b1dbc14a2f35f34011b9d3 GIT binary patch literal 3099 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 XUz}%dpng#w00000NkvXXu0mjfQEJG( literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/so_big_icons/so_hpux.png b/pandora_console/images/os_icons/so_big_icons/so_hpux.png new file mode 100644 index 0000000000000000000000000000000000000000..e9bab8b268329c94eeb6ce6416a2c94ad655aba8 GIT binary patch literal 2895 zcmV-V3$XNwP)W0~1wbqS<q8lmW<23dHLeoaqWZBjGDRhyefrG(ZI08Nu4)W85V z3)bTdQeY;>ZwY#8%F>2ra&V=I?0^7xj+}PY0Hcb)lDZOscs_=!F!_pDg46+ANg==o z{P_f5Dk3hW1p?J=z#k`wQWvu=fgCTGpb)GV$pYeYJa(U604Ihl?GJ>M0|d}0qH-xb z?WzK}9f&(sfvV&MTe1QZ&rRmUD>! z2G}gZ=9BYi8B-9c)kd5}crC$SR499KKXQ z^W}cxEkS6S59J%81r5xX=y}Hhza`j{V*(MqRYx3h6Nt?xu*L;u(4e+puyr~LakU@= zaEud>+K_mF+@fK^k)kLA$W11!5s$AMfbhkAQo2@5r1ilF6qY#jF%fW)AmPy!cw>%{ zvYr<9g0B(Q)*Tc8AOL%2c!VGfLt*e705{MLbQ9eGM{ojh0(1i0Ku2%`-9Scg1obLP z(ln$^Jx|Xb|DbogHc7v{{-5vc;x)sZlO6EBVM^X|H( zvzFHF^C+H>JLE$K?-H?lwD;O^d7`))hRn)Vod^hbZ5k>3vj+g@nm#V?5MYR}0kSwD z6|_64QiR;&r|t)glW`Etg@`7y9(`8T&WjuX46Z=a=P0#(2oy<55pK|feTW8S{z zWMBtvkri45E*xv33@=eHxCrTds90TFHiTQ`5cD3l$btiCa$%dx43!X^a3=mak!Pn! zyxLtm>FDG_gp7#1$b=#jOC((F6%nqvf893FiASW5xuT;4f*5+2{=)jG>wJSy@J06BFy&Icm6 z_NtZQHv)t*S-&{yDH!Wmx04m|Xa!8_UJ;kcU_ck*QgY5z zZb<`TA^hH}Cq>I+>zul5G!$hiSbhh#BkkP3XZ4d_H?~F@cWeh}PbbKGu=yy-lzEUl zu-;tktty+6_EByQJGT$DR1ip7Knsuw=?=NaF(RwVh>{FF+lGs+6(o`%Gx|JoBg$4> zs^(9%eBQcd);4pkLa?o9`kN}eReIP%jJJY7&~)z%fTR!l3}VZB%|$EDazl`#K%`cW zxi#1UL#sIR0a>dRUC3K5H!49A*c$3t5XeCh%tvP8Enau~}O+iUkW^dt? zJ&6Mn=1(XP#~>T=bYCaV7BRuj2cr7|(Ec8A4+iW>%C&Y*+Dl1E=!>DlXGom61vdz! zBy@SL^wtP&SAKGi6K7j_9dX}&89_;Omlp91%1}e&f40NC)?c!AIfkAju*qz8&|T!y zs6Rd3Uq!6ew^EdTB#f<5wE3k2(>~1w*&(JK$|nJxXW0&Y%*?Lj$I~>n1>KfhxRB)l zCQXd_?~O;$c;|0F;P=O@E|G#reyniv%-Z;7C+h8_m=LlEt15ue4AleBCA!Bd8YR3Sq<_@Y|49Iy}o!6>wSCOq$H+Px^!h@ugq^e6V$u6R{)>^anB|v-E zd!056#09V4LpOj40uux#NSL5ug5n8iCx8t?Cor7=GC{pTyg|tZeX7jsE7*4@-JNW| z=w3c0#E13M{lAmaPohML5+&-cpQZ1|+3=vLFje&JAh1D47uhbbEy=&5hYesOEX`yc z@1F+AFnv5gT)oT2m(N#!v5PbT7po~Y4X5&Nl;py^^TzkJ`0D>PI9JWW$08%@VOs=P!Axfr%7F{ zR_NIpQX@J7I_MA(#$Y|Sw6UNzNbIa#sl@fDS}2ZAzdesj&c%&I_&cZrBIA1E=Z4bHROM~V42=Ml@Dz6I2MhfNB2*jJRE|}zbpTkHgqjI`N;DQcbi}|eDamXu_%_!X| zA@z`7h%wwF#_$c;-7~`OegbUPK?w+MQEo*Y{|_zU))lF&jlt>=P|RRe%{%bF_W&4s zqF3ch4+2>VuiNQ37bi$n4!P9jjur2#0=bjXMGw^* zE{;9Sb27AKWzPY*_0TLpUlD*}4D(n3eu$lN*h@f~L9zkeW97CU2&oaD%t2{fjpwy% t2SxS&B!_>}F}_NtlqON4M2Qk<(jUa?_g&JBFTDT&002ovPDHLkV1m_XH@5%) literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/so_big_icons/so_linux.png b/pandora_console/images/os_icons/so_big_icons/so_linux.png new file mode 100644 index 0000000000000000000000000000000000000000..2a5f17525351de11468d5e5a1ba0aaf50b8aa5ae GIT binary patch literal 7214 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 literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/so_big_icons/so_mac.png b/pandora_console/images/os_icons/so_big_icons/so_mac.png new file mode 100644 index 0000000000000000000000000000000000000000..9dbbf22f6a096e46e3503fbf6762e52e67402b84 GIT binary patch literal 2561 zcmV+c3jXzpP)~#kvOlPs5UCQ=00A`U z6SD!a-eg268nC2YTq!OfD22g4Fd45pP#PyH6(Sd8Fbf)67Qrn571X#AAX!QM?bW>u zA|jFua`LLAXK`YK3tP6QN^nsFkYoucFHgPr8jK0W12SO2C%Ny~WrmNRzG2PMoLEX6 zTtSJ~5+^HN-0^dWf#~=_x1^DT(5t_2{>TCYLz{<#q6z~Dpix9pa4}J6fgmk?a2|-? zlU#NYTg;PEhLK%%fh;Jmno7O03sjdNHzi;|L(_<0V}|UAKR-E=Avvvvwx#gjpIB@fC)*dnZ#C zT+d&<$7s}{#}9gb0r@gJ-IcVm>-V3(3|sb`!P+5}AiEx=c%fSA;^*Z8`$SmVnc?P*^R!LEQdW@+8`jMsD+xD} zXjeTMdT7@iq9n&B4ytw+Kmd&*Dy5wSYMI42Kpxl+q#Qu($B&;<#SKgY;EDfGPZUzi z6F6gplr}N3;Mb>D43}o5kW^(8)5a#N4M8pdjg;KqK9Opk7?7kz4^L3+5m0*xSLX$m zoCtXWHc&>&APwDPgqnF`z%n~*)EzWTN$MyfIhma%F#_sQ!T>EiLARs@OH!cNpckNN zjL<7KXkL%tD~UkkKE(E$2FxSKePdjO05v^9R?>R(^flR*f%@Vg0GiPu1m3)PPP-WS z_WdV#1`#%k2m_Mhf()7}GT`1Yp;{gU)HMtd0rT)S!_mWA8FuYliJ_jDDJ-hhBcOqb zyANJ4+c?_>lYdD%Id%yio>Cw-T>+)f@VT!-e{y#cNbi)0K2;zhGd@|ZNQ

^S(&EP(3-bgJ6b{)KL8=TN0AoXONVc_*^940M zF%U_s07@%T+h9g4ohk<)wV&#lVsa#SbOqE8A$7qC7H|OAv2vt)jDRNRVM9bz@Wj9+ zt(z;Wz%*z+o>qV^(+V(vzNlbGc?34C(A~d|ruLBS5zw3nY<>h6_;BY0oQ-RQ1U5H9 zY4?|=F>+@^8%;Af-7`D2hkoel5m;=HyJl_Bcm$R|$XTaI4j_A^5wzlom}QBC0JY{9 zX%Zuk_s^kgvZ9$sUY>=_k3_~43~i6V02dd}@bCyd0o6SMYUzRiJtsnGq`wrsl89|M}%Y0>tgdW_(kW52d2pW)l9`$W&w4%!$2d4g6kLXt;7 zQ_=JS=v&dLnzWD?{@a>q(qv~ksE~m57C}Wgv8@A=JR&D83SYu;_|$bU&C1FQUiF|X zFF}^W&z(KQuyOqy@Cpb@nl~hQ1hk(Ugzr9l!Eot1WWyt9wF8I^<0AupJ}w4U7K9a? zNd0tN0Mue8rw>C`sRassSPXzRwcL5|0_y@z^o^{t*kT#jlyP+rr?|;aaq%lDCJ4s3 zMp}@;gDbSD3~5r2p!XtCJTlshAN2@r0eVq8W*yAV7O(6WT-&#qlk*784>>;uobcAmT|#(1V~tf?A6x(o+>L^#iYp7Z2jWLr)%z zcoGpm5X6fpiZ`JuLJ!7DJ=EGFG*~qnty&QbJ-Gi(W|`ehb-#CJcK&opXF|)eznz&k zGw;2TKT=XsQtS!=^u%iQ+t~9%Z7~ATr8FEu%_dP%wf%-AkZ@sOi`?uheNP3^FI!0X ztpYBlIn!5p6~-$T@3~E27zM@Z?>nr5D6)Ltwt)0sEO)hd%b3;JKkRuW4( zJ;QM7EP(_c&!0Uq)NS3q$5F}&A%Kiey*JdQm!}*9nYeSt(oH$_T&aEeXvxY656q~5 zaO)uehkN4rNd|Bp#|$BWAaafb4nVM?U`>f2?tmbmltcg$9X)=QE7O*_F{Gnok;MfK zb#`Qi(Yt%VQ+#P6k+OIlqb^oJkUb1e!j9J+rbY~*rDzpiW1Zj$%F@`wRhLEb)e(gm zcqW0gXdU#j2;S^4LmDLzld9zhhB6$^MHCl6kg}PcbC4Oi1QL;ECr1qBAhUKzAT~sT zN{R9U1L0z|xBjzgC{K)!Dqm}#T>USsQ-zWHLueqhbp<(%sHEpDLB!C;4oIqJqf3zQ z3<>vp`wqx1%MWcB7;^P@^ufuzn99Ng=$S?5QiCvV@UQ?GXbTy8Gp!|!$Hvpz?iI?q z>}oCldK8wK*MS^6i}&wd)yJ<^C-E^2hj=e`y&EM$1o?m*po~xs@)JPP>k+j|9lx9h)f_GnPXzP>Q>RHuNrkDu Xz7>_i$tf@F00000NkvXXu0mjfo@$c| literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/so_big_icons/so_mainframe.png b/pandora_console/images/os_icons/so_big_icons/so_mainframe.png new file mode 100644 index 0000000000000000000000000000000000000000..73ce9d6240eb863ec0c1d84b3249c0cb9b42be67 GIT binary patch literal 900 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 literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/so_big_icons/so_router.png b/pandora_console/images/os_icons/so_big_icons/so_router.png new file mode 100644 index 0000000000000000000000000000000000000000..441b2416f7ddac706af3138da5dcc74124291e3e GIT binary patch literal 1642 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 e5ClPd8vX%jfSDjvSgwlz0000l literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/so_big_icons/so_switch.png b/pandora_console/images/os_icons/so_big_icons/so_switch.png new file mode 100644 index 0000000000000000000000000000000000000000..73de4894d46c5cdb5933a4221d8def88ad2dab04 GIT binary patch literal 2461 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 Y1%pnS(oXXo%m4rY07*qoM6N<$f;&8_c>n+a literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/so_big_icons/so_win.png b/pandora_console/images/os_icons/so_big_icons/so_win.png new file mode 100644 index 0000000000000000000000000000000000000000..c46d4e8bac5421687037601f4501d377ef8accd5 GIT binary patch literal 1014 zcmV+i@F`YCEul$2i=-wmDV7|-Q6o~d`gI^td^B~9T7oZi zp|>z9t{FgEBMy{ULYGQw6p#b}0%#PCfJe&>1L3IINAt+2 zM@Bs|LOjBPr*t>~F4Yiy1A7Jv$2tbK84vN$0SfHcK_~1v-^Tc?TtmbZ8MGG2K;b?^Qal@6nLeRN3suA znQb6u@c|G(009ILKmf_gYwfFfeT*cn{#~aH?zjKaU*Q6j%_Fu(*Qd1UxA8T#>OgJz z*Z~0q5I_I{1d!u^*sT&*b2sX@y(kIfk*?G(13U$XTq~)nAgf?C?i^}`7M~+sc3H&_ zn-IIQ72f3V1IQa>oTxia*(J!~#D?HCC-G!|lp=(VthWH|+|O;oFcg4s4!$!2?UhSM zAft2>t{sC>7=;lSp|OHn2t>%_FV^o9K7~lp`|KCR&$b@`0Kgd77c!!a{WP2D@hOC5v|0zwD@A%uVsLO=)x6%x .ui-btn-icon-notext, .ui-header-fixed.ui-fixed-hidden > .ui-btn-icon-notext { top: 6px; } .ui-header-fixed > .ui-btn-icon-notext { top: 7px;} -.ui-header .ui-title, .ui-footer .ui-title { min-height: 1.1em; text-align: center; font-size: 16px; display: block; margin: .6em 30% .8em; padding: 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; outline: 0 !important; } -.ui-footer .ui-title { margin: .6em 15px .8em; } +.ui-header .ui-title, .ui-footer .ui-title { + min-height: 1.1em; + text-align: center; + font-size: 16px; + display: block; + margin: .6em 30% .8em; + padding: 0; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + outline: 0 !important; +} +.ui-footer .ui-title { + margin: .6em 15px .8em; +} + /* content area*/ -.ui-content { border-width: 0; overflow: visible; overflow-x: hidden; padding: 15px; } +.ui-content { + border-width: 0; + overflow: hidden; + overflow-x: hidden; + padding: 5px 5px 0px 5px; +} /* corner styling for dialogs and popups */ .ui-corner-all > .ui-header:first-child, .ui-corner-all > .ui-content:first-child, @@ -2128,7 +2147,7 @@ label.ui-submit { font-size: 16px; line-height: 1.4; font-weight: normal; margin .ui-field-contain .ui-btn.ui-submit { width: 78%; display: inline-block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; } .ui-hide-label .ui-btn.ui-submit { width: auto; display: block; } } -.ui-collapsible-inset { margin: .5em 0; } +.ui-collapsible-inset { margin: .5em 2px 1px; width:99%;} .ui-collapsible-heading { font-size: 16px; display: block; margin: 0 -15px; padding: 0; position: relative; } .ui-collapsible-inset .ui-collapsible-heading { margin: 0; } .ui-collapsible-heading .ui-btn { text-align: left; margin: 0; border-left-width: 0; border-right-width: 0; } @@ -2294,7 +2313,7 @@ label.ui-submit { font-size: 16px; line-height: 1.4; font-weight: normal; margin padding: 0; } .ui-dialog-contain > .ui-content { - padding: 15px; + padding: 5px 5px 0px 5px; } .ui-dialog-contain > .ui-footer { z-index: 10; @@ -3120,7 +3139,7 @@ div.ui-slider-switch.ui-mini { } } /* Breakpoint to show as a standard table at 560px (25em x 16px) or wider */ -@media ( min-width: 25em ) { +@media ( min-width: 34.99em ) { /* Fixes table rendering when switching between breakpoints in Safari <= 5. See https://github.com/jquery/jquery-mobile/issues/5380 */ .ui-table-reflow.ui-responsive { display: table-row-group; @@ -3143,7 +3162,7 @@ div.ui-slider-switch.ui-mini { } /* Hack to make IE9 and WP7.5 treat cells like block level elements, scoped to ui-responsive class */ /* Applied in a max-width media query up to the table layout breakpoint so we don't need to negate this*/ -@media ( max-width: 25em ) { +@media ( max-width: 34.98em ) { .ui-table-reflow.ui-responsive td, .ui-table-reflow.ui-responsive th { width: 100%; @@ -3153,6 +3172,15 @@ div.ui-slider-switch.ui-mini { float: left; clear: left; } + #list_agent_Modules.ui-table-reflow.ui-responsive td.cell_0 { + width: 52% !important; + } + #list_agent_Modules.ui-table-reflow.ui-responsive td.cell_1 { + width: 15% !important; + } + #list_agent_Modules.ui-table-reflow.ui-responsive td.cell_4 { + width: 33% !important; + } } /* panel */ .ui-panel { diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css index 0c123564a7..5af548f7d0 100755 --- a/pandora_console/mobile/include/style/main.css +++ b/pandora_console/mobile/include/style/main.css @@ -34,6 +34,10 @@ body { } +.agent_graphs, .events_bar { + padding-top: 10px; +} + #tactical1 *, #tactical2 * { font-weight: bold; } @@ -520,11 +524,32 @@ table.event_details td.cell_event_name { } .agent_details { - line-height: 35px; + padding: 10px 0px 10px 0px; +} +.agent_details > img { + vertical-align: middle; + width: 20px; +} +.agent_os{ + float: right; + position: absolute; + top: 0px; + right: 0px; + padding: 10px; } -.agent_details img { - float: left; +.agent_list_ips { + padding: 10px 0px 10px 0px; +} +.agent_list_ips > img { + vertical-align: middle; + width: 20px; +} +.agent_last_contact { + padding: 10px 0px 10px 0px; +} +.agent_description { + padding: 10px 0px 10px 0px; } .agent_name { @@ -544,8 +569,8 @@ table.event_details td.cell_event_name { } #list_agents td { - height: 35px; - padding-top: 20px; + height: 25px; + padding-top: 10px; } .agents_tiny_stats_tactical { @@ -554,7 +579,33 @@ table.event_details td.cell_event_name { width: 100%; } -@media screen and (max-width: 25em) { +@media screen and (max-width: 34.99em) { + #list_agents td { + height: 35px; + padding-top: 7px; + display: table-cell; + clear: none; + padding-left: 0px !important; + padding-right: 0px !important; + } + + #list_agents td.cell_0 { + width: 45%; + border-top: 0px none; + } + #list_agents td.cell_0>span.tiny>img { + width: 5px; + height: 30px; + margin-top: -6px; + margin-left: 0px; + } + #list_agents td.cell_5 { + width: 30%; + } + #list_agents td.cell_6 { + width: 25%; + } + #list_agents .cell_2 .ui-table-cell-label, #list_agents .cell_3 .ui-table-cell-label, #list_agents .cell_6 .ui-table-cell-label, @@ -572,7 +623,6 @@ table.event_details td.cell_event_name { #list_agents .cell_2, #list_agents .cell_3, - #list_agents .cell_6, #list_agents .cell_7 { display: inline !important; float: none !important; @@ -594,7 +644,7 @@ table.event_details td.cell_event_name { } #list_agents .show_collapside { - display: inline !important; + display: none !important; } #list_agents .cell_1, @@ -605,16 +655,24 @@ table.event_details td.cell_event_name { } #list_agents .cell_0 .ui-link { - font-size: 15px; + font-size: 12px; } #list_agents .cell_6 .show_collapside { - display: inline !important; + display: none !important; } .agents_tiny_stats * { font-size: 12px !important; } + + #list_agent_Modules td { + padding-top: 7px !important; + } + + .agents_tiny_stats { + float: right; + } } /* For mobiles */ @@ -738,7 +796,7 @@ table.event_details td.cell_event_name { /*END-----------Visual maps styles---------------------------------------*/ /*INIT-----------Modules styles---------------------------------------*/ -@media screen and (max-width: 25em) { +@media screen and (max-width: 34.99em) { #list_Modules .cell_1 .ui-table-cell-label, #list_Modules .cell_5 .ui-table-cell-label, #list_Modules .cell_6 .ui-table-cell-label { @@ -755,7 +813,17 @@ table.event_details td.cell_event_name { #list_Modules .cell_3 .ui-table-cell-label, #list_Modules .cell_4 .ui-table-cell-label, #list_Modules .cell_5 .ui-table-cell-label { - display: none; + display: none !important; + } + + #list_Modules td { + height: 35px; + padding-top: 7px; + display: table-cell; + clear: none; + float: none; + padding-left: 0px !important; + padding-right: 0px !important; } #list_Modules .show_collapside { @@ -766,18 +834,43 @@ table.event_details td.cell_event_name { white-space: nowrap; } + #list_Modules .cell_1, #list_Modules .cell_2, #list_Modules .cell_3 { display: none !important; } #list_Modules .cell_0 .show_collapside, - #list_Modules .cell_1 .show_collapside { + #list_Modules .cell_1 .show_collapside, + #list_Modules .cell_4 .show_collapside, + #list_Modules .cell_5 .show_collapside { display: none !important; } #list_Modules .cell_0 .ui-link { - font-size: 15px; + font-size: 12px; + } + + #list_Modules .cell_0{ + width: 50%; + border-top: 0px none; + } + #list_Modules .cell_4{ + width: 25%; + } + #list_Modules .cell_5{ + width: 25%; + } +} + #list_Modules td.cell_0>span.tiny>img { + width: 5px; + height: 30px; + margin-top: -5px; + margin-left: 0px; + float: left; + } + #list_Modules .module_name { + font-size: 12px !important; } } @@ -795,6 +888,10 @@ table.event_details td.cell_event_name { padding-top: 20px; } +#list_agent_Modules td.cell_0 > span.tiny { + display: none; +} + #list_Modules .cell_5 img { float: left; } @@ -809,7 +906,7 @@ table.event_details td.cell_event_name { line-height: 20px; } -@media screen and (max-width: 25em) { +@media screen and (max-width: 34.99em) { #list_agent_Modules .ui-table-cell-label, #list_agent_Modules .cell_2, #list_agent_Modules .cell_3 { @@ -877,7 +974,7 @@ li.ui-btn { float: left; } -@media screen and (max-width: 25em) { +@media screen and (max-width: 34.99em) { .ui-table th, .ui-table td { padding: 8px !important; padding-left: 3px; @@ -924,7 +1021,7 @@ li.ui-btn { height: 28px !important; } -@media screen and (max-width: 25em) +@media screen and (max-width: 35em) { .events .status_row { display: none; @@ -939,12 +1036,12 @@ li.ui-btn { min-width: 50%; } - .agents_tiny_stats, .agents_last_contact { + .agents_last_contact { float: right; } } -@media screen and (min-width: 25em) +@media screen and (min-width: 35em) { .events .cell_0 .event_link{ display: none; @@ -1028,7 +1125,7 @@ li.ui-btn { } .event_name { - font-size: 18px !important; + font-size: 15px !important; } .login_logo img { @@ -1050,7 +1147,7 @@ li.ui-btn { } .event_name { - font-size: 15px; + font-size: 12px; font-weight: bold; } @@ -1199,6 +1296,11 @@ span.nobold * { line-height: 1.1em; } +.events_timestamp > img { + vertical-align: middle; + margin-left: 10px; +} + .events_agent { float: left; } @@ -1258,3 +1360,15 @@ DIV.nodata_container { .ui-table-reflow.ui-responsive { display: table !important; } + +.widget_agent_module > th { + background-color: #373737; +} +#list_agent_Modules >tbody > tr > td { + clear: none; + vertical-align: middle; + padding: 0px; +} +#list_agent_Modules > tbody > tr > td.cell_0 { + border-top: 0px none; +} \ No newline at end of file diff --git a/pandora_console/mobile/include/ui.class.php b/pandora_console/mobile/include/ui.class.php index 23a41b049d..2ef68dc749 100755 --- a/pandora_console/mobile/include/ui.class.php +++ b/pandora_console/mobile/include/ui.class.php @@ -780,6 +780,7 @@ class Table { foreach ($data as $id => $row) { $table_row = array(); foreach ($row as $key => $value) { + if (!in_array($key, $this->head)) { $this->head[] = $key; } @@ -843,45 +844,40 @@ class Table { $html = ''; $html = "\n"; + "data-mode='reflow' class='" . $this->class_table . " ui-responsive table-stroke'>"; - $html .= "\n"; - $html .= "\n"; - //Empty head for white space between rows in the responsive vertical layout - $html .= "\n"; - foreach ($this->head as $head) { - $html .= "\n"; + if ($this->head) { + $html .= ""; + $html .= ""; + //Empty head for white space between rows in the responsive vertical layout + //~ $html .= ""; + foreach ($this->head as $head) { + $html .= ""; + } + $html .= ""; + $html .= ""; } - $html .= "\n"; - $html .= "\n"; - $html .= "\n"; + $html .= ""; foreach ($this->rows as $key => $row) { $class = ''; if (isset($this->rowClass[$key])) { $class = $this->rowClass[$key]; } - $html .= "\n"; + $html .= ""; //Empty head for white space between rows in the responsive vertical layout - if (isset($this->row_heads[$key])) { - $html .= "\n"; - } - elseif ($this->row_keys_as_head_row) { - $html .= "\n"; - } - else { - $html .= "\n"; - } + foreach ($row as $key_cell => $cell) { - $html .= "\n"; + $html .= ""; } - $html .= "\n"; + + $html .= ""; } - $html .= "\n"; - $html .= "
" . $head . "
" . $head . "
" . $this->row_heads[$key] . "" . $key . "" . $cell . "" . $cell . "
\n"; + $html .= ""; + $html .= ""; return $html; } diff --git a/pandora_console/mobile/operation/agent.php b/pandora_console/mobile/operation/agent.php index 2bb7877278..5a765eaedb 100644 --- a/pandora_console/mobile/operation/agent.php +++ b/pandora_console/mobile/operation/agent.php @@ -114,92 +114,123 @@ class Agent { $ui->showFooter(false); $ui->beginContent(); if (empty($this->agent)) { - $ui->contentAddHtml('' . __('No agent found') . ''); + $ui->contentAddHtml('' . + __('No agent found') . ''); } else { $ui->contentBeginGrid(); - if ($this->agent['disabled']) { - $agent_name = "" . $agent_name . "" . ui_print_help_tip(__('Disabled'), true); - } - else if ($this->agent['quiet']) { - $agent_name = "" . $agent_name . " " . html_print_image("images/dot_green.disabled.png", true, array("border" => '0', "title" => __('Quiet'), "alt" => "")) . ""; - } - else { - $agent_name = $agent_name; - } - - - if ($system->getConfig('metaconsole')) { - metaconsole_connect(null, $this->agent['id_tmetaconsole_setup']); - $addresses = agents_get_addresses($this->agent['id_tagente']); - } - else - $addresses = agents_get_addresses($this->id); - - if ($system->getConfig('metaconsole')) - metaconsole_restore_db(); - - $address = $this->agent['direccion']; - foreach ($addresses as $k => $add) { - if ($add == $address) { - unset($addresses[$k]); - } - } - $ip = html_print_image('images/world.png', true, array('title' => __('IP address'))) . '  '; - $ip .= empty($address) ? '' . __('N/A') . '' : $address; - if (!empty($addresses)) { - $ip .= ui_print_help_tip(__('Other IP addresses').':
'.implode('
',$addresses), true); - } - $ip .= '
'; - - $last_contact = '' . __('Last contact') . ': ' - .ui_print_timestamp ($this->agent["ultimo_contacto"], true) . '
'; - - $description = '' . __('Description') . ':
'; - if (empty($agent["comentarios"])) { - $description .= '' . __('N/A') . ''; - } - else { - $description .= $this->agent["comentarios"]; - } - - - $html = '

'; - $html .= ui_print_group_icon ($this->agent["id_grupo"], true, "groups_small", "", false) . '  '; - $html .= '' . $agent_name . '
'; - $html .= $ip; - $html .= $last_contact; - $html .= $description; - $html .= '
'; + if ($this->agent['disabled']) { + $agent_name = "" . $agent_name . "" . + ui_print_help_tip(__('Disabled'), true); + } + else if ($this->agent['quiet']) { + $agent_name = "" . $agent_name . " " . + html_print_image("images/dot_green.disabled.png", + true, array("border" => '0', "title" => __('Quiet'), "alt" => "")) . ""; + } + else { + $agent_name = $agent_name; + } + + if ($system->getConfig('metaconsole')) { metaconsole_connect(null, $this->agent['id_tmetaconsole_setup']); - } + //~ $addresses = agents_get_addresses($this->agent['id_tagente']); + } + else + $addresses = agents_get_addresses($this->id); + + if ($system->getConfig('metaconsole')) + metaconsole_restore_db(); + + $address = $this->agent['direccion']; + //~ foreach ($addresses as $k => $add) { + //~ if ($add == $address) { + //~ unset($addresses[$k]); + //~ } + //~ } + + //~ $ip = html_print_image('images/world.png', + //~ true, array('title' => __('IP address'))) . + //~ '  '; + $ip .= empty($address) ? '' . __('N/A') . + '' : $address; + + //~ if (!empty($addresses)) { + //~ $ip .= ui_print_help_tip(__('Other IP addresses') . + //~ ': ' . implode(', ',$addresses), true); + //~ } + + $last_contact = '' . __('Last contact') . + ': ' . + ui_print_timestamp ($this->agent["ultimo_contacto"], true); + + //~ $description = '' . __('Description') . ': '; + if (empty($agent["comentarios"])) { + $description .= '' . __('N/A') . ''; + } + else { + $description .= $this->agent["comentarios"]; + } + + $html = '
'; + $html .= '' . $agent_name . + ''; + $html .= '
'; + $html .= '
' . ui_print_os_icon ($this->agent["id_os"], false, true, + true, false, false, false, false, true) . '
'; + $html .= '
'; + $html .= $ip . ' - ' . + groups_get_name ($this->agent["id_grupo"], true); + $html .= '
+
'; + $html .= $last_contact; + $html .= '
+
'; + $html .= $description; + $html .= '
'; + + if ($system->getConfig('metaconsole')) { + metaconsole_connect(null, + $this->agent['id_tmetaconsole_setup']); + } + $ui->contentGridAddCell($html, 'agent_details'); - ob_start(); - $html = '
'; - $html .= "" . __('Modules by status') . "
"; - $html .= graph_agent_status ($this->id, 160, 160, true); - $graph_js = ob_get_clean(); - $html = $graph_js . $html; - unset($this->agent['fired_count']); - if ($this->agent['total_count'] > 0) { - $html .= '' . reporting_tiny_stats($this->agent, true) . '
'; - } - $html .= "" . __('Events (24h)') . "

"; - $html .= '
'; - $html .= '
'; - $html .= '
'; + + ob_start(); + + $html = '
'; + $html .= "" . __('Modules by status') . ""; + $html .= graph_agent_status ($this->id, 160, 160, true); + $graph_js = ob_get_clean(); + $html = $graph_js . $html; + + unset($this->agent['fired_count']); + + if ($this->agent['total_count'] > 0) { + $html .= '
' . + reporting_tiny_stats($this->agent, true, 'agent', ' ') . '
'; + } + + $html .= '
'; + $html .= '
'; + $html .= "" . __('Events (24h)') . ""; + $html .= '
'; + $html .= '
'; $ui->contentGridAddCell($html, 'agent_graphs'); $ui->contentEndGrid(); + if ($system->getConfig('metaconsole')) metaconsole_restore_db(); $modules = new Modules(); + if ($system->getConfig('metaconsole')) $filters = array('id_agent' => $this->agent['id_tagente'], 'all_modules' => true, 'status' => -1); else $filters = array('id_agent' => $this->id, 'all_modules' => true, 'status' => -1); + $modules->setFilters($filters); $modules->disabledColumns(array('agent')); $ui->contentBeginCollapsible(__('Modules')); @@ -208,19 +239,24 @@ class Agent { if ($system->getConfig('metaconsole')) { metaconsole_connect(null, $this->agent['id_tmetaconsole_setup']); - } + } + $alerts = new Alerts(); + if ($system->getConfig('metaconsole')) $filters = array('id_agent' => $this->agent['id_tagente'], 'all_alerts' => true); else $filters = array('id_agent' => $this->id, 'all_alerts' => true); + $alerts->setFilters($filters); $alerts->disabledColumns(array('agent')); $ui->contentBeginCollapsible(__('Alerts')); $ui->contentCollapsibleAddItem($alerts->listAlertsHtml(true)); $ui->contentEndCollapsible(); + if ($system->getConfig('metaconsole')) metaconsole_restore_db(); + $events = new Events(); $events->addJavascriptDialog(); diff --git a/pandora_console/mobile/operation/agents.php b/pandora_console/mobile/operation/agents.php index 3430d088b9..1a11e49108 100644 --- a/pandora_console/mobile/operation/agents.php +++ b/pandora_console/mobile/operation/agents.php @@ -325,7 +325,7 @@ class Agents { $row[7] = $row[__('Modules')] = '' . - '' . reporting_tiny_stats($agent, true) . ' '; + '' . reporting_tiny_stats($agent, true, 'agent', ' ') . ' '; $last_time = strtotime ($agent["ultimo_contacto"]); $now = time (); diff --git a/pandora_console/mobile/operation/events.php b/pandora_console/mobile/operation/events.php index 18977219e5..f17a655d2a 100644 --- a/pandora_console/mobile/operation/events.php +++ b/pandora_console/mobile/operation/events.php @@ -105,7 +105,7 @@ class Events { $status_icon = html_print_image($img_st, true, false, false, false, false, true); $row = array(); - $row[] = '' . __('Event Name') . '
' . io_safe_output($event['evento']) . '
'; + $row[] = '' . __('Event Name') . '
' . io_safe_output(str_replace(array(' ',''), ' ', $event['evento'])) . '
'; if ($event["id_agente"] == 0) { $agent_name = __('System'); @@ -115,7 +115,7 @@ class Events { } $row_1 = '' . $agent_name . ''; - $row_1 .= '' . $status_icon . '
' . ui_print_timestamp ($event['timestamp_rep'], true, array('units' => 'tiny')) . '
'; + $row_1 .= '' . ui_print_timestamp ($event['timestamp_rep'], true, array('units' => 'tiny')) . $status_icon . ''; $row[] = $row_1; @@ -966,10 +966,10 @@ class Events { var new_rows = \"\"; $.each(data.events, function(key, event) { new_rows = \"\" + - \"\" + + \"\" + event[0] + \"\" + - \"\" + event[1] + \"\" + + \"\" + event[1] + \"\" + \"\" + new_rows; }); diff --git a/pandora_console/mobile/operation/module_graph.php b/pandora_console/mobile/operation/module_graph.php index c1b18fb427..62da58e81f 100644 --- a/pandora_console/mobile/operation/module_graph.php +++ b/pandora_console/mobile/operation/module_graph.php @@ -84,7 +84,7 @@ class ModuleGraph { $this->height = (int)$system->getRequest('height', 0); //Sancho says "put the height to 1/2 for to make more beautyful" - //$this->height = $this->height / 2; + $this->height = $this->height / 1.5; $this->height -= 80; //Correct the height @@ -279,37 +279,34 @@ class ModuleGraph { ob_start(); ?>