tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,792 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

2319 Commits

Author SHA1 Message Date
artica 2553494696 Auto-updated build strings. 2017-10-09 00:01:22 +02:00
artica 406ceaf8d3 Auto-updated build strings. 2017-10-08 00:01:32 +02:00
artica c1ff200f3c Auto-updated build strings. 2017-10-06 00:01:24 +02:00
artica 9e475f5710 Auto-updated build strings. 2017-10-05 00:01:23 +02:00
artica de8285dc27 Auto-updated build strings. 2017-10-04 00:01:23 +02:00
fermin831 fbc264f6b7 Added space on restart server event 2017-10-03 16:16:52 +02:00
artica 7b3a0d49f1 Auto-updated build strings. 2017-10-03 00:01:22 +02:00
artica 3188bf1b0b Updated version and build strings. 2017-10-02 11:57:37 +02:00
artica e9b8f01931 Auto-updated build strings. 2017-10-02 00:01:20 +02:00
artica bc48ddc747 Auto-updated build strings. 2017-10-01 00:01:20 +02:00
artica befb1fb196 Auto-updated build strings. 2017-09-30 00:01:23 +02:00
artica 6d7a9fd648 Auto-updated build strings. 2017-09-29 00:01:25 +02:00
Ramon Novoa 96a3dfab43 Set @Parser::Expat::Encoding_Path instead of calling load_encoding. 
Parser::Expat::load_encoding doesn't seem to be thread safe. Set
@Parser::Expat::Encoding_Path instead to avoid problems.

Ref pandora_enterprise#1340.
 2017-09-28 15:18:21 +02:00
artica 165087d670 Auto-updated build strings. 2017-09-28 00:01:20 +02:00
daniel 9a66aa52f2 add send mail plain/text 2017-09-27 13:42:02 +02:00
artica 5ab5e04630 Auto-updated build strings. 2017-09-26 00:01:25 +02:00
vgilc 07b8e178d3 Merge branch '152-handle-incomplete-SNMPtraps' into 'develop' 
Improved SNMP trap handling against incomplete traps or partially delayed ones.

Closes #152

See merge request !593
 2017-09-25 13:14:35 +02:00
artica 444101dbdf Auto-updated build strings. 2017-09-25 00:01:22 +02:00
artica 3e3268971f Auto-updated build strings. 2017-09-24 00:01:21 +02:00
artica d1c4ce1008 Auto-updated build strings. 2017-09-23 00:01:17 +02:00
artica c50c7b70da Auto-updated build strings. 2017-09-22 00:01:16 +02:00
artica 581b6cbae2 Auto-updated build strings. 2017-09-21 00:01:28 +02:00
artica 2e802e1b70 Auto-updated build strings. 2017-09-19 00:01:21 +02:00
artica 9a6a22718e Auto-updated build strings. 2017-09-18 00:01:20 +02:00
artica 14cea700ad Auto-updated build strings. 2017-09-17 00:01:19 +02:00
artica d35a88e439 Auto-updated build strings. 2017-09-16 00:01:20 +02:00
artica 802a782c9a Auto-updated build strings. 2017-09-15 00:01:21 +02:00
artica 41956caa5c Auto-updated build strings. 2017-09-14 00:01:20 +02:00
vgilc 754697f51c Merge branch 'ent-966-os_version-en-ficheros-xml-ext-4098-v7-0' into 'develop' 
Ent 966 os version en ficheros xml ext 4098 v7 0

See merge request !813
 2017-09-13 12:53:43 +02:00
artica 4cc2a5da0a Auto-updated build strings. 2017-09-13 00:01:21 +02:00
artica 870a59ba57 Auto-updated build strings. 2017-09-12 00:01:21 +02:00
fermin831 787fb00d16 Avoid to overwrite the os_version when is empty 2017-09-11 17:46:56 +02:00
artica 291871fae0 Auto-updated build strings. 2017-09-11 00:01:20 +02:00
artica e651f64c85 Auto-updated build strings. 2017-09-10 00:01:18 +02:00
artica cc36e2756f Auto-updated build strings. 2017-09-09 00:01:22 +02:00
daniel 8a7b0a0f79 fixed errors in new macro graph treshold 2017-09-08 13:55:03 +02:00
artica 7f3539ecf0 Auto-updated build strings. 2017-09-08 00:01:19 +02:00
artica 80027e4d8c Auto-updated build strings. 2017-09-07 00:01:31 +02:00
fbsanchez 60424e5be2 Added missed use in Tools.pm 2017-09-06 18:50:03 +02:00
artica c4a709acf1 Updated version and build strings. 2017-09-06 17:22:32 +02:00
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
Ramon Novoa 2f069c37dc Add an alpha version of the WUXServer. 2017-08-11 11:08:40 +02:00
artica 941341585e Auto-updated build strings. 2017-08-11 00:01:13 +02:00
artica 8309e4fffb Updated version and build strings. 2017-08-10 10:37:06 +02:00
artica bbe63a30ec Auto-updated build strings. 2017-08-10 00:01:15 +02:00
artica f96032eeaa Auto-updated build strings. 2017-08-09 00:01:15 +02:00
artica d5cff43128 Auto-updated build strings. 2017-08-08 00:01:14 +02:00
artica 5164624dca Auto-updated build strings. 2017-08-07 00:01:14 +02:00
artica 5a0da66b3d Auto-updated build strings. 2017-08-06 00:01:13 +02:00
artica c826d0951e Auto-updated build strings. 2017-08-05 00:01:13 +02:00
artica 2d8697eaeb Auto-updated build strings. 2017-08-04 00:01:14 +02:00