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

2011-07-07 Sergio Martin <sergio.martin@artica.es> 

* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_v3.2_to_v4.0.sql
	godmode/agentes/planned_downtime.php: Added only_alerts 
	flag to planned downtimes



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4522 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-07-07 10:50:49 +00:00
parent 82ccf7fc5d
commit d281058ef2
6 changed files with 60 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2011-07-07 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
extras/pandoradb_migrate_v3.2_to_v4.0.sql
godmode/agentes/planned_downtime.php: Added only_alerts
flag to planned downtimes
2011-07-07 Sergio Martin <sergio.martin@artica.es> 2011-07-07 Sergio Martin <sergio.martin@artica.es>
* operation/servers/view_server_detail.php: Updated missed * operation/servers/view_server_detail.php: Updated missed

6
pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql
View File

@ -200,3 +200,9 @@ ALTER TABLE `tnetwork_map` ADD COLUMN `show_snmp_modules` TINYINT(1) UNSIGNED N
-- ----------------------------------------------------- -- -----------------------------------------------------
ALTER TABLE `trecon_task` ADD COLUMN `disabled` tinyint(1) UNSIGNED NOT NULL DEFAULT 0; ALTER TABLE `trecon_task` ADD COLUMN `disabled` tinyint(1) UNSIGNED NOT NULL DEFAULT 0;
-- -----------------------------------------------------
-- Table `tplanned_downtime`
-- -----------------------------------------------------
ALTER TABLE `tplanned_downtime` ADD COLUMN `only_alerts` TINYINT(1) NOT NULL DEFAULT 0;

55
pandora_console/godmode/agentes/planned_downtime.php
View File

@ -51,6 +51,8 @@ $delete_downtime_agent = (int) get_parameter ("delete_downtime_agent", 0);
$groups = users_get_groups (); $groups = users_get_groups ();
$only_alerts = (bool) get_parameter ('only_alerts', 0);
// Header // Header
ui_print_page_header (__("Planned Downtime"), "images/god1.png", false, "", true, ""); ui_print_page_header (__("Planned Downtime"), "images/god1.png", false, "", true, "");
@ -108,7 +110,8 @@ if ($create_downtime || $update_downtime) {
'description' => $description, 'description' => $description,
'date_from' => $datetime_from, 'date_from' => $datetime_from,
'date_to' => $datetime_to, 'date_to' => $datetime_to,
'id_group' => $id_group); 'id_group' => $id_group,
'only_alerts' => (int)$only_alerts);
$result = db_process_sql_insert('tplanned_downtime', $values); $result = db_process_sql_insert('tplanned_downtime', $values);
} }
else if ($update_downtime) { else if ($update_downtime) {
@ -117,15 +120,26 @@ if ($create_downtime || $update_downtime) {
'description' => $description, 'description' => $description,
'date_from' => $datetime_from, 'date_from' => $datetime_from,
'date_to' => $datetime_to, 'date_to' => $datetime_to,
'id_group' => $id_group); 'id_group' => $id_group,
'only_alerts' => (int)$only_alerts);
$result = db_process_sql_update('tplanned_downtime', $values, array('id' => $id_downtime)); $result = db_process_sql_update('tplanned_downtime', $values, array('id' => $id_downtime));
} }
if ($result === false) { if ($result === false) {
echo '<h3 class="error">'.__('Could not be created').'</h3>'; if($create_downtime) {
echo '<h3 class="error">'.__('Could not be created').'</h3>';
}
else {
echo '<h3 class="error">'.__('Could not be updated').'</h3>';
}
} }
else { else {
echo '<h3 class="suc">'.__('Successfully created').'</h3>'; if($create_downtime) {
echo '<h3 class="suc">'.__('Successfully created').'</h3>';
}
else {
echo '<h3 class="suc">'.__('Successfully updated').'</h3>';
}
} }
} }
} }
@ -137,17 +151,17 @@ if ($create_downtime || $update_downtime) {
if ($id_downtime > 0) { if ($id_downtime > 0) {
switch ($config["dbtype"]) { switch ($config["dbtype"]) {
case "mysql": case "mysql":
$sql = sprintf ("SELECT `id`, `name`, `description`, `date_from`, `date_to`, `id_group` $sql = sprintf ("SELECT `id`, `name`, `description`, `date_from`, `date_to`, `id_group`, `only_alerts`
FROM `tplanned_downtime` WHERE `id` = %d", FROM `tplanned_downtime` WHERE `id` = %d",
$id_downtime); $id_downtime);
break; break;
case "postgresql": case "postgresql":
$sql = sprintf ("SELECT \"id\", \"name\", \"description\", \"date_from\", \"date_to\", \"id_group\" $sql = sprintf ("SELECT \"id\", \"name\", \"description\", \"date_from\", \"date_to\", \"id_group\", \"only_alerts\"
FROM \"tplanned_downtime\" WHERE \"id\" = %d", FROM \"tplanned_downtime\" WHERE \"id\" = %d",
$id_downtime); $id_downtime);
break; break;
case "oracle": case "oracle":
$sql = sprintf ("SELECT id, name, description, date_from, date_to, id_group $sql = sprintf ("SELECT id, name, description, date_from, date_to, id_group, only_alerts
FROM tplanned_downtime WHERE id = %d", FROM tplanned_downtime WHERE id = %d",
$id_downtime); $id_downtime);
break; break;
@ -160,6 +174,7 @@ if ($create_downtime || $update_downtime) {
$date_to = strftime ('%Y-%m-%d', $result["date_to"]); $date_to = strftime ('%Y-%m-%d', $result["date_to"]);
$time_from = strftime ('%I:%M%p', $result["date_from"]); $time_from = strftime ('%I:%M%p', $result["date_from"]);
$time_to = strftime ('%I:%M%p', $result["date_to"]); $time_to = strftime ('%I:%M%p', $result["date_to"]);
$only_alerts = $result["only_alerts"];
if ($id_group == 0) if ($id_group == 0)
$id_group = $result['id_group']; $id_group = $result['id_group'];
@ -182,6 +197,8 @@ if ($create_downtime || $update_downtime) {
$table->data[5][0] = __('Group'); $table->data[5][0] = __('Group');
$table->data[5][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', 0, true); $table->data[5][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', 0, true);
$table->data[6][0] = __('Only alerts');
$table->data[6][1] = html_print_checkbox('only_alerts', 1, $only_alerts, true);
echo '<form method="POST" action="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime">'; echo '<form method="POST" action="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime">';
if ($id_downtime > 0){ if ($id_downtime > 0){
@ -313,13 +330,15 @@ else {
$table->head[2] = __('Group'); $table->head[2] = __('Group');
$table->head[3] = __('From'); $table->head[3] = __('From');
$table->head[4] = __('To'); $table->head[4] = __('To');
$table->head[5] = __('Delete'); $table->head[5] = __('Affect');
$table->head[6] = __('Update'); $table->head[6] = __('Delete');
$table->head[7] = __('Running'); $table->head[7] = __('Update');
$table->head[8] = __('Running');
$table->align[2] = "center"; $table->align[2] = "center";
$table->align[5] = "center"; $table->align[5] = "center";
$table->align[6] = "center"; $table->align[6] = "center";
$table->align[7] = "center"; $table->align[7] = "center";
$table->align[8] = "center";
$sql = "SELECT * FROM tplanned_downtime WHERE id_group IN (" . implode (",", array_keys ($groups)) . ")"; $sql = "SELECT * FROM tplanned_downtime WHERE id_group IN (" . implode (",", array_keys ($groups)) . ")";
$downtimes = db_get_all_rows_sql ($sql); $downtimes = db_get_all_rows_sql ($sql);
@ -336,22 +355,28 @@ else {
$data[2] = ui_print_group_icon ($downtime['id_group'], true); $data[2] = ui_print_group_icon ($downtime['id_group'], true);
$data[3] = date ("Y-m-d H:i", $downtime['date_from']); $data[3] = date ("Y-m-d H:i", $downtime['date_from']);
$data[4] = date ("Y-m-d H:i", $downtime['date_to']); $data[4] = date ("Y-m-d H:i", $downtime['date_to']);
if($only_alerts) {
$data[5] = __('Only alerts');
}
else {
$data[5] = __('All');
}
if ($downtime["executed"] == 0){ if ($downtime["executed"] == 0){
$data[5] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime&amp;id_agent='. $data[6] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime&amp;id_agent='.
$id_agent.'&amp;delete_downtime=1&amp;id_downtime='.$downtime['id'].'">' . $id_agent.'&amp;delete_downtime=1&amp;id_downtime='.$downtime['id'].'">' .
html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))); html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete')));
$data[6] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime&amp;edit_downtime=1&amp;first_update=1&amp;id_downtime='.$downtime['id'].'">' . $data[7] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime&amp;edit_downtime=1&amp;first_update=1&amp;id_downtime='.$downtime['id'].'">' .
html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>'; html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
} }
else { else {
$data[5]= "N/A";
$data[6]= "N/A"; $data[6]= "N/A";
$data[7]= "N/A";
} }
if ($downtime["executed"] == 0) if ($downtime["executed"] == 0)
$data[7] = html_print_image ("images/pixel_green.png", true, array ('width' => 20, 'height' => 20, 'alt' => __('Executed'))); $data[8] = html_print_image ("images/pixel_green.png", true, array ('width' => 20, 'height' => 20, 'alt' => __('Executed')));
else else
$data[7] = html_print_image ("images/pixel_red.png", true, array ('width' => 20, 'height' => 20, 'alt' => __('Not executed'))); $data[8] = html_print_image ("images/pixel_red.png", true, array ('width' => 20, 'height' => 20, 'alt' => __('Not executed')));
array_push ($table->data, $data); array_push ($table->data, $data);
} }

3
pandora_console/pandoradb.oracle.sql
View File

@ -1108,7 +1108,8 @@ CREATE TABLE tplanned_downtime (
date_from NUMBER(19, 0) default 0 NOT NULL, date_from NUMBER(19, 0) default 0 NOT NULL,
date_to NUMBER(19, 0) default 0 NOT NULL, date_to NUMBER(19, 0) default 0 NOT NULL,
executed NUMBER(5, 0) default 0 NOT NULL, executed NUMBER(5, 0) default 0 NOT NULL,
id_group NUMBER(19, 0) default 0 NOT NULL id_group NUMBER(19, 0) default 0 NOT NULL,
only_alerts NUMBER(5, 0) default 0 NOT NULL
); );
CREATE SEQUENCE tplanned_downtime_s INCREMENT BY 1 START WITH 1; CREATE SEQUENCE tplanned_downtime_s INCREMENT BY 1 START WITH 1;

3
pandora_console/pandoradb.postgreSQL.sql
View File

@ -882,7 +882,8 @@ CREATE TABLE "tplanned_downtime" (
"date_from" BIGINT NOT NULL default 0, "date_from" BIGINT NOT NULL default 0,
"date_to" BIGINT NOT NULL default 0, "date_to" BIGINT NOT NULL default 0,
"executed" SMALLINT NOT NULL default 0, "executed" SMALLINT NOT NULL default 0,
"id_group" BIGINT NOT NULL default 0 "id_group" BIGINT NOT NULL default 0,
"only_alerts" SMALLINT NOT NULL default 0
); );
CREATE TABLE "tplanned_downtime_agents" ( CREATE TABLE "tplanned_downtime_agents" (

1
pandora_console/pandoradb.sql
View File

@ -965,6 +965,7 @@ CREATE TABLE IF NOT EXISTS `tplanned_downtime` (
`date_to` bigint(20) NOT NULL default '0', `date_to` bigint(20) NOT NULL default '0',
`executed` tinyint(1) UNSIGNED NOT NULL default 0, `executed` tinyint(1) UNSIGNED NOT NULL default 0,
`id_group` mediumint(8) unsigned NULL default 0, `id_group` mediumint(8) unsigned NULL default 0,
`only_alerts` tinyint(1) UNSIGNED NOT NULL default 0,
PRIMARY KEY ( `id` ) PRIMARY KEY ( `id` )
) ENGINE = InnoDB DEFAULT CHARSET=utf8; ) ENGINE = InnoDB DEFAULT CHARSET=utf8;