Commit Graph

3213 Commits

Author SHA1 Message Date
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 485d132baa Enable SystemD services and other fixes an Suse rpm 2017-10-03 17:56:13 +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
Arturo Gonzalez 0b3f252436 Fixed elements per row to 8 2017-09-28 09:56:15 +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
Arturo Gonzalez 23aa244051 Fixed bad positions when mode is auto and have less than 4 elements and added new parameter to export elements with id 2017-09-27 13:15:51 +02:00
Arturo Gonzalez ed7d8efaea Added 0 to all parents id 2017-09-27 12:26:13 +02:00
Arturo Gonzalez 28ecf5c51b Added simple quotes 2017-09-27 12:21:33 +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
Arturo Gonzalez 9e01eda73d Added change to scape double quotes 2017-09-22 14:42:26 +02:00
Arturo Gonzalez 49d3c2574b Added minor changes to duplicate and export functions 2017-09-22 10:18:18 +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
fermin831 4d27093679 Fixed down server time calculation 2017-09-18 11:50:40 +02:00
vgilc d0f8b9d2a5 Merge branch '118-pandora_db-pl-use-uninisialized-config-value' into 'develop'
Resolve "pandora_db.pl use uninisialized config value"

Closes #118

See merge request !361
2017-09-18 10:53:17 +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
vgilc e8a3484646 Merge branch '1306-visual-console-management-with-cli-dev' into 'develop'
1306 visual console management with cli dev

See merge request !819
2017-09-14 15:48:08 +02:00
Arturo Gonzalez 4fd4783bc5 Added edit function with auto position 2017-09-14 13:14:31 +02:00
Arturo Gonzalez bb0e15261a Added editor function when static option is enabled 2017-09-14 12:07:52 +02:00
Arturo Gonzalez aa8ee4278d Added export to JSON function to cli 2017-09-14 09:37:45 +02:00
artica 41956caa5c Auto-updated build strings. 2017-09-14 00:01:20 +02:00
Arturo Gonzalez f03514c771 Added first version to export console elements to json 2017-09-13 18:07:45 +02:00
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
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