Merge branch 'ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda' into 'develop'

Schema, allow certain autoconfigurations being disabled on MC environments

See merge request artica/pandorafms!4682

.gitlab-ci.yml

@@ -3,4 +3,5 @@ variables:
 
 test:
   script:
-    - docker run --rm -h pandorafms -t -v "$CI_PROJECT_DIR:/tmp/pandorafms" pandorafms/pandorafms-base /tmp/pandorafms/tests/test.sh
+    - docker pull pandorafms/pandorafms-base:centos6
+    - docker run --rm -h pandorafms -t -v "$CI_PROJECT_DIR:/tmp/pandorafms" pandorafms/pandorafms-base:centos6 /tmp/pandorafms/tests/test.sh

pandora_console/extras/mr/52.sql

@@ -14,4 +14,6 @@ SOURCE procedures/alertEvents.sql;
 CALL `migrateEventRanges`();
 DROP PROCEDURE `migrateEventRanges`;
 
-COMMIT;
+ALTER TABLE `tautoconfig` ADD COLUMN `disabled` TINYINT DEFAULT 0;
+
+COMMIT;

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -2187,6 +2187,7 @@ CREATE TABLE IF NOT EXISTS `tautoconfig` (
   `name` varchar(100) NOT NULL,
   `order` int(11) NOT NULL DEFAULT '0',
   `description` text,
+  `disabled` TINYINT,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

pandora_console/godmode/agentes/planned_downtime.editor.php

@@ -639,20 +639,20 @@ $table->data[5][1] = "
             <tr><td>".ui_get_using_system_timezone_warning().'</td></tr>
             <tr>
                 <td>'.__('Type Periodicity:').'&nbsp;'.html_print_select(
-    [
-        'weekly'  => __('Weekly'),
-        'monthly' => __('Monthly'),
-    ],
-    'type_periodicity',
-    $type_periodicity,
-    'change_type_periodicity();',
-    '',
-    0,
-    true,
-    false,
-    true,
-    '',
-    $disabled_in_execution
+                [
+                    'weekly'  => __('Weekly'),
+                    'monthly' => __('Monthly'),
+                ],
+                'type_periodicity',
+                $type_periodicity,
+                'change_type_periodicity();',
+                '',
+                0,
+                true,
+                false,
+                true,
+                '',
+                $disabled_in_execution
 )."</td>
             </tr>
             <tr>
@@ -672,31 +672,31 @@ $table->data[5][1] = "
                         <tr>
                             <td>".__('From day:').'</td>
                             <td>'.html_print_select(
-    $days,
-    'periodically_day_from',
-    $periodically_day_from,
-    '',
-    '',
-    0,
-    true,
-    false,
-    true,
-    '',
-    $disabled_in_execution
+                                $days,
+                                'periodically_day_from',
+                                $periodically_day_from,
+                                '',
+                                '',
+                                0,
+                                true,
+                                false,
+                                true,
+                                '',
+                                $disabled_in_execution
 ).'</td>
                             <td>'.__('To day:').'</td>
                             <td>'.html_print_select(
-    $days,
-    'periodically_day_to',
-    $periodically_day_to,
-    '',
-    '',
-    0,
-    true,
-    false,
-    true,
-    '',
-    $disabled_in_execution
+                                $days,
+                                'periodically_day_to',
+                                $periodically_day_to,
+                                '',
+                                '',
+                                0,
+                                true,
+                                false,
+                                true,
+                                '',
+                                $disabled_in_execution
 ).'</td>
                             <td>'.ui_print_help_tip(__('The end day must be higher than the start day'), true).'</td>
                         </tr>
@@ -705,26 +705,26 @@ $table->data[5][1] = "
                         <tr>
                             <td>'.__('From hour:').'</td>
                             <td>'.html_print_input_text(
-    'periodically_time_from',
-    $periodically_time_from,
-    '',
-    7,
-    7,
-    true,
-    $disabled_in_execution
+                                'periodically_time_from',
+                                $periodically_time_from,
+                                '',
+                                7,
+                                7,
+                                true,
+                                $disabled_in_execution
 ).ui_print_help_tip(
     __('The end time must be higher than the start time'),
     true
 ).'</td>
                             <td>'.__('To hour:').'</td>
                             <td>'.html_print_input_text(
-    'periodically_time_to',
-    $periodically_time_to,
-    '',
-    7,
-    7,
-    true,
-    $disabled_in_execution
+                                'periodically_time_to',
+                                $periodically_time_to,
+                                '',
+                                7,
+                                7,
+                                true,
+                                $disabled_in_execution
 ).ui_print_help_tip(
     __('The end time must be higher than the start time'),
     true
@@ -1008,13 +1008,13 @@ $table->data['module'][1] = "
                 <td class='cell_delete_button' style='text-align: right; width:10%;' id=''>".'<a class="link_delete"
                         onclick="if(!confirm(\''.__('Are you sure?').'\')) return false;"
                         href="">'.html_print_image(
-    'images/cross.png',
-    true,
-    [
-        'border' => '0',
-        'alt'    => __('Delete'),
-        'class'  => 'invert_filter',
-    ]
+                            'images/cross.png',
+                            true,
+                            [
+                                'border' => '0',
+                                'alt'    => __('Delete'),
+                                'class'  => 'invert_filter',
+                            ]
 ).'</a>'."</td>
             </tr>
             <tr class='datos2' id='add_modules_row'>

pandora_console/include/javascript/fullcalendar/main.js

@@ -2249,7 +2249,8 @@ var FullCalendar = (function(exports) {
       return currentRes;
     };
   }
-  function memoizeArraylike(workerFunc, resEquality, teardownFunc) { // used at all?
+  function memoizeArraylike(workerFunc, resEquality, teardownFunc) {
+    // used at all?
     var _this = this;
     var currentArgSets = [];
     var currentResults = [];
@@ -2281,7 +2282,8 @@ var FullCalendar = (function(exports) {
       return currentResults;
     };
   }
-  function memoizeHashlike(workerFunc, resEquality, teardownFunc) { // used?
+  function memoizeHashlike(workerFunc, resEquality, teardownFunc) {
+    // used?
     var _this = this;
     var currentArgHash = {};
     var currentResHash = {};