From c5c84d74216dd537c272b9c52a6ef26e88489e95 Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Mon, 29 Apr 2019 12:32:06 +0200 Subject: [PATCH 1/6] Deleted row Integria IMS incident from event on tevent_responoses Former-commit-id: 76e41297003d537f8b0ea74394dd433e71ca2976 --- pandora_console/extras/mr/27.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/pandora_console/extras/mr/27.sql b/pandora_console/extras/mr/27.sql index 697be21a93..38d0d0d7bb 100644 --- a/pandora_console/extras/mr/27.sql +++ b/pandora_console/extras/mr/27.sql @@ -50,5 +50,6 @@ UPDATE `trecon_script` SET `type` = 4 WHERE `name` LIKE "IPMI%Recon"; UPDATE `trecon_task` SET `type`=3 WHERE `description`="Discovery.Application.VMware"; UPDATE `trecon_task` SET `type`=2 WHERE `description`="Discovery.Cloud"; UPDATE `trecon_task` SET `type`=7 WHERE `description`="Discovery.Cloud.RDS"; +DELETE FROM 'tevent_response' WHERE 'name' LIKE 'Create Integria IMS incident from event'; COMMIT; From 8dc2644368c0e613f581a1dece97a1f2c97bbd74 Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Mon, 29 Apr 2019 12:36:37 +0200 Subject: [PATCH 2/6] Deleted default insert on tevent_response Former-commit-id: 33fb686679fa89afbf0834e1e434739d11bfc4dd --- pandora_console/pandoradb_data.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 7b9517f661..f30798352e 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -1158,7 +1158,7 @@ INSERT INTO `tagent_custom_fields` VALUES (1,'Serial Number',0,0,''),(2,'De INSERT INTO `ttag` VALUES (1,'network','Network equipment','http://artica.es','',''),(2,'critical','Critical modules','','',''),(3,'dmz','DMZ Network Zone','','',''),(4,'performance','Performance anda capacity modules','','',''),(5,'configuration','','','',''); -INSERT INTO `tevent_response` VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,'',0),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,'',0),(4,'Create Integria IMS incident from event','Create a incident from the event with integria incidents system of Pandora FMS. Is necessary to enable and configure the Integria incidents in Pandora FMS setup.','index.php?sec=workspace&sec2=operation/integria_incidents/incident&tab=editor&from_event=_event_id_','url',0,0,0,1,'',0),(5,'Restart agent','Restart the agent with using UDP protocol. To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/util/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'',0),(6,'Ping to module agent host','Ping to the module agent host','ping -c 5 _module_address_','command',0,620,500,0,'',0); +INSERT INTO `tevent_response` VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,'',0),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,'',0),(5,'Restart agent','Restart the agent with using UDP protocol. To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/util/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'',0),(6,'Ping to module agent host','Ping to the module agent host','ping -c 5 _module_address_','command',0,620,500,0,'',0); INSERT INTO `tupdate_settings` VALUES ('current_update', '412'), ('customer_key', 'PANDORA-FREE'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''), ('dbport', ''), ('proxy', ''), ('proxy_port', ''), ('proxy_user', ''), ('proxy_pass', ''); @@ -1315,4 +1315,4 @@ INSERT INTO `tnotification_source_user`(`id_source`,`id_user`,`enabled`,`also_ma INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Message"; - \ No newline at end of file + From e1951c45a4914bed7f464a4ab64592027006928b Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Mon, 6 May 2019 18:06:59 +0200 Subject: [PATCH 3/6] =?UTF-8?q?Se=20a=C3=B1ade=20al=2028?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e --- pandora_console/extras/mr/28.sql | 5 +++++ .../godmode/agentes/module_manager_editor_common.php | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 pandora_console/extras/mr/28.sql diff --git a/pandora_console/extras/mr/28.sql b/pandora_console/extras/mr/28.sql new file mode 100644 index 0000000000..5d61a98318 --- /dev/null +++ b/pandora_console/extras/mr/28.sql @@ -0,0 +1,5 @@ +START TRANSACTION; + +DELETE FROM 'tevent_response' WHERE 'name' LIKE 'Create Integria IMS incident from event'; + +COMMIT; diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 1724ee6622..3f7b3350f9 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -1167,8 +1167,13 @@ foreach ($module_relations as $key => $module_relation) { } html_print_input_hidden('module_relations_count', $relations_count); - +ui_require_jquery_file('ui'); +ui_require_jquery_file('form'); +ui_require_jquery_file('pandora'); +ui_require_jquery_file('pandora.controls'); ui_require_jquery_file('json'); +ui_require_javascript_file('pandora_modules'); + ?> @@ -1362,7 +1367,7 @@ function disabled_two_tailed (disabledBecauseInPolicy) { //Dynamic_options_advance; function advanced_option_dynamic() { if($('.hide_dinamic').is(":visible")){ - $('.hide_dinamic').hide(); + } else { $('.hide_dinamic').show(); From fff3a783a1f045ddeba4718798dc74226645367c Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Mon, 6 May 2019 18:09:30 +0200 Subject: [PATCH 4/6] Se restablece archivo modificado Former-commit-id: 1dca6ef8291dbd98951da31fc765130c9c450316 --- .../godmode/agentes/module_manager_editor_common.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 3f7b3350f9..85114161b6 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -1167,12 +1167,8 @@ foreach ($module_relations as $key => $module_relation) { } html_print_input_hidden('module_relations_count', $relations_count); -ui_require_jquery_file('ui'); -ui_require_jquery_file('form'); -ui_require_jquery_file('pandora'); -ui_require_jquery_file('pandora.controls'); + ui_require_jquery_file('json'); -ui_require_javascript_file('pandora_modules'); ?> @@ -1367,8 +1363,8 @@ function disabled_two_tailed (disabledBecauseInPolicy) { //Dynamic_options_advance; function advanced_option_dynamic() { if($('.hide_dinamic').is(":visible")){ - - + $('.hide_dinamic').hide(); + } else { $('.hide_dinamic').show(); From ad00492ad63d67a41b855c349bf65475fceb4a4e Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Mon, 6 May 2019 18:23:12 +0200 Subject: [PATCH 5/6] se elimina la query del 27 Former-commit-id: 1756d296ad9c13c62c4eb46a854291dfc4200256 --- pandora_console/extras/mr/27.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/extras/mr/27.sql b/pandora_console/extras/mr/27.sql index 38d0d0d7bb..697be21a93 100644 --- a/pandora_console/extras/mr/27.sql +++ b/pandora_console/extras/mr/27.sql @@ -50,6 +50,5 @@ UPDATE `trecon_script` SET `type` = 4 WHERE `name` LIKE "IPMI%Recon"; UPDATE `trecon_task` SET `type`=3 WHERE `description`="Discovery.Application.VMware"; UPDATE `trecon_task` SET `type`=2 WHERE `description`="Discovery.Cloud"; UPDATE `trecon_task` SET `type`=7 WHERE `description`="Discovery.Cloud.RDS"; -DELETE FROM 'tevent_response' WHERE 'name' LIKE 'Create Integria IMS incident from event'; COMMIT; From 5126c651f7ce8ac32baf5e5d4ac658dbee87878c Mon Sep 17 00:00:00 2001 From: Marcos Alconada Date: Thu, 9 May 2019 17:38:40 +0200 Subject: [PATCH 6/6] Changed '' of query --- pandora_console/extras/mr/28.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/extras/mr/28.sql b/pandora_console/extras/mr/28.sql index 5d61a98318..e4dfe8fe9b 100644 --- a/pandora_console/extras/mr/28.sql +++ b/pandora_console/extras/mr/28.sql @@ -1,5 +1,5 @@ START TRANSACTION; -DELETE FROM 'tevent_response' WHERE 'name' LIKE 'Create Integria IMS incident from event'; +DELETE FROM `tevent_response` WHERE `name` LIKE 'Create Integria IMS incident from event'; COMMIT;