More Oracle related fixes.
This commit is contained in:
parent
6255d5c3bf
commit
615231eafd
|
@ -1418,10 +1418,10 @@ sub pandora_planned_downtime_disabled_once_stop($$) {
|
|||
# Stop executed downtimes (enable agents and disable_agents_alerts)
|
||||
my @downtimes = get_db_rows($dbh, 'SELECT *
|
||||
FROM tplanned_downtime
|
||||
WHERE type_downtime != ' . $RDBMS_QUOTE_STRING. 'quiet' . $RDBMS_QUOTE_STRING. '
|
||||
AND type_execution = ' . $RDBMS_QUOTE_STRING. 'once' . $RDBMS_QUOTE_STRING. '
|
||||
WHERE type_downtime != ?
|
||||
AND type_execution = ?
|
||||
AND executed = 1
|
||||
AND date_to <= ?', $utimestamp);
|
||||
AND date_to <= ?', 'quiet', 'once', $utimestamp);
|
||||
|
||||
foreach my $downtime (@downtimes) {
|
||||
|
||||
|
@ -1453,10 +1453,10 @@ sub pandora_planned_downtime_disabled_once_start($$) {
|
|||
# Start pending downtimes (disable agents and disable_agents_alerts)
|
||||
my @downtimes = get_db_rows($dbh, 'SELECT *
|
||||
FROM tplanned_downtime
|
||||
WHERE type_downtime != ' . $RDBMS_QUOTE_STRING . 'quiet' . $RDBMS_QUOTE_STRING . '
|
||||
AND type_execution = ' . $RDBMS_QUOTE_STRING . 'once' . $RDBMS_QUOTE_STRING . '
|
||||
WHERE type_downtime != ?
|
||||
AND type_execution = ?
|
||||
AND executed = 0 AND date_from <= ?
|
||||
AND date_to >= ?', $utimestamp, $utimestamp);
|
||||
AND date_to >= ?', 'quiet', 'once', $utimestamp, $utimestamp);
|
||||
|
||||
foreach my $downtime (@downtimes) {
|
||||
if (!defined($downtime->{'description'})) {
|
||||
|
@ -1651,9 +1651,9 @@ sub pandora_planned_downtime_quiet_once_stop($$) {
|
|||
# Stop pending downtimes
|
||||
my @downtimes = get_db_rows($dbh, 'SELECT *
|
||||
FROM tplanned_downtime
|
||||
WHERE type_downtime = ' . $RDBMS_QUOTE_STRING . 'quiet' . $RDBMS_QUOTE_STRING . '
|
||||
AND type_execution = ' . $RDBMS_QUOTE_STRING. 'once' . $RDBMS_QUOTE_STRING . '
|
||||
AND executed = 1 AND date_to <= ?', $utimestamp);
|
||||
WHERE type_downtime = ?
|
||||
AND type_execution = ?
|
||||
AND executed = 1 AND date_to <= ?', 'quiet', 'once', $utimestamp);
|
||||
|
||||
foreach my $downtime (@downtimes) {
|
||||
if (!defined($downtime->{'description'})) {
|
||||
|
@ -1692,10 +1692,10 @@ sub pandora_planned_downtime_quiet_once_start($$) {
|
|||
# Start pending downtimes
|
||||
my @downtimes = get_db_rows($dbh, 'SELECT *
|
||||
FROM tplanned_downtime
|
||||
WHERE type_downtime = ' . $RDBMS_QUOTE_STRING . 'quiet' . $RDBMS_QUOTE_STRING . '
|
||||
AND type_execution = ' . $RDBMS_QUOTE_STRING . 'once' . $RDBMS_QUOTE_STRING . '
|
||||
WHERE type_downtime = ?
|
||||
AND type_execution = ?
|
||||
AND executed = 0 AND date_from <= ?
|
||||
AND date_to >= ?', $utimestamp, $utimestamp);
|
||||
AND date_to >= ?', 'quiet', 'once', $utimestamp, $utimestamp);
|
||||
|
||||
foreach my $downtime (@downtimes) {
|
||||
if (!defined($downtime->{'description'})) {
|
||||
|
@ -1743,11 +1743,12 @@ sub pandora_planned_downtime_monthly_start($$) {
|
|||
# Start pending downtimes
|
||||
my @downtimes = get_db_rows($dbh, 'SELECT *
|
||||
FROM tplanned_downtime
|
||||
WHERE type_periodicity = ' . $RDBMS_QUOTE_STRING . 'monthly' . $RDBMS_QUOTE_STRING . '
|
||||
WHERE type_periodicity = ?
|
||||
AND executed = 0
|
||||
AND ((periodically_day_from = ? AND periodically_time_from <= ?) OR (periodically_day_from < ?))
|
||||
AND ((periodically_day_to = ? AND periodically_time_to >= ?) OR (periodically_day_to > ?))',
|
||||
$number_day_month, $time, $number_day_month,
|
||||
'monthly', 'number_day_month',
|
||||
$time, $number_day_month,
|
||||
$number_day_month, $time, $number_day_month);
|
||||
|
||||
foreach my $downtime (@downtimes) {
|
||||
|
@ -1817,11 +1818,12 @@ sub pandora_planned_downtime_monthly_stop($$) {
|
|||
# Start pending downtimes
|
||||
my @downtimes = get_db_rows($dbh, 'SELECT *
|
||||
FROM tplanned_downtime
|
||||
WHERE type_periodicity = ' . $RDBMS_QUOTE_STRING . 'monthly' . $RDBMS_QUOTE_STRING . '
|
||||
WHERE type_periodicity = ?
|
||||
AND executed = 1
|
||||
AND type_execution <> ' . $RDBMS_QUOTE_STRING . 'once' . $RDBMS_QUOTE_STRING . '
|
||||
AND type_execution <> ?
|
||||
AND (((periodically_day_from = ? AND periodically_time_from > ?) OR (periodically_day_from > ?))
|
||||
OR ((periodically_day_to = ? AND periodically_time_to < ?) OR (periodically_day_to < ?)))',
|
||||
'monthly', 'once',
|
||||
$number_day_month, $time, $number_day_month,
|
||||
$number_day_month, $time, $number_day_month);
|
||||
|
||||
|
@ -1876,8 +1878,8 @@ sub pandora_planned_downtime_weekly_start($$) {
|
|||
# Start pending downtimes
|
||||
my @downtimes = get_db_rows($dbh, 'SELECT *
|
||||
FROM tplanned_downtime
|
||||
WHERE type_periodicity = ' . $RDBMS_QUOTE_STRING . 'weekly' . $RDBMS_QUOTE_STRING . '
|
||||
AND executed = 0');
|
||||
WHERE type_periodicity = ?
|
||||
AND executed = 0', 'weekly');
|
||||
|
||||
foreach my $downtime (@downtimes) {
|
||||
my $across_date = $downtime->{'periodically_time_from'} gt $downtime->{'periodically_time_to'} ? 1 : 0 ;
|
||||
|
@ -1985,9 +1987,9 @@ sub pandora_planned_downtime_weekly_stop($$) {
|
|||
# Start pending downtimes
|
||||
my @downtimes = get_db_rows($dbh, 'SELECT *
|
||||
FROM tplanned_downtime
|
||||
WHERE type_periodicity = ' . $RDBMS_QUOTE_STRING . 'weekly' . $RDBMS_QUOTE_STRING . '
|
||||
AND type_execution <> ' . $RDBMS_QUOTE_STRING . 'once' . $RDBMS_QUOTE_STRING . '
|
||||
AND executed = 1');
|
||||
WHERE type_periodicity = ?
|
||||
AND type_execution <> ?
|
||||
AND executed = 1', 'weekly', 'once');
|
||||
|
||||
foreach my $downtime (@downtimes) {
|
||||
my $across_date = $downtime->{'periodically_time_from'} gt $downtime->{'periodically_time_to'} ? 1 : 0;
|
||||
|
@ -2311,13 +2313,12 @@ sub pandora_create_template_module ($$$$;$$$) {
|
|||
|
||||
return db_insert ($dbh,
|
||||
'id',
|
||||
"INSERT INTO talert_template_modules(
|
||||
" . $RDBMS_QUOTE . "id_agent_module" . $RDBMS_QUOTE . ",
|
||||
" . $RDBMS_QUOTE . "id_alert_template" . $RDBMS_QUOTE . ",
|
||||
" . $RDBMS_QUOTE . "id_policy_alerts" . $RDBMS_QUOTE . ",
|
||||
" . $RDBMS_QUOTE . "disabled" . $RDBMS_QUOTE . ",
|
||||
" . $RDBMS_QUOTE . "standby" . $RDBMS_QUOTE . ",
|
||||
" . $RDBMS_QUOTE . "last_reference" . $RDBMS_QUOTE . ")
|
||||
"INSERT INTO talert_template_modules(id_agent_module,
|
||||
id_alert_template,
|
||||
id_policy_alerts,
|
||||
disabled,
|
||||
standby,
|
||||
last_reference)
|
||||
VALUES (?, ?, ?, ?, ?, ?)",
|
||||
$id_agent_module, $id_alert_template, $id_policy_alerts, $disabled, $standby, time);
|
||||
}
|
||||
|
@ -2339,9 +2340,9 @@ sub pandora_update_template_module ($$$;$$$) {
|
|||
|
||||
db_do ($dbh,
|
||||
"UPDATE talert_template_modules
|
||||
SET " . $RDBMS_QUOTE . "id_policy_alerts" . $RDBMS_QUOTE . " = ?,
|
||||
" . $RDBMS_QUOTE . "disabled" . $RDBMS_QUOTE . " = ?,
|
||||
" . $RDBMS_QUOTE . "standby" . $RDBMS_QUOTE . " = ?
|
||||
SET id_policy_alerts = ?,
|
||||
disabled = ?,
|
||||
standby = ?
|
||||
WHERE id = ?",
|
||||
$id_policy_alerts, $disabled, $standby, $id_alert);
|
||||
}
|
||||
|
@ -2706,9 +2707,7 @@ sub pandora_create_module_tags ($$$$) {
|
|||
|
||||
db_insert ($dbh,
|
||||
'id_tag',
|
||||
"INSERT INTO ttag_module(
|
||||
" . $RDBMS_QUOTE . "id_tag" . $RDBMS_QUOTE . ",
|
||||
" . $RDBMS_QUOTE . "id_agente_modulo" . $RDBMS_QUOTE . ")
|
||||
"INSERT INTO ttag_module(id_tag, id_agente_modulo)
|
||||
VALUES (?, ?)",
|
||||
$tag_id, $id_agent_module);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue