Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: WATO: Prevent erros if no contactgroups defined for a user

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 766dd018242017fd5bffef74a2bf10317095e76a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=766dd018242017… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 14:20:32 2011 +0100 WATO: Prevent erros if no contactgroups defined for a user --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index db7efc3..78170b0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -921,7 +921,7 @@ def check_folder_permissions(folder, how, exception=True, user = None): if config.user_id not in users: user_cgs = [] else: - user_cgs = users[config.user_id]["contactgroups"] + user_cgs = users[config.user_id].get("contactgroups", []) for c in user_cgs: if c in cgs:

12 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 205ff557720267d23178ed21bd07aef0c5024dbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=205ff557720267… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 23 15:07:42 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: WATO: bugfix visibility of host tags dropdown menu after POST form

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3e7222e32cf5160bbb7007bd1535551164f71804 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e7222e32cf516… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 23 15:06:37 2011 +0100 WATO: bugfix visibility of host tags dropdown menu after POST form --- web/htdocs/htmllib.py | 2 +- web/htdocs/wato.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 1572a03..faa9d8f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -445,7 +445,7 @@ class html: (onchange_code, varname, varname, attributes)) for value, text in options: if value == None: value = "" - sel = value.split('|')[0] == current and " selected" or "" + sel = value == current and " selected" or "" self.write("<option value=\"%s\"%s>%s</option>\n" % (value, sel, text)) self.write("</select>\n") if varname: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a39e220..a4d73bf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3529,8 +3529,10 @@ class HostTagAttribute(Attribute): # But case could occur if tags definitions have been changed. def render_input(self, value): + varname = "attr_" + self.name() if value == None: - value = "" # Important for tag groups with an empty tag entry + value = html.var(varname,"") # "" is important for tag groups with an empty tag entry + # Tag groups with just one entry are being displayed # as checkboxes choices = [] @@ -3543,9 +3545,11 @@ class HostTagAttribute(Attribute): else: secondary_tags = [] choices.append(("|".join([ tagvalue ] + secondary_tags), e[1])) - varname = "attr_" + self.name() + if value != "" and value == tagvalue: + value = value + "|" + "|".join(secondary_tags) + if len(choices) == 1: - html.checkbox(varname, value != None, cssclass = '', onclick='wato_fix_visibility();', add_attr = ["tags=%s"%choices[0][0]]) + html.checkbox(varname, value != "", cssclass = '', onclick='wato_fix_visibility();', add_attr = ["tags=%s"%choices[0][0]]) html.write(" " + choices[0][1]) else: html.select(varname, choices, value, onchange='wato_fix_visibility();')

12 years, 9 months

Check_MK Git: check_mk: Upaded label for check_mk service check reschedule button

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c6c397de3faea094537958aed9fe790805eecebd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6c397de3faea0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 14:05:20 2011 +0100 Upaded label for check_mk service check reschedule button --- web/plugins/icons/builtin.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 9ae167b..3f1899f 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -423,6 +423,7 @@ def paint_reschedule(what, row, tags, custom_vars): servicedesc = '' wait_svc = '' icon = 'icon_reload' + txt = _('Reschedule an immediate check of this %s') % _(what) if what == 'service': servicedesc = row['service_description'] @@ -432,12 +433,12 @@ def paint_reschedule(what, row, tags, custom_vars): if row[what + '_check_command'].startswith('check_mk-'): servicedesc = 'Check_MK' icon = 'icon_reload_cmk' + txt = _('Reschedule an immediate check of the \'Check_MK\' service') return '<a href=\"javascript:void(0);\" ' \ 'onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ '<img class=icon title="%s" src="images/%s.gif" /></a>' % \ - (row["site"], row["host_name"], servicedesc, wait_svc, - (_('Reschedule an immediate check of this %s') % _(what)), icon) + (row["site"], row["host_name"], servicedesc, wait_svc, txt, icon) multisite_icons.append({ 'columns': [ 'active_checks_enabled' ],

12 years, 9 months

Check_MK Git: check_mk: passive check reschedule: Waiting for wait_svc now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d661fd838a633d8d0dc208fb9413172fe628147a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d661fd838a633d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 14:10:44 2011 +0100 passive check reschedule: Waiting for wait_svc now --- web/htdocs/actions.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index 3d26902..20f76dd 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -51,19 +51,21 @@ def action_reschedule(): wait_svc = html.var("wait_svc", "") if service: + cmd = "SVC" what = "service" spec = "%s;%s" % (host, service) + if wait_svc: wait_spec = '%s;%s' % (host, wait_svc) + add_filter = "Filter: service_description = %s\n" % wait_svc else: wait_spec = spec - cmd = "SVC" - add_filter = "Filter: service_description = %s\n" % service + add_filter = "Filter: service_description = %s\n" % service else: + cmd = "HOST" what = "host" spec = host wait_spec = spec - cmd = "HOST" add_filter = "" try:

12 years, 9 months

Check_MK Git: check_mk: Adding reschedule icon to all Check_MK based services. Clicks on these

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf7a1ae11b9601f7631a2827f85a87d4177f19f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf7a1ae11b9601… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 14:01:38 2011 +0100 Adding reschedule icon to all Check_MK based services. Clicks on these icons will simply trigger a reschedule of the Check_MK service --- ChangeLog | 2 ++ web/htdocs/actions.py | 12 ++++++++++-- web/htdocs/images/icon_reload_cmk.gif | Bin 0 -> 1800 bytes web/htdocs/js/check_mk.js | 15 ++++++++++----- web/plugins/icons/builtin.py | 22 +++++++++++++++++----- 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9539d76..c4b9d86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ Multisite: * Several cleanups to prevent css/js warning messages in e.g. Firefox * Made texts in selectable rows selectable again + * Adding reschedule icon to all Check_MK based services. Clicks on these + icons will simply trigger a reschedule of the Check_MK service * FIX: ship missing CSS files for mobile GUI WATO: diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index 45228d1..3d26902 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -46,15 +46,23 @@ def action_reschedule(): host = html.var("host", "") if not host: raise MKGeneralException("Action reschedule: missing host name") - service = html.var("service", "") + + service = html.var("service", "") + wait_svc = html.var("wait_svc", "") + if service: what = "service" spec = "%s;%s" % (host, service) + if wait_svc: + wait_spec = '%s;%s' % (host, wait_svc) + else: + wait_spec = spec cmd = "SVC" add_filter = "Filter: service_description = %s\n" % service else: what = "host" spec = host + wait_spec = spec cmd = "HOST" add_filter = "" @@ -70,7 +78,7 @@ def action_reschedule(): "WaitTrigger: check\n" "Columns: last_check state plugin_output\n" "Filter: host_name = %s\n%s" - % (what, spec, now, config.reschedule_timeout * 1000, host, add_filter)) + % (what, wait_spec, now, config.reschedule_timeout * 1000, host, add_filter)) html.live.set_only_sites() last_check = row[0] if last_check < now: diff --git a/web/htdocs/images/icon_reload_cmk.gif b/web/htdocs/images/icon_reload_cmk.gif new file mode 100644 index 0000000..eae1235 Binary files /dev/null and b/web/htdocs/images/icon_reload_cmk.gif differ diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index caa8e14..a8737b8 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -441,16 +441,21 @@ function actionResponseHandler(oImg, code) { oImg = null; } -function performAction(oLink, action, site, host, service) { +function performAction(oLink, action, site, host, service, wait_svc) { var oImg = oLink.childNodes[0]; - oImg.src = 'images/icon_reloading.gif'; + + if(wait_svc != service) + oImg.src = 'images/icon_reloading_cmk.gif'; + else + oImg.src = 'images/icon_reloading.gif'; // Chrome and IE are not animating the gif during sync ajax request // So better use the async request here get_url('nagios_action.py?action=' + action + - '&site=' + escape(site) + - '&host=' + escape(host) + - '&service=' + escape(service), + '&site=' + escape(site) + + '&host=' + escape(host) + + '&service=' + escape(service) + + '&wait_svc=' + escape(wait_svc), actionResponseHandler, oImg); oImg = null; } diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 60b4b03..9ae167b 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -416,16 +416,28 @@ multisite_icons.append({ def paint_reschedule(what, row, tags, custom_vars): # Reschedule button - if row[what + "_active_checks_enabled"] == 1 \ + if (row[what + "_active_checks_enabled"] == 1 + or row[what + '_check_command'].startswith('check_mk-')) \ and config.may('action.reschedule'): + servicedesc = '' + wait_svc = '' + icon = 'icon_reload' + if what == 'service': servicedesc = row['service_description'] + wait_svc = servicedesc + + # Use Check_MK service for cmk based services + if row[what + '_check_command'].startswith('check_mk-'): + servicedesc = 'Check_MK' + icon = 'icon_reload_cmk' + return '<a href=\"javascript:void(0);\" ' \ - 'onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\');">' \ - '<img class=icon title="%s" src="images/icon_reload.gif" /></a>' % \ - (row["site"], row["host_name"], servicedesc, - (_('Reschedule an immediate check of this %s') % _(what))) + 'onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ + '<img class=icon title="%s" src="images/%s.gif" /></a>' % \ + (row["site"], row["host_name"], servicedesc, wait_svc, + (_('Reschedule an immediate check of this %s') % _(what)), icon) multisite_icons.append({ 'columns': [ 'active_checks_enabled' ],

12 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 15f663717853131f95def95c6f410f473f105acb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15f66371785313… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 14:01:51 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: FIX: rename check_mk.js into checkmk.js

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1f2526686aba18af01eee0e1c3c2df4561b52612 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f2526686aba18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 23 13:49:05 2011 +0100 FIX: rename check_mk.js into checkmk.js --- ChangeLog | 2 ++ web/htdocs/htmllib.py | 2 +- web/htdocs/js/{check_mk.js => checkmk.js} | 0 web/htdocs/mobile.py | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46aa366..b9e63f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ * Several cleanups to prevent css/js warning messages in e.g. Firefox * Made texts in selectable rows selectable again * FIX: ship missing CSS files for mobile GUI + * FIX: rename check_mk.js into checkmk.js in order to avoid browser + caching problems during version update WATO: * Optimized wraps in host lists tag column diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 1572a03..02b2d82 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -635,7 +635,7 @@ class html: self.write('<link rel="stylesheet" type="text/css" href="%s">\n' % config.custom_style_sheet) # Load specified Javascript files - for js in [ "check_mk", "hover" ] + javascripts: + for js in [ "checkmk", "hover" ] + javascripts: self.write('<script type="text/javascript" src="js/%s.js"></script>\n' % js) if self.browser_reload != 0: diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/checkmk.js similarity index 100% rename from web/htdocs/js/check_mk.js rename to web/htdocs/js/checkmk.js diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index f22adea..9d441bc 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -57,7 +57,7 @@ def mobile_html_head(title, ready_code=""): <script type='text/javascript' src='jquery/jquery-1.6.4.min.js'></script> <script type='text/javascript' src='jquery/jquery.mobile-1.0.min.js'></script> <script type='text/javascript' src='js/mobile.js'></script> - <script type='text/javascript' src='js/check_mk.js'></script> + <script type='text/javascript' src='js/checkmk.js'></script> <script type='text/javascript'> $(document).ready(function() { %s }); </script>

12 years, 9 months

Check_MK Git: check_mk: Inventory of SNMP devices: force implicit full scan

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a50c0ce69144aa5cf4fbbc70bc8d863eea437db2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a50c0ce69144aa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 23 13:43:26 2011 +0100 Inventory of SNMP devices: force implicit full scan --- ChangeLog | 2 ++ web/htdocs/wato.py | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9539d76..46aa366 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,8 @@ * NagVis auhtorization file generation is also executed on activate_changes * Implemented a new inclusion based API for using multisite permissions in other addons + * Inventory of SNMP devices: force implicit full scan if no services + are configured yet * FIX: Calling activate_changes hook also in distributed WATO setups * FIX: Fixed javascript errors when doing replication in distributed wato environments when not having the sidebar open diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a39e220..db7efc3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1833,8 +1833,14 @@ def show_service_table(host, firsttime): # Read current check configuration cache_options = not html.var("_scan") and [ '--cache' ] or [] + + # We first try using the Cache (if the user has not pressed Full Scan). + # If we do not find any data, we omit the cache and immediately try + # again without using the cache. try: table = check_mk_automation(host[".siteid"], "try-inventory", cache_options + [hostname]) + if len(table) == 0 and cache_options != []: + table = check_mk_automation(host[".siteid"], "try-inventory", [hostname]) except Exception, e: if config.debug: raise

12 years, 9 months

Check_MK Git: check_mk: Adding reschedule icon to all Check_MK based services. Clicks on these

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ba7bb222cd7715ed04406b2e26e43194e4720648 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba7bb222cd7715… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 13:17:21 2011 +0100 Adding reschedule icon to all Check_MK based services. Clicks on these icons will simply trigger a reschedule of the Check_MK service --- ChangeLog | 2 ++ web/htdocs/js/check_mk.js | 7 ++++++- web/plugins/icons/builtin.py | 7 ++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9539d76..c4b9d86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ Multisite: * Several cleanups to prevent css/js warning messages in e.g. Firefox * Made texts in selectable rows selectable again + * Adding reschedule icon to all Check_MK based services. Clicks on these + icons will simply trigger a reschedule of the Check_MK service * FIX: ship missing CSS files for mobile GUI WATO: diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index caa8e14..a72eaec 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -441,10 +441,15 @@ function actionResponseHandler(oImg, code) { oImg = null; } -function performAction(oLink, action, site, host, service) { +function performAction(oLink, action, site, host, service, check_command) { var oImg = oLink.childNodes[0]; oImg.src = 'images/icon_reloading.gif'; + // Transform reschedules of check_mk triggered services + if(check_command.indexOf('check_mk-') === 0) { + service = 'Check_MK'; + } + // Chrome and IE are not animating the gif during sync ajax request // So better use the async request here get_url('nagios_action.py?action=' + action + diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 60b4b03..b7998f2 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -416,15 +416,16 @@ multisite_icons.append({ def paint_reschedule(what, row, tags, custom_vars): # Reschedule button - if row[what + "_active_checks_enabled"] == 1 \ + if (row[what + "_active_checks_enabled"] == 1 + or row[what + '_check_command'].startswith('check_mk-')) \ and config.may('action.reschedule'): servicedesc = '' if what == 'service': servicedesc = row['service_description'] return '<a href=\"javascript:void(0);\" ' \ - 'onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\');">' \ + 'onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ '<img class=icon title="%s" src="images/icon_reload.gif" /></a>' % \ - (row["site"], row["host_name"], servicedesc, + (row["site"], row["host_name"], servicedesc, row[what + '_check_command'], (_('Reschedule an immediate check of this %s') % _(what))) multisite_icons.append({

12 years, 9 months

← Newer
1
2
3
4
5
6
7
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011