Commit Graph

227 Commits

Author SHA1 Message Date
Daniel Barbero Martin 8eb3a982e1 Fixed error in gauges 2020-06-01 14:48:53 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Daniel Barbero Martin 6ddb501b08 fixed errors VC 2020-01-27 16:15:54 +01:00
Daniel Barbero Martin 5ec8c68aed fixed errors VC 2020-01-24 15:13:42 +01:00
Luis Calvo ca35bb64cc Prepend folder to image to avoid Phar injection 2020-01-22 10:17:35 +01:00
manuel deb217906c Fixed bug in templates 2019-10-22 15:41:13 +02:00
manuel 93bca4673f Fixed bugs in reports 2019-10-09 13:15:07 +02:00
Daniel Barbero Martin c900465546 fixed minor error fgraph 2019-07-17 17:40:49 +02:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
daniel 9bdd1af488 fixed errors in visual console 2018-11-29 13:24:12 +01:00
daniel 81ebfc755e fixed gdgraph 2018-10-19 12:01:22 +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
daniel 1f56054f6c fixed changes php7 2018-10-11 12:57:48 +02:00
enriquecd 632fc26be2 Thermometer graph only for intracom - #2214 2018-06-12 12:39:05 +02:00
daniel f85a8b513a fixed errors 2018-06-08 14:30:15 +02:00
daniel eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
daniel 7834869977 fixed water mark in graphs 2018-06-07 09:15:45 +02:00
daniel badfd83b0d 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
2018-06-06 11:57:02 +02:00
daniel 89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
daniel 25666e1bff fixed errors 2018-05-22 10:50:38 +02:00
daniel b323d524d6 fixed errors in graph update version 2018-05-21 17:25:09 +02:00
daniel 79354a0ebf fixed graphs 2018-05-18 14:22:39 +02:00
enriquecd 734c52d8bd New graph thermometer - #2214 2018-05-04 11:13:26 +02:00
daniel b11e256c8b fixed custom graph 2018-04-27 13:51:13 +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
fbsanchez 835e791ef1 Fixed label shortener in hbar 2018-03-21 13:40:15 +01:00
fermin831 52e6503018 [Vertical Bar Charts] Fixed strpos check 2018-03-01 17:07:55 +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 4719742ba2 [Pie Charts] Maximized the number of elements 2018-03-01 13:19:58 +01:00
fermin831 287d28de4e [Vertical Bar Charts] Preserve order after truncate label 2018-03-01 13:16:36 +01:00
fermin831 d0bf68888e [SQL charts] Fixed SQL vertical chart 2018-03-01 12:02:08 +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 b6798bf31c update flot.js 2018-02-16 13:41:31 +01:00
fbsanchez 958ef2bd38 Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479
Added max/min thresholds to hbar graphs
2017-11-14 10:49:15 +01:00
fbsanchez a42a2ee7e2 Minor changes to allow hbar min/max ranges 2017-11-08 16:41:23 +01:00
Arturo Gonzalez b9b8b37abe Added grid color to bars graph in visual console 2017-11-08 09:55:36 +01:00
enriquecd 2eec3dc766 Fix pdf graph labels 2 - #417 2017-11-07 11:43:42 +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
enriquecd b6d3444212 Fix PDF reports labels - #417 2017-11-06 17:02:54 +01:00
Alejandro Gallardo Escobar 849eba10d4 [Console] Fixed a vulnerability into the 'fgraph.php' script 2017-10-30 18:03:09 +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
vgilc e8a14b6981 Merge branch '1416-new-h-and-v-bar-charts-in-visual-console-dev' into 'develop'
1416 new h and v bar charts in visual console dev

See merge request artica/pandorafms!956
2017-10-26 13:30:52 +02:00
Arturo Gonzalez 1f20247ae3 Added background color to bars charts 2017-10-26 12:24:14 +02:00
enriquecd c04d4ed08e Enable background color options for gauge charts - #1397 2017-10-09 12:03:19 +02:00
enriquecd 3061c35746 Change pchart vertical and horizontal grphs style - #417 2017-09-26 15:39:46 +02:00
daniel ab3cd7dcc0 wux console view 2017-08-17 18:38:12 +02:00
Arturo Gonzalez 09b90be1ca Works in good dashboards module graphs 2017-05-25 10:08:30 +02:00
Arturo Gonzalez 4a03298b69 Added unit to module name and recolocate yaxis label 2017-05-24 12:18:43 +02:00
Arturo Gonzalez 658ff78efb Added homedir lost reference to functions_html 2017-05-08 11:49:54 +02:00
Arturo Gonzalez 629439f271 Added some modifications to adapt um and rr in meta 2017-04-05 10:26:12 +02:00
Daniel Maya f00cf520ce Fixed problem with the module graph type line in the public visual console 2017-03-15 11:43:13 +01:00
daniel 74c8bf5539 fixed errors in custom graph pdf percentil 2017-03-06 15:19:19 +01:00
daniel ed287b7cdb fixed errors in custom graph with percentile and pdf 2017-03-06 10:01:24 +01:00
m-lopez-f b8f6b9fad4 Fixed style of visual mapwidget in dashboards. Gitlab: #374 2017-03-03 12:50:03 +01:00
Arturo Gonzalez c99ff92c86 UX console in progress... (Fixed vcharts) 2017-01-23 17:55:27 +01:00
Arturo Gonzalez d3f5a62814 Fixed threshold in interface graphs. Ticket #156 2017-01-17 14:29:42 +01:00
daniel 50c9763720 Add percentil dinamic custom graph 2016-12-27 13:10:33 +01:00
daniel 9fc797ae9e reports availability and SLA change new function
(cherry picked from commit 7faa1eff1e)
2016-11-30 08:57:17 +01:00
Arturo Gonzalez 2391e7ae78 Added threshold graph to interface monitors graph (Only when monitors have the same warning or critical min value). Ticket #4113 2016-11-28 10:53:05 +01:00
m-lopez-f 2f93fddb6e Add percentil 95 in snmp graphics. internal ticket: 3 2016-10-03 12:48:48 +02:00
m-lopez-f a804040d79 Add label with macros in reports. Ticket: #37 2016-09-12 16:22:58 +02:00
Daniel Maya 203689a5c1 Added new feature. Added font and fotn size in custom graph. Ticket #3316. 2016-09-08 15:44:36 +02:00
m-lopez-f 54c6de6a41 Fixed Pie charts and legend. Tiquet: #3742 2016-06-13 09:00:11 +02:00
m-lopez-f 8aac162cd4 Fixed problems when selected no interactive charts or print pdfs. Tiquet: #3742
(cherry picked from commit d058d096d7)
2016-06-10 11:19:44 +02:00
m-lopez-f b39802b2f1 Revert "Fixed problems when selected no interactive charts or print pdfs. Tiquet: #3742"
This reverts commit cbe624d25b.
2016-06-10 11:16:07 +02:00
m-lopez-f cbe624d25b Fixed problems when selected no interactive charts or print pdfs. Tiquet: #3742
(cherry picked from commit d058d096d7)
2016-06-10 11:15:17 +02:00
Alejandro Gallardo Escobar 4473b42657 Fixed the menu parameter of the area graph function
(cherry picked from commit 52d82bcae1127046b081e157bbb1696bc934bcad)
2016-06-01 15:03:15 +02:00
Alejandro Gallardo Escobar 267290a5dc Improved the graphs behaviour when rendered into the dashboard or the visual console
(cherry picked from commit 20128621395cf381d62f1e1b35064b2fb3a67ac1)
2016-05-30 15:26:29 +02:00
Alejandro Gallardo Escobar 0490a00506 Some visual improvements and an option to hide the labels of the pie graphs
(cherry picked from commit 14127df1dc)
2016-05-26 13:48:08 +02:00
m-lopez-f 09f5f484a8 Add include in functio to fixed problem. 2016-04-18 14:18:44 +02:00
m-lopez-f 7fe0f3aebd Fixed problems with url in public console. Tiquet: #3556
(cherry picked from commit 59fdb8d297)
2016-04-13 18:24:39 +02:00
fermin831 5756d7281e Substituted lines for intervals in modules graphs TICKETS #3392 2016-04-04 10:12:37 +02:00
m-lopez-f 368a96222e Fixed problems with dashboard performance when include users maps. Tiquet: #3438
(cherry picked from commit e3e549cbe8)
2016-03-15 09:26:24 +01:00
m-lopez-f af8b3c6e57 Fixed vertical and horizontal bars when print PDF. Tiquet: #3255 2016-01-25 09:53:05 +01:00
mdtrooper 9710362174 Fixed the hbars for the report exception item. TICKET: #3153
(cherry picked from commit 63566dd3af)
2016-01-13 10:34:33 +01:00
mdtrooper a9f8740320 Fixed the horizontal bars in the dashboard. TICKET: #3157
(cherry picked from commit f2afb2e05f)
2016-01-08 10:47:42 +01:00
m-lopez-f 83938b3e36 Fixed problems with security 2015-11-26 17:59:09 +01:00
m-lopez-f 2cfbe1014f Fixed many errors in custom graphs and this items in dashboard. Tiquet: #2984,part of #2966
(cherry picked from commit 60f0f3378d)
2015-11-25 14:26:02 +01:00
m-lopez-f c72f024610 Add new custom graphs and fixed others graphs.
New graphs:
	Bullet Chart
	Vertical Bars and Horizontal
	Pie
	Gauges
2015-11-04 17:42:45 +01:00
mdtrooper 3cdf73e1ca Now the boolean charts is showed as digital signal charts (added in the pchart engine)
(cherry picked from commit ef85096922)

Conflicts:
	pandora_console/include/graphs/fgraph.php
2015-08-26 16:09:00 +02:00
mdtrooper 6d66bb59b7 Reupload the lost changes in own last cherry pick 2015-08-26 12:03:37 +02:00
Arturo Gonzalez Diaz 596a20b19d Y axis fixed in custom graphs, now show correctly the numeration. Ticket#2578 2015-08-24 13:14:48 +02:00
mdtrooper 63498fdbf7 Added percentile 95º in the stat win of module. TICKET: #2613 2015-08-20 17:55:10 +02:00
mdtrooper 0be8792b01 Killing unicorns and magic numbers. 2015-06-11 20:45:40 +02:00
Alejandro Gallardo Escobar d3151557f7 Now the api can return a string with a module graph encoded in base64 2015-02-06 13:48:59 +01:00
mdtrooper a4c1b8396d Fixed lost parameter background color in flot graphs. TICKET #1306 2014-09-23 13:02:49 +02:00
mdtrooper 56bc6820bc 2014-07-24 Miguel de Dios <miguel.dedios@artica.es>
* operation/snmpconsole/snmp_view.php,
	operation/events/events_list.php, operation/incidents/incident.php,
	extensions/files_repo.php,
	extensions/files_repo/sql/files_repo.postgreSQL.sql,
	extensions/files_repo/functions_files_repo.php,
	extensions/files_repo/files_repo_list.php,
	godmode/agentes/modificar_agente.php,
	godmode/snmpconsole/snmp_alert.php, godmode/db/db_info.php,
	include/functions_graph.php, include/functions_db.php,
	include/db/postgresql.php, include/db/oracle.php,
	include/db/mysql.php, include/functions_update_manager.php,
	include/functions_events.php, include/graphs/functions_flot.php,
	include/graphs/fgraph.php: tiny fixes for the improve the support of
	postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10354 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-24 16:02:06 +00:00
zarzuelo 7e84d8346f 2014-06-13 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/visual_console_builder.editor.js
	include/graphs/fgraph.php
	include/graphs/functions_pchart.php
	include/graphs/pChart/pImage.class.php
	include/functions_visual_map.php
	include/ajax/visual_console_builder.ajax.php
	include/functions_visual_map_editor.php
	include/functions_custom_graphs.php
	include/functions_graph.php: Added option to cusomize the
	background of the graphs in visual consoles for ticket: #886



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10181 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-13 07:53:50 +00:00
mdtrooper 95675f4b5e 2014-03-10 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/flot/pandora.flot.js: fixed the position of buttons
	in the flot area graphs when the graphs are in other pages than
	stat win.
	
	Incident: #560
	
	* operation/agentes/graphs.php, include/graphs/fgraph.php,
	include/graphs/functions_flot.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9542 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-10 15:59:36 +00:00
mdtrooper c72879741b 2013-08-02 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/functions_gd.php, include/graphs/fgraph.php,
	include/functions.php, include/functions_graph.php,
	include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php,
	operation/visual_console/render_view.php: a lot of fixes in the
	visualmap.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8622 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-02 10:53:50 +00:00
mdtrooper 0875fb0af9 2013-07-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php,
	include/javascript/jquery.pandora.controls.js: improved the
	functions to pass the php vars to js, now it supports json.
	
	* include/javascript/d3.v3.js: added this library for to make
	beautiful things.
	
	* include/functions_ui.php, include/graphs/fgraph.php,
	include/javascript/pandora_events.js, include/javascript/pandora.js,
	include/functions_treeview.php,
	include/include_graph_dependencies.php,
	include/functions_categories.php, include/db/postgresql.php,
	include/db/oracle.php, include/db/mysql.php: cleaned source code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8528 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-16 14:13:23 +00:00
mdtrooper 8909befbc7 2013-07-03 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/fgraph.php: change the source code style to make
	more easy the merges with the last branch.
	
	* include/graphs/functions_pchart.php: fixed the water mark for
	pie graph as image.
	
	MERGED FROM THE BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 11:01:53 +00:00
mdtrooper fbb712905a 2013-06-20 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/fgraph.php, include/graphs/functions_pchart.php:
	merged the changes from the branch 4.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-20 11:17:14 +00:00
mdtrooper 2c3bf6ff9a 2013-06-20 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/pChart/pPie.class.php, include/graphs/fgraph.php:
	fixed the htmlentities in the pie chart legend, the border was
	fixed for older commits.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8357 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-20 08:20:11 +00:00
mdtrooper 0a2ac656a5 2013-06-10 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php, include/functions_reporting.php,
	include/graphs/functions_utils.php, include/graphs/fgraph.php,
	include/graphs/functions_pchart.php: fixed the graphs in the
	reports.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8281 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-10 11:13:38 +00:00
zarzuelo 96074ead91 2013-05-23 Sergio Martin <sergio.martin@artica.es>
* include/functions_html.php
	include/styles/pandora_minimal.css
	include/styles/dialog.css
	include/styles/menu.css
	include/styles/jquery-ui-1.10.0.custom.css
	include/functions_events.php
	operation/events/events_list.php
	include/functions_snmp_browser.php
	include/styles/pandora.css: A lot of graphic
	changes including events form and snmp browser
	layout

	* include/ajax/module.php
	include/functions_ui.php
	include/functions.php
	include/functions_agents.php
	include/functions_graph.php
	include/graphs/functions_gd.php
	include/graphs/fgraph.php
	include/functions_reporting.php
	include/functions_filemanager.php
	include/javascript/pandora_snmp_browser.js
	include/functions_treeview.php
	include/constants.php
	index.php
	extensions/net_tools.php
	extensions/pandora_logs.php
	extensions/ssh_gateway.php
	extensions/update_manager/settings.php
	extensions/plugin_registration.php
	operation/incidents/incident.php
	operation/incidents/incident_detail.php
	operation/visual_console/render_view.php
	operation/users/user_edit.php
	operation/reporting/reporting_viewer.php
	operation/reporting/graph_viewer.php
	operation/agentes/datos_agente.php
	operation/agentes/alerts_status.php
	operation/agentes/estado_generalagente.php
	operation/agentes/custom_fields.php
	operation/agentes/estado_agente.php
	operation/agentes/estado_monitores.php
	operation/agentes/agent_fields.php
	operation/agentes/stat_win.php
	operation/servers/recon_view.php
	operation/integria_incidents/incident_detail.php
	operation/netflow/nf_live_view.php
	godmode/groups/configure_group.php
	godmode/groups/configure_modu_group.php
	godmode/groups/group_list.php
	godmode/db/db_refine.php
	godmode/db/db_event.php
	godmode/agentes/module_manager_editor_common.php
	godmode/agentes/fields_manager.php
	godmode/agentes/modificar_agente.php
	godmode/agentes/module_manager_editor.php
	godmode/servers/recon_script.php
	godmode/servers/plugin.php
	godmode/servers/manage_recontask.php
	godmode/servers/modificar_server.php
	godmode/setup/news.php
	godmode/setup/links.php
	godmode/setup/gis.php
	godmode/users/configure_profile.php
	godmode/massive/massive_add_alerts.php
	godmode/massive/massive_delete_profiles.php
	godmode/modules/module_list.php
	godmode/reporting/visual_console_builder.php
	godmode/reporting/map_builder.php
	godmode/reporting/graphs.php
	godmode/tag/tag.php
	godmode/tag/edit_tag.php: Changing the old way of 
	print errors to encapsulated UI function to unify 
	styles

	* images/status_sets/color_text/agent_no_monitors.png
	images/status_sets/color_text/agent_no_monitors_ball.pn
	images/status_sets/color_text/agent_down_ball.png
	images/status_sets/color_text/agent_down.png
	images/status_sets/default/agent_no_monitors.png
	images/status_sets/default/agent_no_monitors_ball.png
	images/status_sets/default/agent_down_ball.png
	images/status_sets/default/agent_down.png: Modify some
	status set images

	* images/gis_map/icons/star.default.png
	images/gis_map/icons/cross.warning.png
	images/gis_map/icons/star.bad.png
	images/gis_map/icons/cross.ok.png
	images/gis_map/icons/marker.default.png
	images/gis_map/icons/square_marker.warning.png
	images/gis_map/icons/circle.warning.png
	images/gis_map/icons/marker.bad.png
	images/gis_map/icons/square_marker.ok.png
	images/gis_map/icons/circle.ok.png
	images/gis_map/icons/triangle.warning.png
	images/gis_map/icons/cross.default.png
	images/gis_map/icons/star.warning.png
	images/gis_map/icons/triangle.ok.png
	images/gis_map/icons/cross.bad.png
	images/gis_map/icons/star.ok.png
	images/gis_map/icons/square_marker.default.png
	images/gis_map/icons/circle.default.png
	images/gis_map/icons/marker.warning.png
	images/gis_map/icons/square_marker.bad.png
	images/gis_map/icons/circle.bad.png
	images/gis_map/icons/triangle.default.png
	images/gis_map/icons/marker.ok.png
	images/gis_map/icons/triangle.bad.png: Change whole the
	gis icons by new ones

	* images/os_icons/so_win.png
	images/os_icons/so_linux.png
	images/os_icons/so_mac.png
	images/os_icons/so_cisco.png
	images/os_icons/so_vmware.png
	images/os_icons/so_bsd.png
	images/os_icons/android.png
	images/os_icons/so_aix.png
	images/os_icons/so_other.png
	images/os_icons/so_hpux.png
	images/os_icons/network.png
	images/os_icons/embedded.png: Reduce the operating 
	system icons size

	* images/vnc.png
	images/op_inventory.png
	images/refresh_mc.png
	images/heart.png
	images/service.png
	images/go.png
	images/graphmenu_arrow_hide.png
	images/submenu_tree_first.png
	images/config_mc.png
	images/cross_double.png
	images/wand.png
	images/expand.png
	images/submenu_tree_middle.png
	images/visual_console.png
	images/down.png
	images/chart_curve_threshold.png
	images/people_1.png
	images/cancel.png
	images/graphmenu_arrow.png
	images/people_2.png
	images/collapse.png
	images/camera_mc.png: Improve a lot of
	icons





git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8198 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-23 15:42:32 +00:00