[checkmk-commits] Combined graphs: cleanup imports

Module: check_mk Branch: master Commit: c114aa29a22efbcf983d0ba62825d2dddafe5ecf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c114aa29a22efb… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Mar 1 10:20:03 2017 +0100 Combined graphs: cleanup imports Change-Id: I883a1717ffda882e06872c73d35656e420d9fe95 --- ZUTUN.graphing | 3 --- web/htdocs/metrics.py | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ZUTUN.graphing b/ZUTUN.graphing index dc70270..91b81cf 100644 --- a/ZUTUN.graphing +++ b/ZUTUN.graphing @@ -7,9 +7,6 @@ lm: nicht durch... -[14] Import views und visuals irgendwie aufrüamen - - [19] Umswitchen der Darstellungsarten über die Knöpfe soll den gewählten Zeitbereich beibehalten. Geht das überhaupt? diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 232fe39..02c68b1 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -38,9 +38,10 @@ import math, time, colorsys, shlex, operator, random import config, pagetypes, table import sites import traceback +from log import logger from lib import * from valuespec import * -from livestatus import MKLivestatusNotFoundError +import livestatus from cmk.regex import regex from collections import OrderedDict @@ -1556,7 +1557,7 @@ def host_service_graph_dashlet_cmk(graph_identification, custom_graph_render_opt graph_recipe = graph_recipes[0] else: raise MKGeneralException(_("Failed to calculate a graph recipe.")) - except MKLivestatusNotFoundError: + except livestatus.MKLivestatusNotFoundError: html.write("<div class=error>%s</div>" % html.attrencode(_("Cannot render graphs: cannot fetch data via Livestatus"))) return