From de3f8b2a0fab85e6c44385bb323845ec0d701019 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Fri, 22 Nov 2019 10:56:30 +0100
Subject: [PATCH] updates

---
 pandora_console/extras/mr/33.sql             | 2 +-
 pandora_console/include/functions_events.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pandora_console/extras/mr/33.sql b/pandora_console/extras/mr/33.sql
index 0d8eda13c6..cb3669979b 100644
--- a/pandora_console/extras/mr/33.sql
+++ b/pandora_console/extras/mr/33.sql
@@ -17,7 +17,7 @@ INSERT INTO `tnetwork_component` (`name`, `description`, `id_group`, `type`, `ma
 INSERT INTO `tnetwork_component` (`name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`, `id_plugin`, `plugin_user`, `plugin_pass`, `plugin_parameter`, `max_timeout`, `max_retries`, `history_data`, `min_warning`, `max_warning`, `max_critical`, `str_warning`, `min_ff_event`, `min_critical`, `custom_string_2`, `str_critical`, `custom_integer_1`, `custom_string_1`, `post_process`, `custom_string_3`, `wizard_level`, `custom_integer_2`, `critical_instructions`, `unit`, `unknown_instructions`, `macros`, `warning_inverse`, `warning_instructions`, `tags`, `critical_inverse`, `module_macros`, `id_category`, `min_ff_event_warning`, `disabled_types_event`, `ff_type`, `min_ff_event_normal`, `dynamic_interval`, `min_ff_event_critical`, `dynamic_min`, `each_ff`, `dynamic_two_tailed`, `dynamic_max`, `dynamic_next`) VALUES ('Linux&#x20;available&#x20;disk&#x20;/','Available&#x20;free&#x20;space&#x20;in&#x20;mountpoint&#x20;/',43,34,0,0,300,0,'df&#x20;/&#x20;|&#x20;tail&#x20;-n&#x20;+2&#x20;|&#x20;awk&#x20;&#039;{print&#x20;$&#40;NF-1&#41;}&#039;&#x20;|&#x20;tr&#x20;-d&#x20;&#039;%&#039;','','','',4,2,0,'','','',0,0,1,0.00,0.00,'0.00',0.00,0.00,'',0,'','inherited','',0,0,0.000000000000000,'','nowizard','','nowizard','0','',0,0,0,'','{\"going_unknown\":1}','',0,0,0,0,0,0,0,0,0,0);
 
 INSERT INTO `tconfig`(`token`, `value`) VALUES ('welcome_state', -1);
-ALTER TABLE `tevent_filter` ADD COLUMN `id_source_event` int(10);
+ALTER TABLE tevent_filter ADD COLUMN id_source_event int(10);
 
 
 COMMIT;
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 4c68ff4306..9a3ccacdff 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -37,7 +37,7 @@ enterprise_include_once('meta/include/functions_agents_meta.php');
 enterprise_include_once('meta/include/functions_modules_meta.php');
 if (is_metaconsole()) {
     $id_source_event = get_parameter('id_source_event');
-enterprise_include_once('meta/include/functions_events_meta.php');
+}
 
 
 /**
@@ -174,7 +174,6 @@ function events_translate_event_criticity($criticity)
         default:
         return __('UNKNOWN');
     }
->>>>>>> pandora_console/include/functions_events.php
 }