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

Merge branch 'ent-11990-error-al-configurar-un-servicio-existente' into 'develop' 

Ent 11990 error al configurar un servicio existente

See merge request artica/pandorafms!6470
This commit is contained in:
Rafael Ameijeiras 2023-09-22 06:59:42 +00:00
parent b706376fa7 d4e2fb4fea
commit 1ffebcf49c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/extras/mr/66.sql
View File

@ -72,5 +72,6 @@ ALTER TABLE `treport_content` ADD COLUMN `cat_security_hardening` INT NOT NULL
ALTER TABLE `treport_content` ADD COLUMN `ignore_skipped` INT NOT NULL DEFAULT 0; ALTER TABLE `treport_content` ADD COLUMN `ignore_skipped` INT NOT NULL DEFAULT 0;
ALTER TABLE `treport_content` ADD COLUMN `status_of_check` TINYTEXT; ALTER TABLE `treport_content` ADD COLUMN `status_of_check` TINYTEXT;
ALTER TABLE `tservice` ADD COLUMN `enable_horizontal_tree` TINYINT NOT NULL DEFAULT 0;
COMMIT; COMMIT;

6
pandora_console/godmode/alerts/configure_alert_template.php
View File

@ -866,7 +866,7 @@ if ($step == 2) {
); );
$table->data["math_function"][0] = html_print_label_input_block( $table->data['math_function'][0] = html_print_label_input_block(
__('Math function'), __('Math function'),
html_print_select( html_print_select(
alerts_get_alert_templates_functions(), alerts_get_alert_templates_functions(),
@ -883,7 +883,7 @@ if ($step == 2) {
) )
); );
$table->data["time_window"][0] = html_print_label_input_block( $table->data['time_window'][0] = html_print_label_input_block(
__('Time window').ui_print_help_tip(__('Limits to data in the following time window.'), true), __('Time window').ui_print_help_tip(__('Limits to data in the following time window.'), true),
html_print_select( html_print_select(
alerts_get_alert_templates_windows(), alerts_get_alert_templates_windows(),
@ -900,7 +900,7 @@ if ($step == 2) {
) )
); );
$table->data["condition"][0] = html_print_label_input_block( $table->data['condition'][0] = html_print_label_input_block(
__('Alert condition'), __('Alert condition'),
html_print_select( html_print_select(
alerts_get_alert_templates_conditions(), alerts_get_alert_templates_conditions(),

1
pandora_console/pandoradb.sql
View File

@ -2916,6 +2916,7 @@ CREATE TABLE IF NOT EXISTS `tservice` (
`is_favourite` TINYINT NOT NULL DEFAULT 0, `is_favourite` TINYINT NOT NULL DEFAULT 0,
`enable_sunburst` TINYINT NOT NULL DEFAULT 0, `enable_sunburst` TINYINT NOT NULL DEFAULT 0,
`asynchronous` TINYINT NOT NULL DEFAULT 0, `asynchronous` TINYINT NOT NULL DEFAULT 0,
`enable_horizontal_tree` TINYINT NOT NULL DEFAULT 0,
`rca` TEXT, `rca` TEXT,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB ) ENGINE=InnoDB