Commit Graph

138 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle
Conflicts resolved:
	pandora_console/include/functions_reporting.php
2015-05-19 19:16:35 +02:00
mdtrooper 73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
2015-05-06 17:02:40 +02:00
Alejandro Gallardo Escobar a98be1cad9 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 17:28:42 +02:00
m-lopez-f 6241ae13d6 Add new option, when is active data of modules type is proc, show ok or fail. Tiquet: #1996 2015-05-04 15:44:37 +02:00
Alejandro Gallardo Escobar 3264c65ef8 Fixed some problems with oracle compatibility 2015-04-30 12:35:42 +02:00
m-lopez-f 0df919dcdd Fixed order data to click in show data module in tree view,tiquet: #2080 2015-04-16 15:18:11 +02:00
mdtrooper f84863540f Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs). 2015-04-10 00:58:24 +02:00
mdtrooper 2646d92b86 Added the function 'modules_is_disable_agent' and fixed the show disabled agents in reports into items 'general' 'sla'.
(cherry picked from commit cf9c53f220)
2015-03-16 11:59:11 +01:00
Ramon Novoa df651810d4 Added support for password encryption to the Pandora FMS Console. 2015-03-02 17:30:19 +01:00
mdtrooper ea8662c7bc Fixed the connection to node in metaconsole when show the data module dialog. TICKET: #1870
(cherry picked from commit eea8e0d8ae)
2015-03-02 11:41:32 +01:00
mdtrooper 609802eb44 Fixed the string module data in reports of items 'general'. #1819 2015-02-23 15:13:21 +01:00
m-lopez-f f9e378d1d6 Fixed problem with call function and not send all variables 2015-01-29 16:41:28 +01:00
m-lopez-f d2238434f0 Fixed problem in tree view to metaconsola, not open popup
(cherry picked from commit 33bf0a4e7b)
2015-01-28 11:29:51 +01:00
mdtrooper 45a4880ec6 Added modules in the treeview 2014-12-19 18:13:47 +01:00
mdtrooper b42d643968 Finish the working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
Alejandro Gallardo Escobar e89565e760 Modified a bunch of functions to choose when the history db should be used and when not 2014-10-22 12:00:14 +02:00
mdtrooper 58fc774564 Added function 'modules_get_agent_group' 2014-10-20 16:45:47 +02:00
mdtrooper 25bed01edb Fixed the update the tags. Ticket # 1417 2014-10-07 13:48:48 +02:00
mdtrooper 0963cda9fb 2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php: killed some unicorns and magic
	numbers into the function "modules_get_status".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 12:58:21 +00:00
mdtrooper ce3b41c0da 2014-05-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php,
	include/functions_networkmap.php: added the filters for the
	CIDR network masks.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9994 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-23 14:42:55 +00:00
mdtrooper a65a494f7f 2014-05-07 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php, include/functions_networkmap.php: clean
	source code style.
	
	* include/functions_modules.php: added function
	"modules_get_interfaces".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9881 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-07 17:15:48 +00:00
mdtrooper e3f38440d3 2014-03-01 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php, operation/agentes/exportdata.php:
	fixed the export data from modules with string data.
	
	Incident: #707




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9695 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-01 13:50:58 +00:00
mdtrooper b4305d7b9a 2014-03-20 Miguel de Dios <miguel.dedios@artica.es>
* images/group_green.disabled.png, images/group_green.png,
	extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql,
	extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
	extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/agentes/configurar_agente.php, include/styles/pandora.css,
	include/functions_networkmap.php, include/functions_agents.php,
	include/functions_visual_map_editor.php,
	include/functions_modules.php, include/functions_groups.php,
	include/constants.php, include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php, pandoradb.sql,
	pandoradb.postgreSQL.sql, pandoradb.oracle.sql: added the feature to
	show the item for groups in visualmap.
	
	Incident: #671




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-20 16:43:42 +00:00
alexhigh 5fe4fbf696 2014-03-19 Alejandro Gallardo <alejandro.gallardo@artica.es>
* pandoradb_data.sql,
	  pandoradb.data.oracle.sql,
	  pandoradb.data.postgreSQL.sql: Deleted an old link
	and updated the link to the Pandora FMS documentation.

	* pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql:
	Added the column "l2_network" to the table "tnetwork_map".

	* godmode/agentes/module_manager_editor_common.php:
	Added a help tip to a column of relations.

	* include/functions_modules.php: Improved the function
	"modules_relation_exists".

	* operation/agentes/networkmap.topology.php,
	  include/functions_networkmap.php,
	  operation/agentes/networkmap.php: Added a new option
	to show the relations between the agents interfaces.

	* operation/agentes/estado_monitores.php: Added a tooltip
	to show the relations of a monitor in the monitor list.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9618 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-19 16:43:08 +00:00
alexhigh a2a6875091 2014-03-18 Alejandro Gallardo <alejandro.gallardo@artica.es>
* pandoradb.data.oracle.sql,
	  pandoradb.data.postgreSQL.sql,
	  pandoradb.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql:
	Added the table "tmodule_relationship".

	* operation/agentes/estado_generalagente.php: Added a
	new table to show the network interfaces of the agent.
	Minor fixes.

	* include/styles/pandora.css: Added properties for the
	class transparent'.

	* include/ajax/module.php: Fixed an error and added code
	to retrieve a module autocomplete input or add, remove
	or update a module relation via ajax.

	* include/functions_modules.php: Added the functions
	"modules_get_relations", "modules_relation_exists",
	"modules_add_relation", "modules_delete_relation" and
	"modules_change_relation_lock".
	
	* godmode/agentes/module_manager_editor_common.php:
	Added a table and control to show, add or delete
	relations with other modules. Added the javascript
	functions "change_modules_autocomplete_input",
	"add_new_relation", "change_lock_relation" and
	"delete_relation".

	* godmode/agentes/module_manager_editor.php: Added a
	line to show the module relations table and control.

	* godmode/agentes/module_manager_editor_network.php:
	Minor fix.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9610 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-18 11:49:33 +00:00
zarzuelo 1e6b6b5776 2014-02-07 Sergio Martin <sergio.martin@artica.es>
* include/functions_visual_map.php
	include/functions_modules.php
	include/functions_agents.php
	include/constants.php: Add code to new "status"
	Warning fired in visual maps
		
	* mobile/operation/agent.php: Fix first time charge
	of code that set same size to both boxes in agent view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9413 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-07 11:29:20 +00:00
mdtrooper a3a82671ee 2014-01-22 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.item_editor.php,
	include/constants.php, include/functions_reporting.php: added
	constants and killed magic numbers and unicorns.
	
	* include/functions_modules.php: added function
	"modules_get_modules_in_group".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-22 12:52:43 +00:00
jsatoh 410fe3d471 2013-12-01 Junichi Satoh <junichi@rworks.jp>
* include/functions_modules.php: Corrected agent counting by module
	group.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9148 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-01 02:17:12 +00:00
jsatoh f7b2255a6c 2013-11-27 Junichi Satoh <junichi@rworks.jp>
* include/functions_modules.php: Fixed that some multibyte characters
	are recognized as invalid characters on module creation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9135 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-27 04:43:14 +00:00
mdtrooper 94765e927f 2013-10-25 Miguel de Dios <miguel.dedios@artica.es>
* godmode/massive/massive_copy_modules.php,
	include/functions_modules.php: fixed the module massive copy from
	agent with remote configuration to agent without remote
	configuration and with a network module.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8957 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-25 10:15:50 +00:00
mdtrooper 9039157070 2013-10-16 Miguel de Dios <miguel.dedios@artica.es>
* godmode/massive/massive_delete_modules.php,
	include/functions_modules.php: fixed the delete modules with
	conf from the massive operations.

2013-10-16 Miguel de Dios <miguel.dedios@artica.es>

	* pandoradb_data.sql,
	extensions/update_manager/sql/update_manager.sql,
	extensions/update_manager/sql/update_manager.postgreSQL.sql,
	extensions/update_manager/sql/update_manager.oracle.sql,
	extensions/system_info.php, pandoradb.data.postgreSQL.sql,
	pandoradb.data.oracle.sql, extras/pandora_diag.php: removed the
	unused path to keygen.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8924 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 10:30:35 +00:00
mdtrooper f132f1eeab 2013-09-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php: made more easy the merge with the
	last branch.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8810 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-25 09:36:12 +00:00
juanmanuelr e5ef147fa8 2013-09-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_modules.php: Module name checking 
        for invalid characters added at creation time.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8780 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-18 13:39:29 +00:00
Ramon Novoa ca1a5f2160 2013-09-05 Ramon Novoa <rnovoa@artica.es>
* extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
	  extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
	  extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  godmode/agentes/configurar_agente.php,
	  godmode/agentes/agent_template.php,
	  godmode/agentes/module_manager_editor_common.php,
	  godmode/agentes/module_manager_editor.php,
	  include/functions_modules.php,
	  pandoradb.sql: Added support for module macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8747 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 16:46:21 +00:00
mdtrooper c90f5ff7ff 2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php: fixed the massive copy modules
	between agents.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8705 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-28 09:16:19 +00:00
mdtrooper 9492e6bcc6 2013-08-27 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.postgreSQL.sql, pandoradb.oracle.sql,
	godmode/agentes/module_manager_editor.php,
	godmode/agentes/module_manager_editor_common.php,
	godmode/agentes/configurar_agente.php,
	godmode/massive/massive_edit_modules.php,
	godmode/modules/manage_network_components_form_common.php,
	godmode/modules/manage_network_components.php,
	include/functions_events.php, include/functions.php,
	include/javascript/pandora_modules.js,
	include/functions_network_components.php,
	include/functions_modules.php, include/constants.php, pandoradb.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql: first version of
	disabled unknown events for modules, now it is implemented in
	modules, massive operations and components, but it is necesary in
	local component, policy,  api, cli, pandora server and recond task.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8701 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-27 13:05:30 +00:00
hkosaka 59a8bc9c60 2013-08-19 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/agentes/module_manager_editor.php,
	godmode/agentes/agent_manager.php,
	godmode/agentes/modificar_agente.php,
	include/functions_agents.php,
	include/functions_modules.php: Added missing enterprise_hook()
	wrapper calls.

	MERGED FROM branch4.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8674 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-19 06:43:12 +00:00
zarzuelo aa1bc58e0d 2013-08-02 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php: Fix modules and 
	alerts count when delete modules massively



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-02 10:48:30 +00:00
mdtrooper b373b23340 2013-08-01 Miguel de Dios <miguel.dedios@artica.es>
* enterprise/godmode/agentes/agent_disk_conf_editor.php,
	enterprise/godmode/agentes/collection_manager.php,
	enterprise/godmode/policies/policy_agents.php,
	enterprise/include/functions_collection.php,
	enterprise/include/functions_policies.php,
	enterprise/include/functions_config_agents.php,
	enterprise/operation/agentes/collection_view.php: fixed and unified
	the code to access the remote config.
	
	MERGED FROM BRANCH PANDORA_4




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8619 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-01 16:20:36 +00:00
zarzuelo e4a9035497 2013-07-24 Sergio Martin <sergio.martin@artica.es>
* include/functions_visual_map.php
	include/functions_agents.php
	include/functions_modules.php
	include/functions_reporting.php
	include/constants.php
	operation/agentes/status_monitor.php
	operation/agentes/estado_agente.php
	operation/agentes/estado_monitores.php
	mobile/operation/agents.php
	mobile/operation/modules.php
	godmode/agentes/module_manager.php: Fix typo
	errors on few constants

	* operation/tree.php: Fix status check for 
	async not init modules to set the status in
	modules branch of tree view. Now it depends on
	the server



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8564 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-24 11:06:24 +00:00
zarzuelo 1615c31696 2013-07-24 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
	include/functions_reporting.php
	operation/agentes/estado_monitores.php
	operation/search_agents.php: Fixed several errors on
	module status counts for bug #2338



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8563 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-24 10:27:13 +00:00
mdtrooper 8d66b9247c 2013-07-10 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components.php: improved the source
	code style.
	
	* include/functions_modules.php: added lost function
	"modules_get_type_id".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8503 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-10 08:46:51 +00:00
mdtrooper 0137d5e2d9 2013-05-21 Miguel de Dios <miguel.dedios@artica.es>
* operation/search_main.php, operation/search_agents.getdata.php:
	changed the source code, now it uses the page size to show the
	agents in first page, fixed the list of icons, now show graphs and
	set in correct english this icons. And added a footpage in the list
	of agents to show if it is all or not.
	
	Fixes: #2227
	
	* include/constants.php: erased constants to count agents to show
	in the search.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8175 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-21 10:17:51 +00:00
mdtrooper 0fd149893e 2013-05-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_incidents.php, include/api.php,
	include/functions.php, include/functions_modules.php,
	include/graphs/flot/pandora.flot.js, include/functions_cron.php,
	include/functions_graph.php: improved the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8140 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-16 09:19:16 +00:00
zarzuelo d36d4a52e8 2013-04-26 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css: Fix aesthetical issues

	* include/functions_modules.php: Mark as needy to calculate
	the module status count in an agent when disable/enable one of
	his modules. The part of server to avoid disabled modules in
	counts was made by ramon. BUG #3611683

	* godmode/users/configure_user.php: Fix warnings due the 
	latest fields added to database schemma

	* images/blank.gif: Add a missed image

	* godmode/agentes/agent_template.php: Fix a little feedback
	bug on template application and add category id to the 
	fields copied from components to modules when apply a template



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8068 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-04-26 12:19:58 +00:00
mdtrooper c12c553e44 2013-03-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php: fixed the notices PHP.
	
	Fixes: #3607807




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7848 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-13 14:28:52 +00:00
mdtrooper 13f69122e9 2013-03-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php: fixed the massive deletion of
	modules when only delete one module, the old code deleted all
	modules in the agents on operation.
	
	* godmode/massive/massive_delete_modules.php: cleaned source code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7845 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-13 12:59:29 +00:00
mdtrooper 7a1ff1e9c3 2013-03-05 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php: improved the style.
	
	* include/functions_reporting.php: fixed into the function
	"reporting_get_agentmodule_sla_array" when have one data of a
	module.
	
	Fixes: #3606811




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7789 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-05 18:04:33 +00:00
mdtrooper ae38902834 2013-03-05 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor.php,
	godmode/netflow/nf_item_list.php, include/functions_reporting.php,
	include/functions_modules.php, include/functions_snmp_browser.php,
	include/functions_agents.php, operation/tree.php,
	operation/reporting/reporting_xml.php: improved source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7778 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-05 10:34:29 +00:00
zarzuelo 87c7345eb4 2013-03-04 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php
	include/functions_modules.php
	include/functions_reporting.php
	include/functions_servers.php: Fix counts when validate or
	delete alerts and fix some little bugs of previous commits



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7775 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-04 18:16:00 +00:00