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

759 Commits

Author SHA1 Message Date
daniel c4c0cc59d4 fixed error automatic combined graph 2018-11-08 15:05:57 +01: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
danielmaya 87abf1dc02 added event time filter in tactical view 2018-10-24 16:36:44 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
daniel b736746e1c php version upgrade 2018-10-19 10:04:26 +02:00
daniel 3c62388f0e fixed errors php and slicebars change version php7 2018-10-16 15:32:31 +02:00
fermin831 41d104ae2c Improve performance on tactical view with a lot of events 2018-10-15 12:23:51 +02:00
daniel d28bc79b79 upgrade php 2018-10-15 09:05:04 +02:00
daniel 16be9488c8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/include/functions_graph.php
 2018-10-11 13:06:17 +02:00
daniel 1f56054f6c fixed changes php7 2018-10-11 12:57:48 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev 
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
 2018-10-10 19:39:27 +02:00
Fermin 979e443824 Removed unused code 2018-10-04 16:31:24 +02:00
Fermin 75768c9eaa [Tags performance] Open reporting checks 2018-10-04 16:23:36 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00
fermin831 f3eae5e111 [Tags performance] Some agents_get_modules checks 2018-10-03 17:00:57 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
vgilc 2fe350ed75 Merge branch '2816-Reports-de-custom-graphs-no-funcionan-si-le-ponemos-un-nombre-a-la-custom-graph' into 'develop' 
fixed bug: reporting of custom graphs not showing graph when graph name is empty

See merge request artica/pandorafms!1809
 2018-09-28 09:58:11 +02:00
alejandro-campos 24de9d9119 fixed bug: reporting of custom graphs not showing graph when graph name is empty 2018-09-25 17:33:29 +02:00
samucarc 0ccb059e36 Fixed reports in alert module reports when module is empty 2018-09-20 15:50:45 +02:00
vgilc bbb36fe6d8 Merge branch '1979-Informe-MAX-no-es-coherente-dev' into 'develop' 
Fixed max_value report

See merge request artica/pandorafms!1777
 2018-09-18 12:59:11 +02:00
danielmaya 6cf638a4d8 Fixed max_value report 2018-09-18 12:18:47 +02:00
daniel 8f3a602097 fixed error in metaconsole reports module events 2018-09-18 10:38:42 +02:00
vgilc e0eb6a3eff Merge branch '1920_Informe_de_alertas_3' into 'develop' 
Fixed minor error module/agent/group alert report

See merge request artica/pandorafms!1775
 2018-09-18 10:15:50 +02:00
samucarc 7100aed448 Fixed minor error module/agent/group alert report 2018-09-18 10:09:11 +02:00
vgilc 9f0271c0b8 Merge branch '1920_Informe_de_alertas_2' into 'develop' 
Fixed module/agent/group alert report

See merge request artica/pandorafms!1772
 2018-09-18 08:37:03 +02:00
samucarc 8daca7d220 Fixed module/agent/group alert report 2018-09-17 18:57:29 +02:00
vgilc ec0640083a Merge branch '2487-Cambiar_forma_de_captura_de_datos_de_graficas_forecast_y_baseline_2' into 'develop' 
2487 cambiar forma de captura de datos de graficas forecast y baseline 2

See merge request artica/pandorafms!1751
 2018-09-12 10:38:04 +02:00
daniel 6312d2e38a fixed forecast report 2018-09-12 10:34:14 +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
daniel ed0d89ec73 fixed baseline report 2018-09-11 17:06:35 +02:00
fermin831 9c032f4dfe [Secondary groups] Fixed group report 2018-09-11 13:22:51 +02:00
daniel f117d1af43 fixed heigth charts for reports 2018-09-11 09:33:24 +02:00
vgilc 7a6c3c16ec Merge branch '1920_Informe_de_alertas' into 'develop' 
Fixed alert report date

See merge request artica/pandorafms!1715
 2018-08-28 10:30:23 +02:00
samucarc 9915518b8e Fixed alert report date 2018-08-27 18:00:44 +02:00
vgilc 69545d7ed8 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios

See merge request artica/pandorafms!1708
 2018-08-27 09:10:00 +02:00
fermin831 0a70284eaa [Secondary groups] Group report and adapted group_stat table to secondary groups 2018-08-21 13:34:52 +02:00
daniel 8e845d2948 fixed error automatic combined graph 2018-08-21 10:54:36 +02:00
daniel fac1b3b616 fixed error for each agent report metaconsole 2018-08-20 17:28:14 +02:00
daniel 271466fb66 fixed errors automatic combined graph report metaconsole 2018-08-20 13:52:01 +02:00
alejandro-campos 25d252a8a4 fixed bug to draw charts in custom reports 2018-06-27 17:24:40 +02:00
daniel 7d4a29cbe2 fixed errors in meta and windows 2018-06-14 19:19:58 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
daniel eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
daniel 47a287b6f6 fixed errors in graph 2018-06-01 13:58:29 +02:00
daniel a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
daniel 79354a0ebf fixed graphs 2018-05-18 14:22:39 +02:00
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