Commit Graph

6007 Commits

Author SHA1 Message Date
artica 56ca01112d Auto-updated build strings. 2021-10-25 01:00:48 +02:00
artica ef41522899 Auto-updated build strings. 2021-10-24 01:00:45 +02:00
artica 134f6ea2a5 Auto-updated build strings. 2021-10-23 01:00:54 +02:00
artica 1218932b05 Auto-updated build strings. 2021-10-22 01:00:20 +02:00
artica 80c7f106ad Auto-updated build strings. 2021-10-21 01:00:55 +02:00
artica 6ccf3a9ee9 Updated version and build strings. 2021-10-20 15:31:02 +02:00
artica b70ca89af2 Auto-updated build strings. 2021-10-20 01:01:06 +02:00
artica 65b0d839f9 Auto-updated build strings. 2021-10-19 01:00:50 +02:00
Daniel Rodriguez 704403fd52 Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop'
Ent 7972 funcionalidad historico de alertas lanzadas

See merge request artica/pandorafms!4465
2021-10-18 11:36:19 +00:00
artica c043c3d023 Auto-updated build strings. 2021-10-18 01:00:18 +02:00
artica 6da17b11aa Auto-updated build strings. 2021-10-17 01:00:18 +02:00
artica 0e9f37a090 Auto-updated build strings. 2021-10-16 01:00:22 +02:00
artica af9711ec3d Auto-updated build strings. 2021-10-15 01:00:20 +02:00
Ramon Novoa 118b0c3ff0 Alias the action name when executing an alert.
When executing an alert, the name of the action retrieved by the Pandora
FMS Server was overwritten by the name of the command, since the names
of the columns are the same. Now the name of the action is aliased to
preserve it.
2021-10-14 11:02:48 +02:00
artica 20448faa35 Auto-updated build strings. 2021-10-14 01:00:21 +02:00
artica 9d813b729e Auto-updated build strings. 2021-10-13 01:00:13 +02:00
artica 4fd071cf60 Auto-updated build strings. 2021-10-12 01:00:19 +02:00
Ramon Novoa 1344dee2c4 Add action information to alert events. 2021-10-11 10:43:41 +02:00
artica a8937abb65 Auto-updated build strings. 2021-10-11 01:00:15 +02:00
artica 2b419b826d Auto-updated build strings. 2021-10-10 01:00:16 +02:00
artica 9867024d2e Auto-updated build strings. 2021-10-09 01:00:19 +02:00
Jose Gonzalez 0414b9991a Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-7972-funcionalidad-historico-de-alertas-lanzadas 2021-10-08 14:03:25 +02:00
artica eb5b34b99e Auto-updated build strings. 2021-10-08 01:00:19 +02:00
artica c7face04e1 Auto-updated build strings. 2021-10-07 01:00:20 +02:00
artica 1ebc2ed082 Auto-updated build strings. 2021-10-06 01:00:22 +02:00
Daniel Rodriguez 0dd98b21f3 Merge branch 'ent-8050-arreglar-comprobacion-de-api-en-el-inicio-del-servidor' into 'develop'
timeout for server API conn test at start

See merge request artica/pandorafms!4437
2021-10-05 11:07:26 +00:00
Daniel Rodriguez cc36fdc54f Merge branch 'ent-fix-webserver' into 'develop'
Fixed warnings and problem with multibyte characters on WebServer.

See merge request artica/pandorafms!4357
2021-10-05 09:51:58 +00:00
artica d1b9dc4ef8 Auto-updated build strings. 2021-10-05 01:00:20 +02:00
artica 0e02cb314c Auto-updated build strings. 2021-10-04 01:00:16 +02:00
artica 7b369d4fed Auto-updated build strings. 2021-10-03 01:00:15 +02:00
artica fd51190b07 Auto-updated build strings. 2021-10-02 01:00:19 +02:00
Daniel Rodriguez 1cdef62ceb Merge branch 'ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli' into 'develop'
add agent_update_custom_fields on cli

See merge request artica/pandorafms!4281
2021-10-01 12:36:17 +00:00
fbsanchez 626a9d17c6 timeout for server API conn test at start 2021-10-01 12:35:26 +02:00
artica 1d74155723 Auto-updated build strings. 2021-10-01 01:00:22 +02:00
marcos d0f08be953 update agent custom fields 2021-09-30 14:34:58 +02:00
marcos d54af52baf update agent custom fields 2021-09-30 12:50:59 +02:00
artica 036da5ea3a Auto-updated build strings. 2021-09-30 01:00:18 +02:00
Daniel Rodriguez ee8ae5cf76 Merge branch 'ent-8004-command-center-las-politicas-una-vez-aplicadas-no-se-marcan-en-verde-en-la-metaconsola' into 'develop'
Avoid MC process data in dataserver

See merge request artica/pandorafms!4427
2021-09-29 13:27:28 +00:00
Daniel Rodriguez f756cec3be Merge branch 'ent-7869-solucion-automatica-splitbrain-pandora-ha' into 'develop'
PandoraHA Splitbrain autorecovery

See merge request artica/pandorafms!4413
2021-09-29 09:58:29 +00:00
artica 06c42a051d Auto-updated build strings. 2021-09-29 01:00:20 +02:00
marcos 4e25442813 update agent custom fields 2021-09-28 11:20:26 +02:00
marcos a8a5289652 update agent custom fields 2021-09-28 09:31:06 +02:00
artica 201fea9378 Auto-updated build strings. 2021-09-28 01:00:21 +02:00
marcos a7e97f0493 refactor update agent custom fields 2021-09-27 17:56:41 +02:00
marcos 87eb16ef32 Merge remote-tracking branch 'origin/master' into ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli 2021-09-27 17:08:03 +02:00
Daniel Rodriguez 83703b88fa Merge branch 'ent-5171-mejora-logs-discovery' into 'develop'
Discovery logs improvement

See merge request artica/pandorafms!4422
2021-09-27 14:37:09 +00:00
fbsanchez f7ec31cc72 Avoid MC process data in dataserver 2021-09-27 10:07:23 +02:00
artica b09febeee0 Auto-updated build strings. 2021-09-27 01:00:15 +02:00
artica 17ba73ad36 Auto-updated build strings. 2021-09-26 01:00:11 +02:00
artica 2cbe307a6f Auto-updated build strings. 2021-09-25 01:00:21 +02:00