[checkmk-commits] New hidden Multisite option force_pnp_graphing for forcing to use PNP

Module: check_mk Branch: master Commit: eae5d7e2b6cd3107a29ddcc485df96028f390a15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eae5d7e2b6cd31… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 26 16:52:36 2016 +0100 New hidden Multisite option force_pnp_graphing for forcing to use PNP Even if CMK graphing is present --- web/htdocs/metrics.py | 2 +- web/plugins/config/builtin.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 31059fd..585ce68 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1219,7 +1219,7 @@ def render_graph_pnp(graph_template, translated_metrics): def cmk_graphs_possible(): try: render_graph_html - return browser_supports_canvas() and not html.is_mobile() + return not config.force_pnp_graphing and browser_supports_canvas() and not html.is_mobile() except: return False diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index c3eee92..f6e8fd4 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -210,6 +210,9 @@ escape_plugin_output = True # Virtual host trees for the "Virtual Host Trees" snapin virtual_host_trees = [] +# Fall back to PNP4Nagios as graphing GUI even on CEE +force_pnp_graphing = False + # Target email address for "Crashed Check" page crash_report_target = "feedback(a)check-mk.org"