Commit Graph

5437 Commits

Author SHA1 Message Date
darode d1fdb6d2d1 2012-06-08 Dario Rodriguez <dario.rodriguez@artica.es>
* lib/PandoraFMS/Core.pm: Fixed an error counting 
	unknown agents in groups.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 12:13:26 +00:00
darode ac01678efb 2012-06-08 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_modules.php,
	include/functions_groups.php,
	include/functions_os.php,
	operation/tree.php: Fixed a problem with unknown agent
	counting.
	
	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 12:11:58 +00:00
zarzuelo c636a70be4 2012-06-08 Sergio Martin <sergio.martin@artica.es>
* ChangeLog: Create the android agent change 
	log file



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6454 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 11:52:07 +00:00
juanmanuelr 4608084d21 2012-06-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/reporting_builder.php: Fixed update of custom 
	graph items.
o


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6453 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 11:46:28 +00:00
jsatoh e899a68a77 2012-06-08 Junichi Satoh <junichi@rworks.jp>
* include/functions_config.php, godmode/setup/setup.php: Fixed that
	ACL with API access cannot be removed after once configured. (Merged
	from 4.0.2)
	Fixed multiple recording of list_ACL_IPs_for_API.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6451 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 07:57:53 +00:00
mdtrooper 26aa9f5400 2012-06-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.wizard.php,
	godmode/reporting/visual_console_builder.php: fixed the modules
	name with white spaces...again in Pandora console..
	
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6449 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:43:32 +00:00
darode 023a834036 2012-06-07 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_modules.php,
        operation/tree.php: Improved performance of tree
        view for modules, its not very good but now works...

	MERGED FROM 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:29:00 +00:00
juanmanuelr cda37e3b16 2012-06-07 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/menu.php: Hide not valid sections with metaconsole 
	 activated.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6444 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:25:08 +00:00
juanmanuelr 463f0feb6d 2012-06-07 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora_minimal.css
	 operation/extensions.php
	 operation/menu.php
	 general/header.php
	 godmode/extensions.php: Hide not valid sections with metaconsole 
	 activated.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:22:38 +00:00
darode 3541c59e9a 2012-06-07 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_os.php: Created this file.
        include/functions_groups,
        operation/tree.php: Fixed a bug related to search
        improved performance of OS tab for tree view.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6441 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 11:44:08 +00:00
hkosaka a79d10b28f 2012-06-07 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_ui.php: Merged from 4.0.x: Fixed bug:
	string truncation did not always work for multi-byte
	characters.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 09:54:03 +00:00
darode 3356ea7904 2012-06-07 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php,
	include/functions_groups.php: Fixed some errors and 
	improved performance of group tree view.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6435 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 09:24:05 +00:00
santimunin 358315f7e1 2012-06-06 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/CreateIncidentActivity.java: All api operations are now asynchronous.
	* res/layout/create_incident.xml: Progress circle next to groups spinner.
	* res/values/strings.xml: New entries.
	* res/menu/options_menu_list_events.xml, res/menu/options_menu.xml: New incident icon.
	* res/drawable-ldpi/incident.png: Added new icon


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6432 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 18:34:09 +00:00
santimunin 67a6bb4eac 2012-06-06 Santiago Munin <burnin1@gmail.com>
* Fixed wrong uploads (bin and gen directories).


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 17:21:19 +00:00
santimunin ed4b19a0e9 2012-06-06 Santiago Munin <burnin1@gmail.com>
* AndroidManifest.xml: Added CreateIncidentActivity (new activity).
	* src/pandroid_event_viewer/pandorafms/Core.java: Added some getAgents and getGroups
	* res/values/strings.xml: Added new entries
	* res/values/arrays.xml: Added new entries
	* res/menu/options_menu_list_events.xml, res/menu/options_menu.xml: Added "Incidents" entry
	* res/layout/create_incident.xml: CreateIncidentActivity's layout.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6428 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 17:16:52 +00:00
juanmanuelr 5afc1612a4 2012-06-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/ver_agente.php
	 pandora_console/godmode/alerts/alert_list.builder.php: Fixed alert
	 creation when metaconsole is activated.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6425 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 16:22:37 +00:00
vgilc 0e33d1f857 2012-06-06 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/exportdata.php: Fixed bug:
	If the data type of module is string, don't export the data in format: table, Excel or CSV.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6424 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 16:13:12 +00:00
vgilc 3f6f4d777f 2012-06-05 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_modules.php: Fixed bug: When you
	copy a policy module, still liked to policy.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6420 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 12:07:51 +00:00
vgilc 46c286b8ea 2012-06-06 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/exportdata.php
	  operation/agentes/exportdata.csv.php
	  operation/agentes/exportdata.excel.php: Fixed bug export
	data: If you choose first the type of export, the chosen 
	agent modules are not loaded into the page.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6419 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 12:05:33 +00:00
hkosaka e0fabc8d61 2012-06-06 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/agentes/planned_downtime.php: fixed that 'Affect'
	column at 'planned downtime' may show bad values. cleaned
	source code style.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6417 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 07:55:31 +00:00
darode 75fa702e45 2012-06-05 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Fixed a missing group icons
	
	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6415 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-05 12:49:17 +00:00
juanmanuelr 29ec5ae23a 2012-06-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/ajax/agent.php: Fixed function search_agent when 
	metaconsole is activated an one of the nodes return no agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6412 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 14:18:21 +00:00
vgilc 51730d71f1 2012-06-04 Vanessa Gil <vanessa.gil@artica.es>
* godmode/alerts/alert_list.list.php: Fixed bug: 
	Standard user can not add actions to an alert.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6410 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 13:48:00 +00:00
zarzuelo 4984b4a40b 2012-06-04 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
	include/functions_io.php: Added new safe string function
	to scape strings to use it in regular expressions and
	change the parameters of enterprise functions to be
	compatible con last changes
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 09:05:32 +00:00
vgilc 59f8fc9346 2012-06-04 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/os.list.php: Fixed bug: you can delete
	operating systems defined by default in the installation.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 08:10:26 +00:00
juanmanuelr 54d932a7dd 2012-06-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/min.png
	 images/max.png
	 images/sum.png
	 images/avg.png: Changed operators images in Global wizard report. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6406 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 07:42:34 +00:00
santimunin a8cf523926 2012-06-01 Santiago Munin <burnin1@gmail.com>
* AndroidManifest.xml: Added IncidenList (new activity)
	* src/pandroid_event_viewer/pandorafms/IncidentListItem.java: Added, value object of incidents.
	* src/pandroid_event_viewer/pandorafms/IncidentList.java: New activity. It will show all incidents.
	* src/pandroid_event_viewer/pandorafms/Options.java: Little refactoring.
	* src/pandroid_event_viewer/pandorafms/EventList.java: Deprecated function removed.
	* res/layout/item_list_incident_layout.xml: Layout of IncidentList items.
	* res/values/strings.xml: Added new entries.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6405 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 16:56:35 +00:00
santimunin 24b2e8363a 2012-06-01 Santiago Munín <burnin1@gmail.com>
* Little changes on the whole app: Fixed some Lint errors.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 13:48:48 +00:00
juanmanuelr b57af4bd65 2012-06-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/alerts/alert_list.builder.php: Fixed agent autocomplete
	in alert builder.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6403 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 13:31:52 +00:00
santimunin 54ac6c9231 2012-06-01 Santiago Munin <burnin1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Core.java: Added image setting methods.
	* src/pandroid_event_viewer/pandorafms/EventList.java: Removed image setting methods.
	* res/layout/item_list_event_layout.xml: Removed not needed ImageViews.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6401 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 12:30:33 +00:00
juanmanuelr 9135d9dece 2012-06-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/massive/massive_edit_modules.php: Fixed group recursion 
	checkbox in massive module edition.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 11:12:39 +00:00
santimunin 11d52ed0b7 2012-06-01 Santiago Munín <burnin1@gmail.com>
* src/pandroid_event_viewer/pandorafms/EventList.java: Now Agent's link points to mobile console.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6398 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 10:33:11 +00:00
zarzuelo c47e3b2037 2012-06-01 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_edit_modules.php: Added units to
	module massive editor and missed help bubble in the same
	editor to post process field
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6397 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 07:49:08 +00:00
mdtrooper 76c436f15f 2012-05-31 Miguel de Dios <miguel.dedios@artica.es>
* mobile/include/user.class.php: added option to get from url a
	"autologin" with the user and the password for this action.
	
	* mobile/index.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6395 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-31 21:31:11 +00:00
santimunin 5b016b25d1 2012-05-31 Santiago Munín <burnin1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Core.java: Added a method which performs http petitions.
	* src/pandroid_event_viewer/pandorafms/EventList.java: Added javadoc comments.
	* src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java,
	  src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java,
	  src/pandroid_event_viewer/pandorafms/Main.java,
	  src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java: Changed api request (now they use Core's new method).


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-31 20:11:56 +00:00
santimunin fd56b777ff 2012-05-31 Santiago Munín <burnin1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Main.java: Now, on MainActivity's restart, fetches groups and tags if url was changed.
	* src/pandroid_event_viewer/pandorafms/Options.java: Puts a boolean in SharedPreferences if url was changed.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6393 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-31 17:34:45 +00:00
santimunin 7d8cae5db3 2012-05-31 Santiago Munín <burnin1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Main.java: Added tag retrieving.
	* res/layout/main.xml: Added tags' spinner.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6392 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-31 17:19:05 +00:00
santimunin 6e9ce11f3e 2012-05-31 Santiago Munin <burning1@gmail.com>
* include/functions_tags.php: Added a method to get all tags.
        * include/functions_api.php: Added de get_tags api call. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6391 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-31 17:03:03 +00:00
juanmanuelr 821806dc75 2012-05-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/graphs/functions_pchart.php
	 include/graphs/pChart/pDraw.class.php: Graphs with all data equal 
	 to zero are displayed correctly.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6390 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-31 14:37:34 +00:00
juanmanuelr 07a341d4c2 2012-05-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/reporting_builder.php: Fixed error updating 
	report items (agent and module were lost if you update item report).
	
	Merged bugfix from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6388 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-31 12:22:44 +00:00
ramonn a05ae1593b 2012-05-31 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/WMIServer.pm: Merged from 4.0 branch. Hide wmic error
	  messages and improved error checking.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6386 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-31 11:29:33 +00:00
vgilc 9013a6a540 2012-05-31 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/agent_template.php: Fixed bug: adding
	modules to an agent with templates, if the agent already had
	modules can be duplicated with the same name.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-31 10:22:18 +00:00
zarzuelo 81dec672fb 2012-05-31 Sergio Martin <sergio.martin@artica.es>
* extensions/system_info.php: Fixed strange behavior in
	the system info form for bug 3530863




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6382 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-31 10:18:35 +00:00
slerena ab85d4e95a 2012-05-30 Sancho Lerena <slerena@artica.es>
* include/functions_reporting.php
	include/functions_groups.php: Group/tactical stats
	are now done with functins in function_group. This
	method is also used in the server for the batch
	stats system.

	* operation/agentes/estado_ultimopaquete.php: Fixed
	view on non-init policy modules, shown in the data tab.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6379 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 17:20:55 +00:00
juanmanuelr 5c94c720ac 2012-05-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/export_csv.php: Fixed csv events exportation 
	query.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6378 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 17:16:11 +00:00
slerena 7f63fc295a 2012-05-30 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/Core.pm: Updated batch statistic queries to get
        information about groups. SQL code taken from new functions in
        functions_group.php. Unified criteria to calculate information.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6377 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 17:15:25 +00:00
ramonn 81314e350f 2012-05-30 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Merged from unix agent. Check for valid regular
	  expressions before adding module conditions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6374 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 16:56:26 +00:00
ramonn cf3ce03383 2012-05-30 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Merged from 4.0 branch. Check for valid regular
	  expressions before adding module conditions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6373 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 16:51:23 +00:00
zarzuelo 327acb02ca 2012-05-30 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php: Duplicate the operations
	too when duplicate a synthetic module for bug 
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6371 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 16:46:02 +00:00
zarzuelo 0481da12bf 2012-05-30 Sergio Martin <sergio.martin@artica.es>
* include/constants.php: Add new error control
	constant to connection errors



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 15:20:50 +00:00