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
98f4bfbcc1
Auto-updated build strings.
2021-11-24 01:00:10 +01:00
e0fec6470d
minor fix
2021-11-23 18:04:34 +01:00
90739088f4
#8228 Added centralised node check
2021-11-23 12:43:07 +01:00
98f519958c
Fix merge
2021-11-23 12:25:58 +01:00
c5588197f2
#8224 centralised node check added
2021-11-23 12:23:27 +01:00
fee6b06a2a
Updated version and build strings.
2021-11-23 11:28:02 +01:00
feedce5a61
Auto-updated build strings.
2021-11-23 01:00:18 +01:00
9474dc9dbc
Auto-updated build strings.
2021-11-22 01:00:09 +01:00
956e1bd82b
Auto-updated build strings.
2021-11-21 01:00:14 +01:00
1751faac96
Auto-updated build strings.
2021-11-20 01:00:24 +01:00
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
f18a575b2a
Auto-updated build strings.
2021-11-19 01:00:17 +01:00
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
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
a5cfe3869c
Auto-updated build strings.
2021-11-18 01:00:18 +01:00
7a290bfac6
Auto-updated build strings.
2021-11-17 01:00:19 +01:00
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
7b717bcc6d
Auto-updated build strings.
2021-11-16 01:00:20 +01:00
203aa3ef8a
Auto-updated build strings.
2021-11-15 01:00:15 +01:00
bb771ec140
Auto-updated build strings.
2021-11-14 01:00:16 +01:00
94fadddc80
Auto-updated build strings.
2021-11-13 01:00:19 +01:00
bfa8dc4473
Auto-updated build strings.
2021-11-12 01:00:07 +01:00
b5cc63c159
Auto-updated build strings.
2021-11-11 01:00:19 +01:00
3069c89e6e
Auto-updated build strings.
2021-11-10 01:00:15 +01:00
707bee66c1
Auto-updated build strings.
2021-11-09 01:01:01 +01:00
900a37ad5d
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-08 08:54:41 +01:00
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
df48e7f73d
Auto-updated build strings.
2021-11-08 01:00:17 +01:00
b2db6064bf
Auto-updated build strings.
2021-11-07 01:00:17 +01:00
3e9bc55e68
Auto-updated build strings.
2021-11-06 01:00:21 +01:00
c3e2b4361f
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-05 10:00:15 +01:00
9c290d917e
Auto-updated build strings.
2021-11-05 01:00:12 +01:00
bdc4d0a8b1
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
...
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
c0abe5edb9
Fix merge
2021-11-04 16:00:05 +01:00
c3f4addb0e
wip special days alerts
2021-11-04 12:33:40 +01:00
4ebb817d90
Auto-updated build strings.
2021-11-04 01:00:54 +01:00
0be9abcdca
Auto-updated build strings.
2021-11-03 01:00:21 +01:00
23566c9ef4
Auto-updated build strings.
2021-11-02 01:00:18 +01:00
f1734e56c3
Auto-updated build strings.
2021-11-01 01:00:17 +01:00
7b9234f392
Auto-updated build strings.
2021-10-31 01:00:19 +02:00
6c6c375702
Auto-updated build strings.
2021-10-30 01:00:24 +02:00
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
c903942c7b
Auto-updated build strings.
2021-10-29 01:00:21 +02:00
bf0064d486
Correlated alerts are not being linked to modules
2021-10-28 17:21:02 +02:00
701c384c54
More accurated message when recovering event alerts
2021-10-28 13:01:18 +02:00
7cd429d9f8
Auto-updated build strings.
2021-10-28 01:00:22 +02:00
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
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
945392b615
Auto-updated build strings.
2021-10-27 01:00:56 +02:00
cd3e20fefe
Fix action information for SNMP alert events.
2021-10-26 17:40:03 +02:00
35aa6b5258
Fix SQL errors in action queries.
2021-10-26 15:07:42 +02:00
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
356e1f9f2b
Fix SQL errors in action queries.
2021-10-26 13:24:23 +02:00
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
24404d5078
Auto-updated build strings.
2021-10-26 01:01:06 +02:00
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
56ca01112d
Auto-updated build strings.
2021-10-25 01:00:48 +02:00
ef41522899
Auto-updated build strings.
2021-10-24 01:00:45 +02:00
134f6ea2a5
Auto-updated build strings.
2021-10-23 01:00:54 +02:00
1218932b05
Auto-updated build strings.
2021-10-22 01:00:20 +02:00
bb8dbc9332
NCM
2021-10-21 02:17:17 +02:00
80c7f106ad
Auto-updated build strings.
2021-10-21 01:00:55 +02:00
6ccf3a9ee9
Updated version and build strings.
2021-10-20 15:31:02 +02:00
bbbbbdd2bc
#8114 remove history_data
2021-10-20 14:50:47 +02:00
829ca31e88
#8114 Fixed history_data
2021-10-20 10:52:40 +02:00
b70ca89af2
Auto-updated build strings.
2021-10-20 01:01:06 +02:00
65b0d839f9
Auto-updated build strings.
2021-10-19 01:00:50 +02:00
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
c043c3d023
Auto-updated build strings.
2021-10-18 01:00:18 +02:00
6da17b11aa
Auto-updated build strings.
2021-10-17 01:00:18 +02:00
0e9f37a090
Auto-updated build strings.
2021-10-16 01:00:22 +02:00
6c0e2d23de
updates
2021-10-15 13:39:23 +02:00
af9711ec3d
Auto-updated build strings.
2021-10-15 01:00:20 +02:00
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
20448faa35
Auto-updated build strings.
2021-10-14 01:00:21 +02:00
96250dcfa0
WIP NCM
2021-10-13 22:47:31 +02:00
9d813b729e
Auto-updated build strings.
2021-10-13 01:00:13 +02:00
4fd071cf60
Auto-updated build strings.
2021-10-12 01:00:19 +02:00
d2f5a04583
WIP NCM
2021-10-11 20:42:43 +02:00
1344dee2c4
Add action information to alert events.
2021-10-11 10:43:41 +02:00
a8937abb65
Auto-updated build strings.
2021-10-11 01:00:15 +02:00
2b419b826d
Auto-updated build strings.
2021-10-10 01:00:16 +02:00
9867024d2e
Auto-updated build strings.
2021-10-09 01:00:19 +02:00
0414b9991a
Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-7972-funcionalidad-historico-de-alertas-lanzadas
2021-10-08 14:03:25 +02:00
5d7cb5e4c7
Rename the _address_n_ macro and add it to more servers.
...
The _address_n_ macro did not work properly because of the partial match
with the _address_ macro. It has been renamed to_addressn_n_ (e.g.,
_addressn_1_, _addressn_2_, etc.) and added to the Network and Plug-in
servers. Fixes pandora_enterprise#7379.
2021-10-08 13:17:04 +02:00
4331438765
Removed some cheerful words in the project
2021-10-08 11:13:28 +02:00
eb5b34b99e
Auto-updated build strings.
2021-10-08 01:00:19 +02:00
c7face04e1
Auto-updated build strings.
2021-10-07 01:00:20 +02:00
a70d48514e
Fix Barivion name in license and readme
2021-10-06 13:33:25 +02:00
1ebc2ed082
Auto-updated build strings.
2021-10-06 01:00:22 +02:00
0dd98b21f3
Merge branch 'ent-8050-arreglar-comprobacion-de-api-en-el-inicio-del-servidor' into 'develop'
...
timeout for server API conn test at start
See merge request artica/pandorafms!4437
2021-10-05 11:07:26 +00:00
cc36fdc54f
Merge branch 'ent-fix-webserver' into 'develop'
...
Fixed warnings and problem with multibyte characters on WebServer.
See merge request artica/pandorafms!4357
2021-10-05 09:51:58 +00:00
d1b9dc4ef8
Auto-updated build strings.
2021-10-05 01:00:20 +02:00
0e02cb314c
Auto-updated build strings.
2021-10-04 01:00:16 +02:00
7b369d4fed
Auto-updated build strings.
2021-10-03 01:00:15 +02:00
fd51190b07
Auto-updated build strings.
2021-10-02 01:00:19 +02:00
1cdef62ceb
Merge branch 'ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli' into 'develop'
...
add agent_update_custom_fields on cli
See merge request artica/pandorafms!4281
2021-10-01 12:36:17 +00:00
626a9d17c6
timeout for server API conn test at start
2021-10-01 12:35:26 +02:00
1d74155723
Auto-updated build strings.
2021-10-01 01:00:22 +02:00
Daniel Rodriguez
artica
Daniel Barbero Martin
Daniel Maya
Jose Gonzalez
Calvo
Junichi Satoh
José González
fbsanchez
Ramon Novoa
Jose Gonzalez