Module: check_mk
Branch: master
Commit: c4cb36bf39e7071350798c062ab0156c42262430
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4cb36bf39e707…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jan 26 09:18:20 2016 +0100
minor code cleanup
---
web/plugins/icons/builtin.py | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py
index 6bf5905..9d6a83a 100644
--- a/web/plugins/icons/builtin.py
+++ b/web/plugins/icons/builtin.py
@@ -294,12 +294,6 @@ multisite_icons_and_actions['realhost'] = {
# | |
# '----------------------------------------------------------------------'
-def has_new_graphing():
- # TODO: Import in function is not good
- import metrics
- return hasattr(metrics, 'render_graph_from_template_html') \
- and metrics.new_style_graphs_possible()
-
# Intelligent Links to PNP4Nagios 0.6.X
def pnp_url(row, what, how = 'graph'):
@@ -346,7 +340,7 @@ def pnp_graph_icon_link(row, what):
if 'X' not in html.display_options:
return ""
- if not has_new_graphing():
+ if not metrics.new_style_graphs_possible():
return pnp_url(row, what)
else:
return new_graphing_url(row, what)
@@ -355,7 +349,7 @@ def pnp_graph_icon_link(row, what):
def pnp_icon(row, what):
url = pnp_graph_icon_link(row, what)
- if not has_new_graphing():
+ if not metrics.new_style_graphs_possible():
# Directly ask PNP for all data, don't try to use the new graph fetching
mechanism
# to keep the number of single requests low
hover_content_func = 'pnp_hover_contents(\'%s\')' %
pnp_popup_url(row, what)