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

17222 Commits

Author SHA1 Message Date
daniel 123d49d604 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/styles/pandora.css
 2018-05-10 08:52:45 +02:00
daniel f758124531 fixed treshold graph 2018-05-10 08:43:09 +02:00
artica e9d8af152d Auto-updated build strings. 2018-05-10 00:01:25 +02:00
vgilc e8f7adc1de Merge branch '2246-ajustes-jmx-weblogic' into 'develop' 
Added pandora_plugin_jmx to update version procedure

See merge request artica/pandorafms!1475
 2018-05-09 18:03:20 +02:00
fbsanchez 10685e6aa2 Added pandora_plugin_jmx to update version procedure 2018-05-09 12:00:38 +02:00
vgilc 902186633c Merge branch '2249-Vulnerabilidad-grave---Ejecución-remota-de-código-dev' into 'develop' 
Fixed check login in ajax.php

See merge request artica/pandorafms!1474
 2018-05-09 11:44:20 +02:00
danielmaya 3c7fe95a33 Added check login and check acl in update_manager.ajax 2018-05-09 11:37:53 +02:00
Ramon Novoa 1abba49c70 Create the extras directory. 2018-05-09 10:57:54 +02:00
danielmaya 931c41698b Fixed check login in ajax.php 2018-05-09 10:52:06 +02:00
vgilc 220ea8d319 Merge branch 'ent-2103-wms-map-server' into 'develop' 
Added a new GIS map source type called WMS

See merge request artica/pandorafms!1469
 2018-05-09 10:28:30 +02:00
vgilc c83def806b Merge branch '2231-Vistas-realtime-en-modulos-de-red' into 'develop' 
2231 vistas realtime en modulos de red

See merge request artica/pandorafms!1470
 2018-05-09 10:28:02 +02:00
vgilc 7cb31c945a Merge branch 'ent-1892-EXT-5237-el-percentil-no-se-muestra-en-las-graficas-personalizadas-del-un-contenedor-grafico' into 'develop' 
Added percentile to custom graphs containers

See merge request artica/pandorafms!1436
 2018-05-09 10:27:34 +02:00
vgilc 6eea48dccf Merge branch 'ent-2057-modulos-prediction-se-crean-en-otro-agente' into 'develop' 
Fixed module prediction agent creation

See merge request artica/pandorafms!1435
 2018-05-09 10:26:16 +02:00
vgilc e257d6dc8d Merge branch 'ent-2184-Bug-Custom-Graph-en-Consola-visual' into 'develop' 
[Visual console] Removed show all advanced options in all elements and add its…

See merge request artica/pandorafms!1472
 2018-05-09 10:24:56 +02:00
vgilc d746af9c28 Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop' 
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso

See merge request artica/pandorafms!1442
 2018-05-09 10:24:19 +02:00
vgilc 96df6938fa Merge branch 'ent-1917-tmb-personalizacion-exportacion-csv-de-eventos' into 'develop' 
Ent 1917 tmb personalizacion exportacion csv de eventos

See merge request artica/pandorafms!1438
 2018-05-09 10:23:38 +02:00
vgilc 1614bbad88 Merge branch 'ent-1960-RedIRIS-URL-de-acceso-a-los-agentes-no-funciona-en-alertas-de-correos' into 'develop' 
Fixed login query params deletion (now it does not delete)

See merge request artica/pandorafms!1437
 2018-05-09 10:22:59 +02:00
vgilc 002eabca77 Merge branch 'ent-1961-Al-aplicar-un-Componente-de-red-por-politica-no-se-guarda-el-FF-Threshold' into 'develop' 
Fixed Flip Flop threshold change value on component loading via AJAX

See merge request artica/pandorafms!1464
 2018-05-09 10:22:32 +02:00
vgilc 118bed56fe Merge branch 'ent-2100-Mejorar-descripcion-de-errores-en-el-TENTACLE-SERVER' into 'develop' 
Now tentacle server errors are more descriptives

See merge request artica/pandorafms!1454
 2018-05-09 10:21:18 +02:00
vgilc 30417cd2fe Merge branch 'ent-2146-Configuracion-Tentacle' into 'develop' 
Ent 2146 configuracion tentacle

See merge request artica/pandorafms!1455
 2018-05-09 10:11:58 +02:00
vgilc d1537f45ae Merge branch '2242-5694-se-superpone-info-timestamp-en-eje-x-graficas-personalizadas' into 'develop' 
Specified more accurate class for label styling

See merge request artica/pandorafms!1466
 2018-05-09 10:10:58 +02:00
artica 04e3d3071d Auto-updated build strings. 2018-05-09 00:01:23 +02:00
fermin831 597e702e13 [Visual console] Removed show all advanced options in all elements and add its options to donut graphs 2018-05-08 18:50:14 +02:00
Alejandro Gallardo Escobar e77b9f35b6 Improved the help of the WMS server connection creation 2018-05-08 17:29:58 +02:00
Alejandro Gallardo Escobar e1319cb584 Improved the GIS map screen 2018-05-08 10:07:33 +02:00
artica 3377ecfd64 Auto-updated build strings. 2018-05-08 00:01:23 +02:00
fermin831 6297b20bf6 Added hint to Realtime SNMP graph 2018-05-07 13:30:09 +02:00
fermin831 fd91ba63f6 Added realtime graph to monitor view 2018-05-07 12:53:12 +02:00
artica e0cf024990 Auto-updated build strings. 2018-05-07 00:01:21 +02:00
artica 6dd28d2d75 Auto-updated build strings. 2018-05-06 00:01:21 +02:00
artica b92d9c9560 Auto-updated build strings. 2018-05-05 00:01:23 +02:00
fermin831 0f4daee237 Added icon to realtime SNMP graph 2018-05-04 13:18:33 +02:00
vgilc aa5a8e8fc1 Merge branch 'patch-2241-Widget-SLA-mal-calculado' into 'develop' 
advanced_sla should multiply by 100 the value

See merge request artica/pandorafms!1467
 2018-05-04 12:57:57 +02:00
fermin831 3d979ff975 advanced_sla should multiply by 100 the value 2018-05-04 12:29:38 +02:00
fbsanchez 3dd4dd51cb Specified more accurate class for label styling 2018-05-04 12:26:18 +02:00
fermin831 bd3f0712f1 Added separated window view to SNMP realtime graphs 2018-05-04 10:58:37 +02:00
Ramon Novoa 7bb3fb8077 Fixes to the Dockerfiles. Thanks to marcelo-ochoa. 
Fix permissions in the DB Dockerfile and add mod_ssl to the Console
Dockerfile.
 2018-05-04 10:02:52 +02:00
artica 770267d72e Auto-updated build strings. 2018-05-04 00:01:21 +02:00
fermin831 32822054d6 Added realtime graph button to agent view 2018-05-03 17:13:38 +02:00
fermin831 2885885cc4 Fixed a JS error (invalid parameter in pandoraAreaGraph) 2018-05-03 13:02:17 +02:00
fermin831 5783e56a2e Fixed a PHP warning (invalida foreach) 2018-05-03 12:57:48 +02:00
fermin831 8bc9805288 [Realtime Graphs] Added the hidden type snmp_module 2018-05-03 12:57:24 +02:00
artica ab1ca78340 Auto-updated build strings. 2018-05-02 00:01:34 +02:00
artica d6a7ca198d Auto-updated build strings. 2018-05-01 00:01:23 +02:00
fermin831 27b2d55371 Fixed Flip Flop threshold change value on component loading via AJAX 2018-04-30 17:48:49 +02:00
fermin831 b6bc835e41 Tentacle config file is readable to all users in all packages 2018-04-30 16:22:52 +02:00
vgilc ecaf360d9d Merge branch 'fixed-csv-export-events-secondary-groups-2' into 'develop' 
Change the extension of CSV events file to .csv

See merge request artica/pandorafms!1463
 2018-04-30 16:04:56 +02:00
fermin831 7162241ef9 Change the extension of CSV events file to .csv 2018-04-30 15:55:15 +02:00
fermin831 4bc10e503b Modified launch daemon Tentacle script to use configuration file 2018-04-30 15:53:09 +02:00
vgilc af19eb2037 Merge branch '2007-Monitorizacion-de-cluster-fase-2-MR15-2' into 'develop' 
Fix MR - #2007

See merge request artica/pandorafms!1461
 2018-04-30 15:15:21 +02:00