diff --git a/graylog-metrics/2.3/graylog_input_metrics-0.4.0.mkp b/graylog-metrics/2.3/graylog_input_metrics-0.4.0.mkp deleted file mode 100755 index 3a5b238..0000000 Binary files a/graylog-metrics/2.3/graylog_input_metrics-0.4.0.mkp and /dev/null differ diff --git a/graylog-metrics/2.3/graylog_input_metrics-0.4.1.mkp b/graylog-metrics/2.3/graylog_input_metrics-0.4.1.mkp new file mode 100755 index 0000000..f8047d6 Binary files /dev/null and b/graylog-metrics/2.3/graylog_input_metrics-0.4.1.mkp differ diff --git a/graylog-metrics/2.3/local/share/check_mk/checks/graylog_input_metrics b/graylog-metrics/2.3/local/share/check_mk/checks/graylog_input_metrics index 21dafd1..f28aded 100644 --- a/graylog-metrics/2.3/local/share/check_mk/checks/graylog_input_metrics +++ b/graylog-metrics/2.3/local/share/check_mk/checks/graylog_input_metrics @@ -36,10 +36,11 @@ def inventory_graylog_input_metrics(parsed): def check_graylog_input_metrics(item, params, parsed): -# if parsed is None: return - item_id = item.split()[-1][1:-1] - input_info = parsed[item_id] + input_info = parsed.get(item_id) + if not input_info: + return + input_state = input_info["input_state"] state = 1 @@ -60,11 +61,12 @@ def check_graylog_input_metrics(item, params, parsed): ("rs_m5_rate", "rs_m5_rate", "/5min", get_bytes_human_readable, ""), ("rs_m15_rate", "rs_m15_rate", "/15min", get_bytes_human_readable, ""), ]: - - value = parsed[item_id][key] + value = input_info[key] value = round(value, 2) + rate_upper = params.get(key, {}).get("%s_upper" % key, (None, None)) rate_lower = params.get(key, {}).get("%s_lower" % key, (None, None)) + yield check_levels( value, dsname,