fbsanchez
|
40dcf343d6
|
Added to_number to Tools.pm
|
2017-09-06 12:28:13 +02:00 |
artica
|
ce4d898deb
|
Auto-updated build strings.
|
2017-09-06 00:01:18 +02:00 |
Daniel Maya
|
b6c44db3cd
|
Merge branch 'develop' into '125-Gestión-recolección-y-correlación-de-logs-dev'
# Conflicts:
# pandora_server/lib/PandoraFMS/Config.pm
|
2017-09-05 10:00:24 +02:00 |
|
artica
|
924518e02b
|
Auto-updated build strings.
|
2017-09-05 00:01:21 +02:00 |
|
fbsanchez
|
ae8ef93191
|
Logstash/Elasticsearch self monitoring
|
2017-09-04 20:07:14 +02:00 |
daniel
|
a04e02570f
|
Merge branch 'develop' into 1056-pandora-wux-grid-server
|
2017-09-04 14:09:08 +02:00 |
|
artica
|
9169cff0b5
|
Auto-updated build strings.
|
2017-09-04 00:01:13 +02:00 |
|
artica
|
b35ffc84ba
|
Auto-updated build strings.
|
2017-09-03 00:01:13 +02:00 |
|
artica
|
f2cf38a3dd
|
Auto-updated build strings.
|
2017-09-02 00:01:14 +02:00 |
|
daniel
|
d74a3f74b4
|
Merge branch 'develop' into 1056-pandora-wux-grid-server
|
2017-09-01 10:51:54 +02:00 |
|
artica
|
cce7f496b6
|
Auto-updated build strings.
|
2017-09-01 00:01:14 +02:00 |
|
fbsanchez
|
e08a3dd040
|
Core: Send _data_ macro as image when needed
|
2017-08-31 16:28:18 +02:00 |
|
artica
|
e45face2fc
|
Auto-updated build strings.
|
2017-08-31 00:01:15 +02:00 |
slerena
|
10a145fe98
|
Merge branch '1248-deadlocks-en-pandora-4452' into 'develop'
Remove nested queries to prevent deadlocks with the Data Server.
See merge request !760
|
2017-08-30 17:48:53 +02:00 |
|
artica
|
0594a7bcbc
|
Auto-updated build strings.
|
2017-08-30 00:01:13 +02:00 |
Ramon Novoa
|
29cecf2e29
|
Remove nested queries to prevent deadlocks with the Data Server.
Ref pandora_enterprise#1248.
|
2017-08-29 14:34:14 +02:00 |
|
artica
|
8616015f38
|
Auto-updated build strings.
|
2017-08-29 00:01:14 +02:00 |
|
artica
|
ab48fabc0b
|
Auto-updated build strings.
|
2017-08-28 00:01:12 +02:00 |
|
artica
|
ed72e8c342
|
Auto-updated build strings.
|
2017-08-27 00:01:12 +02:00 |
|
artica
|
b907a65921
|
Auto-updated build strings.
|
2017-08-26 00:01:37 +02:00 |
|
fbsanchez
|
1d7589dd47
|
Advanced log management pandora_sever conf tokens
|
2017-08-25 17:03:26 +02:00 |
|
artica
|
8f373edf84
|
Auto-updated build strings.
|
2017-08-25 00:01:13 +02:00 |
|
artica
|
1bf7d8278a
|
Auto-updated build strings.
|
2017-08-24 00:01:14 +02:00 |
|
daniel
|
c29d8a4fdb
|
Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
|
2017-08-23 09:35:17 +02:00 |
|
artica
|
dcd5fd2e5e
|
Auto-updated build strings.
|
2017-08-23 00:01:14 +02:00 |
|
daniel
|
8232911713
|
merge develop
|
2017-08-22 18:39:34 +02:00 |
|
artica
|
60757b0ad6
|
Auto-updated build strings.
|
2017-08-22 00:01:13 +02:00 |
|
artica
|
c1545fc802
|
Auto-updated build strings.
|
2017-08-21 00:01:11 +02:00 |
|
artica
|
f3e5c32c09
|
Auto-updated build strings.
|
2017-08-20 00:01:11 +02:00 |
|
artica
|
19f1c3610e
|
Auto-updated build strings.
|
2017-08-19 00:01:13 +02:00 |
vgilc
|
a5d3f916d7
|
Merge branch '1005-Graficas_de_alerta_con_umbrales' into 'develop'
1005 graficas de alerta con umbrales
See merge request !702
|
2017-08-18 12:42:27 +02:00 |
|
vgilc
|
0a1e11b927
|
Merge branch '1072-new-macro-to-get-the-module-id-dev' into 'develop'
Added new macro
See merge request !705
|
2017-08-18 12:37:46 +02:00 |
|
artica
|
3ce15d5814
|
Auto-updated build strings.
|
2017-08-18 00:01:12 +02:00 |
|
artica
|
f7ecefcc60
|
Auto-updated build strings.
|
2017-08-17 00:01:13 +02:00 |
artica
|
f7ea07d559
|
Updated version and build strings.
|
2017-08-16 13:09:03 +02:00 |
|
artica
|
8958dd0900
|
Auto-updated build strings.
|
2017-08-16 10:38:02 +02:00 |
|
artica
|
c08e17084f
|
Auto-updated build strings.
|
2017-08-16 10:38:02 +02:00 |
|
artica
|
9ddf454e09
|
Auto-updated build strings.
|
2017-08-16 10:38:02 +02:00 |
|
artica
|
b973e12a51
|
Auto-updated build strings.
|
2017-08-16 10:38:02 +02:00 |
|
artica
|
5542bd8947
|
Auto-updated build strings.
|
2017-08-16 10:38:02 +02:00 |
|
artica
|
31d5699a2b
|
Auto-updated build strings.
|
2017-08-16 10:38:02 +02:00 |
|
artica
|
ed5c0c71b2
|
Updated version and build strings.
|
2017-08-16 10:38:02 +02:00 |
|
artica
|
70988d8c8c
|
Auto-updated build strings.
|
2017-08-16 10:38:02 +02:00 |
|
daniel
|
55ed4ec840
|
fixed error cli version snmp
|
2017-08-16 10:38:01 +02:00 |
|
artica
|
b0f3a737a9
|
Auto-updated build strings.
|
2017-08-16 00:01:15 +02:00 |
|
artica
|
a12f0de8b7
|
Auto-updated build strings.
|
2017-08-15 00:01:13 +02:00 |
|
vgilc
|
90644f1805
|
Merge branch '1166-Error_al_crear_modulos_snmp_v2c_a_traves_del_CLI' into 'develop'
fixed error cli version snmp
See merge request !709
|
2017-08-14 12:23:52 +02:00 |
|
artica
|
8462e9d3d5
|
Auto-updated build strings.
|
2017-08-14 00:01:13 +02:00 |
|
artica
|
cc7b00bb39
|
Auto-updated build strings.
|
2017-08-13 00:01:12 +02:00 |
|
artica
|
bc022aba2b
|
Auto-updated build strings.
|
2017-08-12 00:01:13 +02:00 |