Commit Graph

6283 Commits

Author SHA1 Message Date
artica 49bf10f0f8 Auto-updated build strings. 2022-01-18 01:00:39 +01:00
artica 98660cd0e3 Auto-updated build strings. 2022-01-17 01:00:26 +01:00
artica 84c4b52d57 Auto-updated build strings. 2022-01-16 01:00:16 +01:00
artica e8b594a03b Auto-updated build strings. 2022-01-15 01:00:18 +01:00
alejandro.campos@artica.es f9bb085dad fixed bug in monitoring event creation 2022-01-14 09:05:50 +01:00
artica 55f8f09894 Auto-updated build strings. 2022-01-14 01:00:19 +01:00
artica 22305d7221 Auto-updated build strings. 2022-01-13 01:00:20 +01:00
Daniel Rodriguez f6f1064cdd Merge branch 'ent-8026-autocreate-group-pandora-server' into 'develop'
Add support for autocreate_group_name.

See merge request artica/pandorafms!4625
2022-01-12 15:16:51 +00:00
Daniel Rodriguez 172b34ee12 Merge branch 'ent-8407-parametro-erroneo-days_purge_ncm' into 'develop'
errata fix

See merge request artica/pandorafms!4597
2022-01-12 12:18:55 +00:00
artica f10c1d3017 Auto-updated build strings. 2022-01-12 01:00:57 +01:00
Ramon Novoa f16bf7e2c8 Add support for autocreate_group_name.
autocreate_group_name works like autocreate_group, but let's you specify
the group name instead of its id. Ref. pandora_enterprise#8026.
2022-01-11 15:15:22 +01:00
artica 1afcf787b0 Auto-updated build strings. 2022-01-11 01:00:19 +01:00
artica cc58138f11 Auto-updated build strings. 2022-01-10 01:00:15 +01:00
artica 9b48d43374 Auto-updated build strings. 2022-01-09 01:00:16 +01:00
artica 18909156dd Auto-updated build strings. 2022-01-08 01:00:19 +01:00
artica 2b560d8806 Auto-updated build strings. 2022-01-07 01:00:18 +01:00
artica f44803eec2 Auto-updated build strings. 2022-01-06 01:00:19 +01:00
artica 68e63bd5fb Auto-updated build strings. 2022-01-05 01:00:20 +01:00
artica 13c3a6f27d Auto-updated build strings. 2022-01-04 01:00:18 +01:00
artica 31885b1ca9 Auto-updated build strings. 2022-01-03 01:00:15 +01:00
artica 8e82247c45 Auto-updated build strings. 2022-01-02 01:00:14 +01:00
artica 1f3fb9dfea Auto-updated build strings. 2022-01-01 01:00:16 +01:00
artica 8908e5c1b3 Auto-updated build strings. 2021-12-31 01:00:16 +01:00
artica d16734cced Auto-updated build strings. 2021-12-30 01:00:15 +01:00
artica d46435a0ad Auto-updated build strings. 2021-12-29 01:00:16 +01:00
artica 6cfd091d0e Auto-updated build strings. 2021-12-28 01:00:17 +01:00
Daniel Rodriguez 02dfea8e58 Merge branch 'ent-8304-correccion-en-comportamiento-al-aplicar-politicas' into 'develop'
Fix db lock stopping policy apply

See merge request artica/pandorafms!4589
2021-12-27 12:46:17 +00:00
artica 60a4d1cfc0 Auto-updated build strings. 2021-12-27 01:00:14 +01:00
artica 78657f0e7e Auto-updated build strings. 2021-12-26 01:00:15 +01:00
artica 2d0531e0a6 Auto-updated build strings. 2021-12-25 01:00:19 +01:00
artica 3da9a8ab91 Auto-updated build strings. 2021-12-24 01:00:22 +01:00
artica e7949e3480 Auto-updated build strings. 2021-12-23 01:00:17 +01:00
artica f534f8357d Auto-updated build strings. 2021-12-22 01:00:19 +01:00
artica ed4e1e4be4 Auto-updated build strings. 2021-12-21 01:00:19 +01:00
fbsanchez b27966aa18 errata fix 2021-12-20 15:50:42 +01:00
artica 0c1829a555 Auto-updated build strings. 2021-12-20 01:00:16 +01:00
artica 0d3d666a52 Auto-updated build strings. 2021-12-19 01:00:17 +01:00
artica b808f6fa0b Auto-updated build strings. 2021-12-18 01:00:21 +01:00
Ramon Novoa ad0b8db4d0 Merge remote-tracking branch 'origin/master' into master-alt 2021-12-17 10:32:32 +01:00
artica 95b85284dd Auto-updated build strings. 2021-12-17 01:00:21 +01:00
Calvo 0bad3761a7 Fix db lock stopping policy apply 2021-12-16 10:26:45 +01:00
artica 231221830b Auto-updated build strings. 2021-12-16 01:00:18 +01:00
artica 34204d4224 Auto-updated build strings. 2021-12-15 01:00:23 +01:00
artica 6d054051ea Updated version and build strings. 2021-12-14 15:32:04 +01:00
Daniel Rodriguez 873f56f551 Merge branch 'ent-8371-recorte-de-predicciones' into 'develop'
Clip predictions if the module has max. and min. values.

See merge request artica/pandorafms!4581
2021-12-14 14:08:18 +00:00
Ramon Novoa c06189af9f Clip predictions if the module has max. and min. values. 2021-12-14 11:30:03 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-14 11:03:04 +01:00
artica 859c632132 Auto-updated build strings. 2021-12-14 01:00:20 +01:00
Daniel Rodriguez 1c69c76789 Merge branch 'ent-3220-modulo-para-capacity-planning' into 'develop'
Ent 3220 modulo para capacity planning

See merge request artica/pandorafms!4578
2021-12-13 16:15:36 +00:00
Ramon Novoa b8565d59dc Add support for capacity planning modules.
Capacity planning modules replace traditional prediction modules. Ref.
pandora_enterprise#3220.
2021-12-13 12:28:58 +01:00
artica 88fe0b69cc Auto-updated build strings. 2021-12-13 01:00:16 +01:00
artica 19b8730c07 Auto-updated build strings. 2021-12-12 01:00:17 +01:00
artica 8ba6a05d1f Auto-updated build strings. 2021-12-11 01:00:19 +01:00
artica 3dd92397f9 Auto-updated build strings. 2021-12-10 01:00:20 +01:00
Ramon Novoa 4ed17b9dae Merge remote-tracking branch 'origin/ent-7456-modulos-de-tendencias-trending-modules' into ent-3220-modulo-para-capacity-planning 2021-12-09 10:55:20 +01:00
artica e7b1bfd368 Auto-updated build strings. 2021-12-09 01:00:16 +01:00
artica 67c8a846b9 Auto-updated build strings. 2021-12-08 01:00:17 +01:00
fbsanchez 1ab02c4c0c cleanup old ncm data keeping 1 data per type and agent 2021-12-07 16:19:50 +01:00
artica 4925aaae18 Auto-updated build strings. 2021-12-07 01:00:17 +01:00
artica 3e0e41038f Auto-updated build strings. 2021-12-06 01:00:16 +01:00
artica f1482dc812 Auto-updated build strings. 2021-12-05 01:00:17 +01:00
artica fcff0eeafd Auto-updated build strings. 2021-12-04 01:00:20 +01:00
Ramon Novoa 642af39395 Add support for trend modules.
Ref. pandora_enterprise#7456.
2021-12-03 11:48:11 +01:00
artica c2348fdc3e Auto-updated build strings. 2021-12-03 01:00:22 +01:00
Daniel Rodriguez 0e16c93c73 Merge branch 'ent-8114-12553-Falla-la-macro-moduledata-X-cuando-no-tienes-activo-el-historico-en-el-modulo' into 'develop'
Ent 8114 12553 falla la macro moduledata x cuando no tienes activo el historico en el modulo

See merge request artica/pandorafms!4486
2021-12-02 16:27:41 +00:00
Daniel Rodriguez 69590afef6 Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop'
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor

See merge request artica/pandorafms!4557
2021-12-02 10:51:57 +00:00
artica e693f7c3a2 Auto-updated build strings. 2021-12-02 01:00:18 +01:00
artica b63a33026b Auto-updated build strings. 2021-12-01 01:00:20 +01:00
Daniel Rodriguez ef310cce4c Merge branch 'ent-fix-special-multibyte-characters-treatment' into 'develop'
Fixed special multibyte characters treatment.

See merge request artica/pandorafms!4524
2021-11-30 13:34:35 +00:00
artica 622d125b36 Auto-updated build strings. 2021-11-30 01:00:24 +01:00
artica 1bbcf965a8 Auto-updated build strings. 2021-11-29 01:00:15 +01:00
artica 7631585546 Auto-updated build strings. 2021-11-28 01:00:16 +01:00
artica 800faaf504 Auto-updated build strings. 2021-11-27 01:00:46 +01:00
artica b1a55ad102 Auto-updated build strings. 2021-11-26 01:00:21 +01:00
Ramon Novoa 5bf83bcc81 Add support for percentage module status thresholds. 2021-11-25 12:58:21 +01:00
Daniel Rodriguez 05e61492c0 Merge branch 'ent-8228-Se-puede-crear/editar/borrar-un-usuario-desde-CLI-en-nodo-centralizado' into 'develop'
Ent 8228 se puede crear/editar/borrar un usuario desde cli en nodo centralizado

See merge request artica/pandorafms!4544
2021-11-25 10:52:58 +00:00
Daniel Rodriguez f66d6e7f9c Merge branch 'ent-8224-Se-puede-crear/editar/borrar-un-grupo-desde-el-CLI-en-nodo-centralizado' into 'develop'
Ent 8224 se puede crear/editar/borrar un grupo desde el cli en nodo centralizado

See merge request artica/pandorafms!4542
2021-11-25 10:52:08 +00:00
artica 1f428a25ad Auto-updated build strings. 2021-11-25 01:00:20 +01:00
Daniel Rodriguez fff8f910f8 Merge branch 'ent-8015-palabras-conflictivas' into 'develop'
Removed some cheerful words in the project

Closes pandora_enterprise#8015

See merge request artica/pandorafms!4460
2021-11-24 17:18:38 +00:00
Daniel Maya 922088c306 resolved conflict 2021-11-24 17:48:34 +01:00
Daniel Maya 4185e34984 Merge branch 'develop' into ent-8228-Se-puede-crear/editar/borrar-un-usuario-desde-CLI-en-nodo-centralizado 2021-11-24 17:47:33 +01:00
Daniel Maya 0d2e4a99a3 resolved conflict 2021-11-24 17:46:23 +01:00
artica 3ec3e5e0a2 Updated version and build strings. 2021-11-24 17:45:09 +01:00
Daniel Maya 3cc3cef7fa oMerge branch 'develop' into ent-8224-Se-puede-crear/editar/borrar-un-grupo-desde-el-CLI-en-nodo-centralizado 2021-11-24 17:36:48 +01:00
Daniel Maya 716e04a6b1 #8224 Fixed print_log 2021-11-24 16:11:32 +01:00
Daniel Maya f52dc0c319 #8228 Fixed print_log 2021-11-24 16:07:20 +01:00
Daniel Rodriguez 07ef0477af Merge branch 'ent-8301-Fallo-pandora-manage-pl' into 'develop'
minor fix

See merge request artica/pandorafms!4548
2021-11-24 10:23:48 +00:00
artica 98f4bfbcc1 Auto-updated build strings. 2021-11-24 01:00:10 +01:00
Daniel Barbero Martin e0fec6470d minor fix 2021-11-23 18:04:34 +01:00
Daniel Maya 90739088f4 #8228 Added centralised node check 2021-11-23 12:43:07 +01:00
Jose Gonzalez 98f519958c Fix merge 2021-11-23 12:25:58 +01:00
Daniel Maya c5588197f2 #8224 centralised node check added 2021-11-23 12:23:27 +01:00
artica fee6b06a2a Updated version and build strings. 2021-11-23 11:28:02 +01:00
artica feedce5a61 Auto-updated build strings. 2021-11-23 01:00:18 +01:00
artica 9474dc9dbc Auto-updated build strings. 2021-11-22 01:00:09 +01:00
artica 956e1bd82b Auto-updated build strings. 2021-11-21 01:00:14 +01:00
artica 1751faac96 Auto-updated build strings. 2021-11-20 01:00:24 +01:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
Conflicts:
	pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
artica f18a575b2a Auto-updated build strings. 2021-11-19 01:00:17 +01:00
Daniel Rodriguez 69a7af2131 Merge branch 'ent-7799-jerarquia-fiels-alertas-snmp-accion-comando-de-alerta' into 'develop'
Ent 7799 jerarquia fiels alertas snmp accion comando de alerta

See merge request artica/pandorafms!4322
2021-11-18 16:31:50 +00:00
Calvo 37dacfa499 g,k kjjMerge remote-tracking branch 'origin/develop' into ent-7799-jerarquia-fiels-alertas-snmp-accion-comando-de-alerta 2021-11-18 09:37:31 +01:00
artica a5cfe3869c Auto-updated build strings. 2021-11-18 01:00:18 +01:00
artica 7a290bfac6 Auto-updated build strings. 2021-11-17 01:00:19 +01:00
Daniel Rodriguez a940396b0d Merge branch 'ent-7379-macro-de-direcciones-en-network-y-pluginserver' into 'develop'
Rename the _address_n_ macro and add it to more servers.

Closes pandora_enterprise#7379

See merge request artica/pandorafms!4462
2021-11-16 12:07:54 +00:00
artica 7b717bcc6d Auto-updated build strings. 2021-11-16 01:00:20 +01:00
artica 203aa3ef8a Auto-updated build strings. 2021-11-15 01:00:15 +01:00
artica bb771ec140 Auto-updated build strings. 2021-11-14 01:00:16 +01:00
artica 94fadddc80 Auto-updated build strings. 2021-11-13 01:00:19 +01:00
artica bfa8dc4473 Auto-updated build strings. 2021-11-12 01:00:07 +01:00
artica bf0be017b6 Updated version and build strings. 2021-11-11 19:06:08 +01:00
Ramon Novoa 55532ab0ab Merge commit '6081384ef968a53b3c9cec84b984d378b85afde6' into master-alt 2021-11-11 18:42:27 +01:00
artica b5cc63c159 Auto-updated build strings. 2021-11-11 01:00:19 +01:00
artica 3069c89e6e Auto-updated build strings. 2021-11-10 01:00:15 +01:00
artica 707bee66c1 Auto-updated build strings. 2021-11-09 01:01:01 +01:00
fbsanchez ac890ee165 some tools for policy-auto-application 2021-11-08 14:00:26 +01:00
Daniel Barbero Martin 900a37ad5d Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-08 08:54:41 +01:00
Junichi Satoh 9c2aae2a44 Fixed special multibyte characters treatment.
They were not converted to html entities when storing to DB.
2021-11-08 10:00:43 +09:00
artica df48e7f73d Auto-updated build strings. 2021-11-08 01:00:17 +01:00
artica b2db6064bf Auto-updated build strings. 2021-11-07 01:00:17 +01:00
artica 3e9bc55e68 Auto-updated build strings. 2021-11-06 01:00:21 +01:00
Daniel Barbero Martin c3e2b4361f Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-05 10:00:15 +01:00
artica 9c290d917e Auto-updated build strings. 2021-11-05 01:00:12 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Barbero Martin c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
artica 4ebb817d90 Auto-updated build strings. 2021-11-04 01:00:54 +01:00
artica 0be9abcdca Auto-updated build strings. 2021-11-03 01:00:21 +01:00
artica 23566c9ef4 Auto-updated build strings. 2021-11-02 01:00:18 +01:00
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