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

2012-11-12 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_reporting.php: cleaned source code style.
	
	* include/functions_api.php: fixed typo error that stoped the
	execution of api.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7142 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-11-12 14:53:33 +00:00
parent 33077cb181
commit 2b0bcb6846
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-11-12 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: cleaned source code style.
* include/functions_api.php: fixed typo error that stoped the
execution of api.
2012-11-11 Junichi Satoh <junichi@rworks.jp> 2012-11-11 Junichi Satoh <junichi@rworks.jp>
* extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: Fixed a typo. * extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: Fixed a typo.

2
pandora_console/include/functions_api.php
View File

@ -1943,7 +1943,7 @@ function api_set_new_snmp_component($id, $thrash1, $other, $thrash2) {
'plugin_user' => '', 'plugin_user' => '',
'plugin_pass' => '', 'plugin_pass' => '',
'tcp_port' => $other['data'][21], 'tcp_port' => $other['data'][21],
'id_modulo' => 2 'id_modulo' => 2,
'max_retries' => $other['data'][22], 'max_retries' => $other['data'][22],
); );
} }

6
pandora_console/include/functions_reporting.php
View File

@ -751,7 +751,7 @@ function reporting_get_agentmodule_sla_array ($id_agent_module, $period = 0, $mi
$id_downtime = $downtime['id_downtime']; $id_downtime = $downtime['id_downtime'];
$sql_date = "SELECT date_from, date_to FROM tplanned_downtime WHERE id=$id_downtime"; $sql_date = "SELECT date_from, date_to FROM tplanned_downtime WHERE id=$id_downtime";
$date_downtime = db_get_row_sql($sql_date); $date_downtime = db_get_row_sql($sql_date);
if ($date_downtime != false) { if ($date_downtime != false) {
// Delete data of the planned downtime and put the last data on the upper limit // Delete data of the planned downtime and put the last data on the upper limit
$interval_data_indexed[$date_downtime['date_from']]['data'] = 0; $interval_data_indexed[$date_downtime['date_from']]['data'] = 0;
@ -804,7 +804,7 @@ function reporting_get_agentmodule_sla_array ($id_agent_module, $period = 0, $mi
//Set initial conditions //Set initial conditions
$first_data = array_shift ($interval_data); $first_data = array_shift ($interval_data);
$previous_utimestamp = $date - $period; $previous_utimestamp = $date - $period;
$previous_value = $first_data ['datos']; $previous_value = $first_data ['datos'];
$previous_status = 0; $previous_status = 0;
@ -2643,7 +2643,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$dataslice[0] = modules_get_agentmodule_agent_name ($sla['id_agent_module']); $dataslice[0] = modules_get_agentmodule_agent_name ($sla['id_agent_module']);
$dataslice[0] .= "<br>"; $dataslice[0] .= "<br>";
$dataslice[0] .= modules_get_agentmodule_name ($sla['id_agent_module']); $dataslice[0] .= modules_get_agentmodule_name ($sla['id_agent_module']);
$dataslice[1] = graph_sla_slicebar ($sla['id_agent_module'], $content['period'], $dataslice[1] = graph_sla_slicebar ($sla['id_agent_module'], $content['period'],
$sla['sla_min'], $sla['sla_max'], $report['datetime'], $content, $content['time_from'], $sla['sla_min'], $sla['sla_max'], $report['datetime'], $content, $content['time_from'],
$content['time_to'], 650, 25, ui_get_full_url(false) . '/', 1, $sla_data_arrays[$k]); $content['time_to'], 650, 25, ui_get_full_url(false) . '/', 1, $sla_data_arrays[$k]);