Commit Graph

17690 Commits

Author SHA1 Message Date
Ramon Novoa 62ed69af90 Fix the service cascade protection. 2018-07-11 13:07:37 +02:00
daniel b36bf868b1 fixed minor error 2018-07-10 16:13:17 +02:00
daniel 73a5a63956 fixed errors delete modules sla_value and sla for services 2018-07-10 16:12:14 +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
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
artica 48e3c547c9 Auto-updated build strings. 2018-07-06 00:01:26 +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
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
daniel e765e4fe08 Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios_2 2018-07-03 08:55:41 +02:00
artica 95678f706b Auto-updated build strings. 2018-07-03 00:01:23 +02:00
daniel 0f9b7d13ee fixed errors cps in meta and others 2018-07-02 17:14:31 +02:00
vgilc 0040837f4b Merge branch 'ent-2375-servidores-sin-referenciar' into 'develop'
Fixed new servers (migration and autoprovision) icons

See merge request artica/pandorafms!1564
2018-07-02 09:48:28 +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
slerena 6da5736a4b Merge branch '2354-Fallo-grafico-tarta-consola-visual' into 'develop'
Changed function that gets pie graphs module data to print no data to show message in such case

See merge request artica/pandorafms!1581
2018-06-29 15:44:29 +02:00
slerena 56ff8706a5 Merge branch '2396-fallo-acl-en-vista-de-cluster' into 'develop'
2396-fallo-acl-en-vista-de-cluster

See merge request artica/pandorafms!1582
2018-06-29 15:43:42 +02:00
slerena 5095ddaf3f Merge branch '2285-La-ordenacion-de-elementos-en-las-custom-graph-no-se-aplica-en-las-graficas' into 'develop'
fixed bug when ordering module list in custom graphs

See merge request artica/pandorafms!1583
2018-06-29 15:37:11 +02:00
slerena b7bd120411 Merge branch '2416-Popup-feo-y-erroneo-editor-de-modulos' into 'develop'
changed size of changing snmp module name alert popup

See merge request artica/pandorafms!1584
2018-06-29 15:33:44 +02:00
alejandro-campos c400b261ff changed size of changing snmp module name alert popup 2018-06-29 14:57:40 +02:00
alejandro-campos ae1f7a4814 fixed bug when ordering module list in custom graphs 2018-06-29 14:35:49 +02:00
manuel.montes 5436c64800 Merge branch '2396-fallo-acl-en-vista-de-cluster' of https://brutus.artica.lan:8081/artica/pandorafms into 2396-fallo-acl-en-vista-de-cluster 2018-06-29 08:52:46 +02:00
artica d41df8335c Auto-updated build strings. 2018-06-29 00:01:29 +02:00
alejandro-campos 05f38eb9e1 Changed function that gets pie graphs module data to print no data to show message in such case 2018-06-28 18:28:18 +02:00
manuel.montes 4f23407ea8 Fixed for group All 2018-06-28 17:03:02 +02:00