Checkmk git commits September 2014

checkmk-commits@lists.checkmk.com

5 participants
195 discussions

Check_MK Git: check_mk: hivemanager_devices: Also add offline devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 47ddf885ae0445d15621cebc0d0b9e0467c5131a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47ddf885ae0445… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 5 14:59:11 2014 +0200 hivemanager_devices: Also add offline devices --- checks/hivemanager_devices | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/hivemanager_devices b/checks/hivemanager_devices index 7c3edf7..e0451ec 100644 --- a/checks/hivemanager_devices +++ b/checks/hivemanager_devices @@ -39,8 +39,7 @@ factory_settings['hivemanger_devices'] = { def inventory_hivemanager_devices(info): for hostname, clients, alarm, connection, uptime in info: - if connection == "True": - yield hostname, {} + yield hostname, {} def check_hivemanager_devices(item, params, info): for hostname, clients, alarm, connection, uptime in info:

10 years

Check_MK Git: check_mk: arris_cmts_cpu: Fixed typo

by Bastian Kuhn

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 <bk(a)mathias-kettner.de> 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

10 years

Check_MK Git: check_mk: TextAscii: Attrencode is now default True

by Bastian Kuhn

Module: check_mk Branch: master Commit: 90d0e70c8faf7276738811bc2f9b7517cef12689 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90d0e70c8faf72… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 5 12:29:03 2014 +0200 TextAscii: Attrencode is now default True --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e27f392..593f59b 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -323,7 +323,7 @@ class TextAscii(ValueSpec): self._size = kwargs.get("size", 25) # also possible: "max" self._cssclass = kwargs.get("cssclass", "text") self._strip = kwargs.get("strip", True) - self._attrencode = kwargs.get("attrencode", False) + self._attrencode = kwargs.get("attrencode", True) self._allow_empty = kwargs.get("allow_empty", _("none")) self._empty_text = kwargs.get("empty_text", "") self._read_only = kwargs.get("read_only")

10 years

Check_MK Git: check_mk: #1396 FIX Fix default setting of Enable sounds in views

by Mathias Kettner

Module: check_mk Branch: master Commit: 4468a4fb091a5f1937e01702e6569ba7deba139a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4468a4fb091a5f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 5 12:22:50 2014 +0200 #1396 FIX Fix default setting of Enable sounds in views The global settings in WATO displayed the default value for the setting Enable sounds in views as on. If fact the default is off. So as long as you did not switch this once back and forth no sounds were being played. This has been fixed now and the default settings is correctly being displayed as off. --- .werks/1396 | 13 +++++++++++++ ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/1396 b/.werks/1396 new file mode 100644 index 0000000..2684bf7 --- /dev/null +++ b/.werks/1396 @@ -0,0 +1,13 @@ +Title: Fix default setting of Enable sounds in views +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1409912476 +Class: fix + +The global settings in WATO displayed the default value for the setting +Enable sounds in views as on. If fact the default is +off. So as long as you did not switch this once back and forth no +sounds were being played. This has been fixed now and the default settings +is correctly being displayed as off. diff --git a/ChangeLog b/ChangeLog index 03a5fe7..ccc7bf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * 0201 FIX: Fixed error message in Rulelist of RBN... * 1100 FIX: WATO backup domains: fixed bug were excluded files still got deleted on snapshot restore... * 1101 FIX: WATO check parameter: renamed 'Nominal Voltages' to 'Voltage Levels..' + * 1396 FIX: Fix default setting of Enable sounds in views... Notifications: * 1151 Add variables (HOST/SERVICE)ACK(AUTHOR/COMMENT) to notification context... diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 716a1cb..47a3236 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -113,13 +113,13 @@ register_configvar(group, register_configvar(group, "enable_sounds", - Checkbox(title = _("Enabled sounds in views"), + Checkbox(title = _("Enable sounds in views"), label = _("enable sounds"), help = _("If sounds are enabled then the user will be alarmed by problems shown " "in a Multisite status view if that view has been configured for sounds. " "From the views shipped in with Multisite all problem views have sounds " "enabled."), - default_value = True), + default_value = False), domain = "multisite") register_configvar(group,

10 years

Check_MK Git: check_mk: docsis_channels_upstream: make compatible with more devices, add Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: d7a68dbecca11173492aa182dd76130ded9c84b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7a68dbecca111… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 5 10:54:41 2014 +0200 docsis_channels_upstream: make compatible with more devices, add Perf-O-Meter --- checks/docsis_channels_upstream | 151 ++++++++++++++++++++++-------------- web/plugins/perfometer/check_mk.py | 6 ++ 2 files changed, 100 insertions(+), 57 deletions(-) diff --git a/checks/docsis_channels_upstream b/checks/docsis_channels_upstream index 2a7f30a..2e25d57 100644 --- a/checks/docsis_channels_upstream +++ b/checks/docsis_channels_upstream @@ -19,7 +19,7 @@ # in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- # out even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. See the GNU General Public License for more de- -# ails. You should have received a copy of the GNU General Public +# tails. You should have received a copy of the GNU General Public # License along with GNU Make; see the file COPYING. If not, write # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. @@ -28,44 +28,74 @@ factory_settings["docsis_channels_upstream_default_levels"] = { "signal_noise" : ( 10.0, 5.0 ), # dB } +def docsis_channels_upstream_convert(info): + parsed = {} + freq_info, sig_info, cm_info = info + if len(freq_info) == 1 and len(sig_info) == 1 and \ + freq_info[0][0] != sig_info[0][0]: # Probably ARRIS modem + cid = freq_info[0][0] + parsed[cid] = freq_info[0][1:] + sig_info[0][1:] + if len(cm_info) == 1: # Never seen + parsed[cid] += cm_info[0] + + else: + sig_info_dict = dict([ (x[0], x[1:]) for x in sig_info]) + cm_info_dict = dict([ (x[0], x[1:]) for x in cm_info]) + for line in freq_info: + endoid = line[0] + cid = line[1] + if line[2] != '0': + parsed[cid] = line[1:] + sig_info_dict[endoid] + cm_info_dict.get(endoid, []) + + return parsed + def inventory_docsis_channels_upstream(info): - for line in info: - if line[1] != '0': - yield line[0], {} + parsed = docsis_channels_upstream_convert(info) + for cid, entry in parsed.items(): + if entry[2] != '0' and entry[5] != '0': + yield cid, {} def check_docsis_channels_upstream(item, params, info): - for channel_id, mhz, total, active, registered, avg_util, \ - unerroreds, correcteds, uncorrectables, signal_noise in info: - if channel_id == item: - for varname, value, title, form, unit in [ - ( "frequency", float(mhz) / 1000000, "Frequency", "%.2f", " MHz"), + parsed = docsis_channels_upstream_convert(info) + if item in parsed: + entry = parsed[item] + + channel_id, mhz, unerroreds, correcteds, uncorrectables, signal_noise = entry[:6] + + # Signal Noise + noise_db = float(signal_noise) / 10 + infotext = "Signal/Noise ratio: %.2f dB" % noise_db + warn, crit = params['signal_noise'] + levels = " (warn/crit at %.1f/%.1f dB)" % ( warn, crit ) + state = 0 + if noise_db <= crit: + state = 2 + infotext += levels + elif noise_db <= warn: + state = 1 + infotext += levels + yield state, infotext, [ ('signal_noise', noise_db, warn, crit ) ] + + fields = [ + ( "frequency", float(mhz) / 1000000, "Frequency", "%.2f", " MHz"), + ( "unerroreds", int(unerroreds), "codewords without errors", "%d", "" ), + ( "correcteds", int(correcteds), "corrected errors", "%d", "" ), + ( "uncorrectables", int(uncorrectables), "uncorrectable errors", "%d", "" ), + ] + if len(entry) >= 10: + total, active, registered, avg_util = entry[6:10] + fields += [ ( "total", int(total), "Modems total", "%d", "" ), ( "active", int(active), "active", "%d", "" ), ( "registered", int(registered), "registered", "%d", "" ), ( "util", int(avg_util), "average utilization", "%d", "%" ), + ] - # Replace with counters later - ( "unerroreds", int(unerroreds), "codewords without errors", "%d", "" ), - ( "correcteds", int(correcteds), "corrected errors", "%d", "" ), - ( "uncorrectables", int(uncorrectables), "uncorrectable errors", "%d", "" ), - ]: - yield 0, title + ": " + (form + "%s") % (value, unit), [ (varname, value) ] - - # Signal Noise - noise_db = float(signal_noise) / 10 - infotext = "Signal/Noise ratio: %.2f dB" % noise_db - warn, crit = params['signal_noise'] - levels = " (warn/crit at %.1f/%.1f dB)" % ( warn, crit ) - state = 0 - if noise_db <= crit: - state = 2 - infotext += levels - elif noise_db <= warn: - state = 1 - infotext += levels - yield state, infotext, [ ('signal_noise', noise_db, warn, crit ) ] - - return + for varname, value, title, form, unit in fields: + yield 0, title + ": " + (form + "%s") % (value, unit), [ (varname, value) ] + + + return yield 3, "Channel information not found in SNMP data" @@ -77,32 +107,39 @@ check_info["docsis_channels_upstream"] = { "service_description" : "Upstream Channel %s", "has_perfdata" : True, "snmp_scan_function" : docsis_scan_function, - "snmp_info" : ( - ".1.3.6.1", [ - "2.1.10.127.1.1.2.1.1", # docsIfUpChannelId - "2.1.10.127.1.1.2.1.2", # docsIfUpChannelFrequency - "4.1.9.9.116.1.4.1.1.3", # cdxIfUpChannelCmTotal - "4.1.9.9.116.1.4.1.1.4", # cdxIfUpChannelCmActive - "4.1.9.9.116.1.4.1.1.5", # cdxIfUpChannelCmRegistered - "4.1.9.9.116.1.4.1.1.7", # cdxIfUpChannelAvgUtil - - "2.1.10.127.1.1.4.1.2", # docsIfSigQUnerroreds: - # "Codewords received on this channel without error. - # This includes all codewords, whether or not they - # were part of frames destined for this device." - - "2.1.10.127.1.1.4.1.3", # docsIfSigQCorrecteds: - # "Codewords received on this channel with correctable - # errors. This includes all codewords, whether or not - # they were part of frames destined for this device." - - "2.1.10.127.1.1.4.1.4", # docsIfSigQUncorrectables: - # "Codewords received on this channel with uncorrectable - # errors. This includes all codewords, whether or not - # they were part of frames destined for this device." - - "2.1.10.127.1.1.4.1.5", # docsIfSigQSignalNoise - ]), + "snmp_info" : [ + ( ".1.3.6.1.2.1.10.127.1.1.2.1", [ + OID_END, + "1", # docsIfUpChannelId + "2", # docsIfUpChannelFrequency + ]), + ( ".1.3.6.1.2.1.10.127.1.1.4.1", [ + OID_END, + "2", # docsIfSigQUnerroreds: + # "Codewords received on this channel without error. + # This includes all codewords, whether or not they + # were part of frames destined for this device." + + "3", # docsIfSigQCorrecteds: + # "Codewords received on this channel with correctable + # errors. This includes all codewords, whether or not + # they were part of frames destined for this device." + + "4", # docsIfSigQUncorrectables: + # "Codewords received on this channel with uncorrectable + # errors. This includes all codewords, whether or not + # they were part of frames destined for this device." + + "5", # docsIfSigQSignalNoise + ]), + ( ".1.3.6.1.4.1.9.9.116.1.4.1.1" , [ + OID_END, + "3", # cdxIfUpChannelCmTotal + "4", # cdxIfUpChannelCmActive + "5", # cdxIfUpChannelCmRegistered + "7", # cdxIfUpChannelAvgUtil + ]), + ], "default_levels_variable" : "docsis_channels_upstream_default_levels", "group" : "docsis_channels_upstream", "includes" : [ "docsis.include" ], diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index dff9aac..0c4286c 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1163,3 +1163,9 @@ def perfometer_dbmv(row, check_command, perf_data): return "%.1f dBmV" % dbmv, perfometer_logarithmic(dbmv, 50, 2, "#da6") perfometers["check_mk-docsis_channels_downstream"] = perfometer_dbmv + +def perfometer_docsis_snr(row, check_command, perf_data): + dbmv = float(perf_data[0][1]) + return "%.1f dB" % dbmv, perfometer_logarithmic(dbmv, 50, 2, "#ad6") + +perfometers["check_mk-docsis_channels_upstream"] = perfometer_docsis_snr

10 years

Check_MK Git: check_mk: winperf_msx_queues: Hopefully the last fix now

by Bastian Kuhn

Module: check_mk Branch: master Commit: cce8fa3acb161b40923d82049b8b531a0afd87e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cce8fa3acb161b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Sep 4 18:47:50 2014 +0200 winperf_msx_queues: Hopefully the last fix now --- checks/winperf_msx_queues | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues index 6d75d98..ee78352 100644 --- a/checks/winperf_msx_queues +++ b/checks/winperf_msx_queues @@ -57,7 +57,7 @@ msx_queues_default_levels = (500, 2000) # Default warn/crit levels for length of queues -factory_settings['winperf_msx_queues'] = { +factory_settings['winperf_msx_queues_factory'] = { 'levels': ( 500, 2000 ), } @@ -92,7 +92,6 @@ def check_winperf_msx_queues(item, params, info): if num_instances < 1: return (3, "no counters available, transport service running?") - # Old default case: if type(params) == tuple: warn, crit = params @@ -126,6 +125,6 @@ check_info["winperf_msx_queues"] = { 'inventory_function': inventory_winperf_msx_queues, 'service_description': 'Queue %s', 'has_perfdata': True, - "default_levels_variable" : "winperf_msx_queues", + "default_levels_variable" : "winperf_msx_queues_factory", 'group': 'msx_queues', }

10 years

Check_MK Git: check_mk: winperf_msx_queues: Fix for legacy support

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1e43cc2c94e6bcacf091c6f57129303bcde12076 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e43cc2c94e6bc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Sep 4 17:16:07 2014 +0200 winperf_msx_queues: Fix for legacy support --- checks/winperf_msx_queues | 3 +++ 1 file changed, 3 insertions(+) diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues index 371fbf2..6d75d98 100644 --- a/checks/winperf_msx_queues +++ b/checks/winperf_msx_queues @@ -53,6 +53,9 @@ # 4 0 0 0 0 rawcount # 6 0 0 0 0 rawcount +# For Legacy reasons we need still this var. +msx_queues_default_levels = (500, 2000) + # Default warn/crit levels for length of queues factory_settings['winperf_msx_queues'] = { 'levels': ( 500, 2000 ),

10 years

Check_MK Git: check_mk: internal code cleanup: move attrencode to TextAscii

by Mathias Kettner

Module: check_mk Branch: master Commit: c5dee65a4150bce5b07ab37c15889e1da93f9af5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5dee65a4150bc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 4 16:39:23 2014 +0200 internal code cleanup: move attrencode to TextAscii --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 05cecf3..e27f392 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -38,7 +38,6 @@ class ValueSpec: def __init__(self, **kwargs): self._title = kwargs.get("title") self._help = kwargs.get("help") - self._attrencode = kwargs.get("attrencode", False) if "default_value" in kwargs: self._default_value = kwargs.get("default_value") self._validate = kwargs.get("validate") @@ -324,6 +323,7 @@ class TextAscii(ValueSpec): self._size = kwargs.get("size", 25) # also possible: "max" self._cssclass = kwargs.get("cssclass", "text") self._strip = kwargs.get("strip", True) + self._attrencode = kwargs.get("attrencode", False) self._allow_empty = kwargs.get("allow_empty", _("none")) self._empty_text = kwargs.get("empty_text", "") self._read_only = kwargs.get("read_only")

10 years

Check_MK Git: check_mk: hivemanager_devices: Added uptime as perfdata

by Bastian Kuhn

Module: check_mk Branch: master Commit: a247555c3737dd1c8cdf200132ab3c00e2aedc96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a247555c3737dd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Sep 4 15:15:41 2014 +0200 hivemanager_devices: Added uptime as perfdata --- checkman/hivemanager_devices | 2 +- checks/hivemanager_devices | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/checkman/hivemanager_devices b/checkman/hivemanager_devices index 8affa8f..59ccd73 100644 --- a/checkman/hivemanager_devices +++ b/checkman/hivemanager_devices @@ -14,7 +14,7 @@ item: The name of the Devices perfdata: - One variable: the current number of clients + Two variables: the current number of clients and the uptime in sec inventory: One check for each device will be created diff --git a/checks/hivemanager_devices b/checks/hivemanager_devices index 88df1a5..7c3edf7 100644 --- a/checks/hivemanager_devices +++ b/checks/hivemanager_devices @@ -34,7 +34,7 @@ factory_settings['hivemanger_devices'] = { 'alert_on_loss' : True, - 'max_clients' : ( 25, 50 ), + 'max_clients' : (25, 50), } def inventory_hivemanager_devices(info): @@ -48,7 +48,7 @@ def check_hivemanager_devices(item, params, info): # Check for Alarm State alarmstate = "Alarm state: " + alarm - if alarm in [ 'Maybe', 'Major', 'Minor' ]: + if alarm in ['Maybe', 'Major', 'Minor']: yield 1, alarmstate elif alarm == 'Critical': yield 2, alarmstate @@ -62,7 +62,7 @@ def check_hivemanager_devices(item, params, info): number_of_clients = int(clients) warn, crit = params['max_clients'] - perfdata = [ ( 'client_count', number_of_clients, warn, crit )] + perfdata = [('client_count', number_of_clients, warn, crit)] infotext = "Clients: %s" % number_of_clients levels = ' Warn/Crit at %s/%s' % ( warn, crit ) @@ -84,13 +84,14 @@ def check_hivemanager_devices(item, params, info): infotext = "Uptime: %s" % get_age_human_readable(uptime_secs) state = 0 + warn, crit = 0 , 0 if 'max_uptime' in params: warn, crit = params['max_uptime'] if uptime_secs >= crit: state = 2 elif uptime_secs >= warn: state = 1 - yield state, infotext + yield state, infotext, [('uptime', uptime_secs, warn, crit)]

10 years

Check_MK Git: check_mk: hivemanager_devices: fixed check parameters

by Bastian Kuhn

Module: check_mk Branch: master Commit: 9a58d7c545e520eb59379d3dc24c8dee2e02f90d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a58d7c545e520… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Sep 4 14:24:49 2014 +0200 hivemanager_devices: fixed check parameters --- checks/hivemanager_devices | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/hivemanager_devices b/checks/hivemanager_devices index d1fc7e8..88df1a5 100644 --- a/checks/hivemanager_devices +++ b/checks/hivemanager_devices @@ -35,12 +35,12 @@ factory_settings['hivemanger_devices'] = { 'alert_on_loss' : True, 'max_clients' : ( 25, 50 ), - 'max_uptime' : False, } def inventory_hivemanager_devices(info): - for line in info: - yield line[0], {} + for hostname, clients, alarm, connection, uptime in info: + if connection == "True": + yield hostname, {} def check_hivemanager_devices(item, params, info): for hostname, clients, alarm, connection, uptime in info: @@ -84,7 +84,7 @@ def check_hivemanager_devices(item, params, info): infotext = "Uptime: %s" % get_age_human_readable(uptime_secs) state = 0 - if params['max_uptime']: + if 'max_uptime' in params: warn, crit = params['max_uptime'] if uptime_secs >= crit: state = 2

10 years

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2014