17573 Commits

Author SHA1 Message Date
Daniel Barbero Martin
9b79fb826d wip reports alert actions 2021-12-02 13:34:28 +01: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
fbsanchez
11c18d9379 minor style changes 2021-12-02 11:10:18 +01:00
fbsanchez
cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-02 10:43:30 +01:00
Daniel Barbero Martin
b781215b4e Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-02 08:33:02 +01:00
artica
e693f7c3a2 Auto-updated build strings. 2021-12-02 01:00:18 +01:00
Daniel Barbero Martin
a02c8a7988 wip reports alert actions 2021-12-01 15:15:45 +01:00
Jose Gonzalez
3238811f96 Fixed comments issues 2021-12-01 13:15:34 +01:00
Calvo
a38503491a Wip: trending prediction modules 2021-12-01 11:34:11 +01:00
Daniel Barbero Martin
e3d6d52c14 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-01 08:15:43 +01:00
artica
b63a33026b Auto-updated build strings. 2021-12-01 01:00:20 +01:00
Daniel Barbero Martin
6d9b3d209c Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:45:07 +01:00
Daniel Rodriguez
e7e8920783 Merge branch 'ent-8307-Supernet-map-Desplegar-elementos' into 'develop'
Ent 8307 supernet map desplegar elementos

See merge request artica/pandorafms!4559
2021-11-30 13:34:04 +00:00
Daniel Barbero Martin
40d801a947 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:16:19 +01:00
Daniel Barbero Martin
40fc8c7308 wip reports alert actions 2021-11-30 13:07:37 +01:00
Jose Gonzalez
64e08d7124 Fixed grouped comments with id_agent 2021-11-30 10:50:40 +01:00
artica
622d125b36 Auto-updated build strings. 2021-11-30 01:00:24 +01:00
Daniel Barbero Martin
33d9db657e wip reports alert actions 2021-11-29 20:45:35 +01:00
Daniel Barbero Martin
e8bf86a789 wip reports alert actions 2021-11-29 17:55:09 +01:00
Jose Gonzalez
7918b883aa Set the last grouped comments to last events fired 2021-11-29 16:12:15 +01:00
Daniel Maya
c289f67395 #8307 Added contextmenu in supernet map 2021-11-29 15:54:45 +01:00
fbsanchez
19643cd685 report for ncm simple 2021-11-29 15:26:19 +01:00
Daniel Rodriguez
75699cb8fc Merge branch 'ent-7844-revision-acl-enterprise-parte-3-fallos-actuales' into 'develop'
Ent 7844 revision acl enterprise parte 3 fallos actuales

See merge request artica/pandorafms!4356
2021-11-29 11:36:52 +00:00
Daniel Rodriguez
198959f6cb Merge branch 'ent-7995-unificar-criterios-de-busqueda-que-no-sean-case-sensitive' into 'develop'
Unify search criteria case insensitive

See merge request artica/pandorafms!4496
2021-11-29 11:08:00 +00:00
Calvo
c8fcd511bf Fix monitoring alert detail filter for defautl actions 2021-11-29 11:07:11 +01:00
fbsanchez
5197d08aa3 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/install.php
2021-11-29 09:54:55 +01:00
Daniel Barbero Martin
75354a97d9 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-29 08:05:45 +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
fbsanchez
9c17625c77 ncm2 2021-11-26 18:11:34 +01:00
Daniel Barbero Martin
960c2de6c3 wip reports alert actions 2021-11-26 14:06:10 +01:00
Daniel Barbero Martin
be5fe18762 wip reports alert actions 2021-11-26 13:23:46 +01:00
Daniel Barbero Martin
0b04ba44f2 wip reports alert actions 2021-11-26 12:15:39 +01:00
Calvo
54755db59b Control inverse and percentege cannot be selected at same time 2021-11-26 11:55:38 +01:00
Jose Gonzalez
5eb4a869cc Fix issue with metaconsole comments 2021-11-26 11:51:27 +01:00
Daniel Barbero Martin
780d2bf87d wip reports alert actions 2021-11-26 11:43:57 +01:00
Daniel Rodriguez
8fac24a469 Merge branch 'ent-8277-12706-Lista-de-alertas-no-filtra-correctamente' into 'develop'
Ent 8277 12706 lista de alertas no filtra correctamente

See merge request artica/pandorafms!4539
2021-11-26 07:58:38 +00:00
Daniel Barbero Martin
9b62aa11da Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-26 08:16:46 +01:00
artica
b1a55ad102 Auto-updated build strings. 2021-11-26 01:00:21 +01:00
Daniel Barbero Martin
dae6182ef0 wip reports alert actions 2021-11-25 17:28:00 +01:00
Jose Gonzalez
b151b3996d Fixed issue with events 2021-11-25 13:52:53 +01:00
Daniel Maya
4211327275 #8260 Fixed Integria IMS Ticket edit in metaconsole 2021-11-25 13:17:12 +01:00
Daniel Barbero Martin
f7233604fe Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-25 08:19:35 +01:00
Daniel Barbero Martin
8746db24c9 demo 2021-11-25 08:19:05 +01:00
artica
1f428a25ad Auto-updated build strings. 2021-11-25 01:00:20 +01:00
Daniel Rodriguez
5fcabbf959 Merge branch 'ent-7902-Bug-visual-en-modal-de-edición-de-acciones-de-alertas' into 'develop'
Ent 7902 bug visual en modal de edición de acciones de alertas

See merge request artica/pandorafms!4541
2021-11-24 17:20:35 +00: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 Rodriguez
e3d7134dc8 Merge branch 'ent-8278-No-funcionan-las-gráficas-de-Agente-en-la-versión-Opensource' into 'develop'
Ent 8278 no funcionan las gráficas de agente en la versión opensource

See merge request artica/pandorafms!4538
2021-11-24 14:43:52 +00:00
Calvo
d7f590bacb Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-24 13:42:48 +01:00