Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: piggyback: new translation that simply drops the domain

by Mathias Kettner

Module: check_mk Branch: master Commit: 7203a2540c26d9e171cdce74f3814e365adea6d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7203a2540c26d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 16 15:52:42 2013 +0200 piggyback: new translation that simply drops the domain --- modules/check_mk_base.py | 8 ++++++-- web/plugins/wato/check_mk_configuration.py | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index b3dd7e2..0cae94f 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -498,7 +498,11 @@ def translate_piggyback_host(sourcehost, backedhost): elif caseconf == "lower": backedhost = backedhost.lower() - # 2. Regular expression conversion + # 2. Drop domain part + if translation.get("drop_domain"): + backedhost = backedhost.split(".", 1)[0] + + # 3. Regular expression conversion if "regex" in translation: regex, subst = translation.get("regex") if not regex.endswith('$'): @@ -510,7 +514,7 @@ def translate_piggyback_host(sourcehost, backedhost): for nr, text in enumerate(mo.groups()): backedhost = backedhost.replace("\\%d" % (nr+1), text) - # 3. Explicity mapping + # 4. Explicity mapping for from_host, to_host in translation.get("mapping", []): if from_host == backedhost: backedhost = to_host diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 59826fa..788b5fe 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1686,6 +1686,12 @@ register_rule(group, ( "lower", _("Convert hostnames to lower case") ), ] )), + ( "drop_domain", + FixedValue( + True, + title = _("Convert FQHN"), + totext = _("Drop domain part (<tt>host123.foobar.de</tt> → <tt>host123</tt>)"), + )), ( "regex", Tuple( title = _("Regular expression substitution"),

11 years, 2 months

Check_MK Git: check_mk: New global setting: hostname translation (allows e. g. to drop domain name)

by Mathias Kettner

Module: check_mk Branch: master Commit: b483813cd3e12920eb30b7a23ca6eacc1260d3ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b483813cd3e129… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 16 16:15:16 2013 +0200 New global setting: hostname translation (allows e.g. to drop domain name) --- ChangeLog | 1 + mkeventd/bin/mkeventd | 52 +++++++++++++++++++- mkeventd/web/plugins/wato/mkeventd.py | 14 ++++++ modules/check_mk_base.py | 4 +- web/htdocs/wato.py | 73 ++++++++++++++++++++++++++++ web/plugins/wato/check_mk_configuration.py | 69 +------------------------- 6 files changed, 142 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b483813cd3…

11 years, 2 months

Check_MK Git: check_mk: esx_vsphere_vm: warn if vmware tools are not installed

by Mathias Kettner

Module: check_mk Branch: master Commit: dee1c8260eab043c9ec827cafdf5db3850f343a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dee1c8260eab04… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 16 15:39:22 2013 +0200 esx_vsphere_vm: warn if vmware tools are not installed --- checks/esx_vsphere_vm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 998db95..32ed6ad 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -126,8 +126,7 @@ check_info['esx_vsphere_vm.name'] = { # def inventory_esx_vsphere_vm_hb_status(info): data = esx_vsphere_vm_convert(info) - status = data.get('guestHeartbeatStatus') - if status and status[0] != "gray": + if 'guestHeartbeatStatus' in data: return [(None, None)] def check_esx_vsphere_vm_hb_status(item, params, info): @@ -135,15 +134,15 @@ def check_esx_vsphere_vm_hb_status(item, params, info): vm_status = data['guestHeartbeatStatus'][0] state = 3 - if vm_status == 'gray': - state = 3 + if vm_status == 'gray': + return 1, "No VMWare Tools installed" elif vm_status == 'green': state = 0 elif vm_status == 'red': state = 2 elif vm_status == 'yellow': state = 1 - return(state, "Heartbeat status is %s" % vm_status) + return state, "Heartbeat status is %s" % vm_status check_info['esx_vsphere_vm.heartbeat'] = {

11 years, 2 months

Check_MK Git: check_mk: Renamed esx_vsphere_virtualmachine ->

by Mathias Kettner

esx_vsphere_vm Message-ID: <516d4f59.NVWuiy78KylLfsCi%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 250a725cc67b0ed7688786afe7fcabe06405d980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=250a725cc67b0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 16 15:17:11 2013 +0200 Renamed esx_vsphere_virtualmachine -> esx_vsphere_vm Check names got too long. Sorry for the mess, but we better cleanup things in the early phase than later... --- agents/special/agent_vsphere | 2 +- checks/.f12 | 2 +- .../{esx_vsphere_virtualmachine => esx_vsphere_vm} | 44 ++++++++++---------- web/plugins/perfometer/check_mk.py | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 7907a8c..49998dc 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -296,7 +296,7 @@ def output_mors(what, properties, direct=False): else: print '<<<<%s>>>>' % name - print '<<<esx_vsphere_%s>>>' % what + print '<<<esx_vsphere_%s>>>' % (what.replace('virtualmachine', 'vm')) items = data.items() items.sort() for name, value in items: diff --git a/checks/.f12 b/checks/.f12 index 959cb4c..c4e5e87 100644 --- a/checks/.f12 +++ b/checks/.f12 @@ -1,3 +1,3 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} -sudo install -m 644 * /omd/sites/$SITE/share/check_mk/checks +sudo rsync -ar --delete-after ./ /omd/sites/$SITE/share/check_mk/checks/ diff --git a/checks/esx_vsphere_virtualmachine b/checks/esx_vsphere_vm similarity index 82% rename from checks/esx_vsphere_virtualmachine rename to checks/esx_vsphere_vm index 3b3bf95..998db95 100644 --- a/checks/esx_vsphere_virtualmachine +++ b/checks/esx_vsphere_vm @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def esx_vsphere_virtualmachine_convert(info): +def esx_vsphere_vm_convert(info): data = {} for line in info: data[line[0]] = line[1:] @@ -40,13 +40,13 @@ def esx_vsphere_virtualmachine_convert(info): # '----------------------------------------------------------------------' -def inventory_esx_vsphere_virtualmachine_mem(info): - data = esx_vsphere_virtualmachine_convert(info).keys() +def inventory_esx_vsphere_vm_mem(info): + data = esx_vsphere_vm_convert(info).keys() if 'summary.quickStats.guestMemoryUsage' in data: return [(None, {})] -def check_esx_vsphere_virtualmachine_mem(item, params, info): - data = esx_vsphere_virtualmachine_convert(info) +def check_esx_vsphere_vm_mem(item, params, info): + data = esx_vsphere_vm_convert(info) #consumed host memory host_memory_usage = savefloat(data["summary.quickStats.hostMemoryUsage"][0]) * 1024 * 1024 @@ -75,9 +75,9 @@ def check_esx_vsphere_virtualmachine_mem(item, params, info): return(0, message, perf) -check_info['esx_vsphere_virtualmachine.mem_usage'] = { - "inventory_function" : inventory_esx_vsphere_virtualmachine_mem, - "check_function" : check_esx_vsphere_virtualmachine_mem, +check_info['esx_vsphere_vm.mem_usage'] = { + "inventory_function" : inventory_esx_vsphere_vm_mem, + "check_function" : check_esx_vsphere_vm_mem, "service_description" : "ESX Memory", "has_perfdata" : True } @@ -92,19 +92,19 @@ check_info['esx_vsphere_virtualmachine.mem_usage'] = { # | | # '----------------------------------------------------------------------' -def inventory_esx_vsphere_virtualmachine_name(info): - data = esx_vsphere_virtualmachine_convert(info).keys() +def inventory_esx_vsphere_vm_name(info): + data = esx_vsphere_vm_convert(info).keys() if 'name' in data: return [(None, None)] -def check_esx_vsphere_virtualmachine_name(item, params, info): - data = esx_vsphere_virtualmachine_convert(info) +def check_esx_vsphere_vm_name(item, params, info): + data = esx_vsphere_vm_convert(info) return(0, " ".join(data['name'])) -check_info['esx_vsphere_virtualmachine.name'] = { - "inventory_function" : inventory_esx_vsphere_virtualmachine_name, - "check_function" : check_esx_vsphere_virtualmachine_name, +check_info['esx_vsphere_vm.name'] = { + "inventory_function" : inventory_esx_vsphere_vm_name, + "check_function" : check_esx_vsphere_vm_name, "service_description" : "ESX Name", } @@ -124,14 +124,14 @@ check_info['esx_vsphere_virtualmachine.name'] = { # yellow - Intermittent heartbeat. May be due to guest load. # green - Guest operating system is responding normally. # -def inventory_esx_vsphere_virtualmachine_hb_status(info): - data = esx_vsphere_virtualmachine_convert(info) +def inventory_esx_vsphere_vm_hb_status(info): + data = esx_vsphere_vm_convert(info) status = data.get('guestHeartbeatStatus') if status and status[0] != "gray": return [(None, None)] -def check_esx_vsphere_virtualmachine_hb_status(item, params, info): - data = esx_vsphere_virtualmachine_convert(info) +def check_esx_vsphere_vm_hb_status(item, params, info): + data = esx_vsphere_vm_convert(info) vm_status = data['guestHeartbeatStatus'][0] state = 3 @@ -146,9 +146,9 @@ def check_esx_vsphere_virtualmachine_hb_status(item, params, info): return(state, "Heartbeat status is %s" % vm_status) -check_info['esx_vsphere_virtualmachine.heartbeat'] = { - "inventory_function" : inventory_esx_vsphere_virtualmachine_hb_status, - "check_function" : check_esx_vsphere_virtualmachine_hb_status, +check_info['esx_vsphere_vm.heartbeat'] = { + "inventory_function" : inventory_esx_vsphere_vm_hb_status, + "check_function" : check_esx_vsphere_vm_hb_status, "service_description" : "ESX Heartbeat", } diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 4d203d9..64da541 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -654,7 +654,7 @@ def perfometer_vmguest_mem_usage(row, command, perf): used = float(perf[0][1]) return number_human_readable(used), perfometer_logarithmic(used, 1024*1024*2000, 2, "#20cf80") -perfometers['check_mk-esx_vsphere_virtualmachine.mem_usage'] = perfometer_vmguest_mem_usage +perfometers['check_mk-esx_vsphere_vm.mem_usage'] = perfometer_vmguest_mem_usage def perfometer_esx_vsphere_hostsystem_cpu(row, command, perf): used_perc = float(perf[0][1])

11 years, 2 months

Check_MK Git: check_mk: Several fixes in ESX VM checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 6681b27bf15b413ba9018bc34c6e5ff728d41b71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6681b27bf15b41… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 16 15:12:00 2013 +0200 Several fixes in ESX VM checks --- checks/esx_vsphere_virtualmachine | 67 +++++++++++++++++++++++++++--------- web/plugins/perfometer/check_mk.py | 7 +++- 2 files changed, 57 insertions(+), 17 deletions(-) diff --git a/checks/esx_vsphere_virtualmachine b/checks/esx_vsphere_virtualmachine index f9c127f..3b3bf95 100644 --- a/checks/esx_vsphere_virtualmachine +++ b/checks/esx_vsphere_virtualmachine @@ -30,35 +30,44 @@ def esx_vsphere_virtualmachine_convert(info): data[line[0]] = line[1:] return data -esx_machine_mem_default = {} +# .--Memory--------------------------------------------------------------. +# | __ __ | +# | | \/ | ___ _ __ ___ ___ _ __ _ _ | +# | | |\/| |/ _ \ '_ ` _ \ / _ \| '__| | | | | +# | | | | | __/ | | | | | (_) | | | |_| | | +# | |_| |_|\___|_| |_| |_|\___/|_| \__, | | +# | |___/ | +# '----------------------------------------------------------------------' + def inventory_esx_vsphere_virtualmachine_mem(info): data = esx_vsphere_virtualmachine_convert(info).keys() if 'summary.quickStats.guestMemoryUsage' in data: - return [(None, esx_machine_mem_default)] + return [(None, {})] def check_esx_vsphere_virtualmachine_mem(item, params, info): data = esx_vsphere_virtualmachine_convert(info) - #active guest memory - guest_memory_usage = savefloat(data["summary.quickStats.guestMemoryUsage"][0]) * 1024 * 1024 #consumed host memory host_memory_usage = savefloat(data["summary.quickStats.hostMemoryUsage"][0]) * 1024 * 1024 + #active guest memory + guest_memory_usage = savefloat(data["summary.quickStats.guestMemoryUsage"][0]) * 1024 * 1024 #size of the balloon driver in the VM ballooned_memory = savefloat(data["summary.quickStats.balloonedMemory"][0]) * 1024 * 1024 #The portion of memory, in MB, that is granted to this VM from non-shared host memor(musst not be set) - private_memory = savefloat(data.get("summary.quickStats.privateMemory",[0])[0]) * 1024 * 1024 - #The portion of memory, in MB, that is granted to this VM from host memory that is shared between VMs. shared_memory = savefloat(data["summary.quickStats.sharedMemory"][0]) * 1024 * 1024 + #The portion of memory, in MB, that is granted to this VM from host memory that is shared between VMs. + private_memory = savefloat(data.get("summary.quickStats.privateMemory",[0])[0]) * 1024 * 1024 perf = [ - ("host_memory_usage", host_memory_usage ), - ("guest_memory_usage", guest_memory_usage ), - ("ballooned_memory", ballooned_memory ), - ("shared_memory", shared_memory ), + ("host", host_memory_usage ), + ("guest", guest_memory_usage ), + ("ballooned", ballooned_memory ), + ("shared", shared_memory ), + ("private", private_memory ), ] - message = "Consumed: %s, Active: %s, " \ + message = "Host: %s, Guest: %s, " \ "Ballooned: %s, Private: %s, Shared: %s" % \ (get_bytes_human_readable(host_memory_usage), \ get_bytes_human_readable(guest_memory_usage), get_bytes_human_readable(ballooned_memory), \ @@ -73,11 +82,20 @@ check_info['esx_vsphere_virtualmachine.mem_usage'] = { "has_perfdata" : True } +#. +# .--Name----------------------------------------------------------------. +# | _ _ | +# | | \ | | __ _ _ __ ___ ___ | +# | | \| |/ _` | '_ ` _ \ / _ \ | +# | | |\ | (_| | | | | | | __/ | +# | |_| \_|\__,_|_| |_| |_|\___| | +# | | +# '----------------------------------------------------------------------' def inventory_esx_vsphere_virtualmachine_name(info): data = esx_vsphere_virtualmachine_convert(info).keys() - if 'summary.quickStats.guestMemoryUsage' in data and 'config.hardware.memoryMB' in data: - return [(None, esx_machine_mem_default)] + if 'name' in data: + return [(None, None)] def check_esx_vsphere_virtualmachine_name(item, params, info): data = esx_vsphere_virtualmachine_convert(info) @@ -90,9 +108,26 @@ check_info['esx_vsphere_virtualmachine.name'] = { "service_description" : "ESX Name", } +#. +# .--Heartbeat-----------------------------------------------------------. +# | _ _ _ _ _ | +# | | | | | ___ __ _ _ __| |_| |__ ___ __ _| |_ | +# | | |_| |/ _ \/ _` | '__| __| '_ \ / _ \/ _` | __| | +# | | _ | __/ (_| | | | |_| |_) | __/ (_| | |_ | +# | |_| |_|\___|\__,_|_| \__|_.__/ \___|\__,_|\__| | +# | | +# '----------------------------------------------------------------------' + +# Possible values (this list is taken from the official documentation) +# gray - VMware Tools are not installed or not running. +# red - No heartbeat. Guest operating system may have stopped responding. +# yellow - Intermittent heartbeat. May be due to guest load. +# green - Guest operating system is responding normally. +# def inventory_esx_vsphere_virtualmachine_hb_status(info): - data = esx_vsphere_virtualmachine_convert(info).keys() - if 'guestHeartbeatStatus' in data: + data = esx_vsphere_virtualmachine_convert(info) + status = data.get('guestHeartbeatStatus') + if status and status[0] != "gray": return [(None, None)] def check_esx_vsphere_virtualmachine_hb_status(item, params, info): @@ -114,6 +149,6 @@ def check_esx_vsphere_virtualmachine_hb_status(item, params, info): check_info['esx_vsphere_virtualmachine.heartbeat'] = { "inventory_function" : inventory_esx_vsphere_virtualmachine_hb_status, "check_function" : check_esx_vsphere_virtualmachine_hb_status, - "service_description" : "ESX Heartbeat Status", + "service_description" : "ESX Heartbeat", } diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 560e654..4d203d9 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -649,7 +649,12 @@ def perfometer_simple_mem_usage(row, command, perf): perfometers['check_mk-db2_mem'] = perfometer_simple_mem_usage perfometers['check_mk-esx_vsphere_hostsystem.mem_usage'] = perfometer_simple_mem_usage -perfometers['check_mk-esx_vsphere_virtualmachine.mem_usage'] = perfometer_simple_mem_usage + +def perfometer_vmguest_mem_usage(row, command, perf): + used = float(perf[0][1]) + return number_human_readable(used), perfometer_logarithmic(used, 1024*1024*2000, 2, "#20cf80") + +perfometers['check_mk-esx_vsphere_virtualmachine.mem_usage'] = perfometer_vmguest_mem_usage def perfometer_esx_vsphere_hostsystem_cpu(row, command, perf): used_perc = float(perf[0][1])

11 years, 2 months

Check_MK Git: check_mk: esx_vsphere_virtualmachine.heartbeat{Status, }: renamed check

by Mathias Kettner

Module: check_mk Branch: master Commit: df18c7b61f10d7bb6084d6556f364446d11f471f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df18c7b61f10d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 16 14:47:09 2013 +0200 esx_vsphere_virtualmachine.heartbeat{Status,}: renamed check In order to make it compliant with the rest of the checks --- checks/esx_vsphere_virtualmachine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_virtualmachine b/checks/esx_vsphere_virtualmachine index b094b77..f9c127f 100644 --- a/checks/esx_vsphere_virtualmachine +++ b/checks/esx_vsphere_virtualmachine @@ -111,7 +111,7 @@ def check_esx_vsphere_virtualmachine_hb_status(item, params, info): return(state, "Heartbeat status is %s" % vm_status) -check_info['esx_vsphere_virtualmachine.heartbeatStatus'] = { +check_info['esx_vsphere_virtualmachine.heartbeat'] = { "inventory_function" : inventory_esx_vsphere_virtualmachine_hb_status, "check_function" : check_esx_vsphere_virtualmachine_hb_status, "service_description" : "ESX Heartbeat Status",

11 years, 2 months

Check_MK Git: check_mk: Fixed typo in checkout of ESX check

by Mathias Kettner

Module: check_mk Branch: master Commit: e5d89616924653205cd80dedef572712b595ad17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5d89616924653… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 16 14:42:52 2013 +0200 Fixed typo in checkout of ESX check --- checks/esx_vsphere_virtualmachine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_virtualmachine b/checks/esx_vsphere_virtualmachine index 700500a..b094b77 100644 --- a/checks/esx_vsphere_virtualmachine +++ b/checks/esx_vsphere_virtualmachine @@ -108,7 +108,7 @@ def check_esx_vsphere_virtualmachine_hb_status(item, params, info): state = 2 elif vm_status == 'yellow': state = 1 - return(state, "Hearbeat status is %s" % vm_status) + return(state, "Heartbeat status is %s" % vm_status) check_info['esx_vsphere_virtualmachine.heartbeatStatus'] = {

11 years, 2 months

Check_MK Git: check_mk: FIX: do not remove directories of non-exisant users anymore

by Mathias Kettner

Module: check_mk Branch: master Commit: 6d8f4c3ad52e0e6e764b39f63381851e564a7571 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d8f4c3ad52e0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 16 14:08:39 2013 +0200 FIX: do not remove directories of non-exisant users anymore Conflicts: ChangeLog --- ChangeLog | 5 +++++ web/htdocs/userdb.py | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a920e57..ebf450e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,11 @@ * FIX: check_mk_agent.aix: fix shebang: was python, must be ksh * FIX: cisco_qos: Be compatible to newer IOS-XE versions (Thanks to Ken Smith) + Multisite: + * FIX: do not remove directories of non-exisant users anymore. This lead to + a deletion of users' settings in case of an external authentication + (like mod_ldap). + 1.2.2: Core: * Added $HOSTURL$ and $SERVICEURL$ to notification macros which contain an diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 2d2853a..2dfd104 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -347,13 +347,16 @@ def save_users(profiles): serial_file = user_dir + '/serial.mk' create_user_file(serial_file, 'w').write('%d\n' % user.get('serial', 0)) - # Remove settings directories of non-existant users - dir = defaults.var_dir + "/web" - for e in os.listdir(dir): - if e not in ['.', '..'] and e not in profiles: - entry = dir + "/" + e - if os.path.isdir(entry): - shutil.rmtree(entry) + # Remove settings directories of non-existant users. + # Beware: we removed this since it leads to violent destructions + # if the user database is out of the scope of Check_MK. This is + # e.g. the case, if mod_ldap is used for user authentication. + # dir = defaults.var_dir + "/web" + # for e in os.listdir(dir): + # if e not in ['.', '..'] and e not in profiles: + # entry = dir + "/" + e + # if os.path.isdir(entry): + # shutil.rmtree(entry) # Call the users_saved hook hooks.call("users-saved", users)

11 years, 2 months

Check_MK Git: check_mk: Improved handling of valuespec validations in WATO rule editor

by Lars Michelsen

Module: check_mk Branch: master Commit: 6454cc5211615533df9a6ad46384e30abbe63904 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6454cc52116155… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 8 12:36:59 2013 +0200 Improved handling of valuespec validations in WATO rule editor Conflicts: ChangeLog --- ChangeLog | 4 ++++ web/htdocs/valuespec.py | 44 +++++++++++++++++++++++++++----------------- web/htdocs/wato.py | 8 +++++++- 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index ebf450e..645dc65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +<<<<<<< HEAD 1.2.3i1: Core: * Agents can send data for other hosts "piggyback". This is being @@ -111,6 +112,9 @@ * FIX: do not remove directories of non-exisant users anymore. This lead to a deletion of users' settings in case of an external authentication (like mod_ldap). + WATO: + * Improved handling of valuespec validations in WATO rule editor. Displaying a + warning message when going to throw away the current settings. 1.2.2: Core: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2564c00..daf92f5 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -27,6 +27,12 @@ import math, os, time, re, sre_constants, urlparse, forms, htmllib from lib import * +def type_name(v): + try: + return type(v).__name__ + except: + return htmllib.attrencode(type(v)) + # Abstract base class of all value declaration classes. class ValueSpec: def __init__(self, **kwargs): @@ -190,7 +196,8 @@ class Age(ValueSpec): def validate_datatype(self, value, varprefix): if type(value) != int: - raise MKUserError(varprefix, _("The value %r has type %s, but must be of type int") % (value, type(value))) + raise MKUserError(varprefix, _("The value %r has type %s, but must be of type int") % + (value, type_name(value))) # Editor for a single integer @@ -254,7 +261,7 @@ class Integer(ValueSpec): def validate_datatype(self, value, varprefix): if type(value) != int: raise MKUserError(varprefix, _("The value %r has the wrong type %s, but must be of type int") - % (value, type(value))) + % (value, type_name(value))) def validate_value(self, value, varprefix): if self._minvalue != None and value < self._minvalue: @@ -346,7 +353,8 @@ class TextAscii(ValueSpec): return if type(value) != str: - raise MKUserError(varprefix, _("The value must be of type str, but it has type %s") % type(value)) + raise MKUserError(varprefix, _("The value must be of type str, but it has type %s") % + type_name(value)) def validate_value(self, value, varprefix): if self._none_is_empty and value == "": @@ -370,7 +378,8 @@ class TextUnicode(TextAscii): def validate_datatype(self, value, varprefix): if type(value) not in [ str, unicode ]: - raise MKUserError(varprefix, _("The value must be of type str or unicode, but it has type %s") % type(value)) + raise MKUserError(varprefix, _("The value must be of type str or unicode, but it has type %s") % + type_name(value)) # Internal ID as used in many places (for contact names, group name, # an so on) @@ -646,7 +655,7 @@ class ListOfStrings(ValueSpec): def validate_datatype(self, value, vp): if type(value) != list: raise MKUserError(varprefix, _("Expected data type is " - "list, but your type is %s." % type(value))) + "list, but your type is %s." % type_name(value))) for nr, s in enumerate(value): self._valuespec.validate_datatype(s, vp + "_%d" % nr) @@ -785,7 +794,7 @@ class ListOf(ValueSpec): def validate_datatype(self, value, varprefix): if type(value) != list: - raise MKUserError(varprefix, _("The type must be list, but is %r") % type(value)) + raise MKUserError(varprefix, _("The type must be list, but is %s") % type_name(value)) for n, v in enumerate(value): self._valuespec.validate_datatype(v, varprefix + "_%d" % (n+1)) @@ -823,7 +832,7 @@ class Float(Integer): if type(value) != float and not \ (type(value) == int and self._accept_int): raise MKUserError(varprefix, _("The value %r has type %s, but must be of type float%s") % - (value, type(value), self._accept_int and _(" or int") or "")) + (value, type_name(value), self._accept_int and _(" or int") or "")) class Percentage(Float): @@ -844,7 +853,7 @@ class Percentage(Float): if self._allow_int: if type(value) not in [ int, float ]: raise MKUserError(varprefix, _("The value %r has type %s, but must be either float or int") - % (value, type(value))) + % (value, type_name(value))) else: Float.validate_datatype(self, value, varprefix) @@ -874,7 +883,8 @@ class Checkbox(ValueSpec): def validate_datatype(self, value, varprefix): if type(value) != bool: - raise MKUserError(varprefix, _("The value %r has type %s, but must be of type bool") % (value, type(value))) + raise MKUserError(varprefix, _("The value %r has type %s, but must be of type bool") % + (value, type_name(value))) # A type-save dropdown choice. Parameters: # help_separator: if you set this to a character, e.g. "-", then @@ -1212,7 +1222,7 @@ class ListChoice(ValueSpec): def validate_datatype(self, value, varprefix): self.load_elements() if type(value) != list: - raise MKUserError(varprefix, _("The datatype must be list, but is %s") % type(value)) + raise MKUserError(varprefix, _("The datatype must be list, but is %s") % type_name(value)) d = dict(self._elements) for v in value: if v not in d: @@ -1463,7 +1473,7 @@ class AbsoluteDate(ValueSpec): def validate_datatype(self, value, varprefix): if type(value) not in [ int, float ]: raise MKUserError(varprefix, _("The type of the timestamp must be int or float, but is %s") % - type(value)) + type_name(value)) def validate_value(self, value, varprefix): if value < 0 or int(value) > (2**31-1): @@ -1520,14 +1530,14 @@ class Timeofday(ValueSpec): return if type(value) != tuple: - raise MKUserError(varprefix, _("The datatype must be tuple, but ist %s" % type(value))) + raise MKUserError(varprefix, _("The datatype must be tuple, but ist %s" % type_name(value))) if len(value) != 2: raise MKUserError(varprefix, _("The tuple must contain two elements, but you have %d" % len(value))) for x in value: if type(x) != int: - raise MKUserError(varprefix, _("All elements of the tuple must be of type int, you have %s" % type(x))) + raise MKUserError(varprefix, _("All elements of the tuple must be of type int, you have %s" % type_name(x))) def validate_value(self, value, varprefix): if not self._allow_empty and value == None: @@ -1585,7 +1595,7 @@ class TimeofdayRange(ValueSpec): return if type(value) != tuple: - raise MKUserError(varprefix, _("The datatype must be tuple, but ist %s" % type(value))) + raise MKUserError(varprefix, _("The datatype must be tuple, but ist %s" % type_name(value))) if len(value) != 2: raise MKUserError(varprefix, _("The tuple must contain two elements, but you have %d" % len(value))) @@ -1862,7 +1872,7 @@ class Tuple(ValueSpec): def validate_datatype(self, value, varprefix): if type(value) != tuple: raise MKUserError(varprefix, - _("The datatype must be a tuple, but is %r") % type(value)) + _("The datatype must be a tuple, but is %s") % type_name(value)) if len(value) != len(self._elements): raise MKUserError(varprefix, _("The number of elements in the tuple must be exactly %d.") % len(self._elements)) @@ -2074,7 +2084,7 @@ class Dictionary(ValueSpec): value = self.migrate(value) if type(value) != dict: - raise MKUserError(varprefix, _("The type must be a dictionary, but it is a %s") % type(value)) + raise MKUserError(varprefix, _("The type must be a dictionary, but it is a %s") % type_name(value)) for param, vs in self._get_elements(): if param in value: @@ -2157,7 +2167,7 @@ class ElementSelection(ValueSpec): def validate_datatype(self, value, varprefix): if type(value) != str: - raise MKUserError(varprefix, _("The datatype must be str (string), but is %s") % type(value)) + raise MKUserError(varprefix, _("The datatype must be str (string), but is %s") % type_name(value)) class AutoTimestamp(FixedValue): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3828f0b..06bcc3c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10739,9 +10739,15 @@ def mode_edit_rule(phase, new = False): try: valuespec.validate_datatype(value, "ve") valuespec.render_input("ve", value) - except: + except Exception, e: if config.debug: raise + else: + html.show_warning(_('Unable to read current options of this rule. Falling back to ' + 'default values. When saving this rule now, your previous settings ' + 'will be overwritten. Problem was: %s.') % e) + + # In case of validation problems render the input with default values valuespec.render_input("ve", valuespec.default_value()) valuespec.set_focus("ve")

11 years, 2 months

Check_MK Git: check_mk: Fixed problem with snmp_check_interval in inventory check

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a2bc59b82f515acc288ef810abf65359ed8d00f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a2bc59b82f515… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 11:08:36 2013 +0200 Fixed problem with snmp_check_interval in inventory check --- modules/check_mk.py | 2 +- modules/check_mk_base.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 432159d..351184d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2346,7 +2346,7 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals checkname_base = checkname.split('.')[0] # make e.g. 'lsi' from 'lsi.arrays' try: - info = get_realhost_info(hostname, ipaddress, checkname_base, inventory_max_cachefile_age) + info = get_realhost_info(hostname, ipaddress, checkname_base, inventory_max_cachefile_age, True) # Add information about nodes if check wants this if check_info[checkname]["node_info"]: if clusters_of(hostname): diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 56c7de0..b3dd7e2 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -321,7 +321,7 @@ def get_host_info(hostname, ipaddress, checkname): # # This function assumes, that each check type is queried # only once for each host. -def get_realhost_info(hostname, ipaddress, check_type, max_cache_age): +def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_check_interval = False): info = get_cached_hostinfo(hostname) if info and info.has_key(check_type): return info[check_type] @@ -335,7 +335,8 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age): if oid_info: cache_path = tcp_cache_dir + "/" + cache_relpath check_interval = check_interval_of(hostname, check_type) - if check_interval is not None and os.path.exists(cache_path) \ + if not ignore_check_interval \ + and check_interval is not None and os.path.exists(cache_path) \ and cachefile_age(cache_path) < check_interval: # cache file is newer than check_interval, skip this check raise MKSkipCheck()

11 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013