From 136504b5a26e41024d3626655c95a9e275e56058 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 9 Jul 2013 09:44:11 +0000 Subject: [PATCH] 2013-07-09 Sergio Martin * include/functions_graph.php: Fix the alerts status pie graph to make it more usefull * godmode/agentes/agent_wizard.snmp_interfaces_explorer.php: Comment code git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8500 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ .../agentes/agent_wizard.snmp_interfaces_explorer.php | 2 +- pandora_console/include/functions_graph.php | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index beee0fc65e..1301d6ea07 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2013-07-09 Sergio Martin + + * include/functions_graph.php: Fix the alerts status pie graph + to make it more usefull + + * godmode/agentes/agent_wizard.snmp_interfaces_explorer.php: Comment + code + 2013-07-09 Sergio Martin * include/styles/pandora.css diff --git a/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php b/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php index 7e5649775f..b22d59cb7b 100644 --- a/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php +++ b/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php @@ -48,7 +48,7 @@ $create_modules = (int) get_parameter("create_modules", 0); $interfaces = array(); if ($snmpwalk) { - + // OID Used is for SNMP MIB-2 Interfaces $snmpis = get_snmpwalk($ip_target, $snmp_version, $snmp_community, $snmp3_auth_user, $snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass, $snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.2", $tcp_port); diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 8e0e859338..a827b11e95 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1355,14 +1355,14 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0, $return = function graph_alert_status ($defined_alerts, $fired_alerts, $width = 300, $height = 200, $return = false) { global $config; - $data = array(__('Defined alerts') => $defined_alerts, __('Fired alerts') => $fired_alerts); + $data = array(__('Not fired alerts') => $defined_alerts - $fired_alerts, __('Fired alerts') => $fired_alerts); $colors = array(COL_NORMAL, COL_ALERTFIRED); $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", 'url' => ui_get_full_url("/images/logo_vertical_water.png")); $out = pie2d_graph($config['flash_charts'], $data, $width, $height, __("other"), - '', $water_mark, $config['fontpath'], $config['font_size'], 1, "hidden", $colors); + '', '', $config['fontpath'], $config['font_size'], 1, "hidden", $colors); if ($return) { return $out;