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

17807 Commits

Author SHA1 Message Date
vgilc 537ecb7564 Merge branch '2450-Falsa_representacion_en_graficas_sin_TIP_4' into 'develop' 
fixed minor error debugPrint in function graph

See merge request artica/pandorafms!1607
 2018-07-10 15:38:38 +02:00
daniel e24b10ad74 fixed minor error debugPrint in function graph 2018-07-10 14:40:48 +02:00
artica 49afdcb4fd Auto-updated build strings. 2018-07-10 00:01:27 +02:00
vgilc 0a4f133b5e Merge branch '198-plugin-bandwidth-ancho-de-banda' into 'develop' 
Fixed pandora_plugins/SNMP/snmp_bandwidth.pl path

Closes #198

See merge request artica/pandorafms!1606
 2018-07-09 16:47:01 +02:00
fbsanchez 466846cae6 Fixed pandora_plugins/SNMP/snmp_bandwidth.pl path 2018-07-09 16:34:20 +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
daniel 4c7c248671 Merge remote-tracking branch 'origin/develop' into 2226-Analisis_de_causa_raiz_en_alertas_mediante_los_servicios 2018-07-09 09:44:33 +02:00
vgilc 3c31d0216e Merge branch '2463-Graficas_cargan_muy_lentas_en_la_primera_muestra' into 'develop' 
mejora el rendimiento en consulta sql

See merge request artica/pandorafms!1605
 2018-07-09 09:39:05 +02:00
daniel 69852a1c2a mejora el rendimiento en consulta sql 2018-07-09 09:23:19 +02:00
vgilc 49ed21b93d Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos-pandorafms3' into 'develop' 
Reverse changes for non-administrators users

See merge request artica/pandorafms!1603
 2018-07-09 08:54:03 +02:00
vgilc a573f69593 Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos-pandorafms2' into 'develop' 
Reverse changes for non-administrators users

See merge request artica/pandorafms!1600
 2018-07-09 08:53:51 +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
Alejandro Gallardo Escobar de58fe7b90 Fixes 2018-07-06 14:03:05 +02:00
fermin831 f455fe3657 [GeoIP] Added script agent_gis_update.pl 2018-07-06 13:58:45 +02:00
manuel.montes 0d7acdc574 Reverse changes for non-administrators users 2018-07-06 12:02:34 +02:00
vgilc 1b3ce33690 Merge branch '2450-Falsa_representacion_en_graficas_sin_TIP_3' into 'develop' 
fixed errors in graphs

See merge request artica/pandorafms!1602
 2018-07-06 12:01:51 +02:00
daniel c26a50e838 fixed errors in graphs 2018-07-06 11:56:38 +02:00
manuel.montes 9f9728fd03 Reverse changes for non-administrators users 2018-07-06 10:22:57 +02:00
vgilc 8d639b031e Merge branch 'ent-2405-recuento-y-paginado-vista-agent-detail' into 'develop' 
Fixed filter count in agent detail.

See merge request artica/pandorafms!1591
 2018-07-06 09:40:15 +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 e8666da878 [GeoIP] Added Geo::IP package to Docker image 2018-07-05 18:43:48 +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 f244dd79be Merge branch '2450-Falsa_representación_en_graficas_sin_TIP' into 'develop' 
2450 falsa representación en graficas sin tip

See merge request artica/pandorafms!1593
 2018-07-05 12:05:09 +02:00
daniel 0dd39f1f00 fixed errors in graph slice for uncompresed 2018-07-05 11:52:52 +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 f235f20560 Merge branch '1885-ue-configurador-automatico-de-agentes' of brutus.artica.lan:artica/pandorafms into 1885-ue-configurador-automatico-de-agentes 2018-07-04 20:09:36 +02:00
fbsanchez 23a9cf7842 Minor fixes 2018-07-04 19:59:31 +02:00
fbsanchez fb0800d375 Minor fixes 2018-07-04 19:47:10 +02:00
fbsanchez c800061bc2 Autoconfiguration v1 2018-07-04 18:39:06 +02:00
fbsanchez 9e028873be Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-04 18:38:36 +02:00
vgilc 8d8b6ffe51 Merge branch '2453-Llamada-a-la-api-no-funciona-en-formato-json-dev' into 'develop' 
Fixed json in functions_api

See merge request artica/pandorafms!1595
 2018-07-04 16:33:20 +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
danielmaya b186c82a7b Fixed json in functions_api 2018-07-04 15:57:08 +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
vgilc 610ec8fd66 Merge branch '2075-Proteccion_en_cascada_de_servicios_2' into 'develop' 
fixed errors cps in meta and others

See merge request artica/pandorafms!1585
 2018-07-03 16:50:48 +02:00
vgilc 6c695999e8 Merge branch '2416-Popup-feo-y-erroneo-editor-de-modulos' into 'develop' 
changed width of changing snmp module name alert popup

See merge request artica/pandorafms!1589
 2018-07-03 14:03:29 +02:00
vgilc 128d3178c8 Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos-pandorafms' into 'develop' 
Remove the 'All Groups' option in non-administrators users

See merge request artica/pandorafms!1590
 2018-07-03 14:02:49 +02:00
fermin831 d1eaef6f6d Fixed filter count in agent detail. 2018-07-03 13:22:23 +02:00
manuel.montes 54a74c43d0 Remove the 'All Groups' option in non-administrators users 2018-07-03 13:11:00 +02:00
alejandro-campos 0cf3aa2e78 changed width of changing snmp module name alert popup 2018-07-03 12:50:28 +02:00
fbsanchez f430b8998f Added DB changes to support ProvisioningServer 2 2018-07-03 12:01:37 +02:00