[checkmk-commits] 4198 mkeventd_status: rework graph templates, only group metrics where it makes sense'

Module: check_mk Branch: master Commit: c74bd858dc5d0728ed3316dc1edff57dbf30eba5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c74bd858dc5d07… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 20 12:32:24 2016 +0100 4198 mkeventd_status: rework graph templates, only group metrics where it makes sense' Change-Id: I40764751b6cfeb48969e1d980667d628d99e343a --- .werks/4198 | 9 ++++ ChangeLog | 1 + checks/mkeventd_status | 4 +- web/plugins/metrics/check_mk.py | 95 ++++++++++++++++++++++++++++++----------- 4 files changed, 82 insertions(+), 27 deletions(-) diff --git a/.werks/4198 b/.werks/4198 new file mode 100644 index 0000000..13183aa --- /dev/null +++ b/.werks/4198 @@ -0,0 +1,9 @@ +Title: mkeventd_status: rework graph templates, only group metrics where it makes sense' +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1482233504 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index df578dd..33ae80c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 4104 veeam_tapejobs: New check to monitor Veeam tape jobs * 4170 local: local check is now clusteraware. Best or worst state in cluster mode can be configured... + * 4198 mkeventd_status: rework graph templates, only group metrics where it makes sense' * 4005 agent_activemq: now able to provide BasicAuth credentials... NOTE: Please refer to the migration notes! * 4171 FIX: perle_psmu: fixed value error... diff --git a/checks/mkeventd_status b/checks/mkeventd_status index affdad1..9822e7c 100644 --- a/checks/mkeventd_status +++ b/checks/mkeventd_status @@ -74,10 +74,10 @@ def check_mkeventd_status(item, params, parsed): yield 0, "Currently not running" return - yield 0, "Open events: %d" % status["num_open_events"], \ + yield 0, "Current events: %d" % status["num_open_events"], \ [("num_open_events", status["num_open_events"])] - yield 0, "Virtual Memory: %s" % \ + yield 0, "Virtual memory: %s" % \ get_bytes_human_readable(status["virtual_memory_size"]), \ [("process_virtual_size", status["virtual_memory_size"])] diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 76e51aa..767ced1 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2323,34 +2323,43 @@ metric_info["cmk_time_ds"] = { } +# Note: current can be any phase, not only open, but also +# delayed, couting or ack. metric_info["num_open_events"] = { - "title" : _("Open events"), + "title" : _("Current events"), "unit" : "count", - "color" : "12/a", + "color" : "26/b", } metric_info["average_message_rate"] = { "title" : _("Incoming messages"), "unit" : "1/s", - "color" : "11/a", + "color" : "23/a", +} + +metric_info["average_drop_rate"] = { + "title" : _("Dropped messages"), + "unit" : "1/s", + "color" : "21/b", } +metric_info["average_sync_time"] = { + "title" : _("Average slave sync time"), + "unit" : "s", + "color" : "46/a", +} + + metric_info["average_rule_trie_rate"] = { "title" : _("Rule tries"), "unit" : "1/s", - "color" : "13/a", + "color" : "33/a", } metric_info["average_rule_hit_rate"] = { "title" : _("Rule hits"), "unit" : "1/s", - "color" : "21/a", -} - -metric_info["average_drop_rate"] = { - "title" : _("Message drops"), - "unit" : "1/s", - "color" : "24/a", + "color" : "34/b", } metric_info["average_event_rate"] = { @@ -2360,27 +2369,27 @@ metric_info["average_event_rate"] = { } metric_info["average_connect_rate"] = { - "title" : _("Status: Client connects"), + "title" : _("Client connects"), "unit" : "1/s", - "color" : "34/a", + "color" : "15/a", } metric_info["average_request_time"] = { - "title" : _("Status: Request time"), + "title" : _("Average request response time"), "unit" : "s", - "color" : "41/a", + "color" : "14/a", } metric_info["average_processing_time"] = { "title" : _("Event processing time"), "unit" : "s", - "color" : "31/a", + "color" : "13/a", } metric_info["average_rule_hit_ratio"] = { "title" : _("Rule hit ratio"), "unit" : "%", - "color" : "31/a", + "color" : "#cccccc", } metric_info["log_message_rate"] = { @@ -6840,27 +6849,63 @@ graph_info.append({ ], }) + +graph_info.append({ + "metrics" : [ + ( "num_open_events", "area" ), + ] +}) + + graph_info.append({ - "title" : _("Event Console performance"), + "title" : _("Message processing"), "metrics" : [ ( "average_message_rate", "area" ), - ( "average_rule_trie_rate", "area" ), - ( "average_rule_hit_rate", "area" ), ( "average_drop_rate", "area" ), - ( "average_event_rate", "area" ), - ( "average_connect_rate", "area" ), ], }) + + graph_info.append({ - "title" : _("Event Console times"), + "title" : _("Rule efficiency"), "metrics" : [ - ( "average_request_time", "stack" ), - ( "average_processing_time", "stack" ), + ( "average_rule_trie_rate", "area" ), + ( "average_rule_hit_rate", "area" ), ], }) graph_info.append({ + "metrics" : [ + ( "average_rule_hit_ratio", "area" ), + ] +}) + +graph_info.append({ + "metrics" : [ + ( "average_event_rate", "area" ), + ] +}) + +graph_info.append({ + "metrics" : [ + ( "average_processing_time", "stack" ), + ] +}) + +# ( "average_connect_rate", "area" ), + + + +# graph_info.append({ +# "title" : _("Event Console times"), +# "metrics" : [ +# ( "average_request_time", "stack" ), +# ( "average_processing_time", "stack" ), +# ], +# }) + +graph_info.append({ "title" : _("Livestatus Requests per Connection"), "metrics" : [ ( "livestatus_request_rate,livestatus_connect_rate,/#88aa33", "area",