tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-19 08:48:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
36,825 Commits 34 Branches 30 Tags
Commit Graph

6083 Commits

Author SHA1 Message Date
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
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
Daniel Maya
bbbbbdd2bc #8114 remove history_data 2021-10-20 14:50:47 +02:00
Daniel Maya
829ca31e88 #8114 Fixed history_data 2021-10-20 10:52:40 +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
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