tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-25 10:59:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

Browse Source
This commit is contained in:
Ramon Novoa 2015-04-28 15:00:19 +02:00
commit e6657441d3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_agents/win32/bin/pandora_agent.conf
View File

@ -19,7 +19,7 @@
server_ip $ServerIP$ server_ip $ServerIP$
server_path /var/spool/pandora/data_in server_path /var/spool/pandora/data_in
temporal "$AgentTemp$" temporal "C:\Program Files\pandora_agent\temp"
#include "C:\Archivos de programa\pandora_agent\pandora_agent_alt.conf" #include "C:\Archivos de programa\pandora_agent\pandora_agent_alt.conf"
#broker_agent name_agent #broker_agent name_agent
@ -47,7 +47,7 @@ address auto
#address 192.168.36.73 #address 192.168.36.73
# Group assigned for this agent (descriptive, p.e: Servers) # Group assigned for this agent (descriptive, p.e: Servers)
group "$AgentGroup$" group Servers
# This limits operation if temporal dir has not enough free disk. # This limits operation if temporal dir has not enough free disk.
#temporal_min_size 1024 #temporal_min_size 1024

10
pandora_console/godmode/servers/servers.build_table.php
View File

@ -61,7 +61,7 @@ $table->head = array ();
$table->head[0] = __('Name'); $table->head[0] = __('Name');
$table->head[1] = __('Status'); $table->head[1] = __('Status');
$table->head[2] = __('Type'); $table->head[2] = __('Type');
$table->head[3] = __('Load') . ui_print_help_tip (__("Modules running on this server / Total modules of this type"), true); $table->head[3] = __('Version');
$table->head[4] = __('Modules'); $table->head[4] = __('Modules');
$table->head[5] = __('Lag') . ui_print_help_tip (__("Avg. Delay(sec)/Modules delayed"), true); $table->head[5] = __('Lag') . ui_print_help_tip (__("Avg. Delay(sec)/Modules delayed"), true);
$table->head[6] = __('T/Q') . ui_print_help_tip (__("Threads / Queued modules currently"), true); $table->head[6] = __('T/Q') . ui_print_help_tip (__("Threads / Queued modules currently"), true);
@ -93,22 +93,22 @@ foreach ($servers as $server) {
if ($server["master"] == 1){ if ($server["master"] == 1){
$data[2] .= ui_print_help_tip (__("This is a master server"), true); $data[2] .= ui_print_help_tip (__("This is a master server"), true);
} }
$data[2] .= '</span> <span style="font-size:8px;"> v' . $server["version"]. '</span>'; //$data[2] .= '</span> <span style="font-size:8px;"> v' .. '</span>';
switch ($server['type']) { switch ($server['type']) {
case "snmp": case "snmp":
case "event": case "event":
$data[3] = 'N/A'; $data[3] = $server["version"];
$data[4] = 'N/A'; $data[4] = 'N/A';
$data[5] = 'N/A'; $data[5] = 'N/A';
break; break;
case "export": case "export":
$data[3] = progress_bar($server["load"], 100, 10, $server["lag_txt"], 0); $data[3] = $server["version"];
$data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"]; $data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"];
$data[5] = 'N/A'; $data[5] = 'N/A';
break; break;
default: default:
$data[3] = progress_bar($server["load"], 100, 10, $server["lag_txt"], 0); $data[3] = $server["version"];
$data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"]; $data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"];
$data[5] = '<span style="white-space:nowrap;">' . $data[5] = '<span style="white-space:nowrap;">' .
$server["lag_txt"] . '</span>'; $server["lag_txt"] . '</span>';