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

120 Commits

Author SHA1 Message Date
daniel 45743e2dc5 Merge branch 'develop' into 1335-Configurar_graficas_full_scale_por_defecto 2017-10-06 08:37:56 +02:00
daniel e032f40525 fixed minor error TIP 2017-09-26 12:03:00 +02:00
daniel 4ec6b4e053 add new select to setup for TIP 2017-09-26 11:53:57 +02:00
vgilc e250e0eeae Revert "Merge branch '1196-Time-range-en-gráficas-de-módulo-dev' into 'develop'" 
This reverts merge request !722
 2017-08-09 09:27:06 +02:00
Daniel Maya 032995fc83 Disabled select for not admins 2017-08-08 14:59:30 +02:00
Arturo Gonzalez ec2872b83b Added second check to period field in module charts (admin have diferent field name) 2017-06-21 16:41:31 +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 913aa4334b Save work and continue with more tests 2017-05-18 17:06:49 +02:00
m-lopez-f 9e1b467850 new changes in graphs 2017-03-17 13:30:11 +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 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
daniel e9fc39b53b add percentil dinamic ticket: 4262 2016-12-23 09:36:44 +01:00
m-lopez-f 3b0344298c Revert "Fixed problems with double pandora in servers. Ticket: #3557" 
This reverts commit e7021d8a0f.
 2016-11-18 13:01:13 +01:00
daniel e80a76901b add new option visual setup for show only average in graphs or min and max ticket: 4076 2016-11-14 16:30:44 +01:00
m-lopez-f e7021d8a0f Fixed problems with double pandora in servers. Ticket: #3557 2016-11-07 09:12:58 +01:00
Daniel Maya 54dcadfe33 changed agent name by alias in visual console,custom reports,view events and csv files. 2016-09-29 13:09:50 +02:00
Alejandro Gallardo Escobar 3686b60ba5 Reduced the width of the graph to avoid the horizontal overflow. Ticket #3778 
(cherry picked from commit 3daf59701a)
 2016-06-07 14:48:44 +02:00
Alejandro Gallardo Escobar 057b3cfcdc Now avg_only is enabled by default in stat_win.php and errors fixed. Ticket #3778 
(cherry picked from commit 8000b55a68)
 2016-06-06 17:01:51 +02:00
Arturo Gonzalez b7de284180 Fixed graph event position in modules graph when resizes the window. Ticket#3070 2015-12-31 12:04:23 +01:00
Arturo Gonzalez Diaz 5c1fdcde8a Fixed "avg only" in module graphs. Ticket #2740 2015-10-07 11:52:27 +02:00
mdtrooper 63498fdbf7 Added percentile 95º in the stat win of module. TICKET: #2613 2015-08-20 17:55:10 +02:00
Arturo Gonzalez Diaz 0eb68ef9cb Added icon to module graph. 2015-08-17 15:11:04 +02:00
Arturo Gonzalez Diaz 435b7381de Fixed broken image in module graph (meta). Ticket #2574 2015-08-17 14:54:04 +02:00
Alejandro Gallardo Escobar 34f56c5f47 Now the module graph popup shows a control to set the start time 
Also added date and time pickers
 2015-08-10 17:04:53 +02:00
mdtrooper 9ad8b1035c Tiny feature, the slide form to config chart in the module chart window adapt to the height of window. 2015-06-11 20:19:50 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
m-lopez-f df065fb10d Fixed problems with title when open graph in status monitor in meta and nodo, tiquet: #2077 2015-04-21 09:06:05 +02:00
m-lopez-f eb803c3ff2 Remove debug trace 2015-04-20 15:32:12 +02:00
m-lopez-f a454a16c57 Fixed error when open graph in tree view and monitor view. tiquet: #2126 2015-04-20 15:30:16 +02:00
m-lopez-f 5be63acffc Fixed html title when click graph in meta and nodo in status monitor, tiquet: #2077 2015-04-07 16:26:57 +02:00
Alejandro Gallardo Escobar 481addb514 ACL improvements 2015-03-24 19:10:09 +01:00
Alejandro Gallardo Escobar 7b2f02571c Now the metaconsole can show the graphs of their nodes 2015-03-23 19:51:59 +01:00
Alejandro Gallardo Escobar bc6495412e Minor fixes 2015-03-13 14:41:47 +01:00
Ramon Novoa df651810d4 Added support for password encryption to the Pandora FMS Console. 2015-03-02 17:30:19 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
mdtrooper a70fc62af0 Fixed typo error in stat_win.php. 2014-11-25 14:30:30 +01:00
mdtrooper 631f0ee2b7 Fixed the lost hash user in the links from metaconsole to the nodes. 2014-11-25 11:07:41 +01:00
mdtrooper 38d352ebe1 Fixed the limits of warnings/critical (the line) that freezed the legend. Ticket #1287 2014-10-01 11:18:03 +02:00
zarzuelo d1789ba232 2013-12-12 Sergio Martin <sergio.martin@artica.es> 
* include/graphs/functions_flot.php
	include/graphs/flot/pandora.flot.js
	include/javascript/pandora.js
	include/styles/pandora.css
	operation/agentes/stat_win.php: A lot of fixes on the
	javascript graphs to be shown correctly in IE. Tested
	and working fine on IE9 with compatibility mode on.
	Incident: #417



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9216 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-12-12 14:49:36 +00:00
mdtrooper 3a215820c1 2013-10-14 Miguel de Dios <miguel.dedios@artica.es> 
* include/graphs/flot/pandora.flot.js,
	include/graphs/functions_flot.php, operation/agentes/stat_win.php:
	fixed the charts with negative values and a flot type.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8906 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-14 11:48:51 +00:00
zarzuelo c5f4c6d913 2013-07-22 Sergio Martin <sergio.martin@artica.es> 
* operation/agentes/stat_win.php: Change the order of jquery
	include file to avoid errors



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8553 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-07-22 12:34:46 +00:00
zarzuelo 3ff6dc86f1 2013-07-01 Sergio Martin <sergio.martin@artica.es> 
* include/functions_graph.php
	operation/agentes/stat_win.php: Fix string type graph colors
	and data. Fix the "Avg only" option because is forced to "true".
	Bug: 2284



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-07-01 15:41:40 +00:00
zarzuelo a8b5fada07 2013-06-13 Sergio Martin <sergio.martin@artica.es> 
* include/functions_ui.php: Fix layout issue

	* operation/events/events.build_table.php: Hide checkbox column
	in read only view

	* operation/events/events_list.php: Hide save filter button
	when user has only ER ACLs permission

	* general/login_page.php: Fix width and height of the 
	login error modal win

	* operation/agentes/stat_win.php: Enable the show events
	filter in replication mode when show local events is enabled



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8320 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-06-13 15:03:07 +00:00
zarzuelo c38ad22f0b 2013-06-10 Sergio Martin <sergio.martin@artica.es> 
* include/styles/jquery-ui-1.10.0.custom.css
	include/styles/pandora.css
	include/ajax/events.php
	include/functions_graph.php
	include/functions_events.php
	include/functions_networkmap.php
	include/functions_netflow.php
	operation/tree.php
	operation/events/events.build_table.php
	operation/reporting/reporting_viewer.php
	operation/agentes/status_monitor.php
	operation/agentes/stat_win.php
	operation/netflow/nf_live_view.php
	images/header_refresh_disabled.png
	images/image_problem_data.png
	images/input_pdf.png
	images/input_delete.png
	general/header.php
	godmode/users/user_list.php
	godmode/events/event_edit_filter.php
	godmode/events/event_responses.list.php
	godmode/events/events.php: Fix a lot of aesthetic issues and other
	little fixes



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8283 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-06-10 16:15:36 +00:00
zarzuelo 7953e4612a 2013-05-27 Sergio Martin <sergio.martin@artica.es> 
* godmode/agentes/module_manager_editor_common.php: Fixed
	creation of data modules for bug #2240

	* godmode/servers/plugin.php
	include/javascript/pandora_modules.js
	godmode/agentes/module_manager_editor_plugin.php: Fixed
	the tips of the macros help and change the input of macro
	help from input to a textarea

	* include/functions_html.php
	include/styles/dialog.css
	include/styles/menu.css
	include/styles/jquery-ui-1.10.0.custom.css
	include/styles/pandora.css
	include/javascript/pandora_events.js
	operation/users/user_edit.php
	operation/agentes/stat_win.php
	images/event_responses.png
	images/filter_mc.png
	images/sort_down.png
	images/tick.png
	images/pandora.ico
	images/tick_off.png
	images/pandora.ico.gif
	images/star.png
	images/sort_up.png
	godmode/setup/setup_general.php: A lot of visual
	improvements



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8213 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-05-27 15:16:54 +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
mdtrooper d3d36ae09e 2013-05-16 Miguel de Dios <miguel.dedios@artica.es> 
* operation/agentes/stat_win.php: disabled show events when the
	pandora node is set replication events.
	
	Fixes: #2216
	
	* operation/events/events.php: improve the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8139 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-05-16 08:58:18 +00:00
mdtrooper 84d628326f 2013-05-16 Miguel de Dios <miguel.dedios@artica.es> 
* ajax.php: fixed PHP warning when the HTTP_REFERER not set.
	
	* godmode/agentes/module_manager_editor_prediction.php,
	include/functions_ui.php, operation/agentes/ver_agente.php,
	operation/agentes/stat_win.php: improved the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8137 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-05-16 08:23:51 +00:00