Commit Graph

4690 Commits

Author SHA1 Message Date
Alejandro Fraguas 5c0636b074 Merge branch 'ent-5203-incluir-ssh_launcher-en-config-pm' into 'develop'
Added ssh_launcher settings to pandora_Server

See merge request artica/pandorafms!2979
2019-12-24 10:03:37 +01:00
artica d653b4d685 Auto-updated build strings. 2019-12-24 00:01:22 +01:00
artica cf8bf74cd4 Auto-updated build strings. 2019-12-23 00:01:17 +01:00
artica 59e91c0ed4 Auto-updated build strings. 2019-12-22 00:01:09 +01:00
artica df704997e3 Auto-updated build strings. 2019-12-21 00:01:24 +01:00
artica 45a8904578 Auto-updated build strings. 2019-12-20 00:01:10 +01:00
fbsanchez 4197b7036b Added ssh_launcher settings to pandora_Server 2019-12-19 11:48:20 +01:00
artica f69d243330 Auto-updated build strings. 2019-12-19 00:01:09 +01:00
artica dcd1bbd527 Auto-updated build strings. 2019-12-18 00:01:20 +01:00
artica 0b0c38f9c0 Auto-updated build strings. 2019-12-17 00:01:10 +01:00
artica 79cad3eaa9 Updated version and build strings. 2019-12-16 11:43:58 +01:00
artica f7b0372e53 Auto-updated build strings. 2019-12-16 00:01:07 +01:00
artica 20f3583fc5 Auto-updated build strings. 2019-12-15 00:01:06 +01:00
artica ebe0ba25c8 Auto-updated build strings. 2019-12-14 00:01:09 +01:00
artica 37c5acf4d1 Auto-updated build strings. 2019-12-13 00:01:12 +01:00
artica dd49f0c91c Auto-updated build strings. 2019-12-12 00:01:11 +01:00
artica 772b26ffcb Auto-updated build strings. 2019-12-11 00:01:11 +01:00
Daniel Rodriguez 1350ef951b Merge branch '5079-Otra-vez-las-comillas-dobles-en-comentarios' into 'develop'
Code reset and solved other issues with comments

See merge request artica/pandorafms!2943
2019-12-10 17:21:48 +01:00
Jose Gonzalez df79950a77 Solve issues with comments with quotes in CLI 2019-12-10 13:31:12 +01:00
Luis 01e3c8bcda Ent 5004 crete event cli no funciona bien 2019-12-10 11:31:45 +01:00
artica 7a858fbc25 Auto-updated build strings. 2019-12-10 00:01:07 +01:00
artica 180d5842ee Auto-updated build strings. 2019-12-09 00:01:08 +01:00
artica 8128f2605a Auto-updated build strings. 2019-12-08 00:01:07 +01:00
artica 8f31fc21f1 Auto-updated build strings. 2019-12-07 00:01:07 +01:00
artica f477014a1b Auto-updated build strings. 2019-12-06 00:01:10 +01:00
artica 0263060639 Auto-updated build strings. 2019-12-05 00:01:09 +01:00
artica 0ba2d86971 Auto-updated build strings. 2019-12-04 00:01:08 +01:00
fbsanchez a8a1b2bcc8 Fix ELK alerts 2019-12-03 19:54:09 +01:00
artica 60aaf4363e Auto-updated build strings. 2019-12-03 00:01:07 +01:00
artica 80d5eea467 Auto-updated build strings. 2019-12-02 00:01:08 +01:00
artica 882198798a Auto-updated build strings. 2019-12-01 00:01:06 +01:00
artica a6f881c6fa Auto-updated build strings. 2019-11-30 00:01:08 +01:00
artica 14999b7b84 Auto-updated build strings. 2019-11-29 00:01:08 +01:00
artica ec6d317bd4 Auto-updated build strings. 2019-11-28 00:01:09 +01:00
artica d2fdc0cf9d Auto-updated build strings. 2019-11-27 00:01:08 +01:00
fbsanchez bf22ff7a50 minor fixes 2019-11-26 17:08:18 +01:00
fbsanchez 69b813390d minor fix - removed trace 2019-11-26 15:49:28 +01:00
fbsanchez a4db8483d1 Discovery Applications minor fixes - SAP backend 2019-11-26 15:47:04 +01:00
fbsanchez c985f2d5f9 Merge remote-tracking branch 'origin/ent-4610-Alertas-de-logs' into ent-EDF
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-11-26 10:50:51 +01:00
artica b3fa4b7b7d Auto-updated build strings. 2019-11-26 00:01:08 +01:00
fbsanchez a854809247 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs 2019-11-25 09:39:25 +01:00
artica 1592773b46 Auto-updated build strings. 2019-11-25 00:01:07 +01:00
artica 44311c0438 Auto-updated build strings. 2019-11-24 00:01:07 +01:00
artica 09e6615611 Auto-updated build strings. 2019-11-23 00:01:09 +01:00
fbsanchez 4e2bd7ed55 minor fixes 2019-11-22 20:49:46 +01:00
fbsanchez 5423e78d62 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/godmode/wizards/Wizard.main.php
	pandora_console/include/functions_agents.php
	pandora_console/include/styles/alert.css
	pandora_console/pandoradb.sql
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2019-11-22 15:49:07 +01:00
artica 561e73d524 Updated version and build strings. 2019-11-22 10:03:53 +01:00
artica b386da7da6 Auto-updated build strings. 2019-11-22 00:01:10 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez 362837f856 updated default values for tevent_rule, new tokens for correlated alerts 2019-11-21 17:47:21 +01:00