29217 Commits

Author SHA1 Message Date
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
Ramon Novoa
417e92f540 Merge remote-tracking branch 'origin/ent-8321-formularios-modulos-de-tendencias-ticket-7456' into ent-3220-modulo-para-capacity-planning 2021-12-09 10:53:32 +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
Daniel Rodriguez
c3f9ed1bf2 Merge branch 'ent-8042-agrupacion-eventos-no-funcionan-bien-comentarios' into 'develop'
Added feature for read comments in grouped events

Closes pandora_enterprise#8042

See merge request artica/pandorafms!4467
2021-12-07 16:51:07 +00:00
Daniel Maya
57cd3d7309 #8171 Fixed server type in metaconsole 2021-12-07 16:21:20 +01:00
fbsanchez
1ab02c4c0c cleanup old ncm data keeping 1 data per type and agent 2021-12-07 16:19:50 +01:00
Daniel Barbero Martin
ffc3728f2a fix minor error 2021-12-07 15:50:34 +01:00
Daniel Maya
765a36f913 #8180 Fix map select in metaconsole 2021-12-07 15:48:49 +01:00
Daniel Maya
2e8a1ecdc8 #8195 Fix z-index in full screen mode 2021-12-07 14:11:33 +01:00
fbsanchez
0d08e27865 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 2021-12-07 13:03:10 +01:00
Daniel Maya
e24987d03e #8201 Fix dashboard event dialog 2021-12-07 12:17:26 +01:00
Daniel Barbero Martin
c20b3bacc8 wip reports alert actions 2021-12-07 11:00:48 +01:00
Daniel Barbero Martin
b19bc9c8ab wip reports alert actions 2021-12-07 09:05:50 +01:00
Daniel Barbero Martin
118b1e1b80 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-07 08:34:03 +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
fbsanchez
6d469912fa some fixes 2021-12-03 14:24:00 +01:00
fbsanchez
5b06415235 errata fix 2021-12-03 13:58:14 +01:00
fbsanchez
a94f6be37e force db_process_sql 2021-12-03 12:59:50 +01:00
Ramon Novoa
642af39395 Add support for trend modules.
Ref. pandora_enterprise#7456.
2021-12-03 11:48:11 +01:00
Calvo
f382a5bf15 Fix trending module bugs 2021-12-03 11:02:11 +01:00
Daniel Maya
be587c5294 #8207 Fixed group item 2021-12-03 10:38:27 +01:00
Calvo
7139b9e1b1 Switch prediction module to prediction planning 2021-12-03 10:38:25 +01:00
fbsanchez
3e7a81ea33 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-03 10:24:01 +01:00
Daniel Maya
6ead6b8a48 #8232 Fixed value in password 2021-12-03 09:22:39 +01:00
artica
c2348fdc3e Auto-updated build strings. 2021-12-03 01:00:22 +01:00
Ramon Novoa
5f8c5f215a Merge remote-tracking branch 'origin/ent-8321-formularios-modulos-de-tendencias-ticket-7456' into ent-7456-modulos-de-tendencias-trending-modules 2021-12-02 18:03:23 +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 Barbero Martin
eb8b89f22e wip reports alert actions 2021-12-02 17:17:21 +01:00
Daniel Barbero Martin
5a3e5aaac4 wip reports alert actions 2021-12-02 16:57:31 +01:00
Daniel Barbero Martin
94bd55fd39 wip reports alert actions 2021-12-02 16:55:53 +01:00
fbsanchez
00d79b553c missing in merge mr 2021-12-02 14:46:31 +01:00
Daniel Barbero Martin
ec21d9d08a wip reports alert actions 2021-12-02 14:27:24 +01:00
Daniel Barbero Martin
d030b3b924 wip reports alert actions 2021-12-02 14:16:01 +01:00
Calvo
66c4087679 Added module interval control and percentage checkbox 2021-12-02 14:12:19 +01:00
Daniel Barbero Martin
abedd87910 wip reports alert actions 2021-12-02 14:04:33 +01:00
Daniel Barbero Martin
751cb7380b wip reports alert actions 2021-12-02 13:52:56 +01:00
Daniel Maya
fb80350f99 #8270 Fixed delete links 2021-12-02 13:46:29 +01:00
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
Rafael Ameijeiras
eed5753d9a merge 2021-12-02 11:26:33 +01: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 Maya
ae0e4e2826 #8295 Added ajax call and spinner 2 2021-12-02 08:52:33 +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