Commit Graph

6897 Commits

Author SHA1 Message Date
mdtrooper c783d677cd 2013-06-25 Miguel de Dios <miguel.dedios@artica.es>
* operation/users/user_edit.php: merge the code for made more
	easy the merges from the branch.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8398 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-25 11:20:13 +00:00
mdtrooper 53f98c65b3 2013-06-25 Miguel de Dios <miguel.dedios@artica.es>
* extensions/vnc_view.php: added the changes from the branch of
	pandora_4 made for Sancho.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8396 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-25 10:45:01 +00:00
mdtrooper 15bab6193f 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* operation/visual_console/render_view.php: fixed the javascript
	draw lines when there is any error in the map.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-25 10:11:26 +00:00
ramonn c85826ec7c 2013-06-25 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: When concatenating IP addresses, do not
	  output a comma unless the IP can be parsed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8390 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-25 09:53:04 +00:00
mdtrooper c49369dab8 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: added more changes for to make
	more easy the merges from the branch.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8389 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-25 09:34:12 +00:00
mdtrooper 9c2d9f9146 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: fixed the links of module
	graphs into public visualmap.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8387 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-24 13:58:37 +00:00
mdtrooper 3c4fdb0b21 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php,
	operation/agentes/status_monitor.php: fixed the links to the items
	that represents modules.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8385 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-24 13:43:49 +00:00
mdtrooper 61dd7402a4 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js: fixed the
	removed the relantionship between items.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-24 12:42:47 +00:00
mdtrooper b281382fa3 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js: fixed the
	moving the lines when the item is a graph.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8380 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-24 11:49:57 +00:00
ramonn 307788383b 2013-06-24 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/ReconServer.pm: Merged from 4.0 branch. Fixed a call
	  to get_agent_from_addr that prevented parents from being properly
	  detected.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8378 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-24 11:07:21 +00:00
mdtrooper 0bb6eaa9d0 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php: fixed the color of
	lines in the editor.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8376 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-24 10:39:47 +00:00
mdtrooper a78937a5eb 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js,
	godmode/reporting/visual_console_builder.editor.php,
	include/functions_visual_map_editor.php: changed the code to show
	the list of parent in the select, now this selectbox doesn't show
	the same item.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8374 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-24 10:11:37 +00:00
mariopulido87 7cbf41b007 2013-06-20 Mario Pulido <mario.pulido@artica.es>
*include/help/es/help_module_tokens.php
        include/help/en/help_module_tokens.php:Added new help



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-20 15:14:17 +00:00
mdtrooper b5904ecbcc 2013-06-20 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/functions_pchart.php: fixed the graphs with all
	values in negative Y axis. Now it shows correct.
	
	Fixes: #2302
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-20 12:59:22 +00:00
mdtrooper 5a612bcfbe 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 db6e54e6ad 2013-06-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/modificar_agente.php: fixed the filter of the
	list of agents. The branch 4 runs fine.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-20 09:21:28 +00:00
mdtrooper bbeacf6a50 2013-06-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/events/events.php, operation/netflow/nf_live_view.php:
	fixed the hook to call a enterprise function.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8360 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-20 09:00:44 +00:00
ramonn de1978c8db 2013-06-20 Ramon Novoa <rnovoa@artica.es>
* windows/winevt.h: Added to repository. Headers for Wevtapi.dll.

	* modules/pandora_module_logevent.cc,
	  modules/pandora_module_logevent.h,
	  pandora_strutils.cc,
	  pandora_strutils.h: Added support for the new XML based eventing model
	  introduced in Windows Vista.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8358 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-20 08:37:35 +00:00
mdtrooper 253cd8f5c9 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
jsatoh 09127c7f8a 2013-06-20 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_alerts_config.php: Added a new help.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8355 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-20 06:58:51 +00:00
mariopulido87 7ebd9d824e 2013-06-19 Mario Pulido <mario.pulido@artica.es>
*godmode/alerts/alert_list.php,
	godmode/alerts/configure_alert_template.php,
	godmode/alerts/alert_templates.php,
	godmode/alerts/configure_alert_action.php,
	godmode/alerts/configure_alert_command.php,
	godmode/alerts/alert_actions.php,
	godmode/alerts/alert_commands.php,
	include/help/en/help_event_alert.php,
	include/help/en/help_alerts_config.php,
	include/help/es/help_event_alert.php,
	include/help/es/help_alerts_config.php,
	include/help/ja/help_event_alert.php,
	images/help/alert01.png,
	images/help/alert02.png,
	images/help/alert03.png,
	images/help/alert04.png,
	images/help/alert05.png,
	images/help/alert06.png,
	images/help/alert07.png,
	images/help/alert08.png,
	images/help/alert09.png,
	images/help/event01.png,
	images/help/event02.png,
	images/help/event03.png,
	images/help/event04.png,
	images/help/alert10.png,
	images/help/alert11.png,
	images/help/alert12.png,
	images/help/alert13.png,
	images/help/alert14.png,
	images/help/alert15.png,
	images/help/alert16.png: Added new helps



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-19 16:28:30 +00:00
hkosaka 59ddf0fb07 2013-05-22 Hirofumi Kosaka <kosaka@rworks.jp>
* pandoradb.sql: (workaround to avoid mysql's warning
	'Specified key was too long; max key length is 767 bytes'
	(warning code=1071).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8350 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-19 09:53:28 +00:00
mdtrooper 5650007350 2013-06-19 Miguel de Dios <miguel.dedios@artica.es>
* util/pandora_xml_stress.pl: fixed the send across tentacle, now
	when it can not send the file almost the log have a error entry.
	And added local send method.
	
	* util/pandora_xml_stress.conf: added confs for local send method.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8349 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-19 08:53:56 +00:00
mdtrooper bec330faaf 2013-06-18 Miguel de Dios <miguel.dedios@artica.es>
* operation/menu.php: showed the message entry in workspace menu for
	all users.
	
	* include/functions_groups.php: added filters into the function
	"groups_get_users" for to avoid to get user without perms.
	
	* operation/messages/message_edit.php: fixed the ACL for to
	destination users.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8347 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-18 11:38:54 +00:00
ramonn 83c36c5201 2013-06-18 Ramon Novoa <rnovoa@artica.es>
* include/functions.php: Fixed a warning.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8345 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-18 09:57:11 +00:00
mdtrooper fa4b41f437 2013-06-18 Miguel de Dios <miguel.dedios@artica.es>
* operation/incidents/incident.php,
	operation/incidents/incident_detail.php: fixed to set the SYSTEM as
	user for the incident.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8344 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-18 09:48:57 +00:00
mdtrooper 2dc972cbcd 2013-06-18 Miguel de Dios <miguel.dedios@artica.es>
* operation/snmpconsole/snmp_view.php: fixed the urls and forms to
	set the filters.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8342 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-18 08:16:50 +00:00
mdtrooper 9b57dc11e8 2013-06-17 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/networkmap.php: fixed to create networkmaps
	with the same name (for example users with diferent groups ACL).
	
	Fixes: #2285
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8339 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-17 13:36:33 +00:00
mdtrooper 002cf78783 2013-06-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_action.php,
	godmode/alerts/alert_commands.php: fixed the duplicated the rows
	and did'nt hide the macros field rows.
	
	Fixes: #2294




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8337 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-17 12:33:34 +00:00
mdtrooper cd25df8283 2013-06-17 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php: fixed in the function "get_snmpwalk" the
	lost global $config var.
	
	Fixes: #2295




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8335 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-17 06:57:25 +00:00
mdtrooper ad7c4c8760 2013-06-14 Miguel de Dios <miguel.dedios@artica.es>
* extensions/plugin_registration.php: fixed the url of module
	library and now show ever the form to upload more plugins.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8332 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-14 12:14:22 +00:00
ramonn 1f9829dfde 2013-06-14 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_logevent.h,
	  modules/pandora_module_logevent.cc: Merged from 4.0 branch. Improved
	  the reading of log event descriptions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8330 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-14 10:58:24 +00:00
zarzuelo c8c5ed5199 2013-06-14 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Fixed comments addition in the
	events with the internal action Create Pandora FMS event



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8328 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-14 10:47:26 +00:00
ramonn 237902d689 2013-06-13 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Merged from 4.0 branch. Quote the XML data file name
	  before trying to send it.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8322 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-13 15:10:53 +00:00
zarzuelo 2cd487cd81 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
mdtrooper 2d7ccc0c15 2013-06-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_snmp.php: changed the PHP function to execute
	command and now get the error string or return true if it runs fine.
	
	* godmode/snmpconsole/snmp_trap_generator.php: show the error when
	fail to call snmptrap, and show error when occurs.
	
	Fixes: #2270
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8318 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-13 14:27:18 +00:00
slerena 233963865f 2013-06-13 SAncho Lerena <alerena@artica.es>
* pandora_server.redhat.spec: Fixed some path permissions.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8315 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-13 11:58:30 +00:00
mariopulido87 422360b0a0 2013-06-13 Mario Pulido <mario.pulido@artica.es>
* images/help/actions.png,
        godmode/alerts/configure_alert_action.php,
        include/help/en/help_alert_config.php,
        include/help/es/help_alert_config.php: Add help in alert action.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8313 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-13 11:47:20 +00:00
mdtrooper 6a33bac77e 2013-06-13 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_manager.php: fixed the show server as none
	when this server is not exist.
	
	Fixes: #2264
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8312 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-13 11:41:56 +00:00
mdtrooper c59decdbc9 2013-06-12 Miguel de Dios <miguel.dedios@artica.es>
* extensions/insert_data.php: fixed the label of notice about the
	directory data_in.
	
	Fixes: #2271
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8309 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-12 16:47:16 +00:00
mdtrooper 1cfafe95e5 2013-06-12 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: fixed the empty serialize vars.
	
	Fixes: #2276

	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8307 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-12 16:36:46 +00:00
mdtrooper e0782a7522 2013-06-12 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: fixed the empty serialize vars.
	
	Fixes: #2276
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8305 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-12 16:09:10 +00:00
mdtrooper 13c6d0e3e0 2013-06-12 Miguel de Dios <miguel.dedios@artica.es>
* operation/tree.php: improved the source code style.
	
	* include/functions_networkmap.php: remove the link in metaconsole
	node and set the color.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-12 14:43:08 +00:00
mariopulido87 9be74b0865 2013-06-12 Mario Pulido <mario.pulido@artica.es>
* pandoradb.data.postgreSQL.sql,
        pandoradb.data.oracle.sql,
        pandoradb_data.sql: Repair windows bug in "Restart Agent" action



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8302 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-12 13:22:21 +00:00
ramonn 92555eed2d 2013-06-12 Ramon Novoa <rnovoa@artica.es>
* util/pandora_db.pl: Message logging abstraction layer and several
	  improvements.

	* lib/PandoraFMS/DB.pm: Removed debugging code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8299 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-12 13:00:48 +00:00
mdtrooper d267b07bcd 2013-06-12 Miguel de Dios <miguel.dedios@artica.es>
* util/pandora_xml_stress.pl: cleaned source code style.
	
	* pandora_server.redhat.spec: added the directories of collections
	and remote configuration into the list of chmod perms.
	
	Fixes: #2290
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8298 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-12 12:16:44 +00:00
slerena 87267de112 2013-06-12 Sancho Lerena <slerena@artica.es>
* extensions/plugin_registration.php: Added link to file manager
        to upload plugin files using the file manager.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8295 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-12 11:52:20 +00:00
mariopulido87 8482869838 2013-06-12 Mario Pulido <mario.pulido@artica.es>
* pandoradb.data.postgreSQL.sql,
	pandoradb.data.oracle.sql,
        pandoradb_data.sql: Change path in command alert.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8294 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-12 10:29:17 +00:00
zarzuelo 22d12afb44 2013-06-11 Sergio Martin <sergio.martin@artica.es>
* include/functions_ui.php: Added node access control to
	alerts view in metaconsole

	* operation/tree.php
	operation/events/events.build_table.php: Visual fixes



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8291 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-11 15:51:28 +00:00
mdtrooper 6b6c417b46 2013-06-11 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/events_list.php, operation/events/events.php:
	fixed the free text search when there is characters as "(".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8289 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-11 13:40:36 +00:00