Commit Graph

4669 Commits

Author SHA1 Message Date
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
artica 23e64ab781 Auto-updated build strings. 2019-11-21 00:01:18 +01:00
fbsanchez e9432aaaa5 Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-11-20 15:51:47 +01:00
artica 12123d68df Auto-updated build strings. 2019-11-20 00:01:37 +01:00
fbsanchez 9cea131378 WIP CorrelatedAlerts 2019-11-19 23:35:29 +01:00
fbsanchez 471389a72a Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl'
Conflicts:
   pandora_console/extras/mr/33.sql
2019-11-19 14:11:38 +01:00
fbsanchez be1e4324d2 missed port 2019-11-19 12:02:10 +01:00
fbsanchez 0fd95647ea log_window 2019-11-19 11:56:11 +01:00
artica 04076a04b1 Auto-updated build strings. 2019-11-19 00:01:12 +01:00
fbsanchez 83e7d5a701 Minor fixes 2019-11-18 19:32:57 +01:00
José González 4cddf5a31a Merge branch 'develop' into 'ent-4930-create_event-no-anade-comentarios-evento'
# Conflicts:
#   pandora_console/include/functions_events.php
2019-11-18 11:02:31 +01:00
fbsanchez 1cacbbc08f fix tools 2019-11-18 10:40:02 +01:00
fbsanchez 4a05cbb544 Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 2019-11-18 10:05:47 +01:00
fbsanchez 6fb2e3af81 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-18 10:05:40 +01:00
fbsanchez 13dd2ebc18 Merge branch 'ent-4226-mejoras-plugin-sap' of brutus.artica.lan:artica/pandorafms into ent-4226-mejoras-plugin-sap 2019-11-18 10:04:52 +01:00
fbsanchez 2f80759227 minor updates pandora sap 2019-11-18 10:04:47 +01:00
artica 73389a7164 Auto-updated build strings. 2019-11-18 00:01:07 +01:00
artica 39b449be9c Auto-updated build strings. 2019-11-17 00:01:07 +01:00
artica 727b3bde5d Auto-updated build strings. 2019-11-16 00:01:11 +01:00
fbsanchez 32466a5f0f Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-15 16:36:06 +01:00
artica 378192a449 Auto-updated build strings. 2019-11-15 00:01:12 +01:00
fbsanchez f69b86663a Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/godmode/wizards/Wizard.main.php
2019-11-14 21:40:35 +01:00