[checkmk-commits] Check_MK Git: check_mk: arris_cmts_cpu: Fixed typo

Module: check_mk Branch: master Commit: e71bc49d676c96204a9b9f48f5cee9b18c5ce103 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e71bc49d676c96… Author: Bastian Kuhn &lt;bk(a)mathias-kettner.de&gt; Date: Fri Sep 5 13:48:08 2014 +0200 arris_cmts_cpu: Fixed typo --- agents/special/agent_hivemanager | 9 +++++---- checks/agent_hivemanager | 2 +- checks/arris_cmts_cpu | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/agents/special/agent_hivemanager b/agents/special/agent_hivemanager index b4145cd..e6cae61 100755 --- a/agents/special/agent_hivemanager +++ b/agents/special/agent_hivemanager @@ -29,10 +29,11 @@ from urllib2 import urlopen import urllib2, base64, json try: - user = sys.argv[1] - password = sys.argv[2] + host = sys.argv[1] + user = sys.argv[2] + password = sys.argv[3] except: - print "Usage: agent_hivemanager <USERNAME> <PASSWORD>" + print "Usage: agent_hivemanager <HOST> <USERNAME> <PASSWORD>" sys.exit(2) def get_url(address): @@ -51,7 +52,7 @@ print "Version: 1.2.5" print "AgentOs: Hivemanager" print "<<<hivemanager_devices:sep(124)>>>" -address = "https://login.hivemanager.ch/hm/api/v1/devices" +address = "https://%s/hm/api/v1/devices" % host for line in json.loads(get_url(address).read()): if line['upTime'] == '': line['upTime'] = "down" diff --git a/checks/agent_hivemanager b/checks/agent_hivemanager index cbdd5f0..5cfe427 100644 --- a/checks/agent_hivemanager +++ b/checks/agent_hivemanager @@ -26,6 +26,6 @@ def agent_hivemanager_arguments(params, hostname, ipaddress): # User, Password - return "%s %s" % ( quote_shell_string(params[0]), quote_shell_string(params[1]) ) + return "'%s' %s %s" % ( hostname, quote_shell_string(params[0]), quote_shell_string(params[1]) ) special_agent_info['hivemanager'] = agent_hivemanager_arguments diff --git a/checks/arris_cmts_cpu b/checks/arris_cmts_cpu index b66aef9..fa74fb2 100644 --- a/checks/arris_cmts_cpu +++ b/checks/arris_cmts_cpu @@ -50,7 +50,7 @@ def check_arris_cmts_cpu(item, params, info): cpu_util = 100 - int(cpu_idle_util) warn, crit = params infotext = "Current utilization is: %d %% " % cpu_util - levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) + levels = " (warn/crit at %.1f/%.1f %%)" % (warn, crit) perfdata = [ ( "util", cpu_util, warn, crit ) ] if cpu_util >= crit: yield 2, infotext + levels, perfdata