Module: check_mk Branch: master Commit: 687fa31d09312891a41a0412e13155d069e45c31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=687fa31d093128… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 15:12:30 2014 +0100 #1575 FIX vSphere Monitoring works with RedHat 5.x now The vSphere agent is now compatible to at least Python 2.4. Before it was only compatible to Python >= 2.6. --- .bugs/2186 | 7 +++++-- .werks/1575 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 5 +---- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.bugs/2186 b/.bugs/2186 index f03ab4e..c44f1d8 100644 --- a/.bugs/2186 +++ b/.bugs/2186 @@ -1,8 +1,11 @@ Title: agent_vsphere not running on RedHat 5 Component: checks -State: open +Class: bug +State: done Date: 2014-10-16 10:43:36 Targetversion: 1.2.5i1 -Class: bug Reason is the Python version. Shouldn't be too hard to fix. + +2014-12-01 15:08:55: changed state open -> done +Fixed. diff --git a/.werks/1575 b/.werks/1575 new file mode 100644 index 0000000..5f05382 --- /dev/null +++ b/.werks/1575 @@ -0,0 +1,10 @@ +Title: vSphere Monitoring works with RedHat 5.x now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417442938 +Class: fix + +The vSphere agent is now compatible to at least Python 2.4. Before +it was only compatible to Python >= 2.6. diff --git a/ChangeLog b/ChangeLog index 20b4989..d46cc47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ * 1536 FIX: fritz!Box special agent now deals with new URLs (firmware >= 6.0) correctly * 1550 FIX: zfs_arc_cache: do not inventorize of no cache information available... * 1572 FIX: Sample configs, plugins etc. for windows agent use windows linebreaks now... + * 1575 FIX: vSphere Monitoring works with RedHat 5.x now... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 050a22a..fd0e780 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -582,7 +582,6 @@ if tracefile: my_cookie = None server_handle = None -transport = None def query_server(payload, payload_params = {}): # Finalize payload payload_params.update(systeminfo) @@ -641,9 +640,7 @@ def encode_url(text): # Initialize server connection try: netloc = host_address + ":" + str(opt_port) - transport = httplib.HTTPSConnection - transdict = {'timeout': opt_timeout} - server_handle = transport(netloc, None, **transdict) + server_handle = httplib.HTTPSConnection(netloc) if opt_debug: sys.stderr.write("Connecting to %s..." % netloc)