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

4305 Commits

Author SHA1 Message Date
artica d9f8616b2c Auto-updated build strings. 2018-10-31 00:01:26 +01:00
fbsanchez 8fe82add30 ondemand pluginTools, pandora_df inodes, cde functions_api cluster options 2018-10-30 17:53:57 +01:00
vgilc e1fdd5692b Merge branch 'fix/pandora_enterprise#2355-compatibilidad-windows' into 'develop' 
Quote the fping binary before calling it.

See merge request artica/pandorafms!1915
 2018-10-30 14:43:21 +01:00
Ramon Novoa a142a32349 Quote the fping binary before calling it. 2018-10-30 13:23:01 +01:00
artica 5a057490ad Auto-updated build strings. 2018-10-30 00:01:29 +01:00
vgilc 4d689d3ce8 Merge branch 'fix/recon-notinit-inoutoctets' into 'develop' 
Check that SNMP in/outoctet modules respond.

See merge request artica/pandorafms!1904
 2018-10-29 13:08:40 +01:00
Ramon Novoa 20d6c30416 Check that SNMP in/outoctet modules respond. 2018-10-29 12:09:35 +01:00
vgilc 88da8d8d9a Merge branch 'fix/incremental-min-max' into 'develop' 
Process incremental modules before checking limits.

Closes pandora_enterprise#2213

See merge request artica/pandorafms!1903
 2018-10-29 09:18:16 +01:00
artica 696abbdead Auto-updated build strings. 2018-10-29 00:01:25 +01:00
artica 507bbcff56 Auto-updated build strings. 2018-10-28 00:01:22 +02:00
artica 01e9251a88 Auto-updated build strings. 2018-10-27 00:01:26 +02:00
Ramon Novoa c5aba438b4 Process incremental modules before checking limits. 
Fixes pandora_enterprise#2213.
 2018-10-26 15:44:16 +02:00
vgilc 7a4b7d4289 Merge branch '2221-Actualizacion_de_Pandora_a_version_7_de_PHP' into 'develop' 
2221 actualizacion de pandora a version 7 de php

See merge request artica/pandorafms!1875
 2018-10-26 14:41:15 +02:00
artica dba51e07b3 Auto-updated build strings. 2018-10-26 00:01:33 +02:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
vgilc ea0474e704 Merge branch '2677-No-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop' 
Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted

See merge request artica/pandorafms!1727
 2018-10-25 10:37:11 +02:00
vgilc 816811b5b7 Merge branch 'fix/pandora_enterprise#2808-badxml' into 'develop' 
Prevent the counter from overflowing often when server_threshold is low.

See merge request artica/pandorafms!1837
 2018-10-25 10:33:58 +02:00
artica db802c5a2e Auto-updated build strings. 2018-10-25 00:01:22 +02:00
artica 7a64bb4855 Auto-updated build strings. 2018-10-24 00:01:28 +02:00
artica 9a77256198 Auto-updated build strings. 2018-10-23 00:01:29 +02:00
artica f899910dd0 Updated version and build strings. 2018-10-22 09:45:06 +02:00
daniel 6bb478ea1a Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-22 08:04:36 +02:00
artica 1d0d656996 Auto-updated build strings. 2018-10-22 00:01:23 +02:00
artica b01362a873 Auto-updated build strings. 2018-10-21 00:01:26 +02:00
artica 5ced50863c Auto-updated build strings. 2018-10-20 00:01:25 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
artica f340a3dda0 Auto-updated build strings. 2018-10-19 00:01:26 +02:00
artica 0c39e321e4 Auto-updated build strings. 2018-10-18 00:01:24 +02:00
artica fd53704dc0 Auto-updated build strings. 2018-10-17 00:01:34 +02:00
artica 9675c6ce52 Auto-updated build strings. 2018-10-16 00:01:27 +02:00
artica 35e1234b3c Auto-updated build strings. 2018-10-15 00:01:24 +02:00
artica 44be4aea57 Auto-updated build strings. 2018-10-14 00:01:23 +02:00
artica b0e56cd506 Auto-updated build strings. 2018-10-13 00:01:24 +02:00
artica 179f3f0526 Auto-updated build strings. 2018-10-12 00:01:28 +02:00
artica d087665d1e Auto-updated build strings. 2018-10-11 00:01:56 +02:00
artica 1694fccd83 Auto-updated build strings. 2018-10-10 00:01:47 +02:00
artica 51c4fbece2 Auto-updated build strings. 2018-10-09 00:01:25 +02:00
artica 76da7384b6 Auto-updated build strings. 2018-10-08 00:01:23 +02:00
artica 5171ef79b0 Auto-updated build strings. 2018-10-07 00:01:23 +02:00
artica a40057b3ff Auto-updated build strings. 2018-10-06 00:01:29 +02:00
artica ec8d36f8eb Auto-updated build strings. 2018-10-05 00:01:30 +02:00
fbsanchez b67eb9ae16 PluginTools Added global alerts to parse_arguments 2018-10-04 17:30:48 +02:00
artica 7ac581ac1e Auto-updated build strings. 2018-10-04 00:01:27 +02:00
artica f39788d8ef Auto-updated build strings. 2018-10-03 00:01:28 +02:00
Ramon Novoa eba9c58f18 Prevent the counter from overflowing often when server_threshold is low. 2018-10-02 12:43:39 +02:00
artica 08a3aabdf2 Auto-updated build strings. 2018-10-02 00:01:33 +02:00
artica 779f3c6c60 Auto-updated build strings. 2018-10-01 00:01:23 +02:00
artica 46373616fa Auto-updated build strings. 2018-09-30 00:01:22 +02:00
artica 2606b73e57 Auto-updated build strings. 2018-09-29 00:01:27 +02:00
vgilc 6a6bae10b1 Merge branch 'ent-2782-ue-agente-software-en-modo-standby' into 'develop' 
Ent 2782 ue agente software en modo standby

See merge request artica/pandorafms!1800
 2018-09-28 10:04:12 +02:00
artica 1a60aee7a6 Auto-updated build strings. 2018-09-28 00:01:25 +02:00
artica 79961b91d0 Auto-updated build strings. 2018-09-27 00:01:24 +02:00
artica 643da5c993 Auto-updated build strings. 2018-09-26 00:01:28 +02:00
fermin831 87fa7a7125 Added --set_disabled_and_standby to CLI 2018-09-25 13:42:29 +02:00
artica f280e54738 Auto-updated build strings. 2018-09-25 00:01:26 +02:00
artica 010207e6ad Auto-updated build strings. 2018-09-24 00:01:23 +02:00
artica bd0176070a Auto-updated build strings. 2018-09-23 00:01:23 +02:00
artica 25f91a451e Auto-updated build strings. 2018-09-22 00:01:24 +02:00
Junichi Satoh d4d978c9ad Fixed that monthly type of planned downtime is not executed at intended time. 
And fixed comments.
 2018-09-21 11:10:50 +09:00
artica fa05ecc477 Auto-updated build strings. 2018-09-21 00:01:24 +02:00
artica dcb3d7d7b9 Auto-updated build strings. 2018-09-20 00:01:25 +02:00
fbsanchez 401583e605 Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-19 11:13:54 +02:00
artica 687a742746 Auto-updated build strings. 2018-09-19 00:01:28 +02:00
artica bcfda72269 Updated version and build strings. 2018-09-18 16:39:44 +02:00
manuel.montes 65010d7080 Merge remote-tracking branch 'origin/develop' into 2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487 
Conflicts:
	pandora_console/extras/mr/20.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2018-09-18 11:17:47 +02:00
artica abc7e2cb3c Auto-updated build strings. 2018-09-18 00:01:27 +02:00
fermin831 0d164fc3e0 Removed unwanted trace 2018-09-17 16:38:02 +02:00
fermin831 146dab5caa Added SNMP v1, v2, v2c and v3 to Network Sweep recon 2018-09-17 14:36:52 +02:00
artica 921a025262 Auto-updated build strings. 2018-09-17 00:01:24 +02:00
artica 4f6aff52c7 Auto-updated build strings. 2018-09-16 00:01:23 +02:00
artica 591db5001f Auto-updated build strings. 2018-09-15 00:01:24 +02:00
fbsanchez 75cb3c9229 Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-14 09:20:48 +02:00
artica dff3fb7d0d Auto-updated build strings. 2018-09-14 00:01:27 +02:00
fbsanchez 33f3bb57e6 Minor fixes 2018-09-13 20:36:20 +02:00
artica c54f414a73 Updated version and build strings. 2018-09-13 15:53:21 +02:00
artica 583a7475e4 Auto-updated build strings. 2018-09-13 00:01:26 +02:00
fermin831 861e25fe43 Added no verify ssl in server daemon 2018-09-12 13:20:46 +02:00
vgilc 1bdfaed293 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios-2' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios 2

See merge request artica/pandorafms!1750
 2018-09-12 10:21:09 +02:00
fermin831 006b086366 [Secondary groups] Fixed tgroup_stat calculation and improve performance. 2018-09-12 09:07:29 +02:00
artica cef1b10ade Auto-updated build strings. 2018-09-12 00:01:26 +02:00
artica f7940908c2 Auto-updated build strings. 2018-09-11 00:01:25 +02:00
artica 003b734f4e Auto-updated build strings. 2018-09-10 00:01:22 +02:00
artica 6ae51b5e34 Auto-updated build strings. 2018-09-09 00:01:23 +02:00
artica cc4de37515 Auto-updated build strings. 2018-09-08 00:01:53 +02:00
artica fb68f3f9b6 Auto-updated build strings. 2018-09-07 00:01:31 +02:00
fbsanchez d0a82c436a Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-06 11:39:58 +02:00
artica 647a324368 Auto-updated build strings. 2018-09-06 00:01:26 +02:00
fbsanchez d46240a200 Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-05 16:52:18 +02:00
artica 05d0bb0f5d Auto-updated build strings. 2018-09-05 00:01:26 +02:00
alejandro-campos 997b1e21d7 Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted 2018-09-04 12:26:47 +02:00
artica 60360d8764 Auto-updated build strings. 2018-09-04 00:01:27 +02:00
fbsanchez 8f4e8c3110 Improved LWP ssl ignore certificate added extra debug 2018-09-03 11:26:01 +02:00
artica b52661054d Auto-updated build strings. 2018-09-03 00:01:24 +02:00
artica 06b36965a2 Auto-updated build strings. 2018-09-02 00:01:23 +02:00
artica 97c562163e Auto-updated build strings. 2018-09-01 00:01:24 +02:00
artica 43a7d4973b Auto-updated build strings. 2018-08-31 00:01:28 +02:00
Junichi Satoh 34c553f5b4 Fixed plugin timeout. 2018-08-30 13:30:22 +09:00
artica 9d35a66ad3 Auto-updated build strings. 2018-08-30 00:01:25 +02:00
artica 91bdb0094a Auto-updated build strings. 2018-08-29 00:01:26 +02:00
artica 7c37a7d2ee Auto-updated build strings. 2018-08-28 00:01:27 +02:00
vgilc 69545d7ed8 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios

See merge request artica/pandorafms!1708
 2018-08-27 09:10:00 +02:00
vgilc f0494ea598 Merge branch 'fix/out-of-order-data-6120' into 'develop' 
Do not update tagente_estado when processing out-of-order data.

See merge request artica/pandorafms!1624
 2018-08-27 09:07:06 +02:00
artica 930a939764 Auto-updated build strings. 2018-08-27 00:01:22 +02:00
artica 6a99bb9aec Auto-updated build strings. 2018-08-26 00:01:22 +02:00
artica f345c01e3e Auto-updated build strings. 2018-08-25 00:01:25 +02:00
artica 733be2d8ba Auto-updated build strings. 2018-08-24 00:01:24 +02:00
artica 80cec1aadb Auto-updated build strings. 2018-08-23 00:01:29 +02:00
artica 99858d3371 Auto-updated build strings. 2018-08-22 00:01:27 +02:00
fermin831 0a70284eaa [Secondary groups] Group report and adapted group_stat table to secondary groups 2018-08-21 13:34:52 +02:00
artica e518135adf Auto-updated build strings. 2018-08-21 00:01:24 +02:00
artica ad6a3d69e8 Auto-updated build strings. 2018-08-20 00:01:20 +02:00
artica c79b06e43c Auto-updated build strings. 2018-08-19 00:01:22 +02:00
artica 693f9617ac Auto-updated build strings. 2018-08-18 00:01:26 +02:00
Junichi Satoh a46b39a764 Fixed month_have_days(), wrong calculation for leap year. 2018-08-17 13:33:12 +09:00
artica 839a91b0ac Auto-updated build strings. 2018-08-17 00:01:25 +02:00
artica 7ac2745b9e Auto-updated build strings. 2018-08-16 00:01:21 +02:00
artica b222c6627a Auto-updated build strings. 2018-08-15 00:01:24 +02:00
artica e94af2ee15 Updated version and build strings. 2018-08-14 15:24:31 +02:00
fermin831 fb97c373ff Fixed replication events and update cache problems 2018-08-14 11:43:14 +02:00
artica b8d8f20d64 Auto-updated build strings. 2018-08-14 00:01:24 +02:00
artica aba54d65fa Auto-updated build strings. 2018-08-13 00:01:21 +02:00
artica 29c8a54e57 Auto-updated build strings. 2018-08-12 00:01:24 +02:00
artica f6382725dd Auto-updated build strings. 2018-08-11 00:01:25 +02:00
fbsanchez e18e2e0b6f Added locate_agent 2018-08-10 12:06:47 +02:00
fbsanchez 505ec5d283 Added methods to locate agent 2018-08-10 12:05:20 +02:00
vgilc 77825c7b2c Merge branch 'fix/pandora_enterprise#2593-server-signals' into 'develop' 
Check and restart server threads if necessary.

See merge request artica/pandorafms!1674
 2018-08-10 11:42:06 +02:00
Ramon Novoa 9a9956296f Check and restart server threads if necessary. 
Ref pandora_enterprise#2593.
 2018-08-10 11:35:27 +02:00
artica e1904878b5 Auto-updated build strings. 2018-08-10 00:01:24 +02:00
fermin831 58c293809f Added Execution_Time module to self monitoring agent 2018-08-09 11:27:02 +02:00
artica 50b4c45652 Auto-updated build strings. 2018-08-09 00:01:24 +02:00
vgilc 323599f50e Merge branch 'pandora_enterprise#2333-intracom-snmp-trap-buffer-subsystem' into 'develop' 
Add support for trap data coming from XML files.

See merge request artica/pandorafms!1667
 2018-08-08 11:40:48 +02:00
vgilc 3333c33c0b Merge branch 'fix/pandora_exec_quotemeta' into 'develop' 
Do not use quotemeta to escape arguments on win32.

See merge request artica/pandorafms!1668
 2018-08-08 11:38:47 +02:00
nramon c6dc5f9ee2 Merge branch 'develop' into 'pandora_enterprise#2333-intracom-snmp-trap-buffer-subsystem' 
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
 2018-08-08 11:27:56 +02:00
Ramon Novoa 90dd961fa1 Do not use quotemeta to escape arguments on win32. 
Ref pandora_enterprise#2625.
 2018-08-08 11:24:50 +02:00
Ramon Novoa 892185a8ca Style fix. 2018-08-08 10:09:48 +02:00
Ramon Novoa 27d1d1d745 Add support for trap data coming from XML files. 
Ref pandora_enterprise#2333.
 2018-08-08 09:08:08 +02:00
artica c6eef38ae8 Auto-updated build strings. 2018-08-08 00:01:22 +02:00
artica e614e3ecec Auto-updated build strings. 2018-08-07 00:01:22 +02:00
artica 1367d0e57e Auto-updated build strings. 2018-08-06 00:01:22 +02:00
artica e5e97a304b Auto-updated build strings. 2018-08-05 00:01:21 +02:00
artica 517c98cf1a Auto-updated build strings. 2018-08-04 00:01:25 +02:00
artica 392b5bc935 Auto-updated build strings. 2018-08-03 00:01:25 +02:00
artica d06c0ebffe Auto-updated build strings. 2018-08-02 00:01:23 +02:00
vgilc 86122be7e7 Merge branch '2488-ue-plugin-updates' into 'develop' 
Added extra compat. to print_module (plugintools)

See merge request artica/pandorafms!1620
 2018-08-01 15:20:55 +02:00
artica 1088c5390d Auto-updated build strings. 2018-08-01 00:01:22 +02:00
artica 2dc5bc1139 Auto-updated build strings. 2018-07-31 00:01:23 +02:00
artica 42ad2cc924 Auto-updated build strings. 2018-07-30 00:01:22 +02:00
artica 258f6b915e Auto-updated build strings. 2018-07-29 00:01:20 +02:00
artica 329bcdbc8b Auto-updated build strings. 2018-07-28 00:02:05 +02:00
artica 284f992819 Auto-updated build strings. 2018-07-27 00:01:29 +02:00
artica fb73a0b8b2 Auto-updated build strings. 2018-07-26 00:01:30 +02:00
vgilc 5bfeac1b87 Merge branch '1885-ue-configurador-automatico-de-agentes' into 'develop' 
Added DB changes to support ProvisioningServer 2

See merge request artica/pandorafms!1587
 2018-07-25 11:21:51 +02:00
artica b0434e7f1d Auto-updated build strings. 2018-07-25 00:01:26 +02:00
fbsanchez 05bee8c856 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-24 18:43:45 +02:00
artica 7748fcf5ce Updated version and build strings. 2018-07-24 17:45:16 +02:00
daniel 65ff6b260c fixed error pandoradb metapolicies 2018-07-24 13:12:46 +02:00
artica 33dd9d5886 Auto-updated build strings. 2018-07-24 00:01:28 +02:00
fbsanchez 079b2437b6 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-23 18:06:02 +02:00
vgilc 44ad0c31d5 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos' into 'develop' 
Add items to the view events

See merge request artica/pandorafms!1623
 2018-07-23 11:22:23 +02:00
artica 63cc7aab9c Auto-updated build strings. 2018-07-23 00:01:23 +02:00
artica 435d44a1ca Auto-updated build strings. 2018-07-22 00:01:23 +02:00
artica f67616a807 Auto-updated build strings. 2018-07-21 00:01:27 +02:00
Ramon Novoa d102a588eb Add module data and status information to events. 2018-07-20 13:50:56 +02:00
Ramon Novoa 34639ac5c4 Do not update tagente_estado when processing out-of-order data. 
Ref pandora_enterprise#6120.
 2018-07-20 10:41:16 +02:00
artica 0557ecb508 Auto-updated build strings. 2018-07-20 00:01:30 +02:00
fbsanchez 82f3678fdd Minor fix migrate_logs.pl no ticket 2018-07-19 16:38:15 +02:00
artica a21892855a Auto-updated build strings. 2018-07-19 00:01:32 +02:00
fbsanchez 3cc1f815ff Added extra compat. to print_module (plugintools) 2018-07-18 17:56:35 +02:00
artica 9dafb653b4 Auto-updated build strings. 2018-07-18 00:01:27 +02:00
artica fc885be510 Auto-updated build strings. 2018-07-17 00:01:27 +02:00
artica 74eecf1a96 Auto-updated build strings. 2018-07-16 00:01:21 +02:00
artica 04dfd30f76 Auto-updated build strings. 2018-07-15 00:01:27 +02:00
artica 4a7c329481 Auto-updated build strings. 2018-07-14 00:01:32 +02:00
artica 98025188cb Auto-updated build strings. 2018-07-13 00:01:29 +02:00
daniel 86c21aea5d merge develop 2018-07-12 13:37:46 +02:00
vgilc dcad2ef9c7 Merge branch 'ent-2418-GIS-Activar-resolucion-GIS-en-creacion-de-agente-por-IP' into 'develop' 
Fixed recon_reverse_geolocation_file configuration

See merge request artica/pandorafms!1611
 2018-07-12 08:16:48 +02:00
artica 8ab387581d Auto-updated build strings. 2018-07-12 00:01:56 +02:00
fermin831 ecd34f41f8 Fixed recon_reverse_geolocation_file configuration 2018-07-11 18:56:49 +02:00
Ramon Novoa 62ed69af90 Fix the service cascade protection. 2018-07-11 13:07:37 +02:00
artica 1df52459a6 Auto-updated build strings. 2018-07-11 00:01:28 +02:00
artica 49afdcb4fd Auto-updated build strings. 2018-07-10 00:01:27 +02:00
vgilc aaa00bd3ff Merge branch 'ent-2418-GIS-Activar-resolucion-GIS-en-creacion-de-agente-por-IP' into 'develop' 
Ent 2418 gis activar resolucion gis en creacion de agente por ip

See merge request artica/pandorafms!1599
 2018-07-09 15:53:42 +02:00
artica f86465bcf3 Auto-updated build strings. 2018-07-09 00:01:23 +02:00
artica c6390f683e Auto-updated build strings. 2018-07-08 00:01:22 +02:00
artica d30559fffc Auto-updated build strings. 2018-07-07 00:01:26 +02:00
fermin831 f455fe3657 [GeoIP] Added script agent_gis_update.pl 2018-07-06 13:58:45 +02:00
fermin831 4632be803c [GeoIP] Added dependency to open makefile 2018-07-06 09:11:55 +02:00
artica 48e3c547c9 Auto-updated build strings. 2018-07-06 00:01:26 +02:00
fermin831 743d5a4a42 [GeoIP] Added Geo::IP package to server packages 2018-07-05 19:04:13 +02:00
fermin831 3c1f192ab4 [GeoIP] Added geolocalization to Recon and DataServer 2018-07-05 16:43:41 +02:00
fermin831 219988018f [GeoIP] Modified server conf file to remove recon_reverse_geolocation_mode 2018-07-05 15:19:13 +02:00
fermin831 20afc77c87 [GeoIP] Refactorized the ip geolocalization 2018-07-05 15:01:23 +02:00
vgilc e363ea9048 Merge branch 'errata-en-la-configuracion-del-satelite-en-windows' into 'develop' 
Updated the win32 Tentacle binaries.

See merge request artica/pandorafms!1596
 2018-07-05 11:36:17 +02:00
Ramon Novoa 467beb58fd Updated the win32 Tentacle binaries. 2018-07-05 11:29:07 +02:00
artica d1f8aa31fd Auto-updated build strings. 2018-07-05 00:01:27 +02:00
fbsanchez c800061bc2 Autoconfiguration v1 2018-07-04 18:39:06 +02:00
vgilc 5723cfca15 Merge branch 'errata-en-la-configuracion-del-satelite-en-windows' into 'develop' 
Update Tentacle to the latest version.

See merge request artica/pandorafms!1594
 2018-07-04 16:31:59 +02:00
Ramon Novoa 0f4ea33667 Update Tentacle to the latest version. 
Ref pandora_enterprise#2360.
 2018-07-04 12:32:55 +02:00
artica 0ab4ef50c5 Auto-updated build strings. 2018-07-04 00:01:24 +02:00
artica 95678f706b Auto-updated build strings. 2018-07-03 00:01:23 +02:00
artica 61668b4cd7 Auto-updated build strings. 2018-07-02 00:01:25 +02:00
artica 960bc8db31 Auto-updated build strings. 2018-07-01 00:01:26 +02:00
artica bf72f8ec3e Auto-updated build strings. 2018-06-30 00:01:30 +02:00
artica d41df8335c Auto-updated build strings. 2018-06-29 00:01:29 +02:00
nramon e1d41c25b1 Merge branch '2227-plugin-de-ancho-de-banda-mcm-neh' into 'develop' 
2227 plugin de ancho de banda mcm neh

See merge request artica/pandorafms!1579
 2018-06-28 09:04:13 +02:00
artica 73dca0446c Auto-updated build strings. 2018-06-28 00:01:34 +02:00
fbsanchez a57570174c Fix in PluginTools (default value for tentacle port) 2018-06-27 18:54:35 +02:00
slerena 905e6bfc56 Merge branch '2075-Proteccion_en_cascada_de_servicios' into 'develop' 
2075 proteccion en cascada de servicios

See merge request artica/pandorafms!1578
 2018-06-27 18:10:41 +02:00
daniel 8ae27da3b7 add cascade protection services in server 2018-06-27 15:39:13 +02:00
fbsanchez 623afea5fe Minor changes in PluginTools 
Added missing plugins to update_version
 2018-06-27 12:21:21 +02:00
artica f4ef0110b2 Auto-updated build strings. 2018-06-27 00:01:31 +02:00
artica b1b486143f Auto-updated build strings. 2018-06-26 00:01:30 +02:00
artica 17e5c39a67 Auto-updated build strings. 2018-06-25 00:01:24 +02:00
artica 5d4a4eebc4 Auto-updated build strings. 2018-06-24 00:01:25 +02:00
artica b467eea16b Auto-updated build strings. 2018-06-23 00:01:25 +02:00
artica 0a61a5f5d3 Auto-updated build strings. 2018-06-22 00:01:24 +02:00
artica f40e3883ec Auto-updated build strings. 2018-06-21 00:01:26 +02:00
artica c97530a4ee Updated version and build strings. 2018-06-20 15:19:39 +02:00
artica 2c6ad942cb Auto-updated build strings. 2018-06-20 00:01:24 +02:00
fbsanchez f7522fcf3f Allowed https connections with consoles with self-signed certificates 2018-06-19 16:48:04 +02:00
Ramon Novoa ad687b3823 Added HA config parameters to pandora_server.conf. 2018-06-19 12:20:02 +02:00
nramon 2071568b16 Merge branch '2016-plugin-monitorizacion-con-docker-swarm' into 'develop' 
Functionalities added - docker swarm

See merge request artica/pandorafms!1547
 2018-06-19 11:33:07 +02:00
artica 8d39712be4 Auto-updated build strings. 2018-06-19 00:01:25 +02:00
fbsanchez 8e2c5bf5cb Functionalities added - docker swarm 2018-06-18 20:47:58 +02:00
artica b29dd4eb8a Auto-updated build strings. 2018-06-18 00:01:21 +02:00
artica a47f7b7e97 Auto-updated build strings. 2018-06-17 00:01:21 +02:00
artica 2926c7789e Auto-updated build strings. 2018-06-16 00:01:21 +02:00
artica 76bc8ad280 Auto-updated build strings. 2018-06-15 00:01:24 +02:00
artica d7f59d4fd3 Auto-updated build strings. 2018-06-14 00:01:24 +02:00
artica 7a26aa3b38 Auto-updated build strings. 2018-06-13 00:01:26 +02:00
artica e4461273ab Updated version and build strings. 2018-06-12 17:28:15 +02:00
fermin831 27700d820e Added trace with module id to tcp network server checks 2018-06-12 16:09:04 +02:00
artica 5574ddd205 Auto-updated build strings. 2018-06-12 00:01:39 +02:00
artica 10e95bf447 Auto-updated build strings. 2018-06-10 00:01:23 +02:00
artica 14dd0e222b Auto-updated build strings. 2018-06-09 00:01:27 +02:00
artica 937cfb7d1e Auto-updated build strings. 2018-06-08 00:01:27 +02:00
artica 18e047d25e Auto-updated build strings. 2018-06-07 00:01:25 +02:00
artica 3fbdd3d026 Auto-updated build strings. 2018-06-06 00:01:25 +02:00
artica db4ce74311 Auto-updated build strings. 2018-06-05 00:01:23 +02:00
vgilc b620c1e7d9 Merge branch '2016-plugin-monitorizacion-con-docker-swarm' into 'develop' 
Minor fix in plugintools api_methods

See merge request artica/pandorafms!1484
 2018-06-04 10:19:56 +02:00
vgilc e0f5fae11a Merge branch 'pandora_enterprise#2274-mejoras-recon-onenet' into 'develop' 
Improvements to the Pandora FMS Recon Server.

See merge request artica/pandorafms!1485
 2018-06-04 10:18:18 +02:00
vgilc d8b219802c Merge branch 'ent-1068-permisos-por-defecto-apache-var-log-pandora' into 'develop' 
Fixed permissions in default log folders

See merge request artica/pandorafms!1510
 2018-06-04 10:17:43 +02:00
artica 77ccbe46a9 Auto-updated build strings. 2018-06-04 00:01:20 +02:00
artica 8138c2f8ae Auto-updated build strings. 2018-06-03 00:01:19 +02:00
artica 57ef534909 Auto-updated build strings. 2018-06-02 00:01:26 +02:00
artica ec050ba606 Auto-updated build strings. 2018-06-01 00:01:21 +02:00
fermin831 9561feaf5c Fixed permissions in default log folders 2018-05-31 20:16:09 +02:00
artica e1cba85c6e Auto-updated build strings. 2018-05-31 00:01:21 +02:00
fermin831 5c6e22c9b6 [Rebranding] Remove delete environment vars and fixed pandora_db redefinitions 2018-05-30 11:08:48 +02:00
artica 7147667d8c Auto-updated build strings. 2018-05-30 00:01:21 +02:00
fermin831 0a2c744ef0 [Rebranding] Modified daemon to load environment vars 2018-05-29 17:32:24 +02:00
fermin831 aa6d931331 [Rebranding] Modified server source events by generic monitoring_event 2018-05-29 17:10:05 +02:00
fermin831 53cbc4ebde [Rebranding] Fixed missing include in pandora_db 2018-05-29 16:50:30 +02:00
artica aa1e7ff4d2 Auto-updated build strings. 2018-05-29 00:01:28 +02:00
artica 01cce15955 Updated version and build strings. 2018-05-28 13:20:38 +02:00
vgilc 8cb5dea3d9 Merge branch '194-async-recovery' into 'develop' 
I fixed the bug about async_recovery.

Closes #194

See merge request artica/pandorafms!1493
 2018-05-28 12:50:28 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
artica 2e4b320861 Auto-updated build strings. 2018-05-28 00:01:21 +02:00
artica 9ff98af9a5 Auto-updated build strings. 2018-05-27 00:01:26 +02:00
artica edd38ac9c8 Auto-updated build strings. 2018-05-26 00:01:24 +02:00
fermin831 7afc617e62 [Rebranding] Implemented server rebranding through environment vars 2018-05-25 12:39:30 +02:00
artica 643a07a163 Auto-updated build strings. 2018-05-25 00:01:22 +02:00
fermin831 66dfd9b171 [Rebranding] Change alert action Pandora FMS Event to Monitoring Event 2018-05-24 11:16:30 +02:00
artica bd48fe4fe6 Auto-updated build strings. 2018-05-24 00:01:24 +02:00
nknsh 4a58b8cb7d I fixed the bug about async_recovery. 
When the async module recovers automatically, known_status and last_known_status are updated to 0.
 2018-05-23 13:49:14 +09:00
artica e015354a99 Auto-updated build strings. 2018-05-23 00:01:24 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
fbsanchez ef778f296c PluginTools Added get_value_translated 2018-05-22 17:18:11 +02:00
fbsanchez a5be501f4d Merge remote-tracking branch 'origin/develop' into 2016-plugin-monitorizacion-con-docker-swarm 2018-05-22 11:41:29 +02:00
artica 4b197ab61a Auto-updated build strings. 2018-05-22 00:01:31 +02:00
fbsanchez a82299f1cf PluginTools minor changes 
API cluster minor changes
 2018-05-21 18:08:36 +02:00
Ramon Novoa 8bda3751df Improvements to the Pandora FMS Recon Server. 
- Ignore virtual interfaces.
- Improved scan of ARP caches.
 2018-05-21 15:03:54 +02:00
fbsanchez 2ab45d28b8 Added api_get_agent_id (API) updated plugintools 2018-05-21 14:42:27 +02:00
fbsanchez 9d1872b2d1 Minor fix in plugintools api_methods 2018-05-21 11:10:05 +02:00
artica dff20a609b Auto-updated build strings. 2018-05-21 00:01:23 +02:00
artica 4a6859aeae Auto-updated build strings. 2018-05-20 00:01:22 +02:00
artica b7ce2f2dc8 Auto-updated build strings. 2018-05-19 00:01:38 +02:00
artica f3509d285a Auto-updated build strings. 2018-05-18 00:01:28 +02:00
fermin831 477fc9d22a [Rebranding] pandora_db 2018-05-17 18:38:26 +02:00
fermin831 cc26124289 Rebranding open server 2018-05-17 16:12:44 +02:00
artica a79f3b2d05 Auto-updated build strings. 2018-05-17 00:01:23 +02:00
artica 5f8e010d01 Auto-updated build strings. 2018-05-16 00:01:21 +02:00
artica 007715fb93 Auto-updated build strings. 2018-05-15 00:01:26 +02:00
artica 3e8f9cbb34 Auto-updated build strings. 2018-05-14 00:01:23 +02:00
artica d63f316042 Auto-updated build strings. 2018-05-13 00:02:13 +02:00
artica 65f9fe1cb7 Auto-updated build strings. 2018-05-11 00:01:26 +02:00
artica e9d8af152d Auto-updated build strings. 2018-05-10 00:01:25 +02:00
Ramon Novoa 1abba49c70 Create the extras directory. 2018-05-09 10:57:54 +02:00
vgilc 118bed56fe Merge branch 'ent-2100-Mejorar-descripcion-de-errores-en-el-TENTACLE-SERVER' into 'develop' 
Now tentacle server errors are more descriptives

See merge request artica/pandorafms!1454
 2018-05-09 10:21:18 +02:00
vgilc 30417cd2fe Merge branch 'ent-2146-Configuracion-Tentacle' into 'develop' 
Ent 2146 configuracion tentacle

See merge request artica/pandorafms!1455
 2018-05-09 10:11:58 +02:00
artica 04e3d3071d Auto-updated build strings. 2018-05-09 00:01:23 +02:00
artica 3377ecfd64 Auto-updated build strings. 2018-05-08 00:01:23 +02:00
artica e0cf024990 Auto-updated build strings. 2018-05-07 00:01:21 +02:00
artica 6dd28d2d75 Auto-updated build strings. 2018-05-06 00:01:21 +02:00
artica b92d9c9560 Auto-updated build strings. 2018-05-05 00:01:23 +02:00
artica 770267d72e Auto-updated build strings. 2018-05-04 00:01:21 +02:00
artica ab1ca78340 Auto-updated build strings. 2018-05-02 00:01:34 +02:00
artica d6a7ca198d Auto-updated build strings. 2018-05-01 00:01:23 +02:00
fermin831 b6bc835e41 Tentacle config file is readable to all users in all packages 2018-04-30 16:22:52 +02:00
fermin831 4bc10e503b Modified launch daemon Tentacle script to use configuration file 2018-04-30 15:53:09 +02:00
fermin831 0699f261ad Added tentacle configuration file to Debian package 2018-04-30 13:49:42 +02:00
fermin831 970a4ac4ee Added tentacle configuration file to SUSE RPM 2018-04-30 13:11:38 +02:00
artica 235f20ef86 Auto-updated build strings. 2018-04-30 00:01:56 +02:00
artica 9b1d62f999 Auto-updated build strings. 2018-04-29 00:02:00 +02:00
artica a1fa3a4ee8 Auto-updated build strings. 2018-04-28 00:01:34 +02:00
fermin831 fdf6455b74 Added tentacle configuration file to RedHat RPM 2018-04-27 14:10:01 +02:00
fermin831 6ea41e3a94 Added tentacle configuration file to open tarball 2018-04-27 13:09:51 +02:00
fermin831 1bf0fa6e02 Moved tentacle configuration file 2018-04-27 12:13:01 +02:00
fermin831 3526ea25f9 Updated windows tentacle to 0.6.2 version 2018-04-27 10:21:07 +02:00
fermin831 1fa309516f Added all configuration options and a sample configuration file of tentacle server 2018-04-27 09:26:56 +02:00
artica 7252b8f172 Auto-updated build strings. 2018-04-27 00:01:31 +02:00
fermin831 979e7fa8b5 Added parse configuration file to tentacle server 2018-04-26 15:43:47 +02:00
fermin831 45daae5b64 Now tentacle server errors are more descriptives 2018-04-26 13:35:05 +02:00
artica edacc90226 Auto-updated build strings. 2018-04-26 00:01:26 +02:00
artica ec61441587 Auto-updated build strings. 2018-04-25 00:01:32 +02:00
artica de2b583583 Auto-updated build strings. 2018-04-24 00:01:30 +02:00
enriquecd b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +02:00
artica d90c78ad9d Auto-updated build strings. 2018-04-23 00:01:25 +02:00
artica 1dc4b4554a Auto-updated build strings. 2018-04-22 00:01:25 +02:00
artica 1cf7efb86b Auto-updated build strings. 2018-04-21 00:01:35 +02:00
enriquecd d78c8daf5b Merge branch 'develop' into 2007-Monitorizacion-de-cluster-fase-2-cli-2 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-04-20 10:19:16 +02:00
artica 235c1cee6c Auto-updated build strings. 2018-04-20 00:01:27 +02:00
artica 418d8b12b7 Updated version and build strings. 2018-04-19 16:05:39 +02:00
artica ee0d890361 Auto-updated build strings. 2018-04-19 00:01:25 +02:00
artica 3c8914a331 Auto-updated build strings. 2018-04-18 00:01:29 +02:00
artica bc251e58df Auto-updated build strings. 2018-04-17 00:01:28 +02:00
artica cb5c3016dc Auto-updated build strings. 2018-04-16 00:01:23 +02:00
artica 2ab79ce5e4 Auto-updated build strings. 2018-04-15 00:01:24 +02:00
artica 738b1fdd68 Auto-updated build strings. 2018-04-14 00:01:27 +02:00
artica 9f2aa451fb Auto-updated build strings. 2018-04-13 00:01:25 +02:00
artica 92fb527ff8 Auto-updated build strings. 2018-04-12 00:01:23 +02:00
artica 1ecfd4669e Auto-updated build strings. 2018-04-11 00:01:26 +02:00
artica a67a4288a1 Updated version and build strings. 2018-04-10 10:18:25 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
artica e2b52a76f7 Auto-updated build strings. 2018-04-10 00:01:23 +02:00
enriquecd 11182e9989 Merge branch 'develop' into 2101-Comprobar-funciones-de-CLI-ceadas-el-de-integria-4261-fix-wiki 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-04-09 11:48:56 +02:00
enriquecd 2c223f4d10 Add cli cluster functions - #2007 2018-04-09 11:43:41 +02:00
artica 6bf0371a85 Auto-updated build strings. 2018-04-09 00:01:22 +02:00
artica 77f26cf08f Auto-updated build strings. 2018-04-08 00:01:21 +02:00
artica dcd57a421a Auto-updated build strings. 2018-04-07 00:01:33 +02:00
enriquecd 48c04fbaaa Fix create web module cli function - #2101 2018-04-06 15:54:48 +02:00
artica f517edca1c Auto-updated build strings. 2018-04-06 00:01:25 +02:00
artica 4b36d86e48 Auto-updated build strings. 2018-04-05 00:01:24 +02:00
fermin831 d0c34e2ce7 [Secondary groups] Added secondary groups to linux agent and server 2018-04-04 16:05:18 +02:00
vgilc c4aa6141e4 Merge branch '1801-migrado-cambios-jmx' into 'develop' 
1801 migrado cambios jmx

See merge request artica/pandorafms!1408
 2018-04-04 15:22:58 +02:00
fbsanchez 35357683cb Merge remote-tracking branch 'origin/develop' into 1801-migrado-cambios-jmx 2018-04-04 13:41:01 +02:00
fermin831 c024fec509 [Secondary groups] Fixed single secondary group update meta cache 2018-04-04 13:07:45 +02:00
enriquecd 47b611469d Fix create_web and create_policy_web CLI functions - #2101 2018-04-04 12:06:10 +02:00
artica f863184454 Auto-updated build strings. 2018-04-04 00:01:24 +02:00
fbsanchez 8a4ee8f28d PluginTools pseudo control for as_agent/server_plugin 2018-04-03 18:22:38 +02:00
fbsanchez 7c202cbb81 PluginTools minor fix in log message 2018-04-03 17:14:11 +02:00
fbsanchez 63e644d88a Minor fix 2018-04-03 17:12:31 +02:00
fermin831 e2d61d5794 [Secondary groups] Added update cache on server 2018-04-03 15:36:33 +02:00
vgilc c087ca8138 Merge branch '983-API-and-CLI-apply-template-components-help' into 'develop' 
Add help to CLI - #983

See merge request artica/pandorafms!1404
 2018-04-03 09:47:59 +02:00
fbsanchez 2380a18c6d Minor changes in PluginTools for 1801 2018-04-03 09:46:44 +02:00
artica 337822a608 Auto-updated build strings. 2018-04-03 00:01:22 +02:00
enriquecd 4f57461b71 Add help to CLI - #983 2018-04-02 15:29:59 +02:00
daniel 4086162705 fixed minor error hel manage.pl 2018-04-02 12:56:50 +02:00
artica 1ab18d6c2d Auto-updated build strings. 2018-04-02 00:01:21 +02:00
artica 4e5d2477ac Auto-updated build strings. 2018-04-01 00:01:22 +02:00
artica 727b69462a Auto-updated build strings. 2018-03-31 00:01:21 +02:00
artica 7976e0461f Auto-updated build strings. 2018-03-30 00:01:21 +02:00
artica 9ea7dc0dbb Auto-updated build strings. 2018-03-29 00:01:22 +02:00
artica 94936a46e9 Auto-updated build strings. 2018-03-28 00:01:22 +02:00
artica ac2638ceea Auto-updated build strings. 2018-03-27 00:01:22 +02:00
artica 999edad737 Auto-updated build strings. 2018-03-26 00:01:20 +02:00
artica b2ed2fbe45 Auto-updated build strings. 2018-03-25 00:01:20 +01:00
artica c91e71569c Auto-updated build strings. 2018-03-24 00:01:24 +01:00
artica dd59704729 Auto-updated build strings. 2018-03-23 00:01:21 +01:00
daniel ad2746e6c3 fixed add help incli 2018-03-22 13:36:24 +01:00
daniel 0156bff9e6 fixed error 2018-03-22 13:33:23 +01:00
daniel 55d0ca122b fixed error 2018-03-22 13:28:18 +01:00
daniel 98355f985a merge develop 2018-03-22 13:21:48 +01:00
daniel b61f8d5cdd add new functions cli 2018-03-22 13:18:48 +01:00
vgilc f809a013e1 Merge branch '983-API-CLI-posibilidad-de-aplicar-templates-componentes-a-un-agente' into 'develop' 
API and CLI apply template components - #983

See merge request artica/pandorafms!1319
 2018-03-22 12:51:33 +01:00
enriquecd dd02b6e2b8 Check create_web_modules CLI functions - #2101 2018-03-22 12:07:08 +01:00
enriquecd dcb33e08b7 Merge branch 'develop' into 983-API-CLI-posibilidad-de-aplicar-templates-componentes-a-un-agente 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-03-22 11:11:01 +01:00
artica 243e24e56e Auto-updated build strings. 2018-03-22 00:01:23 +01:00
fbsanchez 5e3cf3162a CLI example check/get server_address 2018-03-21 16:58:42 +01:00
artica 199b81a79c Auto-updated build strings. 2018-03-21 00:01:22 +01:00
artica 972e394a8e Auto-updated build strings. 2018-03-20 00:01:22 +01:00
artica 25efa085ce Auto-updated build strings. 2018-03-19 00:01:29 +01:00
artica c4ddcc9332 Auto-updated build strings. 2018-03-18 00:01:21 +01:00
artica ea5ef0bc42 Auto-updated build strings. 2018-03-17 00:01:23 +01:00
artica a17c7c3e34 Auto-updated build strings. 2018-03-16 00:01:21 +01:00
vgilc c0cc6bbb5e Merge branch '1873-autoprovisionamiento-de-agentes' into 'develop' 
Added missing constants for two servers.

See merge request artica/pandorafms!1373
 2018-03-15 12:50:11 +01:00
Ramon Novoa 9bdc23077c Added missing constants for two servers. 2018-03-15 12:41:30 +01:00
artica 270a43fbeb Auto-updated build strings. 2018-03-15 00:01:23 +01:00
vgilc 387280e97f Merge branch '1873-autoprovisionamiento-de-agentes' into 'develop' 
1873 autoprovisionamiento de agentes

See merge request artica/pandorafms!1342
 2018-03-14 09:12:07 +01:00
artica fb56ebfbff Auto-updated build strings. 2018-03-14 00:01:25 +01:00
Ramon Novoa 42107017bf Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes 2018-03-13 18:40:51 +01:00
Ramon Novoa 21f8194f0d Add a new agent provisioning server (enterprise). 2018-03-13 17:52:34 +01:00
Ramon Novoa b63a1c4ce8 Remove debugging messages. 2018-03-13 17:52:34 +01:00
vgilc 8af4272152 Merge branch '1923-Migrar_agentes_desde_metaconsola' into 'develop' 
1923 migrar agentes desde metaconsola

See merge request artica/pandorafms!1364
 2018-03-13 17:47:52 +01:00
fbsanchez a6c5a0b046 Moved MigrationServer to enterprise servers load 2018-03-13 17:26:44 +01:00
fbsanchez ed282c6a9b 1923 Added required methods for migrationserver 2018-03-13 16:35:13 +01:00
daniel a3dceac0a0 Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola 2018-03-13 16:00:44 +01:00
fermin831 e03ad1a1bf [Server] Fixed undefined module_interval 2018-03-13 13:03:44 +01:00
artica af5d70bd7d Updated version and build strings. 2018-03-13 11:06:33 +01:00
artica 24ff4014ff Auto-updated build strings. 2018-03-13 00:01:27 +01:00
fbsanchez 7d58734ef2 MigrationServer aux util 2018-03-12 19:39:28 +01:00
fbsanchez 4566aee4e1 Fixed duplicate definition $rs 2018-03-12 13:47:57 +01:00
artica a66a7fde49 Auto-updated build strings. 2018-03-12 00:01:29 +01:00
artica 6235fc381a Auto-updated build strings. 2018-03-11 00:01:29 +01:00
artica 4af8841c29 Auto-updated build strings. 2018-03-10 00:01:37 +01:00
artica 5a13db5a18 Auto-updated build strings. 2018-03-09 00:01:42 +01:00
artica f3f0d7771c Updated version and build strings. 2018-03-08 12:26:57 +01:00
vgilc ff8051b433 Merge branch '2031-syslogserver-perdida-de-historico-en-cambio-de-alias' into 'develop' 
Added get_agent as unified function

See merge request artica/pandorafms!1355
 2018-03-08 10:08:28 +01:00
artica 05fab2100d Updated version and build strings. 2018-03-08 09:47:20 +01:00
artica 89da7843ee Auto-updated build strings. 2018-03-08 00:01:34 +01:00
fbsanchez 5450c682a9 Added get_agent as unified function 
It unifies:
- get_agent_from_alias
- get_agent_from_addr
- get_agent_from_name
 2018-03-07 16:56:35 +01:00
artica a0eff331c5 Auto-updated build strings. 2018-03-07 00:01:39 +01:00
vgilc 9588ddeb1b Merge branch 'ent-2014-5152-autovalidacion-automatica-de-eventos-en-metaconsola-sin-tener-que-validarse' into 'develop' 
[Server] Fixed event creation from alert server (use id_template_module instead id_template)

See merge request artica/pandorafms!1344
 2018-03-06 11:10:25 +01:00
artica 98b2aa2c8e Auto-updated build strings. 2018-03-06 00:01:36 +01:00
fermin831 79f65b43ff [Server] Fixed event creation from alert server (use id_template_module instead id_template) 2018-03-05 18:06:42 +01:00
vgilc 7ee1fbf1d8 Merge branch '1802-comision-europea-mejoras-plugin-mysql' into 'develop' 
Minor fixes and new methods

See merge request artica/pandorafms!1330
 2018-03-05 17:00:02 +01:00
fbsanchez 22192e6890 PluginTools Minor fixes 2018-03-05 16:43:18 +01:00
fbsanchez 19ddaeb799 Plugin Tools added get_address, some fixes and default values 2018-03-05 14:27:51 +01:00
artica a01d65fb89 Auto-updated build strings. 2018-03-05 00:01:32 +01:00
artica 5db4a03117 Auto-updated build strings. 2018-03-04 00:01:30 +01:00
artica a3c3b1c699 Auto-updated build strings. 2018-03-03 00:01:43 +01:00
fbsanchez f85ee5d508 PluginTools: fixed a issue parsing configuration files 2018-03-02 14:21:01 +01:00
fbsanchez b9bd02c7d5 PluginTools: Forwarded pfile to parse_configuration custom evals 2018-03-02 09:09:54 +01:00
artica 6f04665c72 Auto-updated build strings. 2018-03-02 00:01:32 +01:00
fbsanchez 34ad5acffa PluginTools update 
- Improved method documentation parse_configuration
- Added support to entity_detection parse_configuration
 2018-03-01 18:02:43 +01:00
fbsanchez 9dcdbb8eca Minor fixes and new methods 2018-03-01 09:29:36 +01:00
artica ddbe016266 Auto-updated build strings. 2018-03-01 00:01:47 +01:00
fermin831 3529bfaa5a [Server Pluginserver] Added alias to plugin server error 2018-02-28 14:11:26 +01:00
vgilc e46a08bcb8 Merge branch 'ent-1930-5269-safe-mode-y-aplicacion-de-politicas-com1' into 'develop' 
[Server Policies] Check autodisable mode when a policy is apllied

See merge request artica/pandorafms!1322
 2018-02-28 10:33:54 +01:00
artica 789f908b08 Auto-updated build strings. 2018-02-28 00:01:39 +01:00
fermin831 3e56e93108 [Server Policies] Check autodisable mode when a policy is apllied 2018-02-27 15:04:18 +01:00
artica 892d17f65c Auto-updated build strings. 2018-02-27 00:02:10 +01:00
enriquecd 3ee2f8615f API and CLI apply template components - #983 2018-02-26 19:10:53 +01:00
vgilc 913e140d03 Merge branch 'ent-1929-error-en-los-logs-de-Plugin-server' into 'develop' 
[Server Plugins] Modified malformed log on error

See merge request artica/pandorafms!1306
 2018-02-26 10:35:13 +01:00
vgilc ccc17c79ac Merge branch 'ent-1718-module_crontab-Agente-software' into 'develop' 
Ent 1718 module crontab agente software

See merge request artica/pandorafms!1311
 2018-02-26 10:21:46 +01:00
artica 4b9dd69a0f Auto-updated build strings. 2018-02-26 00:01:52 +01:00
artica 6eb5f20d17 Auto-updated build strings. 2018-02-25 00:02:06 +01:00
artica 4dae0c97c0 Auto-updated build strings. 2018-02-24 00:01:59 +01:00
artica effe16a275 Auto-updated build strings. 2018-02-23 00:01:27 +01:00
artica e752e26ee3 Auto-updated build strings. 2018-02-22 00:01:52 +01:00
fermin831 cedf825526 [Server] [Linux Agent] Added cron_interval to modules XML to avoid cron blocked modules go to unknown 2018-02-20 18:31:08 +01:00
artica b4416c3c8a Updated version and build strings. 2018-02-20 16:40:43 +01:00
artica cc088314b8 Auto-updated build strings. 2018-02-20 00:01:14 +01:00
fermin831 6de87f7ce7 [Server Plugins] Modified malformed log on error 2018-02-19 17:30:32 +01:00
artica 87ffae2d88 Auto-updated build strings. 2018-02-19 00:01:12 +01:00
artica fe1b911f02 Auto-updated build strings. 2018-02-18 00:01:12 +01:00
artica 5e6bcd34d8 Auto-updated build strings. 2018-02-17 00:01:14 +01:00
artica 12ef611493 Auto-updated build strings. 2018-02-16 00:01:13 +01:00
artica d90c6ef778 Auto-updated build strings. 2018-02-15 00:01:13 +01:00
vgilc 3af0e812c2 Merge branch '1913-CDE-Tools' into 'develop' 
Exception control added to safe_input and safe_output

See merge request artica/pandorafms!1293
 2018-02-14 08:48:40 +01:00
artica 4fbf0820a4 Auto-updated build strings. 2018-02-14 00:01:13 +01:00
artica 77392c70fc Updated version and build strings. 2018-02-13 11:51:11 +01:00
fbsanchez cc27e63773 Exception control added to safe_input and safe_output 2018-02-13 10:59:00 +01:00
vgilc 4eafda8b15 Merge branch '1853-Modulos-DISABLED-en-critical-dev' into 'develop' 
Fixed disabled agent in bulk operations

See merge request artica/pandorafms!1292
 2018-02-13 09:35:39 +01:00
artica ab10cec7ba Auto-updated build strings. 2018-02-13 00:01:13 +01:00
danielmaya 95c92efc6f Fixed disabled agent in bulk operations 2018-02-12 17:14:54 +01:00
daniel bed124b483 add configuration token conf pandora 2018-02-12 10:08:46 +01:00
artica be4509cbf1 Auto-updated build strings. 2018-02-10 00:01:14 +01:00
artica a6451d01e2 Auto-updated build strings. 2018-02-09 00:01:15 +01:00
artica 4aab64be3d Auto-updated build strings. 2018-02-08 00:01:15 +01:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
artica 520e968500 Auto-updated build strings. 2018-02-07 00:01:14 +01:00
artica be5adb4635 Auto-updated build strings. 2018-02-06 00:01:13 +01:00
artica b819f76c58 Auto-updated build strings. 2018-02-05 00:01:13 +01:00
artica 084bea27cc Auto-updated build strings. 2018-02-04 00:01:13 +01:00
artica 0614e5a492 Auto-updated build strings. 2018-02-03 00:01:14 +01:00
artica 3c6e71dbed Auto-updated build strings. 2018-02-02 00:01:18 +01:00
fbsanchez c02237a27f Fix PluginTools datalist modules 2018-02-01 13:59:22 +01:00
artica 0d944f0322 Auto-updated build strings. 2018-02-01 00:01:13 +01:00
daniel 137f4a1b69 resolve confict 2018-01-31 13:34:43 +01:00
artica 3235215547 Auto-updated build strings. 2018-01-31 00:01:14 +01:00
artica 2065207661 Auto-updated build strings. 2018-01-30 00:01:14 +01:00
vgilc 2af1b628a8 Merge branch '1730-missed-enterprise-plugins' into 'develop' 
Fixed some default values in PluginTools

See merge request artica/pandorafms!1239
 2018-01-29 13:37:11 +01:00
vgilc 2ef8a4905f Merge branch '1601-WUX_bloquea_el_inicio' into 'develop' 
fixed error server WUX

See merge request artica/pandorafms!1146
 2018-01-29 13:34:03 +01:00
vgilc 192fc99bf4 Merge branch '1620-Parametros_que_no_estan_o_sobran_en_el_pandora_server_conf' into 'develop' 
fixed minor error pandora_server.conf

See merge request artica/pandorafms!1148
 2018-01-29 13:32:45 +01:00
vgilc bc6b660592 Merge branch '1674-Sincronizacion-de-agentes-inmediata-con-metaconsola-en-operación-masiva' into 'develop' 
Update metaconsole after agent bulk operations for update - #1674

See merge request artica/pandorafms!1174
 2018-01-29 13:29:40 +01:00
artica 2b0688a76c Auto-updated build strings. 2018-01-29 00:01:11 +01:00
artica fd923a5adb Auto-updated build strings. 2018-01-28 00:01:11 +01:00
artica adb127c1c6 Auto-updated build strings. 2018-01-27 00:01:12 +01:00
fbsanchez 658f870265 Minor fixes PluginTools 2018-01-26 15:18:06 +01:00
Ramon Novoa 94a44c9555 Add support for cluster monitoring modules (enterprise). 
Ref pandora_enterprise#1748.
 2018-01-26 13:10:32 +01:00
fbsanchez 8473b589ec Removed invalid comment 2018-01-26 11:48:42 +01:00
fbsanchez e18abda8c0 Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-26 11:44:07 +01:00
artica 3b88cc46a3 Auto-updated build strings. 2018-01-26 00:01:12 +01:00
fbsanchez 526b5aa29f Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-25 16:24:51 +01:00
artica cd2c000cbf Updated version and build strings. 2018-01-24 14:27:02 +01:00
artica e6aa3de997 Auto-updated build strings. 2018-01-24 00:01:12 +01:00
artica f64498450a Auto-updated build strings. 2018-01-23 00:01:13 +01:00
fbsanchez d6feee7d67 Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-22 15:51:19 +01:00
fbsanchez b1c70bb580 Modified snmp_remote.pl 2018-01-22 15:50:01 +01:00
artica dc9e33953e Auto-updated build strings. 2018-01-22 00:01:11 +01:00
artica 6541fe17e8 Auto-updated build strings. 2018-01-21 00:01:12 +01:00
artica d2c97be01c Auto-updated build strings. 2018-01-20 00:01:16 +01:00
fbsanchez b964758d53 Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-19 16:26:40 +01:00
artica c0c251dd8e Auto-updated build strings. 2018-01-19 00:01:13 +01:00
fbsanchez 7d4e95f3cb Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-18 11:35:19 +01:00
artica c96b9aac0d Auto-updated build strings. 2018-01-18 00:01:12 +01:00
artica ff0132e8de Auto-updated build strings. 2018-01-17 00:01:12 +01:00
artica 9d01f98f21 Auto-updated build strings. 2018-01-16 00:01:12 +01:00
enriquecd a5a3d6ac64 Add _agentname_ and _agentalias_ macros to plugins - #1494 2018-01-15 11:51:33 +01:00