4997 Commits

Author SHA1 Message Date
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
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