Commit Graph

3849 Commits

Author SHA1 Message Date
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