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
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
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
1ebc2ed082
Auto-updated build strings.
2021-10-06 01:00:22 +02: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
1d74155723
Auto-updated build strings.
2021-10-01 01:00:22 +02:00
d0f08be953
update agent custom fields
2021-09-30 14:34:58 +02:00
d54af52baf
update agent custom fields
2021-09-30 12:50:59 +02:00
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
036da5ea3a
Auto-updated build strings.
2021-09-30 01:00:18 +02:00
ee8ae5cf76
Merge branch 'ent-8004-command-center-las-politicas-una-vez-aplicadas-no-se-marcan-en-verde-en-la-metaconsola' into 'develop'
...
Avoid MC process data in dataserver
See merge request artica/pandorafms!4427
2021-09-29 13:27:28 +00:00
f756cec3be
Merge branch 'ent-7869-solucion-automatica-splitbrain-pandora-ha' into 'develop'
...
PandoraHA Splitbrain autorecovery
See merge request artica/pandorafms!4413
2021-09-29 09:58:29 +00:00
06c42a051d
Auto-updated build strings.
2021-09-29 01:00:20 +02:00
4e25442813
update agent custom fields
2021-09-28 11:20:26 +02:00
a8a5289652
update agent custom fields
2021-09-28 09:31:06 +02:00
201fea9378
Auto-updated build strings.
2021-09-28 01:00:21 +02:00
87eb16ef32
Merge remote-tracking branch 'origin/master' into ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli
2021-09-27 17:08:03 +02:00
83703b88fa
Merge branch 'ent-5171-mejora-logs-discovery' into 'develop'
...
Discovery logs improvement
See merge request artica/pandorafms!4422
2021-09-27 14:37:09 +00:00
4f76a44ffa
Several fixes for correlation recovery
2021-09-27 15:12:20 +02:00
1983403327
Some improvements
2021-09-27 14:50:34 +02:00
b7879f8815
CorrelationServer with iterative evaluation
2021-09-27 12:25:43 +02:00
f7ec31cc72
Avoid MC process data in dataserver
2021-09-27 10:07:23 +02:00
b09febeee0
Auto-updated build strings.
2021-09-27 01:00:15 +02:00
17ba73ad36
Auto-updated build strings.
2021-09-26 01:00:11 +02:00
2cbe307a6f
Auto-updated build strings.
2021-09-25 01:00:21 +02:00
bc516889bf
Auto-updated build strings.
2021-09-24 01:00:21 +02:00
7a2c992c44
Merge branch 'ent-7952-comportamiento-extrano-procesamiento-dataserver' into 'develop'
...
Do not search the agent name in tagente.direccion.
See merge request artica/pandorafms!4387
2021-09-23 14:51:48 +00:00
12ddb4d792
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/pandoradb.sql
2021-09-23 16:23:38 +02:00
f60c41ff30
Merge branch 'ent-8011-replicacion-de-eventos-genera-conexiones-infinitas' into 'develop'
...
Read event_replication from the database.
See merge request artica/pandorafms!4419
2021-09-23 10:32:54 +00:00
0e34c1275a
Auto-updated build strings.
2021-09-23 01:00:21 +02:00
1aabb11c8c
Merge branch 'ent-8032-giss-cambiar-comando-de-alerta-para-que-descarte-cualquier-string-que-no-parezca-una-direccion' into 'develop'
...
Add simple email address validation.
See merge request artica/pandorafms!4417
2021-09-22 12:33:18 +00:00
f8ea92923a
minor fixes
2021-09-22 11:44:32 +02:00
61e2a3f21b
Auto-updated build strings.
2021-09-22 01:00:21 +02:00
5b8a391f99
Extra options pandora_ha auto-resync
2021-09-21 18:51:50 +02:00
125f63a7a2
Merge branch 'ent-7695-eventos-con-entities-al-cambiar-info-de-eventos' into 'develop'
...
Fixed entities on text for custom events
See merge request artica/pandorafms!4235
2021-09-21 13:16:17 +00:00
b3114262c5
Discovery logs improvement
2021-09-21 12:15:34 +02:00
d50cf7431b
Auto-updated build strings.
2021-09-21 01:00:17 +02:00
15761e7b02
Read event_replication from the database.
...
Instead of reading event_replication from pandora_server.conf, read it
from the database. Ref. pandora_enterprise#8011.
2021-09-20 13:25:02 +02:00
4a9cac6ef4
Add simple email address validation.
...
Add simple email address validation for internal email alerts. Prevents
connections to the SMTP server when no address is provided. Ref.
pandora_enterprise#8032.
2021-09-20 11:42:27 +02:00
6153237481
Auto-updated build strings.
2021-09-20 01:00:17 +02:00
43c22e9ec7
Auto-updated build strings.
2021-09-19 01:00:12 +02:00
8d2d7f16de
Auto-updated build strings.
2021-09-18 01:00:19 +02:00
33788c9238
Auto-updated build strings.
2021-09-17 01:00:18 +02:00
d7452d19e8
Auto-updated build strings.
2021-09-16 01:00:22 +02:00
2e764afac7
PandoraHA Splitbrain autorecovery
2021-09-15 21:38:10 +02:00
165dea9fe7
Merge remote-tracking branch 'origin/master' into master-alt
2021-09-15 17:21:33 +02:00
4cd17dca40
Auto-updated build strings.
2021-09-15 01:00:20 +02:00
cf3c328d18
Auto-updated build strings.
2021-09-14 01:00:17 +02:00
74ae4efa9a
Add action information to alert events.
2021-09-13 13:13:46 +02:00
c231c82e93
Updated version and build strings.
2021-09-13 12:08:23 +02:00
4ec67b51b7
Auto-updated build strings.
2021-09-13 01:00:16 +02:00
4d2a52fcce
Auto-updated build strings.
2021-09-12 01:00:13 +02:00
48ee2d3fcd
Auto-updated build strings.
2021-09-11 01:00:20 +02:00
12b7cd0c63
Auto-updated build strings.
2021-09-10 01:00:21 +02:00
f2875b5a86
Auto-updated build strings.
2021-09-09 01:00:24 +02:00
34adf6e9e2
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
2021-09-08 21:21:45 +02:00
6f50aed48d
Some improvements
2021-09-08 19:48:20 +02:00
7e5dc6a9c4
Auto-updated build strings.
2021-09-08 01:00:19 +02:00
ecd818bbb7
Auto-updated build strings.
2021-09-07 01:00:19 +02:00
ce3dce926a
use safe_output only when message is going to be used logger
2021-09-06 18:14:58 +02:00
7fbd5ed735
Do not search the agent name in tagente.direccion.
...
Ref. pandora_enterprise#7952.
2021-09-06 13:32:17 +02:00
6bb994f4b7
Auto-updated build strings.
2021-09-06 01:00:37 +02:00
42a999b207
Auto-updated build strings.
2021-09-05 01:00:13 +02:00
22a0709953
Auto-updated build strings.
2021-09-04 01:00:22 +02:00
30c6a78b35
Auto-updated build strings.
2021-09-03 01:00:40 +02:00
d8b12233ed
correlation_threads
2021-09-02 12:53:57 +02:00
737943fee2
Auto-updated build strings.
2021-09-02 01:00:55 +02:00
df95cbf960
Minor changes
2021-09-01 21:10:11 +02:00
e075c8339d
CorrelationServer rc1
2021-09-01 17:56:14 +02:00
10dd28246c
Auto-updated build strings.
2021-09-01 01:00:24 +02:00
966a5df96a
Auto-updated build strings.
2021-08-31 01:00:50 +02:00
b4c52f92f7
Auto-updated build strings.
2021-08-30 01:00:38 +02:00
bffc6c52ce
Auto-updated build strings.
2021-08-29 01:00:17 +02:00
dd538c48bb
Auto-updated build strings.
2021-08-28 01:00:24 +02:00
f0791cbd4f
WIP CorrelationServer
2021-08-27 15:07:14 +02:00
72e46df88b
Auto-updated build strings.
2021-08-27 01:00:23 +02:00
a8fcec1f6a
Auto-updated build strings.
2021-08-26 01:00:50 +02:00
452d986ab5
Merge branch 'ent-7878-errata-funcion-get_console_api_url-en-db-pm' into 'develop'
...
Ensure latest slash in console url
See merge request artica/pandorafms!4368
2021-08-25 06:55:31 +00:00
f63fa5ab96
Auto-updated build strings.
2021-08-25 01:00:39 +02:00
5163f2831d
Auto-updated build strings.
2021-08-24 01:00:38 +02:00
f0c68a0f54
Ensure latest slash in console url
2021-08-23 12:17:03 +02:00
e3619915cc
Auto-updated build strings.
2021-08-23 01:00:21 +02:00
a8ae80f8a6
Auto-updated build strings.
2021-08-22 01:00:15 +02:00
0f34554ba6
Auto-updated build strings.
2021-08-21 01:00:32 +02:00
7e71b6537f
Auto-updated build strings.
2021-08-20 01:00:19 +02:00
38c044f2ae
Auto-updated build strings.
2021-08-19 01:00:34 +02:00
a1942147e4
Auto-updated build strings.
2021-08-18 01:00:49 +02:00
fe30b9c785
Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop'
...
implemented capacity to handle string data for event data
See merge request artica/pandorafms!4184
2021-08-17 12:19:54 +00:00
ba5e78f398
Fixed warnings and problem with multibyte characters on WebServer.
2021-08-17 16:01:35 +09:00
9f65e8deb0
Auto-updated build strings.
2021-08-17 01:00:44 +02:00
18698827a6
Auto-updated build strings.
2021-08-16 01:00:21 +02:00
4e17c0ecf4
Auto-updated build strings.
2021-08-15 01:00:22 +02:00
ce2c4afbb5
Auto-updated build strings.
2021-08-14 01:00:24 +02:00
6a471546d5
Auto-updated build strings.
2021-08-13 01:00:30 +02:00
3bb4c2ac09
Auto-updated build strings.
2021-08-12 01:00:45 +02:00
568bdfb5c0
Auto-updated build strings.
2021-08-11 01:00:19 +02:00
00ed8233d0
Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop'
...
set default font size on graph modules when is send in mails
See merge request artica/pandorafms!4264
2021-08-10 12:19:54 +00:00
2951bf2871
Auto-updated build strings.
2021-08-10 01:00:12 +02:00
ff93169049
Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired'
...
# Conflicts:
# pandora_console/extras/mr/48.sql
2021-08-09 06:45:46 +00:00
8b36a96867
Auto-updated build strings.
2021-08-09 01:00:08 +02:00
7a36b18fc0
Auto-updated build strings.
2021-08-08 01:00:11 +02:00
9ea746991b
Auto-updated build strings.
2021-08-07 01:00:19 +02:00
14688908e2
Auto-updated build strings.
2021-08-06 01:00:21 +02:00
747d39a066
Auto-updated build strings.
2021-08-05 01:00:50 +02:00
c4e1243f18
Auto-updated build strings.
2021-08-04 01:00:42 +02:00
69c4139cc1
Auto-updated build strings.
2021-08-03 01:00:44 +02:00
5d501f3abf
Merge branch 'ent-7866-12249-no-se-muestra-valor-de-macro-snmp_f1' into 'develop'
...
SNMP variable bindings, filter before capture, assign correctly macro values
See merge request artica/pandorafms!4337
2021-08-02 08:46:50 +00:00
1db24ef895
Merge branch 'ent-7856-12235-integria-ims-manda-mal-la-accion-de-crear-ticket-integria' into 'develop'
...
fixed error with url integria api
See merge request artica/pandorafms!4329
2021-08-02 07:24:16 +00:00
b837adaf00
Auto-updated build strings.
2021-08-02 01:00:34 +02:00
6e66675f7f
Auto-updated build strings.
2021-08-01 01:00:36 +02:00
170f0d9045
Auto-updated build strings.
2021-07-31 01:00:44 +02:00
d59b946954
Errata fix
2021-07-30 16:26:26 +02:00
c1e9025eca
SNMP variable bindings, filter before capture, assign correctly macro values
2021-07-30 11:51:00 +02:00
5e2c4349b3
Auto-updated build strings.
2021-07-30 01:00:38 +02:00
f9b69c289c
Auto-updated build strings.
2021-07-29 01:00:43 +02:00
5aef20ee31
Auto-updated build strings.
2021-07-28 01:00:37 +02:00
4431538d14
fixed error with url integria api
2021-07-27 15:48:56 +02:00
ee4868d433
Auto-updated build strings.
2021-07-27 01:00:18 +02:00
1c6508947a
Auto-updated build strings.
2021-07-26 01:00:35 +02:00
29013e7dd6
Auto-updated build strings.
2021-07-25 01:00:36 +02:00
8fa664c0c5
Auto-updated build strings.
2021-07-24 01:00:36 +02:00
5654de748a
Auto-updated build strings.
2021-07-23 01:00:43 +02:00
72d57bc067
Get command field if it is not defined in alert or action
2021-07-22 11:39:00 +02:00
51ca2de1e5
Get command field if it is not defined in alert or action
2021-07-22 11:34:07 +02:00
b554515ca3
Fixed issue with inversed intervals
2021-07-22 11:24:22 +02:00
32210ee7a3
Auto-updated build strings.
2021-07-22 01:00:34 +02:00
61bc6d9ff2
Merge branch 'ent-7836-error-del-snmpserver-pm-en-el-pandora_server-error' into 'develop'
...
Add a default value for snmpconsole_threshold.
See merge request artica/pandorafms!4319
2021-07-21 17:19:36 +00:00
28c33aca6b
Add a default value for snmpconsole_threshold.
...
Ref pandora_enterprise#7836.
2021-07-21 19:07:02 +02:00
53ad5e1cd9
Updated version and build strings.
2021-07-21 10:57:56 +02:00
89ebe2ea2e
Auto-updated build strings.
2021-07-21 01:00:44 +02:00
9d1fbf3127
Merge branch 'ent-7808-12182-promocion-de-servidor-master' into 'develop'
...
Updated component HA rule
See merge request artica/pandorafms!4301
2021-07-20 13:05:37 +00:00
63a8ff3f53
Auto-updated build strings.
2021-07-20 01:00:43 +02:00
9183110028
Auto-updated build strings.
2021-07-19 01:00:37 +02:00
ac28fb7b58
Auto-updated build strings.
2021-07-18 01:00:36 +02:00
c5b8f647fe
Auto-updated build strings.
2021-07-17 01:00:41 +02:00
8f009db92b
Updated component HA rule
2021-07-16 12:03:26 +02:00
9643e3ade9
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-16 10:36:06 +02:00
0508c0fa88
Auto-updated build strings.
2021-07-16 01:00:32 +02:00
bf890c0d11
Auto-updated build strings.
2021-07-15 01:00:40 +02:00
18948ea9c2
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-14 10:04:13 +02:00
31b99ecbfb
Auto-updated build strings.
2021-07-14 01:00:39 +02:00
9b31906bdf
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
2021-07-13 10:01:59 +02:00
925c9fce4f
Auto-updated build strings.
2021-07-13 01:00:34 +02:00
922fb81a58
Auto-updated build strings.
2021-07-12 01:00:31 +02:00
f3ea9fedf9
Auto-updated build strings.
2021-07-11 01:00:30 +02:00
faf154e69c
Auto-updated build strings.
2021-07-10 01:00:35 +02:00
554a32b567
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-09 14:40:44 +02:00
4c82ade184
add agent_update_custom_fields on cli
2021-07-09 13:58:01 +02:00
d6cd48fdde
Auto-updated build strings.
2021-07-09 01:00:35 +02:00
239e149b3c
Auto-updated build strings.
2021-07-08 01:00:36 +02:00
a06989dc11
Auto-updated build strings.
2021-07-07 01:00:38 +02:00
dec62ffca4
Auto-updated build strings.
2021-07-06 01:00:32 +02:00
ea57c58f40
set default font size on graph modules when is send in mails
2021-07-05 11:34:32 +02:00
f52d389327
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
2021-07-05 09:55:14 +02:00
3baae4147a
Auto-updated build strings.
2021-07-05 01:00:29 +02:00
b6477e5526
Auto-updated build strings.
2021-07-04 01:00:26 +02:00
8a4e51bf1b
Auto-updated build strings.
2021-07-03 01:00:31 +02:00
159920a05d
Merge branch 'ent-7127-alert-server-implementar-la-ejecucion-de-alertas-de-manera-independiente' into 'develop'
...
Add the AlertServer to the repo.
See merge request artica/pandorafms!4251
2021-07-02 09:15:27 +00:00
1328b2055c
Auto-updated build strings.
2021-07-02 01:00:32 +02:00
f8bcd1660f
Add the AlertServer to the repo.
...
The new AlertServer allows alerts to be queued and executed outside the
data processing pipeline. Ref. pandora_enterprise#7127.
2021-07-01 16:19:47 +02:00
911d9fe8fe
Auto-updated build strings.
2021-07-01 01:00:09 +02:00
7dc2245f2e
Auto-updated build strings.
2021-06-30 01:00:32 +02:00
074fbf916c
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-29 20:03:07 +02:00
35e889be15
Merge branch 'ent-4759-compatibilidad-ssl-y-certificados-conexiones-mysql' into 'develop'
...
Add SSL support for database connections.
See merge request artica/pandorafms!4134
2021-06-29 14:50:25 +00:00
c64b972564
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-29 10:51:55 +02:00
7f58a93bfd
Auto-updated build strings.
2021-06-29 01:00:15 +02:00
753bb7ff03
Avoid apply a non-synced policy
2021-06-28 12:44:24 +02:00
771c51ef5d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-28 10:13:51 +02:00
6fc94f3fad
Auto-updated build strings.
2021-06-28 01:00:29 +02:00
69c1a5fdad
Auto-updated build strings.
2021-06-27 01:00:26 +02:00
b7d956041d
Auto-updated build strings.
2021-06-26 01:01:41 +02:00
c0d56f8563
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-25 09:48:52 +02:00
4438dad309
Auto-updated build strings.
2021-06-25 01:00:39 +02:00
7c14b5a7fc
Fixed entities on text for custom events
2021-06-24 16:36:10 +02:00
4c2ac234b8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
pandora_console/godmode/servers/plugin.php
2021-06-24 14:37:30 +02:00
f18e8141fe
Updated version and build strings.
2021-06-24 13:06:06 +02:00
f9b090d857
Merge branch 'ent-5620-nuevo-compilador-para-backend' into master-alt
2021-06-24 12:58:44 +02:00
86abd75206
Auto-updated build strings.
2021-06-24 01:00:51 +02:00
2fe6092d37
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-23 20:08:59 +02:00
be8318dc9b
Merge branch 'ent-7559-11881-limitacion-en-macro-_snmp_fx_' into 'develop'
...
Ent 7559 11881 limitacion en macro snmp fx
See merge request artica/pandorafms!4203
2021-06-23 15:29:02 +00:00
2a48208fc2
Merge branch 'ent-7635-11977-procesamiento-de-traps-multi-hilo' into 'develop'
...
Ent 7635 11977 procesamiento de traps multi hilo
See merge request artica/pandorafms!4187
2021-06-23 15:16:47 +00:00
e99183e1f0
Auto-updated build strings.
2021-06-23 01:00:51 +02:00
17bae49b21
Auto-updated build strings.
2021-06-22 01:00:56 +02:00
faa9fee273
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
pandora_agents/unix/Darwin/dmg/resources/text/license.html
pandora_console/extras/delete_files/delete_files.txt
pandora_console/extras/mr/48.sql
2021-06-21 17:33:45 +02:00
a2eb62150c
Merge branch 'ent-7508-Macro-timestamp-en-alertas-unknown-no-funciona' into 'develop'
...
fixed bug in unknown alerts
See merge request artica/pandorafms!4179
2021-06-21 10:15:15 +00:00
acfa36b380
Merge branch 'ent-7286-Líneas-en-pandora-server-error-con-check_string' into 'develop'
...
Ent 7286 líneas en pandora server error con check string
See merge request artica/pandorafms!4208
2021-06-21 09:09:52 +00:00
d22cdf027c
Empty variables also translates macros
2021-06-21 10:06:03 +02:00
6d67a03b78
Merge remote-tracking branch 'origin/develop' into ent-7559-11881-limitacion-en-macro-_snmp_fx_
2021-06-21 10:03:46 +02:00
447d463518
Auto-updated build strings.
2021-06-21 01:00:36 +02:00
dd5e7e550d
Auto-updated build strings.
2021-06-20 01:00:37 +02:00
682a977ef1
Auto-updated build strings.
2021-06-19 01:00:49 +02:00
1e183c2b60
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-18 08:49:57 +02:00
0c1918eb3c
Auto-updated build strings.
2021-06-18 01:00:44 +02:00
8d5acc0d74
Improvements to the SNMP Console.
...
Add several improvements to the SNMP Console:
- Source-based locking.
- Server-specific 'threshold'.
- Other small improvements.
Ref. pandora_enterprise#7635.
2021-06-17 18:59:10 +02:00
50c7394e7d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-17 08:23:46 +02:00
e5cbcd070b
Auto-updated build strings.
2021-06-17 01:00:42 +02:00
841842da59
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb_data.sql
2021-06-16 08:46:21 +02:00
90905d72f5
Auto-updated build strings.
2021-06-16 01:00:23 +02:00
38ad3574f3
scape meta characters
2021-06-15 15:57:13 +02:00
9fcde88ebf
Merge branch 'ent-7698-revision-pandora-ha-open-caracteristicas-enterprise' into 'develop'
...
pandora_ha enterprise components fixed
See merge request artica/pandorafms!4202
2021-06-15 13:11:21 +00:00
c009451d62
Fulfill all variables FX from SNMPTRAP alerts
2021-06-15 13:06:23 +02:00
9e6f3f7b46
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-15 10:35:50 +02:00
2f0cebe979
Auto-updated build strings.
2021-06-15 01:00:51 +02:00
7e5a082e22
pandora_ha enterprise components fixed
2021-06-14 19:29:24 +02:00
94cd4c96dd
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/javascript/pandora_ui.js
2021-06-14 17:37:01 +02:00
42f5727b18
Merge branch 'ent-7510-muchas-conexiones-sobre-la-bbdd-too-many-connections-mysql' into 'develop'
...
Avoid die while decoding erroneus json data
See merge request artica/pandorafms!4116
2021-06-14 11:39:41 +00:00
a7c1c49636
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-14 08:42:31 +02:00
595fabb232
Auto-updated build strings.
2021-06-14 01:00:18 +02:00
e7a204d6d8
Auto-updated build strings.
2021-06-13 01:00:16 +02:00
8272eb4f5b
Auto-updated build strings.
2021-06-12 01:00:21 +02:00
86f2beb587
Agent collection synchronization aysnc some improvements
2021-06-11 13:55:18 +02:00
75b889875e
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-11 08:41:23 +02:00
876e776d29
Auto-updated build strings.
2021-06-11 01:00:09 +02:00
ae34209f52
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 21:45:50 +02:00
f6f0d35a5f
Collections Async synchronization Meta <=> Nodes
2021-06-10 21:36:54 +02:00
ace916bc8e
Updated version and build strings.
2021-06-10 17:12:11 +02:00
9e27843b19
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 08:51:48 +02:00
5ad364cc4a
Auto-updated build strings.
2021-06-10 01:00:20 +02:00
e54fde338d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-09 08:22:04 +02:00
2953870e4f
Auto-updated build strings.
2021-06-09 01:00:20 +02:00
fdc6d2f4c8
implemented capacity to handle string data for event data
2021-06-08 16:09:37 +02:00
4fa8e5cf29
Merge branch 'ent-7617-macro-address-no-funciona-en-modulos-de-red' into 'develop'
...
Fixed macro address on network server modules
See merge request artica/pandorafms!4170
2021-06-08 10:53:15 +00:00
72cb359133
Fixed macro address on network server modules
2021-06-08 10:53:15 +00:00
df2f72cce3
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-08 08:22:16 +02:00
a63a4efb71
Auto-updated build strings.
2021-06-08 01:00:20 +02:00
eb87406e58
fixed bug in unknown alerts
2021-06-07 15:22:20 +02:00
8b7c5c08c6
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-07 08:32:15 +02:00
bc6b4acd8b
Auto-updated build strings.
2021-06-07 01:00:19 +02:00
656105cdf0
Auto-updated build strings.
2021-06-06 01:00:14 +02:00
2513693ada
Auto-updated build strings.
2021-06-05 01:00:19 +02:00
ca59034cf3
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-04 08:13:20 +02:00
8976ec4b6e
Auto-updated build strings.
2021-06-04 01:00:19 +02:00
030a4fed6a
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-03 08:15:30 +02:00
e1ae9d7908
Auto-updated build strings.
2021-06-03 01:00:17 +02:00
18f414ce5b
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-02 08:09:32 +02:00
2a5b5591a3
Auto-updated build strings.
2021-06-02 01:00:45 +02:00
ddc4b47d0b
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-01 08:34:32 +02:00
b0e3b0aa24
Auto-updated build strings.
2021-06-01 01:00:09 +02:00
33618af381
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-31 08:40:09 +02:00
ff3eb72420
Auto-updated build strings.
2021-05-31 01:00:34 +02:00
20d3399d39
Auto-updated build strings.
2021-05-30 01:00:20 +02:00
ec8ffea249
Auto-updated build strings.
2021-05-29 01:00:10 +02:00
8c7654cd2d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/godmode/setup/os.php
pandora_console/include/styles/pandora.css
pandora_console/operation/users/user_edit.php
2021-05-28 08:26:19 +02:00
059b14dbf6
Auto-updated build strings.
2021-05-28 01:00:43 +02:00
a1ca4abe8f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-27 08:22:43 +02:00
9103f671e2
Auto-updated build strings.
2021-05-27 01:00:43 +02:00
d91e7f6aba
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-26 08:28:42 +02:00
22a9043378
Auto-updated build strings.
2021-05-26 01:00:45 +02:00
933f679d27
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-25 08:51:48 +02:00
f3d6dafad2
Auto-updated build strings.
2021-05-25 01:00:38 +02:00
337450a1f8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/ajax.php
pandora_console/extras/delete_files/delete_files.txt
2021-05-24 17:41:28 +02:00
3388bfa699
Auto-updated build strings.
2021-05-24 01:00:35 +02:00
5366b40ac3
Auto-updated build strings.
2021-05-23 01:00:27 +02:00
01e811254e
Auto-updated build strings.
2021-05-22 01:00:37 +02:00
5bc6fa9394
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-21 08:35:49 +02:00
f86c1c50c6
Auto-updated build strings.
2021-05-21 01:01:12 +02:00
73454dd4ea
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-20 08:21:31 +02:00
63da7abe47
Auto-updated build strings.
2021-05-20 01:00:47 +02:00
3eba993c5c
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-19 08:36:26 +02:00
f3eb560518
Auto-updated build strings.
2021-05-19 01:00:46 +02:00
a0982cd260
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/users/profile_list.php
2021-05-18 08:39:06 +02:00
739bc7ebd9
Auto-updated build strings.
2021-05-18 01:00:45 +02:00
fd372d53d1
Ent 6978 umbrales inversos fallan
2021-05-17 13:00:59 +00:00
ecdd28fe0a
Do not enforce SSL.
...
Enforcing SSL (mysql_ssl_optional=0) does not work with the version of
DBD::mysql used to generate Pandora FMS binaries.
2021-05-17 13:37:36 +02:00
c3d81b7d4b
Revert "Do not enforce SSL."
...
This reverts commit 6b0aa45ebc
2021-05-17 13:36:58 +02:00
6b0aa45ebc
Do not enforce SSL.
...
Enforcing SSL (mysql_ssl_optional=0) does not work with the version of
DBD::mysql used to generate Pandora FMS binaries.
2021-05-17 13:21:16 +02:00
439bc2405c
Add SSL support for database connections.
...
Ref. pandora_enterprise#4759.
2021-05-17 13:12:42 +02:00
1526dac01d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-17 08:35:52 +02:00
d2fd310ea2
Auto-updated build strings.
2021-05-17 01:00:38 +02:00
8c0461e2bf
Auto-updated build strings.
2021-05-16 01:00:26 +02:00
bfc805d6a7
Auto-updated build strings.
2021-05-15 01:00:46 +02:00
b3ac981681
Gracefully stop pandorafms threads
2021-05-14 12:43:18 +02:00
3f509ebd09
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-14 08:36:58 +02:00
9b6ad55910
Auto-updated build strings.
2021-05-14 01:00:47 +02:00
5b376568a4
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/47.sql
2021-05-13 08:25:59 +02:00
afa48e815d
Auto-updated build strings.
2021-05-13 01:00:45 +02:00
13fa1159ce
Merge branch 'ent-6858-Goliat-opensource' into 'develop'
...
Backup upload
See merge request artica/pandorafms!3936
2021-05-12 13:10:48 +00:00
6aa1188d35
Merge branch 'ent-7111-acciones-alertas-snmp-no-se-guardan' into 'develop'
...
Added missing fields to alert snmp actions
See merge request artica/pandorafms!3927
2021-05-12 12:54:37 +00:00
7d56552e72
Added missing fields to alert snmp actions
2021-05-12 12:54:36 +00:00
3cfb07a36f
Merge remote-tracking branch 'origin/develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando
2021-05-12 10:18:30 +02:00
83822395f6
Merge branch 'develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando
2021-05-12 10:01:52 +02:00
90573feb1b
Issue with Perl5 paths
2021-05-12 09:35:35 +02:00
ad03bc41aa
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-12 08:41:00 +02:00
671c1ca0a3
Auto-updated build strings.
2021-05-12 01:00:48 +02:00
5aa5e9eab4
Merge branch 'develop' into 'ent-6858-Goliat-opensource'
...
# Conflicts:
# pandora_console/extras/delete_files/delete_files.txt
2021-05-11 13:11:51 +00:00
fc4d3b7d23
Merge branch 'ent-7302-bug-en-macro-moduledata-x' into 'develop'
...
Fixed encoding ampersand on mail alerts
See merge request artica/pandorafms!4035
2021-05-11 09:44:15 +00:00
c19e398057
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-11 07:37:56 +02:00
6bdd983755
Auto-updated build strings.
2021-05-11 01:00:46 +02:00
6939ec4d44
Unify the format of product version messages.
2021-05-10 17:58:17 +02:00
847b567f5c
Merge branch 'ent-7516-warnings-en-ejecuccion-de-vmware-plugin-pl' into 'develop'
...
avoid warnings in old perl versions
See merge request artica/pandorafms!4114
2021-05-10 11:06:45 +00:00
c6068a8544
Merge branch 'ent-7113-warning-ejecucion-erronea-pandora_server' into 'develop'
...
Fixed issue with execution without correct params
Closes pandora_enterprise#7113
See merge request artica/pandorafms!3989
2021-05-10 08:53:21 +00:00
2240f71c0c
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-10 08:40:59 +02:00
dfba1da200
Auto-updated build strings.
2021-05-10 01:00:34 +02:00
fb1ea7bd1d
Auto-updated build strings.
2021-05-09 01:00:25 +02:00
68f4f6f135
Auto-updated build strings.
2021-05-08 01:00:43 +02:00
d160737fb2
Avoid die while decoding erroneus json data
2021-05-07 14:15:16 +02:00
a5c5a30bde
avoid warnings in old perl versions
2021-05-07 14:01:42 +02:00
77693b6c6d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-07 08:33:56 +02:00
454e6120e4
Auto-updated build strings.
2021-05-07 01:00:44 +02:00
d5dcc5bf69
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-06 08:30:30 +02:00
6c87f65367
Auto-updated build strings.
2021-05-06 01:00:44 +02:00
e40014444f
Merge branch 'develop' into ent-5620-nuevo-compilador-para-backend
2021-05-05 17:23:29 +02:00
735df105d3
Mute some license checks while initializing enterprise component (pandora-ha)
2021-05-05 12:40:56 +02:00
20466ec0d1
Auto-updated build strings.
2021-05-05 01:00:40 +02:00
f0f7244d84
Auto-updated build strings.
2021-05-04 01:00:33 +02:00
5461a4391c
Auto-updated build strings.
2021-05-03 01:00:36 +02:00
2494aad730
Auto-updated build strings.
2021-05-02 01:00:30 +02:00
13483e6952
Auto-updated build strings.
2021-05-01 01:00:31 +02:00
c95b629776
Auto-updated build strings.
2021-04-30 01:00:41 +02:00
4951552d1d
Merge branch 'ent-7413-filtro-log-agent-alertas-correladas-logs-no-funciona-correctamente' into 'develop'
...
Fix locating agent while correlating logs
See merge request artica/pandorafms!4074
2021-04-29 12:05:10 +00:00
8407c5353f
Auto-updated build strings.
2021-04-29 01:00:46 +02:00
2930306767
Merge branch 'ent-7381-comportamiento-extraño-cron-modulos' into 'develop'
...
Improved business logic for cron
See merge request artica/pandorafms!4080
2021-04-28 15:24:47 +00:00
9b90039fe2
Merge branch 'ent-7414-rear-eventos-por-cli-metaconsola' into 'develop'
...
fixed error with meta create vent cli
See merge request artica/pandorafms!4079
2021-04-28 14:19:21 +00:00
778d126989
Auto-updated build strings.
2021-04-28 01:00:41 +02:00
24976c4860
Disable timezone offset while setting timestamp from server
2021-04-27 17:58:20 +02:00
2787a1f64c
Merge branch 'ent-7385-no-se-actualizan-los-hilos-del-servidor-transaccional' into 'develop'
...
Removed token trasnsactional_threads as manager only runs 1 thread
See merge request artica/pandorafms!4075
2021-04-27 14:25:36 +00:00
2ef9743d5b
Added elastic_query_size
2021-04-27 14:59:59 +02:00
dedd578fe1
Merge branch 'ent-7329-Fallo-de-conteos-en-tactical-view' into 'develop'
...
fixed count in several views
See merge request artica/pandorafms!4052
2021-04-27 11:47:43 +00:00
5aea0d17f0
Merge branch 'ent-7347-no-funciona-envio-de-mails-desde-servidor-con-sendgrid' into 'develop'
...
Make sure encode_base64 does not break auth strings.
See merge request artica/pandorafms!4059
2021-04-27 11:43:06 +00:00
d0c3174d8c
Improved business logic for cron
2021-04-27 12:19:20 +02:00
9edfe43cb7
fixed error with meta create vent cli
2021-04-27 12:14:32 +02:00
8a5f5992ac
Auto-updated build strings.
2021-04-27 01:00:39 +02:00
5bfd86d944
Removed token trasnsactional_threads as manager only runs 1 thread
2021-04-26 21:21:01 +02:00
00acc46eca
Fix locating agent while correlating logs
2021-04-26 19:49:43 +02:00
72b9748be9
Auto-updated build strings.
2021-04-26 01:00:14 +02:00
fa2748ac5d
Auto-updated build strings.
2021-04-25 01:00:22 +02:00
351570213f
Auto-updated build strings.
2021-04-24 01:00:38 +02:00
f3f44ebbdd
Auto-updated build strings.
2021-04-23 01:00:18 +02:00
d423979426
Make sure encode_base64 does not break auth strings.
...
The way Mail::Sendmail called encode_base64 could break auth strings
into multiple lines, resulting in authentication errors.
Ref pandora_enterprise#7347
2021-04-22 15:03:27 +02:00
c7521d27fa
Auto-updated build strings.
2021-04-22 01:00:16 +02:00
1c8e73df9d
fixed count in several views
2021-04-21 17:11:32 +02:00
d4d7494e27
Auto-updated build strings.
2021-04-21 01:00:16 +02:00
fc21a1234d
PluginTools transfer_xml, Rename filename if it contains symbols (only parsed ones)
2021-04-20 14:05:15 +02:00
d3dc3044aa
Allow sending file_path with symbols
2021-04-20 13:22:13 +02:00
d380e2cd45
Merge branch 'ent-7320-11651-creacion-masiva-de-xml-incorrectos-con-servidor-develop' into 'develop'
...
Ent 7320 11651 creacion masiva de xml incorrectos con servidor develop
See merge request artica/pandorafms!4038
2021-04-20 08:55:21 +00:00
3c7fc18abb
Merge branch 'ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas' into 'develop'
...
reviewing correlated alerts
See merge request artica/pandorafms!4024
2021-04-20 07:56:04 +00:00
20fe99ef29
Auto-updated build strings.
2021-04-20 01:00:15 +02:00
7275bdd061
Allow transfer_xml direct file paths in pluginTools
2021-04-19 18:11:34 +02:00
3737d61793
Updated version and build strings.
2021-04-19 16:09:29 +02:00
50f580c112
Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas
2021-04-19 14:35:59 +02:00
08abb25fc4
Auto-updated build strings.
2021-04-19 01:00:13 +02:00
1030ef052a
Auto-updated build strings.
2021-04-18 01:00:13 +02:00
9ec945fa3c
Auto-updated build strings.
2021-04-17 01:00:15 +02:00
256d4333c6
Fixed encoding ampersand on mail alerts
2021-04-16 15:36:12 +02:00
f585e44692
Auto-updated build strings.
2021-04-16 01:00:41 +02:00
4d1a0d9ef4
Merge remote-tracking branch 'origin/develop' into ent-5620-nuevo-compilador-para-backend
2021-04-15 18:16:41 +02:00
8edaad4e5a
Push /usr/lib/perl5 to the back of the module search path.
...
When /usr/lib/perl5 is added to the front of the module search path it
takes precedence over libraries distributed with binary versions of
Pandora FMS. This can be fixed by pushing it to the back instead.
2021-04-15 17:56:02 +02:00
3bc8f6c4ac
Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas
2021-04-15 15:33:14 +02:00
fe9109e585
Auto-updated build strings.
2021-04-15 01:00:43 +02:00
114f23f474
Added event_server_cache_ttl
2021-04-14 22:36:56 +02:00
46291eed66
Auto-updated build strings.
2021-04-14 01:00:15 +02:00
fff13ad2ac
Merge branch 'ent-6377-proyectos-amazon-s3-en-el-discovery' into 'develop'
...
Minor changes
See merge request artica/pandorafms!3930
2021-04-13 14:31:37 +00:00
27df4348be
resolved error with mail graph
2021-04-13 10:29:42 +02:00
c33f2182ff
Auto-updated build strings.
2021-04-13 01:00:16 +02:00
4a071237b4
Auto-updated build strings.
2021-04-12 01:00:26 +02:00
3627be1f85
Auto-updated build strings.
2021-04-11 01:00:32 +02:00
ea81d04e5f
Auto-updated build strings.
2021-04-10 01:00:37 +02:00
70c6e7196f
Auto-updated build strings.
2021-04-09 01:00:40 +02:00
2e27cebad2
Auto-updated build strings.
2021-04-08 01:00:37 +02:00
8734494b7f
Auto-updated build strings.
2021-04-07 01:00:38 +02:00
0f5f41e97f
Merge branch 'ent-7011-nexcon-se-sigue-generando-el-evento-de-alerta-cesada-aunque-esten-deshabilitados-los-eventos-de-la-alera' into 'develop'
...
Avoid events while ceasing alerts
See merge request artica/pandorafms!3827
2021-04-06 17:25:21 +00:00
247343c0b6
Auto-updated build strings.
2021-04-06 01:02:48 +02:00
31a8fd6c55
Auto-updated build strings.
2021-04-05 01:00:42 +02:00
4811e45bf2
Auto-updated build strings.
2021-04-04 01:00:37 +02:00
95e437252b
Auto-updated build strings.
2021-04-03 01:00:36 +02:00
2f4eaacb6a
Auto-updated build strings.
2021-04-02 01:00:33 +02:00
10ea68f33f
Auto-updated build strings.
2021-04-01 01:00:11 +02:00
14b364baec
Fixed issue with execution without correct params
2021-03-31 12:37:02 +02:00
321fc8aa05
Auto-updated build strings.
2021-03-31 01:00:44 +02:00
8b92c0ffc1
Auto-updated build strings.
2021-03-30 01:00:51 +02:00
96d63e2029
Updated version and build strings.
2021-03-29 14:57:41 +02:00
3e8214850f
Auto-updated build strings.
2021-03-29 01:00:18 +02:00
cf78261d0b
Auto-updated build strings.
2021-03-28 01:00:14 +01:00
e46845e864
Auto-updated build strings.
2021-03-27 01:00:19 +01:00
c10c1b09cf
Auto-updated build strings.
2021-03-26 01:00:18 +01:00
c4b6f709c9
Merge branch 'ent-6979-fallo-discovery-contraseñas-caracteres-especiales' into 'develop'
...
Fix issue
Closes pandora_enterprise#6979
See merge request artica/pandorafms!3821
2021-03-25 11:54:45 +00:00
1934c04388
Auto-updated build strings.
2021-03-25 01:00:21 +01:00
9918e7c3cd
Merge branch 'develop' into 'ent-6858-Goliat-opensource'
...
# Conflicts:
# pandora_console/extras/delete_files/delete_files.txt
2021-03-24 15:50:12 +00:00
artica
Daniel Rodriguez
Ramon Novoa
fbsanchez
Jose Gonzalez
marcos
Junichi Satoh
Alejandro Campos
Calvo
José González
vgilc
Daniel Barbero Martin
Daniel Maya
José González
Ramon Novoa