Commit Graph

5460 Commits

Author SHA1 Message Date
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
vgilc 3f7003c6a3 2012-05-30 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  pandoradb.postgreSQL.sql
	  pandoradb.oracle.sql
	  pandoradb_data.sql
	  pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql
	  index.php
	  godmode/users/configure_user.php
	  include/functions_config.php
	  include/auth/mysql.php
	  include/javascript/jquery.pandora.js: Added admin users to password policy
	and added password history.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 12:07:26 +00:00
santimunin 2fdaae4a92 2012-05-30 Santiago Munin <burnin1@gmail.com>
* src/pandroid_event_viewer/pandorafms/EventList.java: Removed unused methods and added two that will set images to the left of some textviews.
	* res/layout/item_list_event_extended.xml: Refactored some linear layouts with textviews and imageviews. Now, it is a single textview with an image on the left.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 11:40:24 +00:00
zarzuelo 6054bf359a 2012-05-30 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php: Added to API a test function
	to test the API connection returning OK when success



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6364 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 09:20:55 +00:00
darode 6b3930c38f 2012-05-30 Dario Rodriguez <dario@artica.es>
* include/functions_reporting.php: Fixed group view,
        unkown agent count was wrong.

	MERGED PANDORA 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6363 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 08:30:40 +00:00
hkosaka 21d67034af 2012-05-30 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/db/db_main.php: Tiny bug fix. The number of log4x
	turns red when tagente_datos (not tagente_datos_log4x) is more
	than the threshold (max_data).


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-30 05:08:22 +00:00
santimunin e89220a11c 2012-05-29 Santiago Munin <burnin1@gmail.com>
*src/pandrod_event_viewer/pandorafms/EventList.java: Now tags are links to their urls (if have).


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6357 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-29 17:11:17 +00:00
hkosaka cd8828798c 2012-05-29 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: added "event_type" to the
	get_events filters. Some fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6355 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-29 08:55:51 +00:00
koichirok 8d39ad6884 2012-05-29 Koichiro Kikuchi <koichiro@rworks.jp>
* util/pandora_db.pl: Don't delete non-initialized modules which
	 belong to disabled agent.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-29 07:12:09 +00:00
slerena 1b166da0b7 2012-05-28 Sancho Lerena <slerena@artica.es>
* godmode/agentes/module_manager_editor_plugin.php: A bit more
	space on IP target field (a URL doesn't fit there!). 

	* include/styles/pandora.css: Plugin description is not shown
	in small font.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6352 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-28 17:19:49 +00:00
vgilc c9519c19db 2012-05-28 Vanessa Gil <vanessa.gil@artica.es>
* extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Update 'tconfig' fields.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6350 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-28 09:22:56 +00:00
jsatoh e10907b164 2012-05-27 Junichi Satoh <junichi@rworks.jp>
* general/pandora_help.php: Fixed i18n translation does not work
	in the help window.

	* include/help/ja/help_main_help.php: Added new general
	introduction help file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6348 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-27 02:20:43 +00:00
santimunin 4b67dbd92f 2012-05-25 Santiago Munín <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Options.java: Added the option to show or hide advanced options (filter view).
	* res/layout/options.xml: Checkbox to select show or hide advanced options.
	* res/layout/main.xml: Show/hide advanced options (layout) and tag filter.
	* res/values/strings.xml: Added new entries.
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java,
	  src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java: Adapted event parsing to Pandora FMS v5 and added the tag filter.
	* src/pandroid_event_viewer/pandorafms/Main.java: Now, removes advanced filter options if "hide advanced options" is selected in options view.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6347 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-25 10:06:48 +00:00
santimunin bd161b233d 2012-05-24 Santiago Munin <burning1@gmail.com>
* include/functions_api.php: Added "group id" and "tag" to the current get_events filters.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6346 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-24 19:37:24 +00:00
santimunin cc941f12c8 2012-05-24 Santiago Munin <burning1@gmail.com>
* pandoradb_data.sql: Fixed a double insert with the same ID value (it was making fail the installation).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6345 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-24 19:19:50 +00:00
mdtrooper 5049a52559 2012-05-24 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/lib/functions.ajax.php: some fixes, and
	exclude the install "install.php" file or "config.php".
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6344 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-24 16:23:42 +00:00
slerena 6bc5fd6409 2012-05-24 Sancho Lerena <slerena@artica.es>
* pandoradb_data.sql: Updated defaults: compact is not enabled by default
	and dbschema version is updated.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6343 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-24 14:55:09 +00:00
mdtrooper bdcf2a595b 2012-05-24 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/lib/functions.php: set the wget method
	by default.
	
	* extensions/update_manager/lib/functions.ajax.php,
	extensions/update_manager/update_pandora.php: cleaned source code
	style.
	
	
	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6341 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-24 09:55:56 +00:00
ramonn 2c35d793da 2012-05-23 Ramon Novoa <rnovoa@artica.es>
* pc: Added to repository. Generic PC agent for Unix/Win32 (still in
	  alpha).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6339 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-23 17:16:32 +00:00
santimunin 7fae54dc69 2012-05-23 Santiago Munín <burning1@gmail.com>
* Core.java: Added a generic function which will serialize given params in order to send an API request.
	* PandroidEventviewerActivity.java, PandroidEventviewerService: Refactorized the serialization of parameters (now, they call Core.java function).


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6338 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-23 09:54:49 +00:00
zarzuelo 266a12316e 2012-05-22 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_common.php: Fixed 
	desactivation of history data when edit a policy module



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6336 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-22 16:28:05 +00:00
santimunin 727ecf76f7 2012-05-22 Santiago Munín <burning1@gmail.com>
* PandroidEventviewerService.java, PandroidEventviewerActivity.java: Added group filter.
	* res/layout/main.xml: Enabled group spinner.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6335 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-22 14:53:15 +00:00
zarzuelo 744c5a0dcd 2012-05-22 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php
	include/ajax/agent.php
	include/functions_io.php
	include/constants.php
	operation/agentes/ver_agente.php
	godmode/groups/group_list.php
	godmode/reporting/reporting_builder.list_items.php
	godmode/reporting/graph_builder.graph_editor.php
	godmode/reporting/reporting_builder.item_editor.php: Change the
	metaconsole error controls to adapt the calls to last changes
	Clean code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6334 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-22 12:23:49 +00:00
slerena 94d081176d 2012-05-22 Sancho Lerena <slerena@artica.es>
* include/functions_ui.php: Added definition for module unknown.

        * operation/agentes/status_monitor.php: unknown modules are always
        drawn in grey. Fixed inconsistent behaviour.

        * images/status_sets/color_text/module_unknown.png: Missing image.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6333 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-22 10:00:21 +00:00
jsatoh 5dcbcaa745 2012-05-22 Junichi Satoh <junichi@rworks.jp>
* operation/messages/message_edit.php,
	operation/messages/message_list.php: Changed words for sender and
	destination.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6330 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-22 02:53:51 +00:00
santimunin 4ed60b307a 2012-05-21 Santiago Munin <burning1@gmail.com>
* EventList.java, PopupValidationEvent.java: Removed references to Core as an object.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6329 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-21 18:07:59 +00:00
zarzuelo a72abd8fc5 2012-05-21 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_alerts.js
	godmode/alerts/configure_alert_action.php: Added descrption of
	the selected command under the combo when select one in 
	the action editor to help user.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6328 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-21 10:28:35 +00:00
vgilc d52f4ce2c3 2012-05-21 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  pandoradb.postgreSQL.sql
	  pandoradb.oracle.sql
	  pandoradb_data.sql
	  pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Added column 'login_blocked'
	to 'tusuario'.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6327 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-21 09:25:52 +00:00