[checkmk-commits] #3181 FIX Omit icon for downloading agent output on shadow hosts (cmcdump)

Module: check_mk Branch: master Commit: 9919f8414484e17964bde0854f8b6add38c0127d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9919f8414484e1… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Tue Feb 23 14:09:28 2016 +0100 #3181 FIX Omit icon for downloading agent output on shadow hosts (cmcdump) Hosts that are synced via <tt>cmcdump</tt> do not have any agent output. --- .werks/3181 | 10 ++++++++++ ChangeLog | 1 + web/plugins/icons/wato.py | 5 +++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/3181 b/.werks/3181 new file mode 100644 index 0000000..a2c7cfe --- /dev/null +++ b/.werks/3181 @@ -0,0 +1,10 @@ +Title: Omit icon for downloading agent output on shadow hosts (cmcdump) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456232935 + +Hosts that are synced via <tt>cmcdump</tt> do not have any agent output. diff --git a/ChangeLog b/ChangeLog index b259725..f47a466 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition * 3077 FIX: CSV export is now available for host/service availability and now includes summary line + * 3181 FIX: Omit icon for downloading agent output on shadow hosts (cmcdump)... WATO: * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index 93d4cca..dae1894 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -82,7 +82,8 @@ multisite_icons_and_actions['wato'] = { def paint_download_agent_output(what, row, tags, host_custom_vars, ty): if (what == "host" or (what == "service" and row["service_description"] == "Check_MK")) \ - and config.may("wato.download_agent_output"): + and config.may("wato.download_agent_output") \ + and not row["host_check_type"] == 2: # Not for shadow hosts # Not 100% acurate to use the tags here, but this is the best we can do # with the available information. @@ -107,7 +108,7 @@ def paint_download_agent_output(what, row, tags, host_custom_vars, ty): multisite_icons_and_actions['download_agent_output'] = { - 'host_columns' : [ "filename" ], + 'host_columns' : [ "filename", "check_type" ], 'paint' : lambda *args: paint_download_agent_output(*args, ty="agent"), 'toplevel' : False, 'sort_index' : 50,