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

582 Commits

Author SHA1 Message Date
daniel 2a81703a68 fixed minor error custom graph 2018-04-26 10:24:37 +02:00
daniel 3fbd9adc38 fixed graph 2018-04-24 13:19:24 +02:00
daniel e7a8706434 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/graphs/fgraph.php
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2018-04-23 12:21:11 +02:00
fermin831 70bf2dd49f Added percentile to custom graphs containers 2018-04-18 16:01:38 +02:00
vgilc d0458e0194 Merge branch 'ent-2102-graph-error' into 'develop' 
Ent 2102 - Error SQL Graphs meta

See merge request artica/pandorafms!1416
 2018-04-17 16:22:19 +02:00
fermin831 fb4be3cddf [SLA] Substitute the downplanned color 2018-04-11 16:22:16 +02:00
Alejandro Gallardo Escobar d22b2ba588 Bugfix 2018-04-10 11:37:17 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
fermin831 e3341c98ce [Secondary Groups] Fixed agent graph agent status 2018-03-27 17:02:41 +02:00
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
daniel f750d0f49e fixed errors in reports interfaces metaconsole 2018-03-23 08:00:32 +01:00
fermin831 b6688dda1c [SQL charts reports] Added top n report to set the maximum number of elements 2018-03-01 16:49:50 +01:00
fermin831 3359870c2f [SQL Charts] Added limit elements and some improves 2018-03-01 13:11:11 +01:00
fermin831 98b57ef642 [SQL charts] Added breadcrumbs to sql charts 2018-03-01 12:41:17 +01:00
fermin831 d0bf68888e [SQL charts] Fixed SQL vertical chart 2018-03-01 12:02:08 +01:00
daniel 815e9c6759 fixed errors graph 2018-03-01 09:46:52 +01:00
daniel 3910b455ca fixed errors 2018-02-28 10:02:06 +01:00
daniel 51f22413a8 fixed errors in graphs 2018-02-28 08:46:51 +01:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
daniel 688acb8a4b fixed error graphs 2018-02-23 14:31:00 +01:00
daniel 4b654bd87d fixed errors grapgh 2018-02-21 11:54:24 +01:00
daniel b6798bf31c update flot.js 2018-02-16 13:41:31 +01:00
daniel 7bc9a6cfb5 graph 2018-02-12 13:29:25 +01:00
daniel 2417cae01d Merge branch 'develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-12 12:47:53 +01:00
daniel 3e0edcfda8 fixed errors in automatic combined graph meta with TIP 2018-02-08 17:07:54 +01:00
daniel af9e11ffca reconfigure charts 2018-02-08 15:47:12 +01:00
vgilc 717ecb6adc Merge branch '1638-Si-creamos-una-gráfica-combinada-con-un-intervalo-pequeño-sale-vacía-dev' into 'develop' 
Fixed interval when the period is less than resolution in custom graph

See merge request artica/pandorafms!1118
 2018-01-29 12:53:27 +01:00
daniel 36429616f3 fixed minor error combined graph fullscale 2018-01-22 15:46:23 +01:00
daniel ead1161e0b add fullscale combined and custom graph 2018-01-03 12:13:00 +01:00
vgilc 349a9bbd35 Merge branch '1613-4894-No-aparece-fecha-final-en-las-graficas-24h-de-los-agentes' into 'develop' 
Change time format in agent events 24h bar view and show the last start time - #1613

See merge request artica/pandorafms!1089
 2017-12-21 09:04:55 +01:00
daniel a335732267 fixed errors in graphs webproc and keep alive 2017-12-19 13:13:42 +01:00
danielmaya 146802119d Fixed pdf label 2017-12-18 16:50:24 +01:00
danielmaya b65d649750 Fixed reporting custom graph 2017-12-18 13:12:29 +01:00
daniel d7d1cfe81b Merge branch 'develop' into 1632-Pandora_FMS_charts 2017-12-13 17:18:36 +01:00
daniel 4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +01:00
danielmaya 85ac142c6c Updated functions_graph and fixed percentil issue 2017-12-13 10:38:08 +01:00
danielmaya 1d3efb9d9e Updated functions_graph 2017-12-13 10:37:42 +01:00
danielmaya 61b33221bf Added check modules and series 2017-12-13 10:37:23 +01:00
Daniel Maya e01f00ac3d code backup 2017-12-13 10:36:08 +01:00
daniel 06c1c4f243 fixed errors in fullscale graph and normal graph 2017-12-05 13:44:42 +01:00
Arturo Gonzalez 30c879b600 Added more changes to improve radial dynamic maps 2017-11-30 10:45:28 +01:00
vgilc 1895bf3fe9 Merge branch '1375-Que-se-muestre-la-unidad-en-las-custom-graphs-dev' into 'develop' 
added unit in custom graphs

See merge request artica/pandorafms!979
 2017-11-29 15:42:40 +01:00
Arturo Gonzalez 2883e45849 Added changes to get all hierachy to the chart 2017-11-24 12:08:15 +01:00
danielmaya 0b728375db Fixed interval when the period is less than resolution in custom graph 2017-11-24 11:55:25 +01:00
Arturo Gonzalez 06f83825dc Added code to fix agents generation in sunbrust chart 2017-11-24 11:27:10 +01:00
Arturo Gonzalez f4d035cfa5 Added changes to filter by group. Not finished 2017-11-21 10:27:17 +01:00
enriquecd 1f2f8fdc0c Change time format in agent events 24h bar view and show the last start time - #1613 2017-11-17 11:44:38 +01:00
vgilc 3493b9c15c Revert "code backup" 
This reverts commit b9851a3a71
 2017-11-13 10:21:38 +01:00
vgilc 68a10343fb Revert "Merge branch…" 
This reverts merge request !1025
 2017-11-10 12:24:33 +01:00
Arturo Gonzalez b9b8b37abe Added grid color to bars graph in visual console 2017-11-08 09:55:36 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
vgilc 2d87172558 Merge branch 'vulnerabilidad-en-consola' into 'develop' 
Resolve: Vulnerabilidad en consola

See merge request artica/pandorafms!1020
 2017-11-06 17:41:45 +01:00
vgilc 594b6e9417 Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop' 
1320 exportación csv saca entities dev

See merge request artica/pandorafms!1007
 2017-11-02 15:35:38 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
Alejandro Gallardo Escobar 849eba10d4 [Console] Fixed a vulnerability into the 'fgraph.php' script 2017-10-30 18:03:09 +01:00
enriquecd f608c686b8 Graph and table mode for max, min and avg reports an template reports - #654 2017-10-30 17:23:59 +01:00
nramon 8163200f54 Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'" 
This reverts merge request !871
 2017-10-30 16:11:58 +01:00
nramon 65ae5ed2eb Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop' 
Graph and table mode for max, min and avg reports and template reports - #654

See merge request artica/pandorafms!871
 2017-10-30 15:51:51 +01:00
vgilc 2f9d999978 Merge branch '1397-Grafica-combinada-y-fondo-negro-transparente-Consola-visual' into 'develop' 
Enable background color options for gauge charts - #1397

See merge request artica/pandorafms!900
 2017-10-26 13:35:44 +02:00
Daniel Maya 3f0430ab9d added unit in custom graphs 2017-10-26 12:12:44 +02:00
vgilc 197e9a4a30 Merge branch '1367-radial-dinamic-details-dev' into 'develop' 
Added 3 and 4 points

See merge request artica/pandorafms!882
 2017-10-26 11:32:28 +02:00
vgilc 0604dfedbf Merge branch '1433-Mensaje-No-data-to-show-diferentes-en-graficas-de-modulos-y-de-interfaces' into 'develop' 
Change image_problem no data sign to image_problem_area_small - #1433

See merge request artica/pandorafms!908
 2017-10-26 11:13:31 +02:00
fermin831 befb859e23 Fixed auto SLA item on visual console when no module is selected 2017-10-13 14:16:37 +02:00
daniel e912e151a9 fixed errors in setup tip AND prediction modules 2017-10-11 13:17:29 +02:00
enriquecd bd47d5362a Change image_problem no data sign to image_problem_area_small - #1433 2017-10-09 18:31:42 +02:00
enriquecd c04d4ed08e Enable background color options for gauge charts - #1397 2017-10-09 12:03:19 +02:00
Arturo Gonzalez aca4f2e481 Added 3 and 4 points 2017-10-04 17:49:46 +02:00
vgilc d181edc471 Merge branch '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' into 'develop' 
New feature. Dynamic units

See merge request !818
 2017-10-04 17:41:37 +02:00
vgilc 9d4f11113e Merge branch '1283-Imagen-No-data-to-show' into 'develop' 
Fix error showing image when there is no data to show in graphs - #1283

See merge request !831
 2017-10-04 13:46:49 +02:00
enriquecd 788265713e Graph and table mode for max, min and avg reports an template reports - #654 2017-10-02 18:23:26 +02:00
Daniel Maya 237755a84c Merge branch 'develop' into '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-09-25 15:34:39 +02:00
daniel 00f779817d fixed errors in report interfaces 2017-09-25 13:26:04 +02:00
daniel 44a6e39f99 reajust date in flash graphs 2017-09-22 15:12:53 +02:00
daniel 3613d1c1fc fixed minor errors tips 2017-09-21 18:37:57 +02:00
daniel 9337d33ceb tip in graph interfaces 2017-09-21 15:35:28 +02:00
daniel edb2865430 fixed errors in TIP SPARSE 2017-09-20 17:29:17 +02:00
enriquecd 3ae202ff15 Fix error showing image when there is no data to show in graphs - #1283 2017-09-20 10:49:52 +02:00
daniel d54509fd1e fixed errors in TIP boolean graphs 2017-09-18 17:57:43 +02:00
Daniel Maya d7f3e1ecde New feature. Dynamic units 2017-09-14 12:10:41 +02:00
daniel 731e9bf917 fixed error in full_scale 2017-09-08 16:10:31 +02:00
daniel f2f9cc666e boolean graphs 2017-09-07 18:11:42 +02:00
Arturo Gonzalez 598b04c2db Added a change to boolean charts 2017-09-07 16:17:41 +02:00
vgilc 3d2948d7eb Merge branch '1198-errors-in-boolean-chart-third-time-dev' into 'develop' 
Updated module chart code

See merge request !796
 2017-09-07 15:29:29 +02:00
Arturo Gonzalez da117723ef Updated module chart code 2017-09-07 15:19:03 +02:00
Arturo Gonzalez c986e4fad7 Added minor change to boolean charts 2017-09-07 14:45:20 +02:00
Arturo Gonzalez 2fba19d55c Added some changes in boolean charts 2017-09-07 11:14:06 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
vgilc 2d153c1074 Merge branch '1130-Nombres-de-agente-en-vista-táctica-dev' into 'develop' 
Extended number of characters allowed

See merge request !680
 2017-08-18 12:38:15 +02:00
Arturo Gonzalez 4ce9a96b74 Fixed last timestamp in interface charts 2017-07-31 12:50:50 +02:00
artu30 14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
#   pandora_console/include/functions_visual_map_editor.php
#   pandora_console/include/graphs/flot/pandora.flot.js
 2017-07-28 10:30:17 +02:00
vgilc 5f128ed9ce Merge branch '1087-error-in-events-filter-from-agent-events-graph-dev' into 'develop' 
Fixed events filter from agent events graph

See merge request !655
 2017-07-24 13:20:07 +02:00
Daniel Maya f060a2cdd8 Extended number of characters allowed 2017-07-19 16:12:09 +02:00
Arturo Gonzalez e9e10d3a79 Merge branch 'develop' into 618-new-item-auto-sla-graph-in-visual-console-dev 
pandora_console/include/functions_visual_map.php
	pandora_console/include/functions_visual_map_editor.php
 2017-07-18 11:57:13 +02:00
Arturo Gonzalez b4c31df636 Fixed module events graph in vc 2017-07-13 16:57:53 +02:00
Daniel Maya 27077dad6f Resolving conflicts 2017-07-13 15:23:22 +02:00
Arturo Gonzalez 8f2b4fb783 Added more changes to the first version 2017-07-13 13:25:28 +02:00
Arturo Gonzalez 1b766f8ce2 Fixed events filter from agent events graph 2017-07-10 16:22:41 +02:00
vgilc 0fd6d38a6b Merge branch '853-Custom-SQL-que-afecten-a-BDD-de-histórico-enterprise-open' into 'develop' 
Add historical db check to reports template SQL items - #853

See merge request !640
 2017-07-05 11:45:18 +02:00
Arturo Gonzalez b282063325 Added changes to resolve bad history database data 2017-07-03 15:09:31 +02:00
enriquecd e6e993538b Add historical db check to reports template SQL items - #853 2017-07-03 10:38:04 +02:00
Arturo Gonzalez 687e970c8e Fixed more than 6 months charts 2017-06-16 14:42:16 +02:00
Arturo Gonzalez c506c9cce6 Added a condition to small charts 2017-06-13 09:45:08 +02:00
Arturo Gonzalez e237198d06 Added a final fix 2017-06-13 09:26:08 +02:00
Arturo Gonzalez 0af82fd69d Added some code to manage timestamps in chart data 2017-06-12 17:48:42 +02:00
Arturo Gonzalez e3443e044f Added some code to put all data in the chart 2017-06-12 16:39:46 +02:00
Arturo Gonzalez 00ac431216 Added code to manage timestamps in fullscale mode 2017-06-12 13:33:41 +02:00
Daniel Maya 5e099a0da3 added graph colors in dahsboard 2017-06-07 11:43:11 +02:00
artu30 c0a4cd9df5 Merge branch 'develop' into '757-full-scale-graph-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-06-05 09:38:06 +02:00
Arturo Gonzalez 77b5e74343 Added new condition to dashboard and non avg only in simple graphs 2017-06-01 11:24:59 +02:00
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +02:00
enriquecd d33621ffa7 Fill empty data in graphs with last known data, no with nodata point - #937 2017-05-30 16:34:30 +02:00
Arturo Gonzalez 20c205fbc9 Added good styles to graphs 2017-05-24 13:12:47 +02:00
Arturo Gonzalez 4a03298b69 Added unit to module name and recolocate yaxis label 2017-05-24 12:18:43 +02:00
Arturo Gonzalez d744cb9220 Added end date to fullscale chart view 2017-05-23 15:16:34 +02:00
Arturo Gonzalez 53f4c6edb8 Added fullscale setting in boolean chart 2017-05-23 15:15:28 +02:00
Arturo Gonzalez 5bb3cd2ad6 Added some code to fullscale graphs 2017-05-23 15:02:53 +02:00
Arturo Gonzalez 16fe10d1af Added fullscale to boolean charts. Continue with the tests. 2017-05-19 12:04:54 +02:00
Arturo Gonzalez 913aa4334b Save work and continue with more tests 2017-05-18 17:06:49 +02:00
Arturo Gonzalez 8141dac798 Added date format to long periods of time 2017-05-18 17:01:15 +02:00
vgilc eb7514dcd0 Merge branch '700-wrong_format_in_graphs' into 'develop' 
Added new ranges to graph period

See merge request !355
 2017-05-17 17:17:47 +02:00
Arturo Gonzalez 658ff78efb Added homedir lost reference to functions_html 2017-05-08 11:49:54 +02:00
Arturo Gonzalez 41b49770ee Added new ranges to graph period 2017-04-10 11:10:32 +02:00
fermin831 0660d28ed3 Fixed pdf netflow reports 2017-03-23 11:54:04 +01:00
fermin831 e3341ab15f Position watermark inside the static graphs 2017-03-21 12:33:00 +01:00
m-lopez-f ba423c93d8 Only view of system event of user that have admin powers. Gitlab: #455 2017-03-07 16:30:01 +01:00
daniel afecd9f4a4 fixed color in verical graph 2017-03-07 09:10:15 +01:00
daniel 24c4060ab1 fixed last in legend combined graph 2017-03-07 08:37:45 +01:00
enriquecd a0b87859c5 Resize incident by status graph to have similar size to other graphs - #89 2017-03-06 18:11:58 +01:00
daniel ed287b7cdb fixed errors in custom graph with percentile and pdf 2017-03-06 10:01:24 +01:00
Arturo Gonzalez c527aa243b Fixed font size reduction in graphs. Ticket #411 2017-03-02 09:35:28 +01:00
daniel 99bf29b667 fised errors in graph 2017-03-01 14:59:37 +01:00
Alejandro Gallardo Escobar 3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +01:00
m-lopez-f 015890a18a Fixed problems with duplicade color in netflow graphs. Gitlab: #346 2017-02-22 13:08:39 +01:00
Alejandro Gallardo Escobar 6fc884d327 Changed the agent name by its alias in the events sections 2017-02-21 19:07:17 +01:00
Daniel Maya a36e74990d Merge branch 'feature/alias_friendly_name' into 'develop' 
Feature/alias friendly name

See merge request !188
 2017-02-21 16:46:05 +01:00
Arturo Gonzalez cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
Daniel Maya 76cb61f288 Changes for the merge 2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
daniel 40ee2cce0a fixed errors in graphs 2017-02-20 11:13:47 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
 2017-02-16 16:05:21 +01:00
daniel d0faeb3ec1 fixed errors in graphs 2017-02-16 11:18:42 +01:00
Arturo Gonzalez 3976a45e89 Now times under 1 day will be shown in a correct format. Ticket #215 2017-01-31 15:46:56 +01:00
daniel e4f8fa8341 fixed error in legend graph selected 2017-01-20 11:15:50 +01:00
daniel 1b26423867 Merge branch 'develop' into 135-informe-de-eventos-sale-agrupado-int-4330-open 2017-01-18 17:39:04 +01:00
Arturo Gonzalez d3f5a62814 Fixed threshold in interface graphs. Ticket #156 2017-01-17 14:29:42 +01:00
daniel 993bad314d fixed errors in events reports #135 2017-01-11 13:26:50 +01:00
Arturo Gonzalez b683d5d50c Added things to interface thressold. Ticket #4113 2016-12-30 12:56:48 +01:00
daniel 50c9763720 Add percentil dinamic custom graph 2016-12-27 13:10:33 +01:00
daniel e9fc39b53b add percentil dinamic ticket: 4262 2016-12-23 09:36:44 +01:00
daniel b28fe4cef4 Merge branch 'develop' into feature/report_SLA_new 2016-12-14 15:42:18 +01:00