Commit Graph

4065 Commits

Author SHA1 Message Date
vgilc 919a800a0a Revert "Merge branch '2677-No-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop'"
This reverts merge request !1727
2018-11-06 16:41:15 +01:00
vgilc 62b27284aa Merge branch '3000-lost-in-stash' into 'develop'
ondemand pluginTools, pandora_df inodes, cde functions_api cluster options

See merge request artica/pandorafms!1919
2018-11-06 15:03:36 +01:00
fbsanchez bfc669225c Merge remote-tracking branch 'origin/develop' into 3000-lost-in-stash 2018-11-06 14:48:14 +01:00
artica 3ffad9fda8 Auto-updated build strings. 2018-11-06 00:01:27 +01:00
artica 50b8886916 Auto-updated build strings. 2018-11-05 00:01:25 +01:00
artica f9e2936df5 Auto-updated build strings. 2018-11-04 00:01:25 +01:00
artica afd922426e Auto-updated build strings. 2018-11-03 00:01:27 +01:00
artica fc82a9d172 Auto-updated build strings. 2018-11-02 00:01:26 +01:00
artica f47918b4cc Auto-updated build strings. 2018-11-01 00:01:31 +01:00
fbsanchez 7f093b29e3 Merge remote-tracking branch 'origin/develop' into 2716-ue-plugin-modifications 2018-10-31 15:48:57 +01:00
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