Commit Graph

3739 Commits

Author SHA1 Message Date
artica 4d4cee2251 Auto-updated build strings. 2017-12-04 00:01:08 +01:00
artica 3d5e8760cd Auto-updated build strings. 2017-12-03 00:01:09 +01:00
artica dc8c5c54e6 Auto-updated build strings. 2017-12-02 00:01:38 +01:00
daniel 9a976ae8c8 fixed minor error pandora_server.conf 2017-12-01 12:44:35 +01:00
daniel ea03a485c1 fixed error server WUX 2017-12-01 12:26:13 +01:00
artica 4652980457 Auto-updated build strings. 2017-12-01 00:01:11 +01:00
fbsanchez c4f9723d0d PluginTools: New methods
- Added extract_key_map
- Added read_configuration
2017-11-30 17:00:28 +01:00
Ramon Novoa c72f583f0a Merge remote-tracking branch 'origin/develop' into 1526-grep_syslog_module 2017-11-30 13:20:51 +01:00
artica d8ee188b95 Auto-updated build strings. 2017-11-30 00:01:12 +01:00
fbsanchez 831e621c6a PluginTools transfer_xml CDE 2017-11-29 19:48:15 +01:00
fbsanchez 7283390f12 PluginTools CDE 2017-11-29 18:27:31 +01:00
fbsanchez 5f0bc277b6 PluginTools Added get_lib_version 2017-11-29 17:13:12 +01:00
vgilc 227eb2b9cb Merge branch '1465-optimizacion-en-el-procesado-de-xml' into 'develop'
Performance improvements. Rewrote safe_input and safe_output.

See merge request artica/pandorafms!925
2017-11-29 17:08:03 +01:00
vgilc dad457b4d6 Merge branch 'ent-621-automonitorizacion-del-servidor-usa-comandos-de-otro-sistema-operativo' into 'develop'
Fixed automonitoring on Windows

See merge request artica/pandorafms!971
2017-11-29 16:56:10 +01:00
vgilc 89c08ede12 Merge branch '1351-AND-filters-added-to-snmp-filters-(so-much-wow)-dev' into 'develop'
1351 and filters added to snmp filters (so much wow) dev

See merge request artica/pandorafms!978
2017-11-29 14:07:58 +01:00
fbsanchez 0edf8cd046 PluginTools Fix in __system {solaris} 2017-11-29 13:31:27 +01:00
fbsanchez 3f82db6c6c Merge branch 'develop' into 1552-vmware-plugin-no-esta-actualizado-en-las-isos 2017-11-29 12:08:59 +01:00
artica 0df9ae47ce Auto-updated build strings. 2017-11-29 00:01:11 +01:00
artica 406c69d5be Auto-updated build strings. 2017-11-28 00:01:13 +01:00
fbsanchez f3b0f1708e Minor fixes in PluginTools
Updated subroutine arguments to standar dev line
2017-11-27 18:19:32 +01:00
artica 13e0221013 Updated version and build strings. 2017-11-27 12:24:02 +01:00
artica 6b79dc357d Auto-updated build strings. 2017-11-27 00:01:09 +01:00
artica 0ced834c75 Auto-updated build strings. 2017-11-26 00:01:09 +01:00
artica fd47d57ce2 Auto-updated build strings. 2017-11-25 00:01:11 +01:00
vgilc 7b3e71f79a Merge branch 'feature/safe_mode_module' into 'develop'
Filter by id_agente_modulo when evaluating safe mode operation.

See merge request artica/pandorafms!1116
2017-11-24 12:11:11 +01:00
Ramon Novoa fe9a426109 Filter by id_agente_modulo when evaluating safe mode operation.
Ref pandora_enterprise#1276.
2017-11-24 12:04:53 +01:00
artica b6dfc147f3 Auto-updated build strings. 2017-11-24 00:01:11 +01:00
vgilc ebc35ae791 Merge branch 'ent-1436-opciones-avanzadas-cron-modulos-sinteticos-no-funciona-correctamente-3' into 'develop'
Ent 1436 opciones avanzadas cron modulos sinteticos no funciona correctamente 3

See merge request artica/pandorafms!1112
2017-11-23 17:44:25 +01:00
artica 1ce4adb54e Auto-updated build strings. 2017-11-23 00:01:12 +01:00
fermin831 98a343a3b3 Fixed non-cron current interval on cronned modules on srever 2017-11-22 18:46:04 +01:00
artica b4ba8acaa2 Auto-updated build strings. 2017-11-22 00:01:11 +01:00
vgilc 480ebd4c9b Merge branch 'feature/safe_mode_module' into 'develop'
Add safe-module mode support.

See merge request artica/pandorafms!1103
2017-11-21 12:16:05 +01:00
Ramon Novoa 0f37cccab5 Add safe-module mode support.
Ref pandora_enterprise#1276.
2017-11-21 12:03:16 +01:00
artica ae6df5a24e Auto-updated build strings. 2017-11-21 00:01:13 +01:00
fermin831 50569f187f Fixed server cron problems when there is set only time from 2017-11-20 14:06:40 +01:00
artica 04c271ae61 Auto-updated build strings. 2017-11-20 00:01:08 +01:00
artica 92b71b17f4 Auto-updated build strings. 2017-11-19 00:01:09 +01:00
artica 1fb39ee151 Auto-updated build strings. 2017-11-18 00:01:11 +01:00
Arturo Gonzalez 2bfd7bd231 Added new fields 2017-11-17 13:12:35 +01:00
artica c624c213ea Auto-updated build strings. 2017-11-17 00:01:11 +01:00
Alejandro Gallardo Escobar c93ab00920 Recovered a reverted change 2017-11-16 16:47:19 +01:00
fbsanchez 539deda4d6 Updates plugintools 2017-11-16 14:53:17 +01:00
artica 104db9a875 Auto-updated build strings. 2017-11-16 00:01:12 +01:00
Ramon Novoa 18fdba9dd6 Add a new enterprise server to parse syslog's output.
Ref pandora_enterprise#1526.
2017-11-15 11:29:50 +01:00
vgilc fbbd029812 Merge branch 'ent-1493-problemas-con-las-entidades-html-al-crear-eventos-con-el-pandora_server' into 'develop'
Added safe_output to server events

See merge request artica/pandorafms!970
2017-11-15 09:40:10 +01:00
artica e793e3fd4e Auto-updated build strings. 2017-11-15 00:01:16 +01:00
fermin831 ae94be7779 Delete orig repo files 2017-11-14 19:37:00 +01:00
fbsanchez 722bc86381 Opensource plugins added to pandorafms 2017-11-14 15:17:27 +01:00
vgilc c65841938a Merge branch '182-fallo-instalador-pwrd' into 'develop'
Fixed install_pwrd (added logrotate)

Closes #182

See merge request artica/pandorafms!1058
2017-11-14 08:59:01 +01:00
artica 69aff8a420 Auto-updated build strings. 2017-11-14 00:01:10 +01:00
fbsanchez d60f35e083 Fixed install_pwrd (added logrotate) 2017-11-13 19:12:56 +01:00
artica 301795af83 Auto-updated build strings. 2017-11-13 00:01:08 +01:00
artica 2e6e46c10c Auto-updated build strings. 2017-11-12 00:01:08 +01:00
artica b8e6d7927e Auto-updated build strings. 2017-11-11 00:01:10 +01:00
artica 680d23038e Auto-updated build strings. 2017-11-10 00:01:09 +01:00
artica f512bea610 Auto-updated build strings. 2017-11-09 00:01:13 +01:00
artica ef8b69841c Updated version and build strings. 2017-11-08 15:30:28 +01:00
vgilc bb05772d60 Merge branch 'comportamiento-de-icmp_checks-por-defecto' into 'develop'
Change the default number of ICMP packets and retries for ping modules.

See merge request artica/pandorafms!1041
2017-11-08 12:21:52 +01:00
danielmaya 1d7df38b61 Fixed entities in networkserver.pm 2017-11-08 11:55:23 +01:00
Ramon Novoa ab03a6b71c Change the default number of ICMP packets and retries for ping modules.
Ref pandora_enterprise#1562.
2017-11-08 10:37:15 +01:00
artica b461121361 Auto-updated build strings. 2017-11-08 00:01:10 +01:00
daniel 29c69b1dbc add send mail plain/text 2017-11-07 11:43:46 +01:00
artica 3763a1a93c Auto-updated build strings. 2017-11-07 00:01:10 +01:00
danielmaya 6cd13dbc6d Fixed call snmp in server 2017-11-06 15:53:33 +01:00
artica 2bca9c92fa Auto-updated build strings. 2017-11-06 00:01:08 +01:00
artica 3a220564ec Auto-updated build strings. 2017-11-05 00:01:09 +01:00
artica cc4e337f70 Auto-updated build strings. 2017-11-04 00:01:12 +01:00
artica 3d6d1044ea Auto-updated build strings. 2017-11-03 00:01:11 +01:00
artica f8211e2c63 Auto-updated build strings. 2017-11-02 00:01:07 +01:00
artica 9b530c414f Auto-updated build strings. 2017-11-01 00:01:10 +01:00
artica 0653c17a9d Auto-updated build strings. 2017-10-31 00:01:11 +01:00
artica 90b671de74 Auto-updated build strings. 2017-10-30 00:01:08 +01:00
artica 8f6d4a5d42 Auto-updated build strings. 2017-10-29 00:01:08 +02:00
artica 9bc804073a Auto-updated build strings. 2017-10-28 00:01:11 +02:00
artica 42a43b0c4e Auto-updated build strings. 2017-10-27 00:01:09 +02:00
vgilc e4e5734ff5 Merge branch 'ent-1178-solicitud-de-macro-que-devuelve-el-server-al-que-esta-asignado-el-agente' into 'develop'
Ent 1178 solicitud de macro que devuelve el server al que esta asignado el agente

See merge request artica/pandorafms!902
2017-10-26 13:54:39 +02:00
vgilc 0191fd38d4 Merge branch 'ent-300-proteccion-contra-tormenta-de-eventos-solo-funciona-en-el-servidor-master' into 'develop'
Modified events protection checking to protect secundary servers too

See merge request artica/pandorafms!917
2017-10-26 12:32:54 +02:00
vgilc ce5b6109c4 Merge branch 'bug-paquetes-pandora-instalacion-opensuse' into 'develop'
Enable SystemD services and other fixes an Suse rpm

See merge request artica/pandorafms!878
2017-10-26 12:29:30 +02:00
Arturo Gonzalez 3f77b3ae7d Added changes to snmp server to evaluate all filters in the same virtual world 2017-10-26 12:01:04 +02:00
vgilc 99e2b07e23 Merge branch 'ent-1415-falta-espacio-en-nombre-de-evento-al-reiniciar-server' into 'develop'
Added space on restart server event

See merge request artica/pandorafms!876
2017-10-26 11:14:45 +02:00
Arturo Gonzalez 91a39ab01e Added visual upgrades to filter view 2017-10-26 11:03:08 +02:00
vgilc e1c3e55582 Merge branch 'ent-1411-pandora_manage---get_module_data-con-modulos-incrementales' into 'develop'
Fixed inc modules on pandora manage --get_module_data

See merge request artica/pandorafms!894
2017-10-26 10:39:16 +02:00
vgilc 9767f9bb9e Merge branch 'ent-1436-opciones-avanzadas-cron-modulos-sinteticos-no-funciona-correctamente' into 'develop'
Fixed cron on server modules

See merge request artica/pandorafms!914
2017-10-26 09:54:29 +02:00
vgilc 64117e2744 Merge branch 'tardanza-en-vista-de-arbol-carrefour' into 'develop'
Tardanza en vista de arbol carrefour

See merge request artica/pandorafms!924
2017-10-26 09:51:34 +02:00
artica 0a74291730 Auto-updated build strings. 2017-10-26 00:01:09 +02:00
Arturo Gonzalez efd8c850a0 Added new filter function to snmp traps 2017-10-25 16:47:58 +02:00
fermin831 38d216b108 Fixed automonitoring on Windows 2017-10-25 15:42:54 +02:00
fermin831 f1cbaec98b Added safe_output to server events 2017-10-25 12:11:56 +02:00
artica fc81469b7c Auto-updated build strings. 2017-10-25 00:01:09 +02:00
artica 326b1a0828 Auto-updated build strings. 2017-10-24 00:01:10 +02:00
artica 906201a34c Updated version and build strings. 2017-10-23 17:45:29 +02:00
Alejandro Gallardo Escobar edcff5e1f1 [Pandora Server] Added a decode to the alert description before the event creation, to avoid a double encode with HTML entities 2017-10-23 16:23:30 +02:00
artica f59c4f591c Auto-updated build strings. 2017-10-23 00:01:07 +02:00
artica 50c0447d85 Auto-updated build strings. 2017-10-22 00:01:08 +02:00
artica 83b0e393e1 Auto-updated build strings. 2017-10-21 00:01:07 +02:00
artica 30f4162d91 Auto-updated build strings. 2017-10-20 00:01:08 +02:00
artica 038fce3346 Auto-updated build strings. 2017-10-19 00:01:08 +02:00
vgilc 7121d4a343 Merge branch 'deadlocks-base-de-datos-en-cluster-de-percona-4137' into 'develop'
Retry queries when a deadlock is found.

See merge request !936
2017-10-18 11:15:54 +02:00
Ramon Novoa 702bed8c13 Retry queries when a deadlock is found.
Ref pandora_enterprise#1126.
2017-10-18 10:45:55 +02:00
artica 157670c21c Auto-updated build strings. 2017-10-18 00:01:15 +02:00
artica fc762719c9 Auto-updated build strings. 2017-10-17 00:01:21 +02:00
vgilc 4bd7c7fb1f Merge branch 'reinicio-automatico-de-recon-ext-4100' into 'develop'
Do not automatically restart manual recon tasks.

See merge request !928
2017-10-16 17:21:23 +02:00
vgilc 27746eedc0 Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'"
This reverts merge request !862
2017-10-16 16:44:44 +02:00
Ramon Novoa e649815624 Do not automatically restart manual recon tasks.
Ref pandora_enterprise#1274.
2017-10-16 15:52:00 +02:00
artica 6c11b68d3d Auto-updated build strings. 2017-10-16 00:01:18 +02:00
artica 606697a405 Auto-updated build strings. 2017-10-15 00:01:19 +02:00
artica 6bfc11be4a Auto-updated build strings. 2017-10-14 00:01:20 +02:00
slerena 551704a0bf Updated description to be more precise in the comments of web server configuration token. 2017-10-13 17:10:48 +02:00
Ramon Novoa 90366e7e58 Performance improvements. Rewrote safe_input and safe_output.
Ref pandora_enterprise#1465.
2017-10-13 15:50:26 +02:00
Ramon Novoa 7d3e86296b Add metaconsole support to server-side group stats. 2017-10-13 15:10:46 +02:00
artica 3fb49f294d Auto-updated build strings. 2017-10-13 00:02:12 +02:00
vgilc c1fe2a3447 Merge branch '1425-new-improvements-in-route-analyzer-feature-dev' into 'develop'
1425 new improvements in route analyzer feature dev

See merge request !919
2017-10-11 17:40:55 +02:00
fermin831 4dfd000ba0 Modified events protection checking to protect secundary servers too 2017-10-11 11:05:55 +02:00
artica 6bc0949942 Auto-updated build strings. 2017-10-11 00:01:25 +02:00
fermin831 5171f7a747 Fixed cron on server modules 2017-10-10 16:32:02 +02:00
Arturo Gonzalez 1e6f3a9d9b Borja fix this error 2017-10-10 11:44:15 +02:00
fbsanchez 4fc33ec58b Fix pandora_db string data purge 2017-10-10 11:26:04 +02:00
artica ec95400043 Auto-updated build strings. 2017-10-10 00:01:23 +02:00
Arturo Gonzalez 391655f6fe Added images and Borsha fix 2017-10-09 17:11:08 +02:00
fermin831 739c507d77 Added _server_ip_ and _server_name_ macros to alerts 2017-10-09 12:28:17 +02:00
vgilc f8023bf44a Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'
add send mail plain/text

See merge request !862
2017-10-09 10:11:27 +02:00
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
fermin831 5b933977af Fixed inc modules on pandora manage --get_module_data 2017-10-06 10:55:18 +02:00
artica c1ff200f3c Auto-updated build strings. 2017-10-06 00:01:24 +02:00
Daniel Maya b5fcf50257 Fixed snmp version in plugin snmp_remote 2017-10-05 12:12:59 +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 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
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
artica cc40fcccc2 Auto-updated build strings. 2017-07-29 00:01:14 +02:00
vgilc b745bfb884 Merge branch '597-Optimizacion_query_pandora_server' into 'develop'
fixed query in server

See merge request !694
2017-07-28 10:14:19 +02:00
artica 55c70098ba Auto-updated build strings. 2017-07-28 00:01:13 +02:00
daniel 8252362879 fixed query in server 2017-07-27 09:33:52 +02:00
artica 9d6bd697a7 Auto-updated build strings. 2017-07-27 00:01:13 +02:00
artica a9d76e2748 Updated version and build strings. 2017-07-26 17:03:41 +02:00
artica 729503f509 Auto-updated build strings. 2017-07-26 00:01:13 +02:00
artica daa952649b Auto-updated build strings. 2017-07-25 00:01:13 +02:00
Ramon Novoa 17229cbcd7 Add a script to count .data files by agent. 2017-07-24 11:09:41 +02:00
artica f3d6d7262e Auto-updated build strings. 2017-07-24 00:01:17 +02:00
artica c51cf9774f Auto-updated build strings. 2017-07-23 00:01:13 +02:00
artica b5caec31b5 Auto-updated build strings. 2017-07-22 00:01:45 +02:00
artica 1d35620ea6 Auto-updated build strings. 2017-07-21 00:01:16 +02:00
artica 728fb7cc69 Auto-updated build strings. 2017-07-20 00:01:18 +02:00
artica b8b6937284 Auto-updated build strings. 2017-07-19 00:01:16 +02:00
Arturo Gonzalez bec023dc4d Fixed meta event table in cli and api functions 2017-07-18 11:36:57 +02:00
artica d65ad2693e Auto-updated build strings. 2017-07-18 00:01:17 +02:00
artica 3fb887f516 Auto-updated build strings. 2017-07-17 00:01:15 +02:00
artica c5c748c831 Auto-updated build strings. 2017-07-16 00:01:15 +02:00
artica 8f88f87203 Auto-updated build strings. 2017-07-15 00:01:15 +02:00
artica 65cbbd1bae Auto-updated build strings. 2017-07-14 00:01:19 +02:00
artica b0c2a9e25c Auto-updated build strings. 2017-07-13 00:01:16 +02:00
artica 7536b1fd56 Auto-updated build strings. 2017-07-12 00:01:15 +02:00
artica 2872686042 Auto-updated build strings. 2017-07-11 00:01:16 +02:00
artica ede763cecf Updated version and build strings. 2017-07-10 15:11:14 +02:00
vgilc fd4dc4174c Merge branch 'alertas-trap-snmp-no-interpretan-macros-con-valor-0' into 'develop'
Make explicit comparisons to avoid trouble with values that evaluate to false.

See merge request !651
2017-07-10 12:54:47 +02:00
Ramon Novoa 48d303cf8f Fix a warning when there are multiple empty addresses. 2017-07-10 12:20:23 +02:00
artica 7002f24586 Auto-updated build strings. 2017-07-10 00:01:15 +02:00
artica 6fff54b0f0 Auto-updated build strings. 2017-07-09 00:01:15 +02:00
artica f1520483fd Auto-updated build strings. 2017-07-08 00:01:21 +02:00
artica 60e92e759b Auto-updated build strings. 2017-07-07 00:01:19 +02:00
artica 872e36672c Auto-updated build strings. 2017-07-06 00:01:16 +02:00
vgilc 3a3a7a83fe Merge branch 'ordenar-replicacion-de-eventos-y-update-agent-cache-al-final-del-arranque-del-server' into 'develop'
Sync the agent cache in the background.

See merge request !639
2017-07-05 11:39:58 +02:00
artica 7e376fc6dd Auto-updated build strings. 2017-07-05 00:01:15 +02:00
artica 2fef8a39dd Auto-updated build strings. 2017-07-04 00:01:16 +02:00
artica acbe200f90 Auto-updated build strings. 2017-07-03 00:01:16 +02:00
artica ef6cf3d5d7 Auto-updated build strings. 2017-07-02 00:01:15 +02:00
artica 83fef400ae Auto-updated build strings. 2017-07-01 00:01:18 +02:00
Ramon Novoa 0603a8408b Make explicit comparisons to avoid trouble with values that evaluate to false. 2017-06-30 20:39:41 +02:00
Ramon Novoa ce1491154e Sync the agent cache in the background.
Ref artica/pandora_enterprise#871.
2017-06-30 17:53:57 +02:00
artica 5eb53d599a Auto-updated build strings. 2017-06-30 00:01:18 +02:00
nramon 204681dbc0 Merge branch '1064-Acumulación-de-XMLs-al-finalizar-paradas-planificadas-dev' into 'develop'
Changed to disabled agents in planned downtime

See merge request !630
2017-06-29 12:21:54 +02:00
artica 470ff1857b Auto-updated build strings. 2017-06-29 00:01:17 +02:00
Daniel Maya 4244e23737 Changed to disabled agents in planned downtime 2017-06-28 16:20:20 +02:00
nramon 1b5d36d89f Merge branch '150-SNMP-alert-could-not-refer-agents' into 'develop'
Bug Fix: SNMP Alert could not refer agents. #150

Closes #150

See merge request !495
2017-06-28 08:37:53 +02:00
artica bd6088135d Auto-updated build strings. 2017-06-28 00:01:14 +02:00
artica d678760e5d Auto-updated build strings. 2017-06-27 00:01:15 +02:00
daniel f681f63ccb fixed error in plugin server agent for alias 2017-06-26 15:42:34 +02:00
artica ef22945b80 Auto-updated build strings. 2017-06-26 00:01:16 +02:00
artica 849a4d14e1 Auto-updated build strings. 2017-06-25 00:01:15 +02:00
artica 6ac3df710e Auto-updated build strings. 2017-06-24 00:01:16 +02:00
artica 41e1d42b22 Auto-updated build strings. 2017-06-23 00:01:16 +02:00
artica 0ea3bc90fb Auto-updated build strings. 2017-06-22 00:01:16 +02:00
daniel d3a0c4b52b fixed errors in pandora revent 2017-06-21 14:34:06 +02:00
artica 1b262808f2 Auto-updated build strings. 2017-06-21 00:01:18 +02:00
Hirofumi Kosaka 660a4594e5 Changed verbosity level of the warning "snmpTrapOID not found" to 5. 2017-06-20 16:56:19 +09:00
artica e56d147345 Auto-updated build strings. 2017-06-20 00:01:16 +02:00
Hirofumi Kosaka 09ddd9aa93 Improved SNMP trap handling against incomplete traps or partially delayed ones. 2017-06-19 15:54:27 +09:00
artica 5e4b1d6965 Auto-updated build strings. 2017-06-19 00:01:14 +02:00
artica 89ea98f505 Auto-updated build strings. 2017-06-18 00:01:14 +02:00
artica 8e94fd58f4 Auto-updated build strings. 2017-06-17 00:01:16 +02:00
artica 0059f79012 Auto-updated build strings. 2017-06-16 00:01:14 +02:00
artica 70c651466e Auto-updated build strings. 2017-06-15 00:01:27 +02:00
vgilc 7bfd3254a7 Merge branch '656-changes-in-system-log-viewer-dev' into 'develop'
Added changes

See merge request !518
2017-06-14 11:32:44 +02:00
vgilc 773c6e3bc7 Merge branch '945-set-a-default-servername-value-in-pandora_db-dev' into 'develop'
Set servername default value in pandora_db script

See merge request !539
2017-06-14 10:49:48 +02:00
vgilc 91f8e9d65c Merge branch '1010-Actualizar-servername-cuando-haya-cambio-de-mayúculas' into 'develop'
fixed errors caase sensitive servername

See merge request !583
2017-06-14 10:41:46 +02:00
artica d090692412 Auto-updated build strings. 2017-06-14 00:01:12 +02:00
daniel d85ec51220 fixed errors caase sensitive servername 2017-06-13 12:42:21 +02:00
artica 8ba1cf66af Auto-updated build strings. 2017-06-13 00:02:03 +02:00
artica d3df682528 Updated version and build strings. 2017-06-12 16:05:06 +02:00
vgilc ba9da1a14d Merge branch '637-moduledata-new-macro-dev' into 'develop'
changed macro name

See merge request !578
2017-06-12 15:46:35 +02:00
Arturo Gonzalez 722ca036a4 changed macro name 2017-06-12 15:22:31 +02:00
enriquecd 131753cfba Inprove event title format and alias rather name - #523 2017-06-12 14:34:03 +02:00
artica ff30396595 Auto-updated build strings. 2017-06-12 00:01:16 +02:00
artica 0d458763b9 Auto-updated build strings. 2017-06-11 00:01:13 +02:00
artica 97bf8f1fda Auto-updated build strings. 2017-06-10 00:01:13 +02:00
artica 1f94295c0c Auto-updated build strings. 2017-06-09 00:01:17 +02:00
artica bb17348087 Auto-updated build strings. 2017-06-08 00:01:15 +02:00
artica a19b321f9a Auto-updated build strings. 2017-06-07 00:01:14 +02:00
vgilc c5698b7070 Merge branch '637-multi-origin-macros-dev' into 'develop'
637 multi origin macros dev

See merge request !556
2017-06-06 10:30:50 +02:00
Arturo Gonzalez 6c63067ff5 Added new macro 2017-06-06 10:08:14 +02:00
artica a90906f2c9 Auto-updated build strings. 2017-06-06 00:01:16 +02:00
Arturo Gonzalez 0c57d35f53 Added a first version to multi origin macros feature. 2017-06-05 17:48:37 +02:00
artica 291ae3a192 Auto-updated build strings. 2017-06-05 00:01:13 +02:00
artica f9da9b404b Auto-updated build strings. 2017-06-04 00:01:14 +02:00
artica 9f041fb76b Auto-updated build strings. 2017-06-03 00:01:19 +02:00
artica 475a56f6bd Auto-updated build strings. 2017-06-02 00:01:19 +02:00
Arturo Gonzalez c0036d523c Set servername default value in pandora_db script 2017-06-01 10:15:22 +02:00
artica 40cc85ab43 Auto-updated build strings. 2017-06-01 00:01:17 +02:00
artica 619014733b Auto-updated build strings. 2017-05-31 00:01:19 +02:00
artica 3b481af7d6 Updated version and build strings. 2017-05-30 11:22:26 +02:00
artica 05c9b7c4da Auto-updated build strings. 2017-05-30 00:01:17 +02:00
Arturo Gonzalez 369bbfba7f Changed pandora_server.error perms to 664 2017-05-29 10:34:42 +02:00
artica 0fe95248c1 Auto-updated build strings. 2017-05-29 00:01:13 +02:00
artica 63d3cefe0b Auto-updated build strings. 2017-05-28 00:01:12 +02:00
artica 5ca2065013 Auto-updated build strings. 2017-05-27 00:01:14 +02:00
artica 474d22ed30 Auto-updated build strings. 2017-05-26 00:01:14 +02:00
artica faa96927dd Auto-updated build strings. 2017-05-25 00:01:12 +02:00
artica 42704e5981 Auto-updated build strings. 2017-05-24 00:01:10 +02:00
daniel 37d3d895b0 add new macros all_address and address_n 2017-05-23 10:09:32 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user'
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
2017-05-23 09:48:37 +02:00
artica eddeb12bcf Auto-updated build strings. 2017-05-23 00:01:18 +02:00
Hirofumi Kosaka d209bd2f45 Bug Fix: SNMP Alert could not refer agents. #150 2017-05-22 15:50:49 +09:00
artica 3b6272a7d2 Auto-updated build strings. 2017-05-22 00:01:14 +02:00
artica 7d7d5a9cec Auto-updated build strings. 2017-05-21 00:01:52 +02:00
artica 7749e7c08a Auto-updated build strings. 2017-05-20 00:01:16 +02:00
artica 8d16f573cc Auto-updated build strings. 2017-05-19 00:01:19 +02:00
artica 15b65ef3f8 Auto-updated build strings. 2017-05-18 00:01:18 +02:00
vgilc 130362e8c7 Merge branch '766-Error-CRON-dev' into 'develop'
Fixed error in cron

See merge request !398
2017-05-17 17:25:42 +02:00
vgilc a2f664f0c9 Merge branch 'ent-531-Macro-alert_unknown_instructions_' into 'develop'
Added _alert_unkown_instructions_ macro

See merge request !279
2017-05-17 17:10:46 +02:00
Ramon Novoa 0d91a0ac22 Add support for per-module alert cascade protection. 2017-05-17 13:03:16 +02:00
artica 24915e47cb Updated version and build strings. 2017-05-17 12:08:40 +02:00
vgilc bd340f2327 Merge branch '854-no-estan-funcionando-modulos-snmp-mediante-wizard-interfaces' into 'develop'
Add support for auto IP addresses to SNMP modules.

See merge request !473
2017-05-17 09:26:51 +02:00
Ramon Novoa c317fa478c Add support for auto IP addresses to SNMP modules. 2017-05-17 08:09:00 +02:00
artica ead3556700 Auto-updated build strings. 2017-05-17 00:01:21 +02:00
artica 63cc6f5244 Auto-updated build strings. 2017-05-16 00:01:15 +02:00
artica 45239e4cdd Auto-updated build strings. 2017-05-15 00:01:14 +02:00
artica 31970c521d Auto-updated build strings. 2017-05-14 00:01:14 +02:00
artica afff44138c Auto-updated build strings. 2017-05-13 00:01:16 +02:00
vgilc 03158ccc16 Merge branch 'weird-names-whe-apply-policies-7.0' into 'develop'
Calculate md5 checksums byte by byte, not char by char!

See merge request !464
2017-05-12 09:42:02 +02:00
artica 3d0c77709e Auto-updated build strings. 2017-05-12 00:01:25 +02:00
Ramon Novoa 6a83598c64 Calculate md5 checksums byte by byte, not char by char!
(cherry picked from commit dc4d144de8)
2017-05-11 16:22:11 +02:00
artica 46e16f65ea Auto-updated build strings. 2017-05-11 00:01:21 +02:00
artica 71f8f29107 Auto-updated build strings. 2017-05-10 00:01:15 +02:00
artica ce179c39aa Auto-updated build strings. 2017-05-09 00:01:18 +02:00
vgilc 93f6ad2e8d Merge branch '662-modulos-web-de-latencia-pasan-a-desconocido-ext-3807' into 'develop'
Add a default timeout for web modules. Ref artica/pandora_enterprise#662.

See merge request !437
2017-05-08 11:30:51 +02:00
artica 3865f13f8f Auto-updated build strings. 2017-05-08 00:01:14 +02:00
artica 3935442574 Auto-updated build strings. 2017-05-07 00:01:14 +02:00
artica 2c56de48f8 Auto-updated build strings. 2017-05-06 00:01:15 +02:00
Ramon Novoa 78e919a65e Add a default timeout for web modules. Ref artica/pandora_enterprise#662.
(cherry picked from commit e49400ae15)
2017-05-05 14:43:35 +02:00
artica 02e1c6c8d2 Auto-updated build strings. 2017-05-05 00:01:17 +02:00
artica 96a13fe84c Auto-updated build strings. 2017-05-04 00:01:14 +02:00
artica 8b3102f29a Auto-updated build strings. 2017-05-03 00:01:14 +02:00
artica 026c498c46 Auto-updated build strings. 2017-05-02 00:01:14 +02:00
artica 186fc2422e Auto-updated build strings. 2017-05-01 00:01:14 +02:00
artica 17437c197f Auto-updated build strings. 2017-04-30 00:01:13 +02:00
artica 36dd55148a Auto-updated build strings. 2017-04-29 00:01:14 +02:00
artica 682b7938ab Auto-updated build strings. 2017-04-28 00:01:15 +02:00
artica 7493da21cc Auto-updated build strings. 2017-04-27 00:01:16 +02:00
daniel bf2485ec25 fixed errors send email text-plain 2017-04-26 12:00:08 +02:00
artica aa223aa583 Auto-updated build strings. 2017-04-26 00:01:15 +02:00
vgilc d10b0906ec Merge branch '141-cli-pandora-create_data_module' into 'develop'
fixed error cli pandora-create_data_module

See merge request !405
2017-04-25 17:17:39 +02:00
vgilc d420c98560 Merge branch 'ent-515-Macro-para-SO' into 'develop'
Added macro _agentos_

See merge request !275
2017-04-25 16:18:00 +02:00
artica 4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
daniel f6290d25fa fixed error cli pandora-create_data_module 2017-04-25 13:48:17 +02:00
artica d3f998b081 Auto-updated build strings. 2017-04-25 00:01:17 +02:00
artica e32d353cc2 Revert "Updated version and build strings."
This reverts commit 8c49cfffd7.
2017-04-24 15:59:34 +02:00
artica 8c49cfffd7 Updated version and build strings. 2017-04-24 15:39:47 +02:00
Daniel Maya 3f6adf9f65 Fixed error in cron 2017-04-24 12:39:11 +02:00
artica 0aa6835df7 Auto-updated build strings. 2017-04-24 00:01:12 +02:00
artica 37e1daca9f Auto-updated build strings. 2017-04-23 00:01:13 +02:00
artica 37fcc10551 Auto-updated build strings. 2017-04-22 00:01:56 +02:00
artica f6faa4861b Auto-updated build strings. 2017-04-21 00:01:18 +02:00
artica dd25cff4ec Auto-updated build strings. 2017-04-20 00:01:19 +02:00
Ramon Novoa 25df1acfff Do not chmod +x pandora_server_installer.
Running `chmod +x pandora_server_installer &&
./pandora_server_installer` inside a container causes an error when
using Docker's aufs storage driver.

(cherry picked from commit dc97c29198)
2017-04-19 08:57:13 +02:00
artica 43993e1a14 Auto-updated build strings. 2017-04-19 00:01:21 +02:00
Arturo Gonzalez 1066124678 Merge branch 'develop' into 596-default_event_filter_by_user
Conflicts:
	pandora_agents/unix/DEBIAN/control
	pandora_agents/unix/DEBIAN/make_deb_package.sh
	pandora_agents/unix/pandora_agent
	pandora_agents/unix/pandora_agent.redhat.spec
	pandora_agents/unix/pandora_agent.spec
	pandora_agents/unix/pandora_agent_installer
	pandora_agents/win32/installer/pandora.mpi
	pandora_agents/win32/pandora.cc
	pandora_agents/win32/versioninfo.rc
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/extras/mr/1.sql
	pandora_console/include/config_process.php
	pandora_console/install.php
	pandora_console/pandora_console.redhat.spec
	pandora_console/pandora_console.spec
	pandora_server/DEBIAN/control
	pandora_server/DEBIAN/make_deb_package.sh
	pandora_server/lib/PandoraFMS/Config.pm
	pandora_server/pandora_server.redhat.spec
	pandora_server/pandora_server.spec
	pandora_server/pandora_server_installer
	pandora_server/util/pandora_db.pl
	pandora_server/util/pandora_manage.pl
2017-04-18 11:28:02 +02:00
artica e6a8f6afa2 Auto-updated build strings. 2017-04-18 00:01:21 +02:00
artica 9d0fde648a Auto-updated build strings. 2017-04-17 00:01:21 +02:00
artica 98f61b991a Auto-updated build strings. 2017-04-16 00:01:15 +02:00
artica 5f2884950d Auto-updated build strings. 2017-04-15 00:01:15 +02:00
artica 3dfdfad220 Auto-updated build strings. 2017-04-14 00:01:18 +02:00
artica f081f81569 Auto-updated build strings. 2017-04-13 00:01:18 +02:00
artica b3e1125526 Auto-updated build strings. 2017-04-12 00:01:17 +02:00
Shigekazu Aoyagi 200b821a20 add defined check for $conf->{'_inventory_purge'} 2017-04-11 03:37:23 +00:00
Shigekazu Aoyagi 311ac744c6 move logging $conf->{'_days_delete_unknown'} after defined checking 2017-04-11 03:35:12 +00:00
Shigekazu Aoyagi fc357b8c14 add initialize $conf->{'verbosity'} when not defined config file. 2017-04-11 03:32:58 +00:00
artica ac738f682f Auto-updated build strings. 2017-04-11 00:01:17 +02:00
artica ea6deaea04 Auto-updated build strings. 2017-04-10 08:54:41 +02:00
artica b3d6575176 Auto-updated build strings. 2017-04-10 00:01:18 +02:00
artica 20caf87fd5 Auto-updated build strings. 2017-04-09 00:01:19 +02:00
artica 16b0bc83a1 Auto-updated build strings. 2017-04-08 00:01:18 +02:00
vgilc dd5ad8324c Merge branch '686-problema-con-el-Export-server' into 'develop'
fixed problem with alias in export server

See merge request !342
2017-04-07 12:17:01 +02:00
artica 6b0d42c4a4 Auto-updated build strings. 2017-04-07 00:01:16 +02:00
artica 37142657a5 Auto-updated build strings. 2017-04-06 00:01:16 +02:00
artica d25dc0b13a Auto-updated build strings. 2017-04-05 00:01:20 +02:00
Daniel Maya 2ff3d785ba fixed problem with alias in export server 2017-04-04 16:22:48 +02:00
artica 6039772b20 Auto-updated build strings. 2017-04-04 00:01:19 +02:00
artica b769531d16 Auto-updated build strings. 2017-04-03 00:01:17 +02:00
artica 6ca2d24786 Auto-updated build strings. 2017-04-02 00:01:18 +02:00
artica 1121f8ffc5 Auto-updated build strings. 2017-04-01 00:01:18 +02:00
nramon 5036ad9467 Merge branch '560-modificar-la-metaconsola-consola-para-sincronizar-licencias-con-los-nodos' into 'develop'
Metaconsole nodes will always sync the agent cache.

See merge request !333
2017-03-31 14:50:12 +02:00
Ramon Novoa 03b0b3cb33 Metaconsole nodes will always sync the agent cache. 2017-03-31 11:39:25 +02:00
artica 3d1bdc799e Auto-updated build strings. 2017-03-31 00:01:19 +02:00
Ramon Novoa 7f1030abd6 Add support for the new metaconsole licensing mode. 2017-03-30 09:47:00 +02:00
artica da17532889 Auto-updated build strings. 2017-03-30 00:01:18 +02:00
artica a6a9f7eff4 Auto-updated build strings. 2017-03-29 00:01:21 +02:00
artica f81998b294 Auto-updated build strings. 2017-03-28 00:01:18 +02:00
artica 10b145463f Auto-updated build strings. 2017-03-27 00:01:16 +02:00
artica 149e8be750 Auto-updated build strings. 2017-03-26 00:01:17 +01:00
artica d1c4512977 Auto-updated build strings. 2017-03-25 00:01:19 +01:00
Ramon Novoa b574a92f35 Fix a typo. 2017-03-24 11:02:05 +01:00
artica bac8b24853 Auto-updated build strings. 2017-03-24 00:01:21 +01:00
Ramon Novoa e5d29d4c3b Small speed optimization. Check parent_detection from the outer loop. 2017-03-23 16:15:57 +01:00
Ramon Novoa 81fc537426 Merge the Recon module from the Satellite Server. 2017-03-23 14:33:46 +01:00
Ramon Novoa 4886c8ffb7 Disable the VLAN cache by default. 2017-03-23 14:33:46 +01:00
Ramon Novoa c957faad18 Add support for high capacity counters. 2017-03-23 14:33:46 +01:00
artica db7d154aa9 Auto-updated build strings. 2017-03-23 00:01:20 +01:00
daniel a1b3c448a0 fixed macro prevdata for modules type string 2017-03-22 17:52:05 +01:00
artica dc085fa339 Auto-updated build strings. 2017-03-22 00:01:19 +01:00
artica e6ffb47535 Auto-updated build strings. 2017-03-21 00:01:17 +01:00
artica 53837de343 Auto-updated build strings. 2017-03-20 00:01:18 +01:00
artica 6610391bc3 Auto-updated build strings. 2017-03-19 00:01:15 +01:00
artica 40b3c318cd Auto-updated build strings. 2017-03-18 00:01:19 +01:00
fermin831 1d5afbb36a Added _alert_unkown_instructions_ macro 2017-03-17 11:23:28 +01:00
fermin831 65033788f0 Added macro _agentos_ 2017-03-17 09:37:10 +01:00
artica a9cc5cd593 Auto-updated build strings. 2017-03-17 00:01:18 +01:00
artica 41072d8347 Auto-updated build strings. 2017-03-16 00:01:21 +01:00
artica 904e3142c8 Auto-updated build strings. 2017-03-15 00:01:18 +01:00
m-lopez-f ce576441fa Not stop pandora_server service on windows when send XML PARSER error in data consumer. Gitlab: #518 2017-03-14 16:47:09 +01:00
mlopez 75e8926c11 Revert "Only stop service in windows when error not XML PARSER problems. Gitlab: #518"
This reverts commit 4dce98e2d2
2017-03-14 14:30:08 +01:00
m-lopez-f 4dce98e2d2 Only stop service in windows when error not XML PARSER problems. Gitlab: #518 2017-03-14 12:45:50 +01:00
Ramon Novoa a314495a2e Do not reset the progress when multiple subnets are scanned. 2017-03-14 11:51:01 +01:00
Ramon Novoa fcb75ec1aa Clean blanks and HTML entities from recon tasks. 2017-03-14 08:28:12 +01:00
artica 4fb6a26365 Auto-updated build strings. 2017-03-14 00:01:18 +01:00
Ramon Novoa 4a0a9bbd37 Move the Recon module to PandoraFMS. 2017-03-13 11:14:21 +01:00
artica 7890d7bfea Auto-updated build strings. 2017-03-13 00:01:17 +01:00
artica 76fe1bbab6 Auto-updated build strings. 2017-03-12 00:01:18 +01:00
artica 9b45f46af5 Auto-updated build strings. 2017-03-11 00:01:19 +01:00
daniel b7bf236f3c fixed error in macros send mail 2017-03-10 13:51:27 +01:00
Ramon Novoa 472d484583 Fix a typo. 2017-03-10 12:04:35 +01:00
artica c3f3900ee5 Updated version and build strings for the 7.0NG release. 2017-03-10 11:10:28 +01:00
Ramon Novoa a022592e10 Merge the Recon module from the Satellite Server. 2017-03-10 10:36:37 +01:00
Ramon Novoa 4a739775c9 Merge remote-tracking branch 'origin/develop' into feature#new-iface-names 2017-03-10 10:32:46 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
artica 67a31f8a70 Auto-updated build strings. 2017-03-10 00:01:21 +01:00
daniel e7b14143ed add new macro _homeurl_ 2017-03-09 10:57:03 +01:00
daniel e5c0440d0b fixed errors in mail module_graph 2017-03-09 08:58:53 +01:00
artica cfec08d075 Updated version string to 7.0NG_BETA to avoid problems with package managers. 2017-03-09 08:10:20 +01:00