Commit Graph

6988 Commits

Author SHA1 Message Date
zarzuelo 4480476589 2013-07-05 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/PluginServer.pm: Fixed subst_alert_macros assignation
	to variable.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8482 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 10:15:41 +00:00
Ramon Novoa a2e554f5dd 2013-07-05 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Exported subst_alert_macros. Added support
	  for an arbitrarily large number of _snmp_fx_ macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8481 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 09:56:08 +00:00
Ramon Novoa cf2afde6fd 2013-07-05 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/PluginServer.pm: Added agent and module macros to
	  plugins.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8480 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 09:45:47 +00:00
hkosaka 5d63aa4876 2013-07-05 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/alerts/alert_list.builder.php: Small changes. Make
	alert action list sorted (in the same order of extra action
	list that appears at the defined alert list)

	Merged from branch 4.0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8479 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 09:12:07 +00:00
hkosaka 264604e8de 2013-07-05 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/alerts/alert_list.builder.php: When creating new
	alert, wrong action might be assigned to the alert (if you had
	some deleted actions in the past).

	Merged from branch 4.0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8477 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 08:28:48 +00:00
mdtrooper 5d128c6788 2013-07-04 Miguel de Dios <miguel.dedios@artica.es>
* mobile/include/style/images/*,
	mobile/include/style/jquery.mobile-1.3.1.css,
	mobile/include/javascript/jquery.js, 
	mobile/include/javascript/jquery.mobile-1.3.1.js: added the
	jquery mobile, and made some changes in the css.
	
	* mobile/include/style/main.css, mobile/operation/agents.php,
	mobile/include/ui.class.php: some fixes.
	
	MERGED FROM THE BRANCH 4.0.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8474 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-04 16:55:39 +00:00
mdtrooper e278d705e4 2013-07-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: fixed include javascript in the
	static image for boolean module graph.
	
	* mobile/operation/module_graph.php,
	mobile/operation/modules.php,
	mobile/include/style/main.css: a lot of fixes in mobile.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8472 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-04 13:41:47 +00:00
Ramon Novoa 846b4a12c2 2013-07-03 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Assign default values to the _snmp_fx_ macros
	  from variable bindings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8469 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 17:26:27 +00:00
mdtrooper 13c8e650ed 2013-07-03 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/events.php, mobile/operation/module_graph.php,
	mobile/operation/modules.php, mobile/operation/networkmaps.php,
	mobile/operation/groups.php, mobile/operation/agents.php,
	mobile/operation/tactical.php, mobile/operation/networkmap.php,
	mobile/operation/alerts.php, mobile/operation/agent.php,
	mobile/include/ui.class.php: added the back button in the head and
	impoved the source code style to make more easy the merges with
	the last branch.
	
	* include/functions_graph.php: fixed PHP notices.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 13:59:38 +00:00
zarzuelo fe45fdf449 2013-07-03 Sergio Martin <sergio.martin@artica.es>
* godmode/snmpconsole/snmp_alert.php: Fixed malfunction of the
	macros javascript in snmp alert editor



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8467 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 13:08:56 +00:00
mdtrooper 2dbe9c1697 2013-07-03 Miguel de Dios <miguel.dedios@artica.es>
* mobile/include/style/main.css: some fix for the module list
	when it is embedded in agent view, now it is show in Android but
	I need work more for to show in the jobs fashion gadget.
	
	* mobile/operation/networkmaps.php: fixed to avoid
	unused the javascript for mobile.
	
	MERGED FROM THE BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8466 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 12:09:23 +00:00
Ramon Novoa aeeaf21ad2 2013-07-03 Ramon Novoa <rnovoa@artica.es>
* pandora_agent.redhat.spec: Make absolute calls to chkconfig. Add the
	  service before enabling it.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 11:41:25 +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 696f14235b 2013-07-03 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/networkmap.php: fixed the scroll for browser
	upper that microshit IE and equal as browser of Android 2.2.
	
	MERGED FROM THE BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8460 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 10:19:31 +00:00
zarzuelo 4c9b5aefb2 2013-07-03 Sergio Martin <sergio.martin@artica.es>
* include/functions_config.php
	include/help/en/help_custom_logo.php
	include/help/es/help_custom_logo.php
	include/help/ja/help_custom_logo.php
	images/custom_logo/sourceforge.jpg
	images/custom_logo/pandora_logo_head.jpg
	images/custom_logo/artica_logo.png
	images/custom_logo/sourceforge.png
	images/custom_logo/pandora_logo_head.png
	images/custom_logo/none.jpg
	images/pandora_header_logo_enterprise.png
	images/pandora_header_logo.png
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
	general/header.php: Change the old system of custom logo
	to be used in the unique logo (left side) of Pandora FMS 5
	Bug #2241




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 10:15:25 +00:00
mdtrooper 97e47d8bc7 2013-07-03 Miguel de Dios <miguel.dedios@artica.es>
* mobile/index.php, mobile/operation/networkmaps.php,
	mobile/operation/networkmap.php, mobile/operation/home.php,
	mobile/include/ui.class.php, include/functions_networkmap.php,
	include/functions_ui.php: uploaded the some changes and files
	for to show networkmaps in the Pandora mobile.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 08:50:50 +00:00
mdtrooper 051ef6b82f git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8454 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f 2013-07-03 07:51:19 +00:00
zarzuelo 036b675f78 2013-07-03 Sergio Martin <sergio.martin@artica.es>
* godmode/users/configure_user.php: improve the meta
	setup screen hidding assigned server field when the
	agent management is not checked



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8453 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 07:40:27 +00:00
mdtrooper fb136060cf 2013-07-03 Miguel de Dios <miguel.dedios@artica.es>
* AndroidManifest.xml: fixed small warning.






git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8452 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 07:38:37 +00:00
zarzuelo a1655972a6 2013-07-02 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php: Changed the way of encode
	data configuration in create/update config form API



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8450 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-02 15:38:49 +00:00
mdtrooper 5e31fc574b 2013-07-02 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php,
	operation/agentes/networkmap.topology.php,
	operation/agentes/networkmap.groups.php,
	operation/agentes/networkmap.php: improved the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8448 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-02 09:44:10 +00:00
zarzuelo c25815d031 2013-07-02 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_modules.js: Fixed deprecated way
	of activate a select option from jquery for bug #2299



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-02 08:49:39 +00:00
Ramon Novoa 3851224d18 2013-07-01 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Resolve numeric ids to strings before writing
	  events to an external log file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8444 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-01 17:03:36 +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
Ramon Novoa 4d1adc96cc 2013-07-01 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/Core.pm,
	  conf/pandora_server.conf.new: Added support for writing events to an
	  external log file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8442 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-01 14:05:44 +00:00
mdtrooper 00bf47e9e5 2013-07-01 Miguel de Dios <miguel.dedios@artica.es>
* godmode/menu.php, include/functions_menu.php: fixed the entry
	gis map in ACL enterprise.
	
	* index.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8441 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-01 11:01:20 +00:00
zarzuelo 684fa26079 2013-07-01 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.sql: Added to default actions 
	some default values to avoid confusion in a clean installation



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8438 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-01 09:24:41 +00:00
Ramon Novoa baeb96bd38 2013-07-01 Ramon Novoa <rnovoa@artica.es>
* build_vars.sh: Use absolute paths.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-01 09:14:00 +00:00
mdtrooper 5bf1f2216f 2013-06-27 Miguel de Dios <miguel.dedios@artica.es>
* godmode/servers/plugin.php, godmode/setup/file_manager.php,
	include/functions_filemanager.php: added the filemanager to server
	plugin, and of course change the code for to make this feature.
	
	MERGED FROM THE BRANCH PANDORA_4_0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-27 11:42:53 +00:00
slerena ca47644a7f 2013-06-26 Sancho Lerena <slerena@artica.es>
* util/plugin/pandora_loadgen.pl,
        util/plugin/ssh_pandoraplugin.sh: Fixed small problems with
        plugins provided as sample.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8420 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-26 16:21:36 +00:00
mdtrooper d1f0582c4d 2013-06-26 Miguel de Dios <miguel.dedios@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: added the new
	columns in the table "talert_snmp".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8418 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-26 10:57:28 +00:00
Ramon Novoa cbe6067fc6 2013-06-26 Ramon Novoa <rnovoa@artica.es>
* pandora_console.spec,
	  pandora_console.redhat.spec: Fixed directory permissions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8417 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-26 10:46:33 +00:00
Ramon Novoa ae4fcf7b9d 2013-06-26 Ramon Novoa <rnovoa@artica.es>
* pandora_agent.redhat.spec,
	  pandora_agent.spec: Fixed directory permissions



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8416 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-26 10:45:22 +00:00
Ramon Novoa 1d043d4acf 2013-06-26 Ramon Novoa <rnovoa@artica.es>
* pandora_server.redhat.spec,
	  pandora_server.spec: Fixed directory permissions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8414 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-26 09:22:10 +00:00
mdtrooper b6d9a31ce0 2013-06-26 Miguel de Dios <miguel.dedios@artica.es>
* Linux/pandora_agent.conf: restored the remote_config as disabled
	for to avoid problems.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8413 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-26 08:22:39 +00:00
mdtrooper 822e2ef03e 2013-06-26 Miguel de Dios <miguel.dedios@artica.es>
* bin/pandora_agent.conf: restored the remote_config as disabled
	for to avoid problems.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8412 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-26 08:18:29 +00:00
slerena a415ff7507 2013-06-25 Sancho Lerena <slerena@artica.es>
* Linux/pandora_agent.conf: new defaul values (inventory enabled,
        remote config enabled).




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-25 16:07:30 +00:00
slerena 5b6d1823db 2013-06-25 Sancho Lerena <slerena@artica.es>
* bin/pandora_agent.conf: removed old references to ODBC feature
        not supported anymore. New defaults (inventory, remote config and
        IP detection now by default).




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-25 16:04:51 +00:00
mdtrooper 6b5dc3bc6b 2013-06-25 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/configurar_agente.php,
	include/functions_agents.php: fixed the operations with the ip or
	ips adress of agent.
	
	MERGED FROM THE BRANCH PANDORA_4_0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-25 14:44:40 +00:00
mdtrooper 84d47d8e9d 2013-06-25 Miguel de Dios <miguel.dedios@artica.es>
* godmode/menu.php: fixed the default value for refresh in the
	extensions.
	
	Fixes: #2310
	
	* include/functions_extensions.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8402 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-25 13:30:13 +00:00
mdtrooper d1a999334f 2013-06-25 Miguel de Dios <miguel.dedios@artica.es>
* operation/users/user_edit.php: fixed the "home page" for user,
	now it does show ugly 0, show correct the dashboard and
	visualmap and can set other.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-25 12:58:03 +00:00
mdtrooper 3ce3bb7921 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 c855e455cf 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 e11dca6754 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
Ramon Novoa cb31a08927 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 e744f8c1ef 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 fd94ce7699 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 82fd0c13cd 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 05832082b5 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 ee63531a03 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