Module: check_mk Branch: master Commit: 8fa6808a56c4b59d87bdb531071d253d48d4c62e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fa6808a56c4b5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 24 10:40:38 2016 +0100 3306 FIX docsis_channels_upstream: fixed missing channel handling --- .werks/3306 | 10 ++++++++++ ChangeLog | 1 + checks/docsis_channels_upstream | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3306 b/.werks/3306 new file mode 100644 index 0000000..53fa287 --- /dev/null +++ b/.werks/3306 @@ -0,0 +1,10 @@ +Title: docsis_channels_upstream: fixed missing channel handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458812388 + + diff --git a/ChangeLog b/ChangeLog index a5b987b..ddfd2a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,7 @@ * 3305 FIX: cmciii.phase: fixed wrong datatype handling * 3107 FIX: heartbeat_crm: fixed incorrect timezone handling... * 3341 FIX: df: Ignoring mounted lib*.so.1 volumes (seen on Solaris 10) + * 3306 FIX: docsis_channels_upstream: fixed missing channel handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/docsis_channels_upstream b/checks/docsis_channels_upstream index 5345b1c..d9a1b52 100644 --- a/checks/docsis_channels_upstream +++ b/checks/docsis_channels_upstream @@ -48,7 +48,7 @@ def docsis_channels_upstream_convert(info): for line in freq_info: endoid = line[0] cid = is_unique and line[1] or "%s.%s" % (line[0], line[1]) - if line[2] != '0': + if line[2] != '0' and endoid in sig_info_dict: parsed[cid] = line[1:] + sig_info_dict[endoid] + cm_info_dict.get(endoid, []) return parsed