Commit Graph

5060 Commits

Author SHA1 Message Date
ramonn 74aedbda44 2012-01-24 Ramon Novoa <rnovoa@artica.es>
* DEBIAN/make_deb_package.sh,
	  pandora_server_installer,
	  pandora_server.spec: Auto-create the netflow storage dir.

	* bin/pandora_server: Aesthetic changes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5418 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 18:46:00 +00:00
ramonn 821ee50be2 2012-01-24 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/PredictionServer.pm,
	  lib/PandoraFMS/Core.pm,
	  bin/pandora_server: Added support for enterprise netflow modules.

	* lib/PandoraFMS/PluginServer.pm: Run plugins inside eval to avoid
	  server crashes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5417 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 17:16:56 +00:00
ramonn 037c9c54a9 2012-01-24 Ramon Novoa <rnovoa@artica.es>
* include/functions_config.php,
	  include/functions_netflow.php,
	  pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  operation/netflow/nf_live_view.php,
	  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,
	  godmode/agentes/module_manager_editor_prediction.php,
	  godmode/agentes/configurar_agente.php,
	  godmode/menu.php,
	  godmode/netflow/nf_edit_form.php: Added support for enterprise
	  netflow modules.

	* godmode/netflow/nf_manage.php: Moved to
	  godmode/setup/setup_netflow.php.

	* godmode/netflow/nf_option_form.php: Removed from repository. Not used.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5416 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 17:11:12 +00:00
javilanz ac3c96cab4 2010-01-24 Javier Lanz <javier.lanz@artica.es>
* godmode/massive/massive_delete_modules.php: Fixed a small entities
	bug. Added io_safe_output


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5415 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 14:55:00 +00:00
juanmanuelr 141e5dd424 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb.sql
	 pandoradb.postgreSQL.sql
 	 pandoradb.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: Modified
	 tagente table.
 	
	* operation/agentes/estado_generalagente.php
	 operation/agentes/url_address.php
	 operation/agentes/ver_agente.php
	 godmode/agentes/agent_incidents.php
	 godmode/agentes/configurar_agente.php
	 godmode/agentes/agent_manager.php: Added url_address functionality.

	Pending task: #3472445



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 18:36:22 +00:00
ramonn 1950f614e7 2012-01-23 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php: Aesthetic fixes to netflow report
	  tables.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 18:20:30 +00:00
ramonn 9faeefd0a4 2012-01-23 Ramon Novoa <rnovoa@artica.es>
* operation/menu.php,
	  operation/netflow/nf_live_view.php,
	  godmode/netflow/nf_edit_form.php,
	  godmode/netflow/nf_item_list.php,
	  godmode/netflow/nf_report_item.php,
	  godmode/netflow/nf_report_form.php,
	  godmode/netflow/nf_edit.php: Multiple improvements to netflow live
	  view and report and filter edition.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 18:17:52 +00:00
juanmanuelr 7ea01805e4 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php: Removed Php warning in function 
	agents_get_agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5406 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 17:08:45 +00:00
juanmanuelr e1ea2d84ce 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php
	 operation/incidents/incident.php
	 operation/incidents/incident_detail.php
     operation/agentes/ver_agente.php
	 godmode/agentes/agent_incidents.php
	 godmode/agentes/configurar_agente.php: Added the possibility to add
	 agent to an incident and added new tab in agent view if the agent
	 has incidents associated.
  
	 * pandoradb.postgreSQL.sql
	 pandoradb.oracle.sql
	 pandoradb.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: modified 
	 table tincidencia.
	 
	 Pending task: # 3472447
	 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5405 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 17:01:00 +00:00
vgilc 7d6ab5a944 2012-01-23 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/estado_agente.php
	  include/functions_agents.php: Simplify code estado_agente
	and fix bug in search filter.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 16:28:22 +00:00
ramonn 9e60e3f19e 2012-01-23 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql, pandoradb.sql,
	  pandoradb.data.postgreSQL.sql,
	  pandoradb.data.oracle.sql,
	  godmode/netflow/nf_manage.php: Added netflow daemon configuration
	  options.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5403 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 15:37:45 +00:00
hkosaka df0a86c6bd 2012-01-23 Hirofumi Kosaka <kosaka@rworks.jp>
* util/pandora_manage.pl: Fixed mismatch arguments call of
	pandora_create_template_module.

	* lib/PandoraFMS/Core.pm: Fixed misleading comment about
	pandora_create_template_module function signature.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5401 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 10:45:47 +00:00
juanmanuelr be2b4b7d10 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Modified get_policy_modules function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 09:03:57 +00:00
koichirok 3ed66be052 2012-01-23 Koichiro Kikuchi <koichiro@rworks.jp>
* include/functions_servers.php: Exclude modules which belong to
	  disabled agent from server performance and lag calculation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5399 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 08:05:35 +00:00
juanmanuelr 0ddeab6b4c 2012-01-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Modified get_all_agents function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5398 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 07:52:43 +00:00
ramonn 2009c60047 2012-01-20 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php,
	  operation/menu.php,
	  operation/netflow/nf_view.php,
	  godmode/netflow/nf_report_item.php: Netflow live view support and small
	  fixes.

	* operation/netflow/nf_live_view.php: Added to repository: Netflow live view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5397 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-20 13:14:09 +00:00
juanmanuelr 271f3df593 2012-01-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Modified in parameters in 
	update_modules functions (network, data, snmp and plugin).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5396 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-20 12:23:17 +00:00
zarzuelo 01339015a6 2012-01-20 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Fixed some typos and
	help



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5395 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-20 10:55:18 +00:00
zarzuelo 8c30786c39 2012-01-20 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	util/pandora_manage.pl: Added new options to CLI
	managing conf files and updating agents...



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-20 08:52:17 +00:00
juanmanuelr cc4bbbc2a5 2012-01-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php
	 include/functions_agents.php
	 include/functions_alerts.php: New functionality for the Api.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5393 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-19 17:45:59 +00:00
ramonn 9ab9ae3784 2012-01-19 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_odbc.cc: Check for NULL pointers.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5392 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-19 12:38:36 +00:00
zarzuelo 8d1d6d5eec 2012-01-18 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Add option to CLI to 
	get all policies or the policies with a given agent



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5389 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-18 12:25:03 +00:00
vgilc 76f4f1d68d 2012-01-18 Vanessa Gil <vanessa.gil@artica.es>
* operation/reporting/reporting_viewer.php: Check that the date range
	entered is correct.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5388 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-18 11:56:14 +00:00
zarzuelo 65fdb2b5f0 2012-01-18 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Added new options to
	CLI as get agent modules, get policy modules, 
	validate alerts, and more



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5387 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-18 11:21:59 +00:00
vgilc f5eb6a24f0 2012-01-18 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php
	  operation/agentes/estado_monitores.php: Counter modified to ignore
	disabled modules.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5386 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-18 10:09:58 +00:00
jsatoh f4d2c55dec 2012-01-18 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_pcap_filter.php: Added a new help file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5385 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-18 08:36:14 +00:00
juanmanuelr 9fc7ff50a5 2012-01-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_network_components.php
	 include/functions_api.php: Added new functions to Api.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5384 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 20:20:45 +00:00
ramonn 51ebd92b2b 2012-01-17 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php: Clean \r and \n from advanced
	  filters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 15:37:50 +00:00
ramonn cff11f680b 2012-01-17 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php, include/functions_netflow.php,
	  godmode/netflow/nf_edit_form.php, pandoradb.sql,
	  pandoradb.postgreSQL.sql, pandoradb.oracle.sql: Added suport for
	  custom filters. Small fixes.

	* include/help/en/help_pcap_filter.php,
	  include/help/es/help_pcap_filter.php: Added to repository. Nfdump
	  filter syntax help files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5382 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 14:01:49 +00:00
zarzuelo 81af81be97 2012-01-17 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Added option to add all
	policy to application queue in CLI. Organize help
	by categories



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5381 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 13:10:54 +00:00
juanmanuelr 1cb3751ba8 2012-01-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Added new functions add_agent_policy,
	add_data_module_policy, add_network_module_policy, 
	add_snmp_module_policy and add_plugin_module_policy to Api.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5380 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 12:08:53 +00:00
koichirok a89a1c093f 2012-01-17 Koichiro Kikuchi <koichiro@rworks.jp>
* pandora_server.redhat.spec: Fixed a wrong dependency. RHEL has a
	  net-snmp-perl, not a perl-SNMP.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5378 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 10:50:37 +00:00
vgilc 985083d10d 2012-01-17 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php
	  extensions/module_groups.php: Fixed bug: sql error in
	extension "Module Groups" and popup alert.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5376 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 10:20:53 +00:00
zarzuelo 0cb5d0bc62 2012-01-17 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Added the option
	exec_from_file to import CSV data. Fixed create_user
	option entities



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5375 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 09:30:52 +00:00
zarzuelo 55d5d8ed49 2012-01-16 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm: Added a missed safe input in
	the get_agent_module_id function

	* util/pandora_manage.pl: Added options to update a 
	field of a data, network, plugin or snmp module



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5374 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 14:55:55 +00:00
vgilc 19c0857a48 2012-01-16 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_item_list.php
	  godmode/netflow/nf_report_item.php: Changed name items.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5373 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 14:34:25 +00:00
vgilc df67d27eaf 2012-01-16 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/estado_monitores.php: Fixed bug: count in the group
	mode is not well done because ignore the disabled modules.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5372 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 14:24:20 +00:00
vgilc 0fd88fd3c6 2012-01-16 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit_form.php: Changed add button.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5371 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 11:08:28 +00:00
juanmanuelr 62e79b4d1d 2012-01-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: New functions in Api 
	update_network_module, update_plugin_module, update_data_module and
	update_snmp_module.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5370 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 10:30:16 +00:00
ramonn 0d3586ad32 2012-01-13 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php,
	  include/functions_netflow.php,
	  operation/netflow/nf_view.php: Aesthetic fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5369 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 14:52:52 +00:00
ramonn a034893237 2012-01-13 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php,
	  include/functions_netflow.php,
	  operation/netflow/nf_view.php: Fixed data source ordering for some
	  netflow charts and implemented a basic disk cache.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 13:14:16 +00:00
vgilc 0c39ae634e 2012-01-13 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_item_list.php: Changes sort
	rows in netflow items.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 13:06:28 +00:00
vgilc d3c662ab50 2012-01-13 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.oracle.sql
	  pandoradb.postgreSQL.sql
	  pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	  pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	  pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Update
	table tnetflow_report_content.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 12:11:00 +00:00
vgilc 4668df5db0 2012-01-13 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_item_list.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_item.php
	  operation/netflow/nf_reporting.php
	  pandoradb.sql: Sort items of netflow reports.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 11:58:59 +00:00
zarzuelo ceb5842fee 2012-01-13 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Added update_alert_template
	option



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5364 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 09:43:29 +00:00
zarzuelo f83eb60189 2012-01-12 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Added options to add
	network, plugin and snmp modules to policy from 
	CLI



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5363 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 16:02:04 +00:00
juanmanuelr d1f1ba7cb2 2012-01-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_users.php
	 include/functions_groups.php
	 include/functions_profile.php
	 include/functions_api.php: Added functions and new functions to Api
	 set_update_template, set_delete_template, 
	 set_delete_module_template, set_update_user, set_add_user_profile,
	 set_create_module_template.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5362 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 15:33:52 +00:00
vgilc 0b7861a2ab 2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit.php: Added column group
	to report list.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 15:05:25 +00:00
vgilc b3267ae973 2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_graph.php
	  include/functions_netflow.php: translate netflow titles.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5360 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 14:20:32 +00:00
vgilc b3e12dd60a 2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.oracle.sql
	  pandoradb.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: Changes in group
	fields of netflow tables.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5359 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 12:55:17 +00:00