Commit Graph

6096 Commits

Author SHA1 Message Date
artica f1734e56c3 Auto-updated build strings. 2021-11-01 01:00:17 +01:00
artica 7b9234f392 Auto-updated build strings. 2021-10-31 01:00:19 +02:00
artica 6c6c375702 Auto-updated build strings. 2021-10-30 01:00:24 +02:00
Daniel Rodriguez 3883c99804 Merge branch 'ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card' into 'develop'
CorrelationServer

See merge request artica/pandorafms!4377
2021-10-29 10:07:25 +00:00
artica c903942c7b Auto-updated build strings. 2021-10-29 01:00:21 +02:00
fbsanchez bf0064d486 Correlated alerts are not being linked to modules 2021-10-28 17:21:02 +02:00
fbsanchez 701c384c54 More accurated message when recovering event alerts 2021-10-28 13:01:18 +02:00
artica 7cd429d9f8 Auto-updated build strings. 2021-10-28 01:00:22 +02:00
fbsanchez 2d09e5bfb7 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-10-27 22:59:19 +02:00
Daniel Rodriguez 0ec2bf30ce Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop'
Fix SQL errors in action queries.

See merge request artica/pandorafms!4502
2021-10-27 15:45:33 +00:00
artica 945392b615 Auto-updated build strings. 2021-10-27 01:00:56 +02:00
Ramon Novoa cd3e20fefe Fix action information for SNMP alert events. 2021-10-26 17:40:03 +02:00
Ramon Novoa 35aa6b5258 Fix SQL errors in action queries. 2021-10-26 15:07:42 +02:00
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
2021-10-26 14:21:40 +02:00
Ramon Novoa 356e1f9f2b Fix SQL errors in action queries. 2021-10-26 13:24:23 +02:00
Daniel Rodriguez e2ae42dd89 Merge branch 'ent-7060-gestion-basica-de-configuracion-de-equipos-de-red' into 'develop'
NCM

See merge request artica/pandorafms!4434
2021-10-26 08:21:01 +00:00
artica 24404d5078 Auto-updated build strings. 2021-10-26 01:01:06 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
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
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +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
fbsanchez 6c0e2d23de updates 2021-10-15 13:39:23 +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
fbsanchez 96250dcfa0 WIP NCM 2021-10-13 22:47:31 +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
fbsanchez d2f5a04583 WIP NCM 2021-10-11 20:42:43 +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
Ramon Novoa 5d7cb5e4c7 Rename the _address_n_ macro and add it to more servers.
The _address_n_ macro did not work properly because of the partial match
with the _address_ macro. It has been renamed to_addressn_n_ (e.g.,
_addressn_1_, _addressn_2_, etc.) and added to the Network and Plug-in
servers. Fixes pandora_enterprise#7379.
2021-10-08 13:17:04 +02:00
Jose Gonzalez 4331438765 Removed some cheerful words in the project 2021-10-08 11:13:28 +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
Jose Gonzalez a70d48514e Fix Barivion name in license and readme 2021-10-06 13:33:25 +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
fbsanchez e237d7dd07 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
Conflicts:
	pandora_console/extras/mr/50.sql
2021-09-30 12:24:19 +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 4f76a44ffa Several fixes for correlation recovery 2021-09-27 15:12:20 +02:00
fbsanchez 1983403327 Some improvements 2021-09-27 14:50:34 +02:00
fbsanchez b7879f8815 CorrelationServer with iterative evaluation 2021-09-27 12:25:43 +02: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
artica bc516889bf Auto-updated build strings. 2021-09-24 01:00:21 +02:00
Daniel Rodriguez 7a2c992c44 Merge branch 'ent-7952-comportamiento-extrano-procesamiento-dataserver' into 'develop'
Do not search the agent name in tagente.direccion.

See merge request artica/pandorafms!4387
2021-09-23 14:51:48 +00:00
fbsanchez 12ddb4d792 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
2021-09-23 16:23:38 +02:00
Daniel Rodriguez f60c41ff30 Merge branch 'ent-8011-replicacion-de-eventos-genera-conexiones-infinitas' into 'develop'
Read event_replication from the database.

See merge request artica/pandorafms!4419
2021-09-23 10:32:54 +00:00
artica 0e34c1275a Auto-updated build strings. 2021-09-23 01:00:21 +02:00
Daniel Rodriguez 1aabb11c8c Merge branch 'ent-8032-giss-cambiar-comando-de-alerta-para-que-descarte-cualquier-string-que-no-parezca-una-direccion' into 'develop'
Add simple email address validation.

See merge request artica/pandorafms!4417
2021-09-22 12:33:18 +00:00
fbsanchez f8ea92923a minor fixes 2021-09-22 11:44:32 +02:00
artica 61e2a3f21b Auto-updated build strings. 2021-09-22 01:00:21 +02:00
fbsanchez 5b8a391f99 Extra options pandora_ha auto-resync 2021-09-21 18:51:50 +02:00
Daniel Rodriguez 125f63a7a2 Merge branch 'ent-7695-eventos-con-entities-al-cambiar-info-de-eventos' into 'develop'
Fixed entities on text for custom events

See merge request artica/pandorafms!4235
2021-09-21 13:16:17 +00:00
fbsanchez e9c5d89fdc Added level to log_message (pandora_ha) 2021-09-21 12:48:57 +02:00
fbsanchez b3114262c5 Discovery logs improvement 2021-09-21 12:15:34 +02:00
artica d50cf7431b Auto-updated build strings. 2021-09-21 01:00:17 +02:00
Ramon Novoa 15761e7b02 Read event_replication from the database.
Instead of reading event_replication from pandora_server.conf, read it
from the database. Ref. pandora_enterprise#8011.
2021-09-20 13:25:02 +02:00
Ramon Novoa 4a9cac6ef4 Add simple email address validation.
Add simple email address validation for internal email alerts. Prevents
connections to the SMTP server when no address is provided. Ref.
pandora_enterprise#8032.
2021-09-20 11:42:27 +02:00
artica 6153237481 Auto-updated build strings. 2021-09-20 01:00:17 +02:00
artica 43c22e9ec7 Auto-updated build strings. 2021-09-19 01:00:12 +02:00
artica 8d2d7f16de Auto-updated build strings. 2021-09-18 01:00:19 +02:00
artica 33788c9238 Auto-updated build strings. 2021-09-17 01:00:18 +02:00
artica d7452d19e8 Auto-updated build strings. 2021-09-16 01:00:22 +02:00
fbsanchez 2e764afac7 PandoraHA Splitbrain autorecovery 2021-09-15 21:38:10 +02:00