tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-25 19:58:41 +02:00
Code Issues Packages Projects Releases Wiki Activity
25,155 Commits 34 Branches 30 Tags
Commit Graph

5224 Commits

Author SHA1 Message Date
Arturo Gonzalez
351f9e27b1 Added duplicate function 2017-09-13 17:39:17 +02:00
Arturo Gonzalez
26522ecaaa Added remove console items function to cli 2017-09-13 15:19:41 +02:00
Arturo Gonzalez
e7cdf9b049 Added creation when elements position is auto 2017-09-13 13:27:37 +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
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