Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

#2441 NetApp 7Mode: Now able to monitor reserved snapshot space for volumes

by Andreas Boesl

Module: check_mk Branch: master Commit: 7226ab7ce6938959fbc409e396eaa61e86e42777 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7226ab7ce69389… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Oct 31 16:47:53 2015 +0100 #2441 NetApp 7Mode: Now able to monitor reserved snapshot space for volumes --- .werks/2441 | 9 ++++++ ChangeLog | 1 + agents/special/agent_netapp | 13 ++++++++ checkman/netapp_api_snapshots | 12 ++++++++ checks/netapp_api.include | 8 +++-- checks/netapp_api_snapshots | 67 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 108 insertions(+), 2 deletions(-) diff --git a/.werks/2441 b/.werks/2441 new file mode 100644 index 0000000..0c1a0da --- /dev/null +++ b/.werks/2441 @@ -0,0 +1,9 @@ +Title: NetApp 7Mode: Now able to monitor reserved snapshot space for volumes +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1446306382 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 2b46e7e..890e597 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 2699 windows_tasks: new task success constant 'an instance of the task is already running' * 2671 df: avoid duplicate items for btrfs that is mounted several times... NOTE: Please refer to the migration notes! + * 2441 NetApp 7Mode: Now able to monitor reserved snapshot space for volumes * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index b7c233a..a0e9d5b 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -619,6 +619,19 @@ else: print format_config(aggregations, "aggregation", "name", config_report = ["name", "size-total", "size-available"]) + # Snapshot info + for volume in volumes.children_get(): + name = volume.child_get_string("name") + + volume_snapshots_reserved = server.invoke("snapshot-get-reserve", "volume", name) + dict_reserved = create_dict(volume_snapshots_reserved) + dict_reserved["size-total"] = volume.child_get_string("size-total") + print format_dict(dict_reserved, prefix = "volume_snapshot %s" % name, as_line = True) + + volume_snapshots = server.invoke("snapshot-list-info", "target-name", name, "target-type", "volume") + print format_config(volume_snapshots.child_get("snapshots"), "volume_snapshot", name, + report = ["volume_snapshot", "percentage-of-total-blocks", "cumulative-total"]) + # Protocols print "<<<netapp_api_protocol:sep(9)>>>" diff --git a/checkman/netapp_api_snapshots b/checkman/netapp_api_snapshots new file mode 100644 index 0000000..fcd0d2b --- /dev/null +++ b/checkman/netapp_api_snapshots @@ -0,0 +1,12 @@ +title: NetApp Filers: Used Space in Filesystems +agents: netapp +catalog: hw/storagehw/netapp +license: GPL +distribution: check_mk +description: + This check monitors the reserved space for snapshots of NetApp volumes. + If the cumulative size of all snapshots for a volume exceeds the configured + reserved percentage the check goes CRIT. + +item: + The name of the volume diff --git a/checks/netapp_api.include b/checks/netapp_api.include index b31aca9..bbc28a3 100644 --- a/checks/netapp_api.include +++ b/checks/netapp_api.include @@ -27,7 +27,7 @@ # Transforms all lines into a dictionary. # The first key is the dictionary key, unless modified by the custom_keys -def netapp_api_parse_lines(info, custom_keys = []): +def netapp_api_parse_lines(info, custom_keys = [], as_dict_list = False): instances = {} for line in info: instance = {} @@ -43,7 +43,11 @@ def netapp_api_parse_lines(info, custom_keys = []): custom_name.append(instance[key]) name = ".".join(custom_name) - instances[name] = instance + if as_dict_list: + instances.setdefault(name, []) + instances[name].append(instance) + else: + instances[name] = instance return instances diff --git a/checks/netapp_api_snapshots b/checks/netapp_api_snapshots new file mode 100644 index 0000000..ed5fd58 --- /dev/null +++ b/checks/netapp_api_snapshots @@ -0,0 +1,67 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Agent output: +# <<<netapp_api_snapshots:sep(9)>>> +# volume_snapshot volch150 percent-reserved 22 blocks-reserved 3322 size-total 12122 ... +# volume_snapshot volch150 percentage-of-total-blocks 0 cumulative-total 122924 ... + +def inventory_netapp_api_snapshots(parsed): + for key in parsed.keys(): + yield key, {} + +def check_netapp_api_snapshots(item, _no_params, parsed): + data = parsed.get(item) + + if not data: + return + + snapshot_total = int(data[-1]["cumulative-total"]) * 1024.0 + size_total = int(data[0]["size-total"]) + reserved_percent = snapshot_total / size_total + reserved_bytes = int(data[0]["blocks-reserved"]) * 1024.0 + + state = 0 + if reserved_percent > 100: + state = 2 + yield state, "Reserve used: %.1f%% (%s)" % (reserved_percent, + get_bytes_human_readable(snapshot_total)) + + yield 0, "Total Reserve: %s%% (%s) of %s" % (data[0]["percent-reserved"], + get_bytes_human_readable(reserved_bytes), + get_bytes_human_readable(size_total)),\ + [("bytes", snapshot_total, 0, 0, 0, reserved_bytes)] + +check_info["netapp_api_snapshots"] = { + 'parse_function' : lambda info: netapp_api_parse_lines(info, + custom_keys = ["volume_snapshot"], as_dict_list = True), + 'check_function' : check_netapp_api_snapshots, + 'inventory_function' : inventory_netapp_api_snapshots, + 'service_description' : 'Snapshots Volume', + 'has_perfdata' : True, + 'includes' : ["netapp_api.include"] +} +

8 years, 7 months

fixed permissions

by Andreas Boesl

Module: check_mk Branch: master Commit: 15c384b25fb13f692a87ce8c7d9c61c2486934ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15c384b25fb13f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Oct 31 16:12:01 2015 +0100 fixed permissions --- 0 files changed diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere old mode 100644 new mode 100755

8 years, 7 months

#2440 VMware ESX inventory: Now able to display ESX hostsystems and virtualmachines of clusters

by Andreas Boesl

Module: check_mk Branch: master Commit: 6703d130df88ec4834786d441cd8c79ba32ed155 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6703d130df88ec… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Oct 31 16:04:24 2015 +0100 #2440 VMware ESX inventory: Now able to display ESX hostsystems and virtualmachines of clusters --- .werks/2440 | 9 + ChangeLog | 1 + agents/special/agent_vsphere | 383 +++++++++++++++++++++++++++++++++++++++- inventory/esx_vsphere_clusters | 55 ++++++ web/plugins/views/inventory.py | 3 + 5 files changed, 448 insertions(+), 3 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6703d130df…

8 years, 7 months

#2672 FIX mounts: ignore options that are allowed to change on btrfs filesystems

by Mathias Kettner

Module: check_mk Branch: master Commit: f5f41946d9be03f50e832dd3dcb6891c05bb3334 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5f41946d9be03… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 31 11:48:37 2015 +0100 #2672 FIX mounts: ignore options that are allowed to change on btrfs filesystems This prevents the service from complaining about <tt>subvolid</tt> and <tt>subvol</tt>. --- .werks/2672 | 10 ++++++++++ ChangeLog | 1 + checks/mounts | 15 +++++++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.werks/2672 b/.werks/2672 new file mode 100644 index 0000000..c531409 --- /dev/null +++ b/.werks/2672 @@ -0,0 +1,10 @@ +Title: mounts: ignore options that are allowed to change on btrfs filesystems +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446288478 + +This prevents the service from complaining about <tt>subvolid</tt> and <tt>subvol</tt>. diff --git a/ChangeLog b/ChangeLog index 82b7f8f..9473b2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 2706 FIX: winperf_if: fixed rare crashes of windows_if.ps1 plugin... * 1297 FIX: emcvnx_hba: Prevent old emc versions from inventory... * 2698 FIX: ups_capacity: fixed missing battery time and fuel information + * 2672 FIX: mounts: ignore options that are allowed to change on btrfs filesystems... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/mounts b/checks/mounts index 40d0ead..3dd5f65 100644 --- a/checks/mounts +++ b/checks/mounts @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + def inventory_mounts(info): inventory = [] devices = [] @@ -36,6 +37,14 @@ def inventory_mounts(info): return inventory def check_mounts(item, targetopts, info): + + # Ignore options that are allowed to change + def should_ignore_option(option): + for ignored_option in [ "commit=", "localalloc=", "subvol=", "subvolid=" ]: + if option.startswith(ignored_option): + return True + return False + for dev, mp, fstype, options, dump, fsck in info: if item == mp: opts = options.split(",") @@ -43,14 +52,12 @@ def check_mounts(item, targetopts, info): exceeding = [] for o in opts: - if o not in targetopts and not o.startswith("commit=") \ - and not o.startswith("localalloc="): + if o not in targetopts and not should_ignore_option(o): exceeding.append(o) missing = [] for o in targetopts: - if o not in opts and not o.startswith("commit=") \ - and not o.startswith("localalloc="): + if o not in opts and not should_ignore_option(o): missing.append(o) if not missing and not exceeding:

8 years, 7 months

#2671 df: avoid duplicate items for btrfs that is mounted several times

by Mathias Kettner

Module: check_mk Branch: master Commit: bf1ad637a2eec45e430636e92428024c426d8146 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf1ad637a2eec4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 31 11:42:16 2015 +0100 #2671 df: avoid duplicate items for btrfs that is mounted several times With SLES 12 btrfs has been introduced. Here one filesystem (e.g. <tt>/dev/sda1</tt>) is mounted at a lot of directories at the same times and Check_MK had created one service for each of this - showing exactly the same stats. This has now been fixed so that only one filesystem check is being created for each btrfs device. The service in our example has the name <tt>Filesystem btrfs /dev/sda1</tt>. You need to redo service discovery or the affected hosts. --- .werks/2671 | 14 ++++++++++++++ ChangeLog | 2 ++ checks/df | 26 +++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/.werks/2671 b/.werks/2671 new file mode 100644 index 0000000..25f899e --- /dev/null +++ b/.werks/2671 @@ -0,0 +1,14 @@ +Title: df: avoid duplicate items for btrfs that is mounted several times +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i4 +Date: 1446287956 +Class: feature + +With SLES 12 btrfs has been introduced. Here one filesystem (e.g. <tt>/dev/sda1</tt>) is +mounted at a lot of directories at the same times and Check_MK had created one service +for each of this - showing exactly the same stats. This has now been fixed so that only +one filesystem check is being created for each btrfs device. The service in our example +has the name <tt>Filesystem btrfs /dev/sda1</tt>. You need to redo service discovery +or the affected hosts. diff --git a/ChangeLog b/ChangeLog index bf984d9..82b7f8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ * 2703 logwatch.ec: now transfers the service level to the event console... * 2705 winperf_if: added option to warn if an interface is using dhcp... * 2699 windows_tasks: new task success constant 'an instance of the task is already running' + * 2671 df: avoid duplicate items for btrfs that is mounted several times... + NOTE: Please refer to the migration notes! * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/df b/checks/df index 74bbebc..0ab4b9c 100644 --- a/checks/df +++ b/checks/df @@ -37,10 +37,28 @@ # Data NTFS 976506816 528665344 447841472 55% D:\ # PS3 PlayStation(R)3 File System 0 0 0 0% P:\ +# An example with btrfs (SLES 12). Here the same device is mounted +# several times at different mount point. But must only be monitored +# once. We use the device instead of the mount point in this case. +# <<<df>>> +# /dev/sda1 btrfs 20970496 4169036 16539348 21% / +# devtmpfs devtmpfs 497396 0 497396 0% /dev +# tmpfs tmpfs 506312 0 506312 0% /dev/shm +# tmpfs tmpfs 506312 6980 499332 2% /run +# tmpfs tmpfs 506312 0 506312 0% /sys/fs/cgroup +# /dev/sda1 btrfs 20970496 4169036 16539348 21% /.snapshots +# /dev/sda1 btrfs 20970496 4169036 16539348 21% /var/tmp +# /dev/sda1 btrfs 20970496 4169036 16539348 21% /var/spool +# /dev/sda1 btrfs 20970496 4169036 16539348 21% /var/opt +# /dev/sda1 btrfs 20970496 4169036 16539348 21% /var/log + + def df_parse_info(info): df_blocks = [] df_inodes = [] + btrfs_devices = set() # We might generalize that later lines = iter(info) + try: is_inode = False while True: @@ -55,7 +73,13 @@ def df_parse_info(info): # Handle known cases, where the file system contains spaces if line[2] == "File" and line[3] == "System": line = [ line[0], " ".join(line[1:4]) ] + line[4:] - df_blocks.append(line) + if line[1] == "btrfs": + device = line[0] + if device not in btrfs_devices: + btrfs_devices.add(device) + df_blocks.append(line[:6] + [ "btrfs " + line[0] ]) # replace mount point with device + else: + df_blocks.append(line) else: df_inodes.append(line) except StopIteration:

8 years, 7 months

Merge brancl 'master' of ssh://mathias-kettner.de/check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 36919ee4d4d644cf4190479232e75e293209a3dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36919ee4d4d644… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 31 11:42:25 2015 +0100 Merge brancl 'master' of ssh://mathias-kettner.de/check_mk ---

8 years, 7 months

Fixed folding for shipped sidebar snapins

by Lars Michelsen

Module: check_mk Branch: master Commit: 109b10d141d5bd3884871d58e2de6a20c7665097 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=109b10d141d5bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 30 16:19:45 2015 +0100 Fixed folding for shipped sidebar snapins --- web/plugins/sidebar/shipped.py | 239 ++++++++++++++++++++++------------------ 1 file changed, 129 insertions(+), 110 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=109b10d141…

8 years, 7 months

Removed Python 2.3 compatibility code - 2.4 is the oldest supported version

by Lars Michelsen

Module: check_mk Branch: master Commit: 302028c5926b934697208d25f5f7b026570baec3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=302028c5926b93… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 30 16:11:36 2015 +0100 Removed Python 2.3 compatibility code - 2.4 is the oldest supported version --- modules/check_mk_base.py | 7 ------- web/htdocs/bi.py | 8 -------- web/htdocs/config.py | 8 -------- web/htdocs/dashboard.py | 7 ------- web/htdocs/htmllib.py | 6 ------ web/htdocs/livestatus.py | 7 ------- web/htdocs/views.py | 7 ------- web/htdocs/webapi.py | 7 ------- web/plugins/sidebar/bi.py | 7 ------- 9 files changed, 64 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 6d743ca..ea758c3 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -65,13 +65,6 @@ import subprocess # or define a new output function # - Also create a function bail_out() for printing and error and exiting -# Python 2.3 does not have 'set' in normal namespace. -# But it can be imported from 'sets' -try: - set() -except NameError: - from sets import Set as set - #. # .--Globals-------------------------------------------------------------. # | ____ _ _ _ | diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index df1aea0..56c0a36 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -27,14 +27,6 @@ import config, re, pprint, time, views from lib import * - -# Python 2.3 does not have 'set' in normal namespace. -# But it can be imported from 'sets' -try: - set() -except NameError: - from sets import Set as set - # Datastructures and functions needed before plugins can be loaded loaded_with_language = False diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 0a0051d..f7aa6ca 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -36,14 +36,6 @@ try: except: import defaults_standalone as defaults -# Python 2.3 does not have 'set' in normal namespace. -# But it can be imported from 'sets' -# FIXME: We should officially drop Python 2.3 support -try: - set() -except NameError: - from sets import Set as set - # FIXME: Make clear whether or not user related values should be part # of the "config" module. Maybe move to dedicated module (userdb?). Then # move all user related stuff there. e.g. html.user should also be moved diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 069b64f..477c3d8 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -29,13 +29,6 @@ from valuespec import * from lib import * import wato -# Python 2.3 does not have 'set' in normal namespace. -# But it can be imported from 'sets' -try: - set() -except NameError: - from sets import Set as set - loaded_with_language = False builtin_dashboards = {} dashlet_types = {} diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 1e36f51..22a671c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -53,12 +53,6 @@ except ImportError: import json from lib import * -# Python 2.3 does not have 'set' in normal namespace. -# But it can be imported from 'sets' -try: - set() -except NameError: - from sets import Set as set # Only parse variable adhering to the following regular expressions varname_regex = re.compile('^[\w\d_.%+-\\\*]+$') diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index 562345f..fb6865c 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -26,13 +26,6 @@ import socket, time, re -# Python 2.3 does not have 'set' in normal namespace. -# But it can be imported from 'sets' -try: - set() -except NameError: - from sets import Set as set - """MK Livestatus Python API This module allows easy access to Nagios via MK Livestatus. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ad9d264..e571785 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -28,13 +28,6 @@ import config, defaults, livestatus, time, os, re, pprint, time import weblib, traceback, forms, valuespec, inventory, visuals from lib import * -# Python 2.3 does not have 'set' in normal namespace. -# But it can be imported from 'sets' -try: - set() -except NameError: - from sets import Set as set - # Datastructures and functions needed before plugins can be loaded loaded_with_language = False diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index 35eb977..eae3c50 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -28,13 +28,6 @@ from lib import * from wato import API import config -# Python 2.3 does not have 'set' in normal namespace. -# But it can be imported from 'sets' -try: - set() -except NameError: - from sets import Set as set - try: import simplejson as json except ImportError: diff --git a/web/plugins/sidebar/bi.py b/web/plugins/sidebar/bi.py index 10dfd25..be5c0d0 100644 --- a/web/plugins/sidebar/bi.py +++ b/web/plugins/sidebar/bi.py @@ -26,13 +26,6 @@ import bi -# Python 2.3 does not have 'set' in normal namespace. -# But it can be imported from 'sets' -try: - set() -except NameError: - from sets import Set as set - def render_bi_groups(): html.write("<ul>") for group in bi.aggregation_groups():

8 years, 7 months

Cleaning up global caches after each host during bulk actions

by Lars Michelsen

Module: check_mk Branch: master Commit: 994ea58cf57602c8c3d90bc5382f58425bde0de8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=994ea58cf57602… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 30 15:48:40 2015 +0100 Cleaning up global caches after each host during bulk actions --- modules/check_mk.py | 9 ++++++++- modules/discovery.py | 2 ++ modules/inventory.py | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 8402777..6ed4325 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3260,6 +3260,7 @@ def do_snmptranslate(args): for translation, line in translated_lines: sys.stdout.write("%s --> %s\n" % (line, translation)) + def do_snmpwalk(hostnames): if opt_oids and opt_extra_oids: raise MKGeneralException("You cannot specify --oid and --extraoid at the same time.") @@ -3267,8 +3268,10 @@ def do_snmpwalk(hostnames): if len(hostnames) == 0: sys.stderr.write("Please specify host names to walk on.\n") return + if not os.path.exists(snmpwalks_dir): os.makedirs(snmpwalks_dir) + for host in hostnames: try: do_snmpwalk_on(host, snmpwalks_dir + "/" + host) @@ -3276,6 +3279,8 @@ def do_snmpwalk(hostnames): sys.stderr.write("Error walking %s: %s\n" % (host, e)) if opt_debug: raise + cleanup_globals() + def do_snmpwalk_on(hostname, filename): verbose("%s:\n" % hostname) @@ -3309,6 +3314,7 @@ def do_snmpwalk_on(hostname, filename): out.close() verbose("Successfully Wrote %s%s%s.\n" % (tty_bold, filename, tty_normal)) + def do_snmpget(oid, hostnames): if len(hostnames) == 0: for host in all_active_realhosts(): @@ -3319,6 +3325,7 @@ def do_snmpget(oid, hostnames): ip = lookup_ipv4_address(host) value = get_single_oid(host, ip, oid) sys.stdout.write("%s (%s): %r\n" % (host, ip, value)) + cleanup_globals() def show_paths(): @@ -3600,7 +3607,7 @@ def usage(): cmk -D, --dump [H1 H2 ..] dump all or some hosts cmk -d HOSTNAME|IPADDRESS show raw information from agent cmk --check-discovery HOSTNAME check for items not yet checked - cmk --discover-marked-hosts run discover-marked-hosts for hosts known to have changed services + cmk --discover-marked-hosts run discovery for hosts known to have changed services cmk --update-dns-cache update IP address lookup cache cmk -l, --list-hosts [G1 G2 ...] print list of all hosts cmk --list-tag TAG1 TAG2 ... list hosts having certain tags diff --git a/modules/discovery.py b/modules/discovery.py index bd6d374..ee09c5d 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -76,6 +76,8 @@ def do_discovery(hostnames, check_types, only_new): raise verbose(" -> Failed: %s\n" % e) + cleanup_globals() + def do_discovery_for(hostname, check_types, only_new, use_caches, on_error): # Usually we disable SNMP scan if cmk -I is used without a list of diff --git a/modules/inventory.py b/modules/inventory.py index 075d0c5..897eee0 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -171,6 +171,7 @@ def do_inv(hostnames): raise verbose("Failed: %s\n" % e) errors.append("Failed to inventorize %s: %s" % (hostname, e)) + cleanup_globals() if errors: raise MKGeneralException("\n".join(errors))

8 years, 7 months

Fixed bug from last commit. Should go home now.

by Lars Michelsen

Module: check_mk Branch: master Commit: 950b10e885f7ba0d64d8f0969fff4e713435c5e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=950b10e885f7ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 30 14:23:02 2015 +0100 Fixed bug from last commit. Should go home now. --- web/htdocs/sidebar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index f69b141..a111825 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -160,7 +160,7 @@ def save_user_config(user_config): def get_check_mk_edition_title(): if not defaults.omd_root: return "Raw" - version_link = os.readlink("/omd/sites/heute/version") + version_link = os.readlink(defaults.omd_root) if version_link.endswith(".cee.demo"): return "Enterprise (Demo)" elif "cee" in version_link:

8 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015