Commit Graph

294 Commits

Author SHA1 Message Date
Ramon Novoa ba23ce80c2 2012-08-03 Ramon Novoa <rnovoa@artica.es>
* win32/modules/pandora_module_logevent.cc: Get the EventID from the
	  InstanceID. Seems like Microsoft replaced Eventid with InstanceID at
	  some point.

	* pc/pandora_agent.mpi: Fixed some paths.

	* pc/tentacle_client,
	  unix/tentacle_client,
	  shellscript/linux/tentacle_client,
	  shellscript/mac_osx/tentacle_client: Specify the socket type. On some
	  OSs (like certain versions of Solaris) it can't be guessed and results in an error.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6844 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-08-03 12:03:59 +00:00
Ramon Novoa 42d58d76bf 2012-06-21 Ramon Novoa <rnovoa@artica.es>
* win32/bin/pandora_agent.conf,
	  win32/installer/pandora.mpi,
	  win32/versioninfo.rc,
	  win32/pandora.cc,
	  pc/AIX/pandora_agent.conf,
	  pc/Linux/pandora_agent.conf,
	  pc/HP-UX/pandora_agent.conf,
	  pc/Win32/pandora_agent.conf,
	  pc/NT4/pandora_agent.conf,
	  pc/SunOS/pandora_agent.conf,
	  pc/FreeBSD/pandora_agent.conf,
	  unix/AIX/pandora_agent.conf,
	  unix/DEBIAN/control,
	  unix/DEBIAN/make_deb_package.sh,
	  unix/pandora_agent.spec,
	  unix/Linux/pandora_agent.conf,
	  unix/HP-UX/pandora_agent.conf,
	  unix/pandora_agent.redhat.spec,
	  unix/pandora_agent,
	  unix/NT4/pandora_agent.conf,
	  unix/SunOS/pandora_agent.conf,
	  unix/FreeBSD/pandora_agent.conf,
	  shellscript/linux/pandora_agent.conf,
	  shellscript/bsd-ipso/pandora_agent.conf,
	  shellscript/aix/pandora_agent.conf,
	  shellscript/hp-ux/pandora_agent.conf,
	  shellscript/mac_osx/pandora_agent.conf,
	  shellscript/solaris/pandora_agent.conf,
	  shellscript/openWRT/pandora_agent.conf: Updated version strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6672 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 17:41:54 +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
zarzuelo 5f1f45cf43 2012-05-03 Sergio Martin <sergio.martin@artica.es>
* win32/windows/pandora_wmi.cc: Added to the windows
	agent inventory module for patches the service pack
	column

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6251 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-03 14:45:42 +00:00
zarzuelo acfa343a1c 2012-04-25 Sergio Martin <sergio.martin@artica.es>
* win32/bin/pandora_agent.conf
	unix/Linux/pandora_agent.conf: Restore files changed
	by error in last commit



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6165 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 16:03:46 +00:00
zarzuelo d0f2e121ec 2012-04-25 Sergio Martin <sergio.martin@artica.es>
* unix/plugins/inventory: Fixed init_services inventory modules
	in machines /etc/rc.d/rcX.d paths instead of /etc/rcX.d/ paths
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6162 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 15:55:26 +00:00
darode d633dc7737 2012-04-25 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/pandora_agent.conf: Fixed a default module type.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6154 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 14:10:15 +00:00
darode 55699ec605 2012-04-25 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/pandora_agent.conf: Improved windows configuration file.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6151 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 14:03:50 +00:00
darode 6d4486ae19 2012-04-24 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/pandora_agent.conf,
	unix/Linux/pandora_agent.conf: Added more examples of modules enabled and
	improved comments in config file for windows and linux.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6141 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 07:20:59 +00:00
darode 308fc2dc5f 2012-04-23 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/pandora_agent.conf: Added "parent_agent_name" parameter
        which was missing for windows configuration file.

        MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6082 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 08:49:04 +00:00
darode c796863495 2012-04-20 Dario Rodriguez <dario.rodriguez@artica.es>
* pandora_agents/win32/bin/pandora_agent.conf: Added more inventory
	parameters to inventory module

	MERGED FROM 4.0.2	



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6062 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 10:37:09 +00:00
Ramon Novoa 2f0086c7f4 2012-04-19 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module.cc: Default to generic_data if no module_type
	  is not set.

	* installer/pandora.mpi: Remove the util directory from the PATH when
	  uninstalling.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6038 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 14:52:24 +00:00
darode fbf82c1cd1 2012-04-19 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/pandora_agent.conf: Added sencodary server parameters example
	in agent configuration.
	
	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6037 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 13:18:41 +00:00
Ramon Novoa bf54328305 2012-02-07 Ramon Novoa <rnovoa@artica.es>
* pandora_windows_service.cc: Convert tentacle_timeout to milliseconds.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5510 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-07 16:58:06 +00:00
Ramon Novoa 8589da3b27 2012-02-07 Ramon Novoa <rnovoa@artica.es>
* win32/pandora_windows_service.cc: Added a timeout to the tentacle
	  client execution.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5507 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-07 16:33:01 +00:00
Ramon Novoa c67481b149 2012-02-02 Ramon Novoa <rnovoa@artica.es>
* installer/pandora.mpi: Added an uninstall action to delete
	  the agent's at job.

	* installer/scripts/delete_at_job.bat: Added to repository. Batch
	  script to delete the agent's at job.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5474 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-02 17:25:29 +00:00
Ramon Novoa 9202627292 2012-01-30 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_regexp.cc: Do not open the file in the
	  constructor to avoid trouble if other modules modify it before
	  the regexp module runs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5448 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-30 16:49:14 +00:00
Ramon Novoa 4f9aacb7f0 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
Ramon Novoa 5e34c7e51d 2012-01-04 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module.cc: Fixed an error when checking multiple
	  preconditions. Fixed precondition evaluation logic.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5322 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-04 16:09:11 +00:00
Ramon Novoa f6818a7277 2012-01-03 Ramon Novoa <rnovoa@artica.es>
* pandora_windows_service.h,
	  modules/pandora_module.h,
	  modules/pandora_module_factory.cc,
	  modules/pandora_module.cc,
	  pandora_windows_service.cc: Added support for intensive modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5318 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-03 17:23:23 +00:00
Ramon Novoa becd47d5fa 2011-12-14 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_perfcounter.cc,
	  modules/pandora_module_perfcounter.h: Use MinrGW's pdh.h
	  instead of our own definitions.

	* modules/pandora_module.cc: Fixed a bug in pre-conditions that led to an
	  infinite loop.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5257 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-14 10:38:53 +00:00
Ramon Novoa 75116f7eba 2011-12-13 Ramon Novoa <rnovoa@artica.es>
* win32/installer/pandora.mpi,
	  win32/pandora_windows_service.cc,
	  win32/pandora.cc,
	  unix/DEBIAN/control,
	  unix/DEBIAN/make_deb_package.sh,
	  unix/pandora_agent.spec,
	  unix/pandora_agent: Fixed version strings (were wrong
	  in the previous commit).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5254 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-13 14:37:32 +00:00
Ramon Novoa 181c11c711 2011-12-13 Ramon Novoa <rnovoa@artica.es>
* win32/pandora_windows_service.cc: Brokers do not need to
	  modify the path.

	* win32/installer/pandora.mpi,
	  win32/pandora.cc,
	  unix/DEBIAN/control,
	  unix/DEBIAN/make_deb_package.sh,
	  unix/pandora_agent.spec,
	  unix/pandora_agent: Updated version strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5250 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-13 14:10:51 +00:00
Ramon Novoa d3d14d51c8 2011-12-12 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: Removed some debugging messages.

	* modules/pandora_module.h,
	  modules/pandora_module.cc,
	  pandora_windows_service.cc: Fixed pre-conditions (were not working
	  properly).

	* modules/pandora_module_regexp.cc: Improved file status detection and
	  small fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5247 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-12 17:11:06 +00:00
Ramon Novoa 3c5b4ed39a 2011-12-09 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: Added a debug message.

	* modules/pandora_module_perfcounter.cc,
	  modules/pandora_module_perfcounter.h,
	  modules/pandora_module_factory.cc: Added support to read the
	  'cooked' value of a performance counter.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5244 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-09 14:57:47 +00:00
Ramon Novoa a59bdce0ad 2011-11-30 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_logevent.cc,
	  modules/pandora_module_logevent.h: Added support for regular
	  expressions to the pattern filter.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5220 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-30 16:52:43 +00:00
Ramon Novoa 589278436f 2011-11-29 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_snmpget.cc: Modified the call to snmpget.exe
	  to directly retrieve the value.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5204 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-29 14:35:52 +00:00
Ramon Novoa 7544bac9a9 2011-11-29 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module.h,
	  modules/pandora_module_exec.cc,
	  modules/pandora_module_exec.h,
	  modules/pandora_module_list.cc,
	  modules/pandora_module_factory.cc,
	  modules/pandora_module.cc,
	  Makefile.am: Added native ping and SNMP get modules that wrap the
	  calls to ping.exe and snmpget.exe.

	* modules/pandora_module_ping.h,
	  modules/pandora_module_snmpget.h,
	  modules/pandora_module_ping.cc,
	  modules/pandora_module_snmpget.cc: Added to repository. Ping and
	  SNMP get modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5203 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-29 13:19:34 +00:00
Ramon Novoa a2ff5e7380 2011-11-29 Ramon Novoa <rnovoa@artica.es>
* bin/PandoraAgent.exe: Updated to current revision.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5201 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-29 13:10:03 +00:00
Ramon Novoa d4b510c89c 2011-11-24 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: Use double instead of long for intermediate
	  result to avoid overflows. Fixes bug #3422900.

	* modules/pandora_module_perfcounter.cc: Print PDH errors in a more
	  descriptive format.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5167 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-24 18:18:14 +00:00
Ramon Novoa 4e20886910 2011-11-22 Ramon Novoa <rnovoa@artica.es>
* pandora_windows_service.cc: Fixed a bug that resulted in a buffer
	  overflow.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5150 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-22 12:44:47 +00:00
Ramon Novoa 6fd5410ebe 2011-11-15 Ramon Novoa <rnovoa@artica.es>
* build.sh, modules/pandora_module_odbc.cc, Makefile.am: Made
	  changes to cross-compile in openSUSE 11.4.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5135 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-15 13:10:24 +00:00
Ramon Novoa f2d1a13a85 2011-11-03 Ramon Novoa <rnovoa@artica.es>
* pandora_windows_service.h,
	  pandora_windows_service.cc: Several fixes to the proxy mode and
	  broker agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5109 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-03 19:13:57 +00:00
darode afcc0eb6f0 2011-09-26 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/PandoraAgent.exe, win32/bin/util/tentacle_server.exe: Added 
	lastest version of executables compiled



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5012 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-26 18:21:08 +00:00
darode 8791afb503 2011-09-26 Dario Rodriguez <dario.rodriguez@artica.es>
* pandora_windows_service.cc: Fixed a problem sending XML with broker
	mode enabled (the "master" agent didn't report).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5011 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-26 17:25:53 +00:00
vgilc 2097aed8fe 2011-09-26 Vanessa Gil <vanessa.gil@artica.es>
* win32/windows/pandora_wmi.cc: Removed trace.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5000 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-26 10:22:29 +00:00
slerena ed5c6c7ed4 2011-09-23 Sancho Lerena <slerena@artica.es>
* installer/pandora.mpi: Updated string version in agent installer.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4994 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-23 14:46:05 +00:00
darode a087fa61f4 2011-09-22 Dario Rodriguez <dario.rodriguez@artica.es>
* bin/util/tentacle_server.exe: Added version with memory leak bug
	fixed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4981 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-22 14:01:00 +00:00
darode c65547879e 2011-09-16 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/pandora_agent_conf.cc: Fixed a problem generating broker conf
	files with wrong agent names.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4966 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-16 12:35:18 +00:00
vgilc 1d0b904818 2011-09-15 Vanessa Gil <vanessa.gil@artica.es>
* win32/pandora_windows_service.cc: Fixed problem sending xml file.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4956 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-15 15:30:13 +00:00
darode 0e8ca9437e 2011-09-14 Dario Rodriguez <dario.rodriguez@artica.es>
* bin/util/tentacle_server.exe: Tentacle Proxy temporal
	with temporal patch for Windows Platforms.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4951 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-14 12:22:26 +00:00
vgilc 22cdbe6999 2011-09-08 Vanessa Gil <vanessa.gil@artica.es>
* win32/bin/pandora_agent.conf: Added example about module preconditions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4929 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-08 13:26:19 +00:00
vgilc 3c5a7c2ae4 2011-09-06 Vanessa Gil <vanessa.gil@artica.es>
* win32/pandora_agent_conf.php: Fixed error creating broker agent.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4918 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-06 13:59:35 +00:00
vgilc ffaee6938c 2011-09-01 Vanessa Gil <vanessa.gil@artica.es>
* win32/pandora_windows_service.php: Add information about the parent agent name to xml file.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4878 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-01 14:37:57 +00:00
Ramon Novoa 19b0d9b621 2011-08-29 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_regexp.cc,
	  modules/pandora_module_regexp.h,
	  modules/pandora_module_factory.cc: Check file size to detect if the
	  file was truncated. Added a new configuration token to avoid seeking
	  to the eof.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4844 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-29 17:17:33 +00:00
darode 276837aa34 2011-08-29 Dario Rodriguez <dario.rodriguez@artica.es>
* modules/pandora_module_factory.cc: Fixed a bug collecting some module
	parameters like min_warning, max_warning, min_ff_event, etc.

	Fixes: 3396949



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4840 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-29 14:44:53 +00:00
zarzuelo 8ab93450ef 2011-08-22 Sergio Martin <sergio.martin@artica.es>
* win32/bin/PandoraAgent.exe: Updated the executable
	with the last code build fixing "runWMIQuery error"
	for bug 3394721



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4798 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-22 07:44:29 +00:00
slerena c2397d41e1 2011-08-19 Sancho Lerena <slerena@artica.es>
* bin/pandora_agent.conf: Ready to get the server string from the
        installer

        * installer/pandora.mpi: Updated installer, version, some strings
        and added the question to get the agent group.

        * installer/pandora.ico: New icon for windows shortcuts. Nice! :)

        * pandora.cc: Updated version.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4793 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-19 19:31:33 +00:00
Ramon Novoa 598ebae6e5 2011-08-19 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_plugin.cc: Set a virtually infinite timeout
	  for plugins.

	* pandora_windows_service.cc: The Pandora_Windows_Service destructor
	  could try to dereference a NULL pointer. Fixed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4782 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-19 11:58:22 +00:00
zarzuelo c35cb15176 2011-08-18 Sergio Martin <sergio.martin@artica.es>
* win32/windows/pandora_windows_info.h
	win32/windows/pandora_wmi.cc
	win32/windows/pandora_wmi.h
	win32/windows/pandora_windows_info.cc
	win32/bin/PandoraAgent.exe
	win32/bin/pandora_agent.conf
	win32/pandora_windows_service.cc: Added to the windows agent
	the address token with manual (specified address) and auto 
	(detecting from WMI the address) modes



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4763 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-18 09:41:37 +00:00