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

3168 Commits

Author SHA1 Message Date
Arturo Gonzalez 4dec318607 Added function to create visual console with elements in cli 2017-09-11 17:56:42 +02:00
fermin831 787fb00d16 Avoid to overwrite the os_version when is empty 2017-09-11 17:46:56 +02:00
Arturo Gonzalez ac36c701f7 Added a first contact with the new functions 2017-09-11 16:09:13 +02:00
vgilc 49f7168e1b Merge branch '1089-Incluir-borrado-de-entradas-en-tgraph_source-al-pandora_db-dev' into 'develop' 
Delete old tgraph_source data

See merge request !806
 2017-09-11 09:58:09 +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
Daniel Maya 61fd2c6d61 Delete old tgraph_source data 2017-09-08 13:04:19 +02:00
nramon 71efc0e773 Merge branch 'develop' into '118-pandora_db-pl-use-uninisialized-config-value' 
# Conflicts:
#   pandora_server/util/pandora_db.pl
 2017-09-08 12:55:05 +02:00
artica 7f3539ecf0 Auto-updated build strings. 2017-09-08 00:01:19 +02:00
fbsanchez 231ba7c2c6 minor fixes - migration tool 2017-09-07 10:40:00 +02:00
fbsanchez bb41da5ed4 help message for migrate tool 2017-09-07 10:19:38 +02:00
fbsanchez 06ff6d85ee Added preproc header pandora_migrate_logs 2017-09-07 10:15:01 +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
vgilc b2461dca65 Merge branch '1056-pandora-wux-grid-server' into 'develop' 
Moved pwrd to pandorafms

See merge request !789
 2017-09-06 17:16:46 +02:00
Ramon Novoa f78b6a9576 Change pandora_db.pl to work with the Elastic log collector. 2017-09-06 17:10:53 +02:00
vgilc 242abb1689 Merge branch '125-Gestión-recolección-y-correlación-de-logs-dev' into 'develop' 
Log migration tool

See merge request !788
 2017-09-06 16:36:37 +02:00
fbsanchez c51226e3de Moved pwrd to pandorafms 2017-09-06 16:33:39 +02:00
fbsanchez 6b6ca75d90 Merge branch 'develop' into 125-Gestión-recolección-y-correlación-de-logs-dev 2017-09-06 16:23:02 +02:00
fbsanchez c267073868 Migrate log tool 2017-09-06 16:22:54 +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
fbsanchez 629f5aa237 Merge branch 'develop' into 1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc 2017-09-04 16:20:20 +02:00
fbsanchez 6995a81509 Removed all traces of anytermd from code 2017-09-04 16:19:56 +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
slerena 88acc6352d Merge branch '309-Mejoras-CLI-para-TMB-3' into 'develop' 
Add instructions,user and force_create_agent parameters to CLI event_creator - #309

See merge request !744
 2017-08-28 12:20:01 +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
enriquecd 031a70cc51 Add instructions,user and force_create_agent parameters to CLI event_creator - #309 2017-08-22 10:43:22 +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 901a163c84 Merge branch '1108-bad-api-and-cli-request-in-meta-with-events-dev' into 'develop' 
Fixed meta event table in cli and api functions

See merge request !665
 2017-08-18 12:50:19 +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 6d2466cba2 fixed minor error 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
vgilc 10182b6aa1 Merge branch '1174-Modificar_ayuda_pandora_manage_create_snmp_module' into 'develop' 
fixed minor error

See merge request !711
 2017-08-14 12:21:34 +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
daniel 88411aedf5 fixed minor error 2017-08-03 15:07:49 +02:00
daniel df4b66fbd5 fixed error cli version snmp 2017-08-03 13:51:56 +02:00
Arturo Gonzalez cccbc8ff5b Added new macro 2017-08-03 11:49:56 +02:00
artica 5860d29e37 Auto-updated build strings. 2017-08-03 00:01:15 +02:00
daniel 6e45b3cd9e add threshold graph send for mail 2017-08-02 11:48:37 +02:00
artica 408efec325 Updated version and build strings. 2017-08-02 10:12:45 +02:00
artica c363a2e085 Auto-updated build strings. 2017-08-02 00:01:14 +02:00
artica 7e508a4137 Auto-updated build strings. 2017-08-01 00:01:14 +02:00
artica 6a4a199c96 Auto-updated build strings. 2017-07-31 00:01:13 +02:00
artica 50c4419ef7 Auto-updated build strings. 2017-07-30 00:01:13 +02:00