Commit Graph

5444 Commits

Author SHA1 Message Date
slerena e243e7c19f 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 005f6f40ce 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 f42cec7299 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
Ramon Novoa 7f1d4177df 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
Ramon Novoa 6cfbb4205a 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 77771b13ec 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 72ae46344b 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 e193f5a2c2 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 e9a8e26a7e 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 d0831d8d37 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 3a7a821b7a 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 6968fad2db 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 2a29945239 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 652dee3801 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 f313e1a1e2 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 e5ca336684 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 0f66156cc4 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 fcfab78247 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 28f0284bc3 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 3efaf75d3d 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 a644407f47 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 00cd77d75d 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 c4dfd7a5bd 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 88bea5da55 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
Ramon Novoa 954488bd1a 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 02ebde436f 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 78657a6d18 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 64f1128125 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 d777cd8f94 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 3cdf47e5b6 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 6a4ec7eeae 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 a3973324f4 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 5fd61467d8 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 76d5c92db2 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
zarzuelo 3ba8291166 2012-05-21 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.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 
	new alert command for validate events to the database
	schemma and migration scripts



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6326 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-21 09:03:25 +00:00
zarzuelo a24f7ed111 2012-05-21 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Added new Internal Command for
	actions to validate the events of one module given 
	the agent name (field1) and the module name (field2)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6325 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-21 08:40:53 +00:00
koichirok 0fcd6f8641 2012-05-21 Koichiro Kikuchi <koichiro@rworks.jp>
* util/pandora_db.pl: Merged from 4.0.2: Set default DB port
	 number when it's not specified in the configuration file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6324 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-21 06:37:12 +00:00
santimunin da297ec58e 2012-05-19 Santiago Munin <burning1@gmail.com>
* AlarmReceiver.java: Removed. Now it's the service which will retrieve data.
	* Core.java: The method of setting periodically data retrieval was changed. 
				 Now, the AlarmManager will launch the Service instead of BroadcastReceiver.
	* PandroidEventviewerService.java: Every time it receives a call from the AlarmManager, will search for new events.
	* Most of files have little changes to adapt the new data retrieval subsystem.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6322 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-19 00:18:05 +00:00
koichirok 9437651954 2012-05-18 Koichiro Kikuchi <koichiro@rworks.jp>
* godmode/agentes/configurar_agente.php: Merged from 4.0: Added
	 missing io_safe_input to the module copy operation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6321 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-18 06:56:20 +00:00
santimunin ef54999b54 2012-05-17 Santiago Munín <burning1@gmail.com>
* Core.java: Changed methods to static. 
	
	* Main.java,
	  PandroidEventviewerService.java,
	  Core.java, Options.java,
	  EventList.java
	  PandroidEventviewerActivity.java: Instances of "Core" removed.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6319 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-17 21:34:03 +00:00
zarzuelo f6088d2d33 2012-05-17 Sergio Martin <sergio.martin@artica.es>
* install.php: Fixed number of step mistakes
	in the install process
	Merged from 4.0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6318 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-17 16:05:13 +00:00
zarzuelo b7d52a2503 2012-05-17 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php: Added create_network_module_from_component 
	operation to API



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6314 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-17 13:41:54 +00:00
vgilc 8519fab723 2012-05-17 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/setup.php: Fixed bug updating setup.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6313 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-17 12:00:42 +00:00
vgilc 9cc02bfaf5 2012-05-17 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/javascript/jquery.pandora.js: Added password policy.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6312 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-17 11:08:11 +00:00
koichirok ad1e473094 2012-05-17 Kikuchi Koichiro <koichiro@rworks.jp>
* extensions/update_manager/settings.php,
	  extensions/update_manager/main.php: Merged from 4.0.2: Added missing
	 dbport parameter to um_db_connect() call.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6311 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-17 11:04:02 +00:00
zarzuelo 22ffc92411 2012-05-17 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Added --create_network_module_from_component
	option to CLI passing component and target agent names



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6308 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-17 09:42:52 +00:00
zarzuelo c6cb4ba961 2012-05-16 Sergio Martin <sergio.martin@artica.es>
* include/constants.php: Added a constants for
	more common used colors in pandora: critical, 
	warning, normal, unknown...

	* extensions/agents_alerts.php: Added new view of
	agents/alerts for pending tasks #3468889



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6304 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-16 14:52:49 +00:00
darode 9b096f7a4a 2012-05-16 Dario Rodriguez <dario.rodriguez@artica.es>
* util/pandora_xml_stress.conf: Fixed a wrong default configuration file
	for pandora_xmk_stress

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-16 04:59:22 +00:00
juanmanuelr add0143e94 2012-05-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora.css: Added transparent background in input
	html elements of image type.
	
	Bugfix merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6301 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-14 16:12:27 +00:00
zarzuelo 9fb2b683d8 2012-05-14 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/estado_ultimopaquete.php
	godmode/agentes/module_manager.php: Added string filter
	to modules view in the operation and godmode views for
	pending #3482262



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6299 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-14 14:24:29 +00:00