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

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

This commit is contained in:
m-lopez-f 2015-09-07 15:21:38 +02:00
parent e3f85ea567 7f3632d098
commit 835b082450
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/languages/en_GB.po
View File

@ -32174,10 +32174,8 @@ msgstr "Error on first setup open update"
#: ../../include/functions_config_bk.php:1436 #: ../../include/functions_config_bk.php:1436
msgid "" msgid ""
"There is a new update please go to menu Administration and into extensions " "There is a new update. Please go to menu Administration/Update manager
"<a style=\"font-weight:bold;\" " for more details."
"href=\"index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=on"
"line\">go to Update Manager</a> for more details."
msgstr "" msgstr ""
#: ../../include/functions_config_bk.php:1437 #: ../../include/functions_config_bk.php:1437

4
pandora_console/include/styles/pandora.css
View File

@ -2858,6 +2858,10 @@ table#policy_modules td * {
text-align: left; text-align: left;
} }
.right_align {
text-align: right;
}
.status_tactical{ .status_tactical{
width: 100%; width: 100%;
margin-left: auto; margin-left: auto;

19
pandora_console/operation/agentes/group_view.php
View File

@ -137,7 +137,9 @@ if (!empty($result_groups)) {
echo "</tr>"; echo "</tr>";
foreach ($result_groups as $data) { foreach ($result_groups as $data) {
$groups_id = $data["_id_"];
// Calculate entire row color // Calculate entire row color
if ($data["_monitors_alerts_fired_"] > 0) { if ($data["_monitors_alerts_fired_"] > 0) {
$color_class = 'group_view_alrm'; $color_class = 'group_view_alrm';
@ -218,8 +220,9 @@ if (!empty($result_groups)) {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."'>"; href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."'>";
} }
$agent_counter = agents_get_group_agents($groups_id);
if ($data["_total_agents_"] > 0) { if ($data["_total_agents_"] > 0) {
echo $link . $data["_total_agents_"] . "</a>"; echo $link . count($agent_counter) . "</a>";
} }
echo "</td>"; echo "</td>";
@ -232,8 +235,12 @@ if (!empty($result_groups)) {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_UNKNOWN ."'>"; href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_UNKNOWN ."'>";
} }
$search = array(
'status' => AGENT_STATUS_UNKNOWN
);
$agent_counter_unknown = agents_get_group_agents($groups_id, $search);
if ($data["_agents_unknown_"] > 0) { if ($data["_agents_unknown_"] > 0) {
echo $link . $data["_agents_unknown_"] . "</a>"; echo $link . count($agent_counter_unknown) . "</a>";
} }
echo "</td>"; echo "</td>";
@ -246,8 +253,12 @@ if (!empty($result_groups)) {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_NOT_INIT ."'>"; href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_NOT_INIT ."'>";
} }
$search = array(
'status' => AGENT_STATUS_NOT_INIT
);
$agent_counter_not_init = agents_get_group_agents($groups_id, $search);
if ($data["_agents_not_init_"] > 0) { if ($data["_agents_not_init_"] > 0) {
echo $link . $data["_agents_not_init_"] . "</a>"; echo $link . count($agent_counter_not_init) . "</a>";
} }
echo "</td>"; echo "</td>";

2
pandora_console/pandoradb.oracle.sql
View File

@ -776,7 +776,7 @@ CREATE TABLE trecon_task (
resolve_names NUMBER(5, 0) DEFAULT 1, resolve_names NUMBER(5, 0) DEFAULT 1,
parent_detection NUMBER(5, 0) DEFAULT 1, parent_detection NUMBER(5, 0) DEFAULT 1,
parent_recursion NUMBER(5, 0) DEFAULT 1, parent_recursion NUMBER(5, 0) DEFAULT 1,
disabled NUMBER(5, 0) DEFAULT 1, disabled NUMBER(5, 0) DEFAULT 0,
macros CLOB DEFAULT '' macros CLOB DEFAULT ''
); );
CREATE INDEX trecon_task_id_rec_serv_idx ON trecon_task(id_recon_server); CREATE INDEX trecon_task_id_rec_serv_idx ON trecon_task(id_recon_server);