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

4020 Commits

Author SHA1 Message Date
vgilc e6bac9a195 Merge branch 'lab/selenium-docker' into 'develop' 
updates on pwrd, simplified

See merge request artica/pandorafms!2045

Former-commit-id: cfae76c639904ce34f2512ca1e4661826912c8eb
 2018-12-05 08:33:47 +01:00
artica fe47a9c07e Auto-updated build strings. 2018-12-05 00:01:38 +01:00
fbsanchez 60ac4e75df Fix PID path not absolute message on certain systems 
Former-commit-id: 91e9063535633dfd9d8e2fd5d309cfeb13d13131
 2018-12-04 21:37:25 +01:00
fbsanchez cff621338f Fixed file permissions pwrd 
Former-commit-id: d50a2df513e0ee567ba79e2d3a4873a0b92b0a21
 2018-12-04 21:28:43 +01:00
fbsanchez b542cb868b updated pwrd, installer now allows user/directory locations 
Former-commit-id: cb5c74a260dfcfadec820c0fbbd589e602ac6249
 2018-12-04 21:27:46 +01:00
fbsanchez b2758e6738 updates on pwrd, simplified 2018-12-04 18:22:11 +01:00
vgilc dfad4cf74f Merge branch 'pandora_enterprise/#3135-no-funciona-encriptacion-del-pandora_encrypt_db' into 'develop' 
Add a missing module to the Docker image and fix a related warning.

See merge request artica/pandorafms!2039
 2018-12-04 13:05:58 +01:00
Ramon Novoa e009ea5567 Add a missing module to the Docker image and fix a related warning. 2018-12-04 12:50:12 +01:00
artica 500601c67f Auto-updated build strings. 2018-12-04 00:01:28 +01:00
samucarc 517cb85547 Added new features in CLI to create and view alert commands 2018-12-03 17:38:57 +01:00
artica 76db57a8b6 Auto-updated build strings. 2018-12-03 00:01:26 +01:00
artica b5ac333dd4 Auto-updated build strings. 2018-12-02 00:01:27 +01:00
artica f18c7cfc08 Auto-updated build strings. 2018-12-01 00:01:45 +01:00
artica 2249ac4d8e Auto-updated build strings. 2018-11-30 00:01:26 +01:00
artica 4b1649d5f8 Auto-updated build strings. 2018-11-29 00:01:26 +01:00
Ramon Novoa 35cd33e446 Fix event replication for offline win32 nodes. 
Ref pandora_enterprise#3030.
 2018-11-28 13:33:15 +01:00
artica c48a0ffc49 Auto-updated build strings. 2018-11-28 00:01:25 +01:00
artica ad743d332e Auto-updated build strings. 2018-11-27 00:01:24 +01:00
artica b7546a5019 Auto-updated build strings. 2018-11-26 00:01:25 +01:00
artica 6bfe880dc8 Auto-updated build strings. 2018-11-25 00:01:24 +01:00
artica 53401e1f4d Auto-updated build strings. 2018-11-24 00:01:28 +01:00
artica c8969582a0 Auto-updated build strings. 2018-11-23 00:01:28 +01:00
nramon 3586403a08 Merge branch 'fix/win32-set-names' into 'develop' 
Fix encoding related issues.

See merge request artica/pandorafms!2009
 2018-11-22 12:34:24 +01:00
Ramon Novoa 1abe45c662 Fix encoding related issues. 
Ref pandora_enterprise#3031.
 2018-11-22 12:29:41 +01:00
nramon 0b4b60dec9 Merge branch 'fix/win32-set-names' into 'develop' 
Pandora's DB does not default to utf8 on win32 anymore. Thanks koichiro!

See merge request artica/pandorafms!2008
 2018-11-22 11:02:47 +01:00
Ramon Novoa c8f94e6756 Pandora's DB does not default to utf8 on win32 anymore. Thanks koichiro! 
Ref pandora_enterprise#3031.
 2018-11-22 10:49:56 +01:00
artica de77e52297 Auto-updated build strings. 2018-11-22 00:01:28 +01:00
Ramon Novoa 2480de2f9f Fix a typo in pandora_exec. 2018-11-21 16:20:26 +01:00
Ramon Novoa d912812127 Include Encode::CN, needed for cp936 support. 
Ref pandora_enterprise#3031.
 2018-11-21 12:17:22 +01:00
nramon 8735adc252 Merge branch 'feature/offline-license' into 'develop' 
Add support for offline licenses.

See merge request artica/pandorafms!2001
 2018-11-21 12:10:13 +01:00
Ramon Novoa 054546fd0f Add support for offline licenses. 
Ref pandora_enterprise#3098.
 2018-11-21 12:05:20 +01:00
artica fd6d830de3 Auto-updated build strings. 2018-11-21 00:01:25 +01:00
artica 01ba290a68 Auto-updated build strings. 2018-11-20 00:01:29 +01:00
artica ce5c679ad6 Auto-updated build strings. 2018-11-19 00:01:29 +01:00
artica f2bf27d367 Auto-updated build strings. 2018-11-18 00:01:28 +01:00
artica 4021af48f9 Auto-updated build strings. 2018-11-17 00:01:31 +01:00
fbsanchez 2a110e11c8 retried db query on error 1205 - lock 2018-11-16 10:28:49 +01:00
artica a0fde9503f Auto-updated build strings. 2018-11-16 00:01:29 +01:00
artica e9e132589c Auto-updated build strings. 2018-11-15 00:01:29 +01:00
artica 633d6987eb Auto-updated build strings. 2018-11-14 00:01:29 +01:00
artica f308e1f590 Updated version and build strings. 2018-11-13 15:59:16 +01:00
vgilc 72691ffe8d 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!1961
 2018-11-13 08:37:45 +01:00
artica e29160f34d Auto-updated build strings. 2018-11-13 00:01:29 +01:00
alejandro-campos e45dc3a981 Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted 2018-11-12 18:39:14 +01:00
Ramon Novoa be79ae83fb Remove a semaphore that is no longer needed. Thanks fbsanchez! 
Ref pandora_enterprise#3060.
 2018-11-12 15:32:37 +01:00
artica 0dd6c54651 Auto-updated build strings. 2018-11-12 00:01:25 +01:00
artica 4f928c8c22 Auto-updated build strings. 2018-11-11 00:01:25 +01:00
artica 76b24c3214 Auto-updated build strings. 2018-11-10 00:01:28 +01:00
artica 2ed98eac77 Auto-updated build strings. 2018-11-09 00:01:27 +01:00
artica d28b229423 Auto-updated build strings. 2018-11-08 00:01:29 +01:00
fbsanchez df5e6daf7b re evaluate enterprise capabilities on configuration reload 2018-11-07 15:59:19 +01:00
fbsanchez 7407431343 re-initialize pandorafms_server after configuration change 2018-11-07 14:57:20 +01:00
vgilc c7a54182a3 Merge branch '6219_Comprobacion_Paradas_planificadas_CLI_2' into 'develop' 
Added check for the creation of planned downtimes by pandora manage

See merge request artica/pandorafms!1936
 2018-11-07 08:48:48 +01:00
artica a01f79d294 Auto-updated build strings. 2018-11-07 00:01:31 +01:00
samucarc a80c7e493e Added check for the creation of planned downtimes by pandora manage 2018-11-06 16:42:03 +01:00
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