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
artica
20448faa35
Auto-updated build strings.
2021-10-14 01:00:21 +02:00
artica
9d813b729e
Auto-updated build strings.
2021-10-13 01:00:13 +02:00
artica
4fd071cf60
Auto-updated build strings.
2021-10-12 01:00:19 +02:00
fbsanchez
d2f5a04583
WIP NCM
2021-10-11 20:42:43 +02:00
Ramon Novoa
1344dee2c4
Add action information to alert events.
2021-10-11 10:43:41 +02:00
artica
a8937abb65
Auto-updated build strings.
2021-10-11 01:00:15 +02:00
artica
2b419b826d
Auto-updated build strings.
2021-10-10 01:00:16 +02:00
artica
9867024d2e
Auto-updated build strings.
2021-10-09 01:00:19 +02:00
Jose Gonzalez
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
Ramon Novoa
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
Jose Gonzalez
4331438765
Removed some cheerful words in the project
2021-10-08 11:13:28 +02:00
artica
eb5b34b99e
Auto-updated build strings.
2021-10-08 01:00:19 +02:00
artica
c7face04e1
Auto-updated build strings.
2021-10-07 01:00:20 +02:00
artica
1ebc2ed082
Auto-updated build strings.
2021-10-06 01:00:22 +02:00
Daniel Rodriguez
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
artica
d1b9dc4ef8
Auto-updated build strings.
2021-10-05 01:00:20 +02:00
artica
0e02cb314c
Auto-updated build strings.
2021-10-04 01:00:16 +02:00
artica
7b369d4fed
Auto-updated build strings.
2021-10-03 01:00:15 +02:00
artica
fd51190b07
Auto-updated build strings.
2021-10-02 01:00:19 +02:00
Daniel Rodriguez
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
artica
1d74155723
Auto-updated build strings.
2021-10-01 01:00:22 +02:00
marcos
d0f08be953
update agent custom fields
2021-09-30 14:34:58 +02:00
marcos
d54af52baf
update agent custom fields
2021-09-30 12:50:59 +02:00
fbsanchez
e237d7dd07
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/mr/50.sql
2021-09-30 12:24:19 +02:00