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

2013-04-24 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_reporting.php, include/functions_servers.php:
	fixed the set default value for "local_modules_rate".
	
	Fixes: #3611336




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8050 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-04-24 15:01:52 +00:00
parent 0a25b5bdc4
commit c9cbc64d16
3 changed files with 21 additions and 12 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 @@
2013-04-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php, include/functions_servers.php:
fixed the set default value for "local_modules_rate".
Fixes: #3611336
2013-04-24 Miguel de Dios <miguel.dedios@artica.es> 2013-04-24 Miguel de Dios <miguel.dedios@artica.es>
* extensions/agents_alerts.php, extensions/agents_modules.php, * extensions/agents_alerts.php, extensions/agents_modules.php,

3
pandora_console/include/functions_reporting.php
View File

@ -894,7 +894,8 @@ function reporting_get_stats_servers($tiny = true) {
$tdata[0] = html_print_image('images/database.png', true, array('title' => __('Local modules'), 'width' => '25px')); $tdata[0] = html_print_image('images/database.png', true, array('title' => __('Local modules'), 'width' => '25px'));
$tdata[1] = '<span class="big_data">' . format_numeric($server_performance ["total_local_modules"]) . '</span>'; $tdata[1] = '<span class="big_data">' . format_numeric($server_performance ["total_local_modules"]) . '</span>';
$tdata[2] = '<span class="med_data">' . format_numeric($server_performance ["local_modules_rate"], 2) . '</span>'; $tdata[2] = '<span class="med_data">' .
format_numeric($server_performance ["local_modules_rate"], 2) . '</span>';
$tdata[3] = html_print_image('images/module.png', true, array('title' => __('Ratio') . ': ' . __('Modules by second'), 'width' => '16px')) . '/sec </span>'; $tdata[3] = html_print_image('images/module.png', true, array('title' => __('Ratio') . ': ' . __('Modules by second'), 'width' => '16px')) . '/sec </span>';
$table_srv->rowclass[] = ''; $table_srv->rowclass[] = '';

23
pandora_console/include/functions_servers.php
View File

@ -78,18 +78,19 @@ function servers_get_performance () {
$data["avg_interval_total_modules"] = array(); $data["avg_interval_total_modules"] = array();
$data["avg_interval_remote_modules"] = array(); $data["avg_interval_remote_modules"] = array();
$data["avg_interval_local_modules"] = 0; $data["avg_interval_local_modules"] = 0;
$data["local_modules_rate"] = 0;
if ($config["realtimestats"] == 1){ if ($config["realtimestats"] == 1) {
$counts = db_get_all_rows_sql ("SELECT tagente_modulo.id_modulo, COUNT(tagente_modulo.id_agente_modulo) modules $counts = db_get_all_rows_sql ("SELECT tagente_modulo.id_modulo, COUNT(tagente_modulo.id_agente_modulo) modules
FROM tagente_modulo, tagente_estado, tagente FROM tagente_modulo, tagente_estado, tagente
WHERE tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo WHERE tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
AND tagente_modulo.disabled = 0 AND delete_pending = 0 AND (utimestamp > 0 OR (id_tipo_modulo = 100 OR (id_tipo_modulo > 21 AND id_tipo_modulo < 23))) AND tagente_modulo.disabled = 0 AND delete_pending = 0 AND (utimestamp > 0 OR (id_tipo_modulo = 100 OR (id_tipo_modulo > 21 AND id_tipo_modulo < 23)))
AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente GROUP BY tagente_modulo.id_modulo"); AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente GROUP BY tagente_modulo.id_modulo");
if(empty($counts)) { if (empty($counts)) {
$counts = array(); $counts = array();
} }
foreach($counts as $c) { foreach($counts as $c) {
switch($c['id_modulo']) { switch($c['id_modulo']) {
case MODULE_DATA: case MODULE_DATA:
@ -121,8 +122,8 @@ function servers_get_performance () {
} }
else { else {
$counts = db_get_all_rows_sql ("SELECT server_type, my_modules modules FROM tserver GROUP BY server_type"); $counts = db_get_all_rows_sql ("SELECT server_type, my_modules modules FROM tserver GROUP BY server_type");
if(empty($counts)) { if (empty($counts)) {
$counts = array(); $counts = array();
} }
@ -172,12 +173,12 @@ function servers_get_performance () {
AND delete_pending = 0 AND delete_pending = 0
AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente GROUP BY tagente_modulo.id_modulo"); AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente GROUP BY tagente_modulo.id_modulo");
if(empty($interval_avgs_modules)) { if (empty($interval_avgs_modules)) {
$interval_avgs_modules = array(); $interval_avgs_modules = array();
} }
// Transform into a easily format // Transform into a easily format
foreach($interval_avgs_modules as $iamodules) { foreach ($interval_avgs_modules as $iamodules) {
$interval_avgs[$iamodules['id_modulo']]['avg_interval'] = $iamodules['avg_interval']; $interval_avgs[$iamodules['id_modulo']]['avg_interval'] = $iamodules['avg_interval'];
$interval_avgs[$iamodules['id_modulo']]['modules'] = $iamodules['modules']; $interval_avgs[$iamodules['id_modulo']]['modules'] = $iamodules['modules'];
} }
@ -190,7 +191,7 @@ function servers_get_performance () {
AND delete_pending = 0 AND delete_pending = 0
AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente GROUP BY tagente_modulo.id_modulo"); AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente GROUP BY tagente_modulo.id_modulo");
if(empty($interval_avgs_agents)) { if (empty($interval_avgs_agents)) {
$interval_avgs_agents = array(); $interval_avgs_agents = array();
} }
@ -206,7 +207,7 @@ function servers_get_performance () {
} }
} }
foreach($interval_avgs as $id_modulo => $ia) { foreach ($interval_avgs as $id_modulo => $ia) {
switch($id_modulo) { switch($id_modulo) {
case MODULE_DATA: case MODULE_DATA:
$data["avg_interval_local_modules"] = $ia['avg_interval']; $data["avg_interval_local_modules"] = $ia['avg_interval'];
@ -234,7 +235,7 @@ function servers_get_performance () {
break; break;
} }
if($id_modulo != MODULE_DATA) { if ($id_modulo != MODULE_DATA) {
$data["avg_interval_remote_modules"][] = $ia['avg_interval']; $data["avg_interval_remote_modules"][] = $ia['avg_interval'];
} }