[checkmk-commits] Check_MK Git: check_mk: Allow host graphs to use new metric system

Module: check_mk Branch: master Commit: 5f1a0972567e3f641f30ce95fc1fdf0b92036203 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f1a0972567e3f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 10:18:30 2015 +0100 Allow host graphs to use new metric system --- web/plugins/metrics/check_mk.py | 1 + web/plugins/views/painters.py | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 71a38da..ee7726d 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1061,6 +1061,7 @@ check_metrics["check-mk-ping"] = {} check_metrics["check-mk"] = {} check_metrics["check_mk_active-tcp"] = { "time" : { "name": "response_time" } } +check_metrics["check-mk-host-tcp"] = { "time" : { "name": "response_time" } } check_metrics["check_mk-uptime"] = {} check_metrics["check_mk-esx_vsphere_counters.uptime"] = {} diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index f312bb5..bf64ab5 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -782,15 +782,14 @@ multisite_painters["svc_group_memberlist"] = { def paint_graph(row): # For hosts graphs always use PNP - if row.get("service_description"): - try: - css, htmlcode = paint_svc_time_graph(row) - if htmlcode: - return css, htmlcode - except NameError: - if config.debug: - raise - pass + try: + css, htmlcode = paint_time_graph(row) + if htmlcode: + return css, htmlcode + except NameError: + if config.debug: + raise + pass sitename = row["site"] host = row["host_name"]