tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-07-11 Miguel de Dios <miguel.dedios@artica.es> 

* mobile/operation/agents.php, mobile/operation/agent.php,
	include/functions_graph.php: fixed the show static graphs in
	mobile.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8513 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-11 08:15:48 +00:00
parent 454db840e5
commit 995cda4b1e
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-07-11 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/agents.php, mobile/operation/agent.php,
include/functions_graph.php: fixed the show static graphs in
mobile.
2013-07-10 Ramon Novoa <rnovoa@artica.es> 2013-07-10 Ramon Novoa <rnovoa@artica.es>
* extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql, * extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,

5
pandora_console/include/functions_graph.php
View File

@ -1425,8 +1425,9 @@ function graph_agent_status ($id_agent = false, $width = 300, $height = 200, $re
$data = array(); $data = array();
} }
$out = pie2d_graph($config['flash_charts'], $data, $width, $height, __("other"), $out = pie2d_graph($config['flash_charts'], $data, $width, $height,
'', '', $config['fontpath'], $config['font_size'], 1, "hidden", $colors); __("other"),
ui_get_full_url(false), '', $config['fontpath'], $config['font_size'], 1, "hidden", $colors);
if ($return) { if ($return) {
return $out; return $out;

4
pandora_console/mobile/operation/agent.php
View File

@ -100,7 +100,7 @@ class Agent {
$addresses = agents_get_addresses($this->id); $addresses = agents_get_addresses($this->id);
$address = agents_get_address($this->id); $address = agents_get_address($this->id);
foreach ($addresses as $k => $add) { foreach ($addresses as $k => $add) {
if($add == $address) { if ($add == $address) {
unset($addresses[$k]); unset($addresses[$k]);
} }
} }
@ -131,7 +131,7 @@ class Agent {
$html = $graph_js . $html; $html = $graph_js . $html;
$html .= "<b>" . __('Events (24h)') . "</b><br />"; $html .= "<b>" . __('Events (24h)') . "</b><br />";
$html .= graph_graphic_agentevents( $html .= graph_graphic_agentevents(
$this->id, 250, 15, 86400, '', true); $this->id, 250, 15, 86400, ui_get_full_url(false), true);
$ui->contentGridAddCell($html); $ui->contentGridAddCell($html);
$ui->contentEndGrid(); $ui->contentEndGrid();

4
pandora_console/mobile/operation/agents.php
View File

@ -262,9 +262,9 @@ class Agents {
$img_status = agents_tree_view_status_img ($agent["critical_count"], $img_status = agents_tree_view_status_img ($agent["critical_count"],
$agent["warning_count"], $agent["unknown_count"]); $agent["warning_count"], $agent["unknown_count"], $agent['total_count'], $agent['notinit_count']);
$img_alert = agents_tree_view_alert_img ($agent_info["monitor_alertsfired"]); $img_alert = agents_tree_view_alert_img ($agent["fired_count"]);
$row[0] = $row[__('Agent')] = $row[0] = $row[__('Agent')] =