diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2d9459de09..0cfd872b42 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ + +2007-04-22 Sancho Lerena + + * functions_db.php, language_en.php, estado_grupo.php + estado_agente.php configurar_grupo.php lista_grupos.php + modificar_server.php: New feature implemented: groups could be + configured to do not launch alerts (Disabled field). Any agent + inside this group does not fire alerts while disabled will be + activated. Useful for programmed non-service periods or programmed + shutdowns. + 2007-04-21 Sancho Lerena * include/languages/language_en.php: New strings added. diff --git a/pandora_console/godmode/grupos/configurar_grupo.php b/pandora_console/godmode/grupos/configurar_grupo.php index 7deefa892c..6604c9bc24 100644 --- a/pandora_console/godmode/grupos/configurar_grupo.php +++ b/pandora_console/godmode/grupos/configurar_grupo.php @@ -31,6 +31,7 @@ if (comprueba_login() == 0) $id_grupo = ""; $nombre = ""; $id_parent = ""; + $disabled = 0; if (isset($_GET["creacion_grupo"])){ // $creacion_grupo = entrada_limpia($_GET["creacion_grupo"]); @@ -45,6 +46,7 @@ if (comprueba_login() == 0) if ($row=mysql_fetch_array($result)){ $nombre = $row["nombre"]; $icono = $row["icon"]; + $disabled = $row["disabled"]; $id_parent = entrada_limpia($row["parent"]); } else { @@ -73,7 +75,7 @@ sec2=godmode/grupos/lista_grupos"> echo ""; } ?> - + @@ -116,6 +118,22 @@ sec2=godmode/grupos/lista_grupos"> } echo ''; + // Disabled + echo ""; + echo $lang_label["alerts"]; + echo ''; + echo '"; + + echo "
"; echo ''; if (isset($_GET["creacion_grupo"])) diff --git a/pandora_console/godmode/grupos/lista_grupos.php b/pandora_console/godmode/grupos/lista_grupos.php index cc59ad28e5..5f6ae8df77 100644 --- a/pandora_console/godmode/grupos/lista_grupos.php +++ b/pandora_console/godmode/grupos/lista_grupos.php @@ -32,8 +32,9 @@ if (comprueba_login() == 0) $nombre = entrada_limpia($_POST["nombre"]); $icon = entrada_limpia($_POST["icon"]); $parent = entrada_limpia($_POST["parent"]); - $sql_insert="INSERT INTO tgrupo (nombre, icon, parent) - VALUES ('$nombre', '$icon', '$parent') "; + $disabled = entrada_limpia($_POST["disabled"]); + $sql_insert="INSERT INTO tgrupo (nombre, icon, parent, disabled) + VALUES ('$nombre', '$icon', '$parent', $disabled) "; $result=mysql_query($sql_insert); if (! $result) echo "

".$lang_label["create_group_no"]."

"; @@ -47,9 +48,10 @@ if (comprueba_login() == 0) $nombre = entrada_limpia($_POST["nombre"]); $id_grupo = entrada_limpia($_POST["id_grupo"]); $icon = entrada_limpia($_POST["icon"]); + $disabled = entrada_limpia($_POST["disabled"]); $parent = entrada_limpia($_POST["parent"]); $sql_update ="UPDATE tgrupo - SET nombre = '$nombre', icon = '$icon', parent = '$parent' + SET nombre = '$nombre', icon = '$icon', disabled = $disabled, parent = '$parent' WHERE id_grupo = '$id_grupo'"; $result=mysql_query($sql_update); if (! $result) @@ -80,6 +82,7 @@ if (comprueba_login() == 0) echo "".$lang_label["icon"].""; echo "".$lang_label["group_name"].""; echo "".$lang_label["parent"].""; + echo "".$lang_label["alerts"].""; echo "".$lang_label["delete"].""; $sql1='SELECT * FROM tgrupo ORDER BY nombre'; $result=mysql_query($sql1); @@ -103,14 +106,23 @@ if (comprueba_login() == 0) echo ""; echo dame_nombre_grupo ($row["parent"]); echo ""; + + // Disabled? + echo ""; + if ($row["disabled"]==1) + echo " ".$lang_label["disabled"]; + else + echo " ".$lang_label["enabled"]; + echo ""; + echo ""; echo "'; echo ""; } } - echo "
"; - echo ""; + echo "
"; + echo ""; echo "
"; echo ""; diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index e0673bf9ec..dec24348fc 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -69,8 +69,8 @@ if (comprueba_login() == 0) { echo ''; echo ""; echo ""; + // Show SO icon :) echo ""; } + + // Show GROUP icon echo ''; + '; + echo ''; + + echo ""; echo "
"; - echo "".$lang_label["name"].""; - echo "
".$lang_label['ip_address'].""; + echo "".$lang_label["name"].""; + echo "
".$lang_label['ip_address'].""; echo "
".$lang_label['description'].""; } else { @@ -173,4 +173,4 @@ if (comprueba_login() == 0) { require ("general/noaccess.php"); } } -?> \ No newline at end of file +?> diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index f599eb1146..2187135b7d 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -135,6 +135,22 @@ function dame_perfil($id){ return $cat; } +// --------------------------------------------------------------- +// Returns disabled from a given group_id +// --------------------------------------------------------------- + +function give_disabled_group($id){ + require("config.php"); + $query1="SELECT * FROM tgrupo WHERE id_grupo =".$id; + $resq1=mysql_query($query1); + if ($rowdup=mysql_fetch_array($resq1)){ + $cat=$rowdup["disabled"]; + } + else $cat = ""; + return $cat; +} + + // --------------------------------------------------------------- // Returns group given ID diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php index b91047033c..0c429641b2 100644 --- a/pandora_console/include/languages/language_en.php +++ b/pandora_console/include/languages/language_en.php @@ -766,7 +766,7 @@ $lang_label["custom_reporting"]="Custom reporting"; $lang_label["alert_text"]="Alert text"; $lang_label["text"]="Text"; $lang_label["delete_data_above"]="Delete data above"; - +$lang_label["enabled"]="Enabled"; diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index 968e164217..bf283dd695 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -213,6 +213,7 @@ if (comprueba_login() == 0) { echo "  ".$nombre_agente." ".$intervalo." - ". $numero_modulos." / ".$numero_monitor; if ($monitor_bad <> 0) { @@ -257,11 +263,14 @@ if (comprueba_login() == 0) { // checks if an alert was fired recently echo ""; - if (check_alert_fired($id_agente) == 1) - echo ""; - else - echo ""; - + if (give_disabled_group($id_grupo) == 1) + echo " ".$lang_label["disabled"].""; + else { + if (check_alert_fired($id_agente) == 1) + echo ""; + else + echo ""; + } echo ""; if ( $ultimo_contacto == "0000-00-00 00:00:00"){ diff --git a/pandora_console/operation/agentes/estado_grupo.php b/pandora_console/operation/agentes/estado_grupo.php index c6dad99523..115fc0df14 100644 --- a/pandora_console/operation/agentes/estado_grupo.php +++ b/pandora_console/operation/agentes/estado_grupo.php @@ -159,6 +159,10 @@ $icono_type=$icono_type." "; } + + // Show red flag is group has disabled alert system + if (give_disabled_group($grupo[$real_count]["id_grupo"]) == 1) + $icono_type = $icono_type." ".$lang_label["disabled"].""; // By default green border $celda = "";