Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: removed ugly tabstops

by Andreas Boesl

Module: check_mk Branch: master Commit: 60010890c1fd617ea6b015b7e8db5524caec6915 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60010890c1fd61… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 17 10:11:21 2014 +0200 removed ugly tabstops --- modules/check_mk.py | 16 ++++++++-------- modules/check_mk_base.py | 42 +++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index b58a897..bac4a22 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2532,7 +2532,7 @@ define hostgroup { # No creation of host groups but we need to define # default host group elif default_host_group in hostgroups_to_define: - outfile.write(""" + outfile.write(""" define hostgroup { hostgroup_name\t\t%s alias\t\t\t\tCheck_MK default hostgroup @@ -2921,8 +2921,8 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals # handling for WATO. if check_only and not include_state and str(e): raise - elif not include_state and str(e): - sys.stderr.write("Host '%s': %s\n" % (hostname, str(e))) + elif not include_state and str(e): + sys.stderr.write("Host '%s': %s\n" % (hostname, str(e))) elif include_state and str(e): # WATO automation. Abort raise continue @@ -2931,7 +2931,7 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals # handling for WATO. if check_only and not include_state and str(e): raise - elif not include_state and str(e): + elif not include_state and str(e): sys.stderr.write("Host '%s': %s\n" % (hostname, str(e))) continue except Exception, e: @@ -2960,7 +2960,7 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals sys.stderr.write("Exception in inventory function of check type %s\n" % checkname) raise if opt_verbose: - sys.stderr.write("%s: Invalid output from agent or invalid configuration: %s\n" % (hostname, e)) + sys.stderr.write("%s: Invalid output from agent or invalid configuration: %s\n" % (hostname, e)) continue if not isinstance(inventory, list): @@ -3068,7 +3068,7 @@ def check_inventory(hostname): if check_uses_snmp(ct) and not is_snmp: continue # Skip SNMP checks on non-SNMP hosts elif check_uses_snmp(ct) and ct not in hosts_checktypes and ct not in snmp_checktypes: - continue # Only try positive scans and existing types + continue # Only try positive scans and existing types elif not check_uses_snmp(ct) and not is_tcp: continue # Skip TCP checks on non-TCP hosts @@ -4552,8 +4552,8 @@ def dump_host(hostname): add_txt = " (cluster of " + (",".join(nodes_of(hostname))) + ")" try: ipaddress = lookup_ipaddress(hostname) - except: - ipaddress = "0.0.0.0" + except: + ipaddress = "0.0.0.0" else: color = tty_bgblue try: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index b2b5006..4e697f2 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -279,7 +279,7 @@ def get_host_info(hostname, ipaddress, checkname): exception_texts = [] global opt_use_cachefile opt_use_cachefile = True - is_snmp_error = False + is_snmp_error = False for node in nodes: # If an error with the agent occurs, we still can (and must) # try the other nodes. @@ -294,16 +294,16 @@ def get_host_info(hostname, ipaddress, checkname): except MKSkipCheck: at_least_one_without_exception = True except MKAgentError, e: - if str(e) != "": # only first error contains text + if str(e) != "": # only first error contains text exception_texts.append(str(e)) - g_broken_agent_hosts.add(node) + g_broken_agent_hosts.add(node) except MKSNMPError, e: - if str(e) != "": # only first error contains text - exception_texts.append(str(e)) - g_broken_snmp_hosts.add(node) - is_snmp_error = True + if str(e) != "": # only first error contains text + exception_texts.append(str(e)) + g_broken_snmp_hosts.add(node) + is_snmp_error = True if not at_least_one_without_exception: - if is_snmp_error: + if is_snmp_error: raise MKSNMPError(", ".join(exception_texts)) else: raise MKAgentError(", ".join(exception_texts)) @@ -364,8 +364,8 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_che # Not cached -> need to get info via SNMP # Try to contact host only once - if hostname in g_broken_snmp_hosts: - raise MKSNMPError("") + if hostname in g_broken_snmp_hosts: + raise MKSNMPError("") # New in 1.1.3: oid_info can now be a list: Each element # of that list is interpreted as one real oid_info, fetches @@ -393,7 +393,7 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_che # tries to get data from the agent? If yes we must not do that again! Even if # no cache file is present. if g_agent_already_contacted.has_key(hostname): - raise MKAgentError("") + raise MKAgentError("") g_agent_already_contacted[hostname] = True store_cached_hostinfo(hostname, []) # leave emtpy info in case of error @@ -983,7 +983,7 @@ def do_check(hostname, ipaddress, only_check_types = None): num_errors = len(error_sections) save_counters(hostname) if problems: - output = "%s, " % problems + output = "%s, " % problems status = exit_spec.get("connection", 2) elif num_errors > 0 and num_success > 0: output = "Missing agent sections: %s - " % ", ".join(error_sections) @@ -1221,22 +1221,22 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): infotype = checkname.split('.')[0] try: - info = get_host_info(hostname, ipaddress, infotype) + info = get_host_info(hostname, ipaddress, infotype) except MKSkipCheck, e: continue except MKSNMPError, e: - if str(e): - problems.append(str(e)) + if str(e): + problems.append(str(e)) error_sections.add(infotype) - g_broken_snmp_hosts.add(hostname) - continue + g_broken_snmp_hosts.add(hostname) + continue except MKAgentError, e: - if str(e): + if str(e): problems.append(str(e)) error_sections.add(infotype) - g_broken_agent_hosts.add(hostname) - continue + g_broken_agent_hosts.add(hostname) + continue if info or info == []: num_success += 1 @@ -1307,7 +1307,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): else: agent_version = None except MKAgentError, e: - g_broken_agent_hosts.add(hostname) + g_broken_agent_hosts.add(hostname) agent_version = "(unknown)" except: agent_version = "(unknown)"

9 years, 8 months

Check_MK Git: check_mk: Prepared support to monitor cifs mounts

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2f06da763a2933439a1e3620627cada612a97163 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f06da763a2933… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 17 10:06:48 2014 +0200 Prepared support to monitor cifs mounts --- checks/cifsmounts | 39 ++++++++++++++++++++++++++ checks/network_fs.include | 68 +++++++++++++++++++++++++++++++++++++++++++++ checks/nfsmounts | 42 ++-------------------------- 3 files changed, 110 insertions(+), 39 deletions(-) diff --git a/checks/cifsmounts b/checks/cifsmounts new file mode 100644 index 0000000..5fbccab --- /dev/null +++ b/checks/cifsmounts @@ -0,0 +1,39 @@ +#!/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. + +# Example out from agent: +# <<<cifsmounts>>> +# /foobar hanging 0 0 0 0 +# /with spaces ok 217492 123563 112515 524288 + + +check_info["cifsmounts"] = { + 'check_function': check_network_fs_mounts, + 'inventory_function': inventory_network_fs_mounts, + 'service_description': 'CIFS mount %s', + 'group': 'network_fs', + 'includes': [ 'network_fs.include' ], +} diff --git a/checks/network_fs.include b/checks/network_fs.include new file mode 100644 index 0000000..a5408c1 --- /dev/null +++ b/checks/network_fs.include @@ -0,0 +1,68 @@ +#!/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. + +# Example out from agent: +# <<<...mounts>>> +# /foobar hanging 0 0 0 0 +# /with spaces ok 217492 123563 112515 524288 + +def inventory_network_fs_mounts(info): + return [ (" ".join(line[:-5]), None) for line in info ] + +def check_network_fs_mounts(item, _no_params, info): + for line in info: + mountpoint = " ".join(line[:-5]) + if mountpoint == item: + # On some operating systems there is no information about + # used and free space, but just dahshes (e.g. AIX) + if line[-4] == '-': + if line[-5] == 'ok': + return 0, "mount seems OK" + else: + return 2, "Server not responding" + + + size_blocks = int(line[-4]) + free_blocks = int(line[-2]) # for non-root user + blocksize = int(line[-1]) + + if size_blocks < 0 or free_blocks < 0 or blocksize > 1024*1024: + return (2, "Stale fs handle") + + if line[-5] == 'ok': + gb = 1024 * 1024 * 1024.0 + size_gb = (size_blocks * blocksize) / gb + if size_gb == 0: + return (0, "server is responding") + + free_gb = (free_blocks * blocksize) / gb + used_gb = size_gb - free_gb + used_perc = 100.0 * used_gb / size_gb + return (0, "%.1f%% used (%.1f of %.1f GB)" % (used_perc, used_gb, size_gb)) + else: + return (2, "server not responding") + return (3, "not mounted") + diff --git a/checks/nfsmounts b/checks/nfsmounts index a705cab..2e16cec 100644 --- a/checks/nfsmounts +++ b/checks/nfsmounts @@ -29,47 +29,11 @@ # /foobar hanging 0 0 0 0 # /with spaces ok 217492 123563 112515 524288 -def inventory_nfsmounts(info): - return [ (" ".join(line[:-5]), None) for line in info ] - -def check_nfsmounts(item, _no_params, info): - for line in info: - mountpoint = " ".join(line[:-5]) - if mountpoint == item: - # On some operating systems there is no information about - # used and free space, but just dahshes (e.g. AIX) - if line[-4] == '-': - if line[-5] == 'ok': - return 0, "NFS mount seems OK" - else: - return 2, "Server not responding" - - - size_blocks = int(line[-4]) - free_blocks = int(line[-2]) # for non-root user - blocksize = int(line[-1]) - - if size_blocks < 0 or free_blocks < 0 or blocksize > 1024*1024: - return (2, "Stale NFS handle") - - if line[-5] == 'ok': - gb = 1024 * 1024 * 1024.0 - size_gb = (size_blocks * blocksize) / gb - if size_gb == 0: - return (0, "server is responding") - - free_gb = (free_blocks * blocksize) / gb - used_gb = size_gb - free_gb - used_perc = 100.0 * used_gb / size_gb - return (0, "%.1f%% used (%.1f of %.1f GB)" % (used_perc, used_gb, size_gb)) - else: - return (2, "server not responding") - return (3, "not mounted") - check_info["nfsmounts"] = { - 'check_function': check_nfsmounts, - 'inventory_function': inventory_nfsmounts, + 'check_function': check_network_fs_mounts, + 'inventory_function': inventory_network_fs_mounts, 'service_description': 'NFS mount %s', 'group': 'network_fs', + 'includes': [ 'network_fs.include' ], }

9 years, 8 months

Check_MK Git: check_mk: hivemanager_devices: Fixed inventory function

by Bastian Kuhn

Module: check_mk Branch: master Commit: 868bc11f40efef2797139fc284450db3301f42fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=868bc11f40efef… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 17 09:30:31 2014 +0200 hivemanager_devices: Fixed inventory function --- checks/hivemanager_devices | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/hivemanager_devices b/checks/hivemanager_devices index 4f5bd92..8109d54 100644 --- a/checks/hivemanager_devices +++ b/checks/hivemanager_devices @@ -42,7 +42,7 @@ factory_settings['hivemanger_devices'] = { def inventory_hivemanager_devices(info): for line in info: infos = dict([ x.split('::') for x in line ]) - yield hostname, {} + yield infos['hostName'], {} def check_hivemanager_devices(item, params, info): for line in info:

9 years, 8 months

Check_MK Git: check_mk: Updated descriptions of several werks

by Mathias Kettner

Module: check_mk Branch: master Commit: 4fb51dcb3fdc4caebd04f8b52bb7b69107464ff0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fb51dcb3fdc4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 15:26:12 2014 +0200 Updated descriptions of several werks --- .werks/1066 | 2 +- .werks/1085 | 2 +- .werks/1086 | 2 +- .werks/1096 | 17 +++++++++-------- .werks/134 | 6 +++--- .werks/382 | 2 +- .werks/561 | 10 +++++----- .werks/685 | 4 ++-- .werks/784 | 2 +- .werks/908 | 2 +- .werks/949 | 2 +- ChangeLog | 4 ++-- 12 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.werks/1066 b/.werks/1066 index 0682ef7..f62db15 100644 --- a/.werks/1066 +++ b/.werks/1066 @@ -1,4 +1,4 @@ -Title: Implemented Dashboard Designer +Title: New Dashboard Designer Level: 3 Component: multisite Version: 1.2.5i6 diff --git a/.werks/1085 b/.werks/1085 index c519807..c64a3b6 100644 --- a/.werks/1085 +++ b/.werks/1085 @@ -1,4 +1,4 @@ -Title: quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view +Title: Quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view Level: 1 Component: multisite Version: 1.2.5i5 diff --git a/.werks/1086 b/.werks/1086 index e1200a2..6bfb614 100644 --- a/.werks/1086 +++ b/.werks/1086 @@ -1,6 +1,6 @@ Title: check_http: now able to enter non-ascii signs in "Send HTTP POST data" rule Level: 1 -Component: wato +Component: checks Version: 1.2.5i5 Date: 1406117033 Class: feature diff --git a/.werks/1096 b/.werks/1096 index d8bb3d5..54a9e1a 100644 --- a/.werks/1096 +++ b/.werks/1096 @@ -1,4 +1,4 @@ -Title: New WATO webservices: manage hosts via webinterface +Title: New WATO web service: manage hosts via a new HTTP API Level: 3 Component: wato Compatible: compat @@ -6,8 +6,7 @@ Version: 1.2.5i6 Date: 1407773391 Class: feature -It is now possible to manage hosts via web requests<br> -This includes the following operations +It is now possible to manage hosts via web requests. This includes the following operations: <ul> <li>Add host</li> @@ -18,9 +17,11 @@ This includes the following operations <li>Activate changes</li> </ul> -These operations also work in a distributed environment. You can find more information -regarding these web request in the <tt>Roles & Permissions</tt> page under a roles settings. -There is a new permission topic <tt>Web API</tt> where you can configure the permissions -of all available API requests. The help texts for these permissions provide some useful examples. +These operations also work in a distributed environment. You can find more +information regarding these web request in the <tt>Roles & Permissions</tt> +page under a roles settings. There is a new permission topic <tt>Web API</tt> +where you can configure the permissions of all available API requests. The +help texts for these permissions provide some useful examples. -In the near future, there will be a "Howto Web-API" article in our online documentation, too. +In the near future, there will be a "Howto Web-API" article in our online +documentation, too. diff --git a/.werks/134 b/.werks/134 index 394238b..1fb8377 100644 --- a/.werks/134 +++ b/.werks/134 @@ -1,10 +1,10 @@ -Title: New option to use expect string in response heads for check_http in wato +Title: New option to use expect string in response heads for check_http in WATO Level: 1 -Component: wato +Component: checks Version: 1.2.5i1 Date: 1391680748 Class: feature -The parameter -d from check_http (String to expect in the response headers) can now be set via wato. +The parameter -d from <tt>check_http</tt> (string to expect in the response headers) can now be set via WATO. diff --git a/.werks/382 b/.werks/382 index 0186b27..3d89459 100644 --- a/.werks/382 +++ b/.werks/382 @@ -1,6 +1,6 @@ Title: Active HTTP check now supports multiline regexp matching Level: 1 -Component: wato +Component: checks Class: feature State: unknown Version: 1.2.5i1 diff --git a/.werks/561 b/.werks/561 index 2ad4445..8413113 100644 --- a/.werks/561 +++ b/.werks/561 @@ -1,4 +1,4 @@ -Title: quicksearch: now able to search with multiple filters +Title: Quicksearch: now able to search with multiple filters Level: 2 Component: multisite Version: 1.2.5i1 @@ -8,10 +8,10 @@ Class: feature The classical quicksearch allowed certain filter prefixes, which specified the item to look for. For example: <ul> -<li>h: {search_text} # Find hostname, host_address or hostalias</li> -<li>s: {search_text} # Find service</li> -<li>hg: {search_text} # Find hostgroup</li> -<li>sg: {search_text} # Find servicegroup</li> +<li><tt>h:</tt> {search_text} # Find hostname, host_address or hostalias</li> +<li><tt>s:</tt> {search_text} # Find service</li> +<li><tt>hg:</tt> {search_text} # Find hostgroup</li> +<li><tt>sg:</tt> {search_text} # Find servicegroup</li> </ul> The new search feature enhances the service search.<br> diff --git a/.werks/685 b/.werks/685 index 1482980..97b3421 100644 --- a/.werks/685 +++ b/.werks/685 @@ -1,4 +1,4 @@ -Title: Distributed WATO now disabled WATO on slave sites per default +Title: Distributed WATO now disable WATO on slave sites per default Level: 1 Component: wato Version: 1.2.5i1 @@ -6,7 +6,7 @@ Date: 1390819312 Class: feature When pushing a configuration to a slave site on that site WATO is -now disabled per default. This can be configured in the site +now disable per default. This can be configured in the site configuration with a new check box <i>Disable configuration via WATO on this site</i>, which is check per default. diff --git a/.werks/784 b/.werks/784 index 14ff121..e055701 100644 --- a/.werks/784 +++ b/.werks/784 @@ -1,4 +1,4 @@ -Title: Improved security of WATO bulk inventory by using transaction ids +Title: Improved security of WATO bulk inventory by using transaction IDs Level: 2 Component: wato Class: security diff --git a/.werks/908 b/.werks/908 index 357662c..15d891a 100644 --- a/.werks/908 +++ b/.werks/908 @@ -1,6 +1,6 @@ Title: Check event state: New option "Less Verbose Output" Level: 1 -Component: wato +Component: checks Version: 1.2.5i3 Date: 1398690971 Class: feature diff --git a/.werks/949 b/.werks/949 index 9e0c832..ae7974e 100644 --- a/.werks/949 +++ b/.werks/949 @@ -1,4 +1,4 @@ -Title: quicksearch: now able to search for multiple hosts at once +Title: Quicksearch: now able to search for multiple hosts at once Level: 1 Component: multisite Version: 1.2.5i5 diff --git a/ChangeLog b/ChangeLog index 024a5bd..5b06995 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,7 +113,7 @@ * 1128 FIX: bluecat_dns: now reports UNKNOWN if no snmp data is available Multisite: - * 1066 Implemented Dashboard Designer... + * 1066 New Dashboard Designer... * 1392 WATO Folder filter: show only the paths a user is allowed to see * 1398 Allow to spread times of next check when rescheduling... * 1405 Checkbox for settings downtimes on the hosts of the selected services... @@ -131,7 +131,7 @@ * 1077 FIX: Fixed labelling of Y achsis in prediction graphs... WATO: - * 1096 New WATO webservices: manage hosts via webinterface... + * 1096 New WATO web service: manage hosts via a new HTTP API... * 1155 NagVis map edit/view permissions can now be set using roles/groups... * 1115 Renamed rule: Hosts using SNMP v2c -> Legacy SNMP devices using SNMP v2c... * 1404 Make title/help of custom user attributes localizable...

9 years, 8 months

Check_MK Git: check_mk: Updated werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 8ca9dd432e279d8535cf7155e92e69bc00cf0f79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ca9dd432e279d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 14:36:08 2014 +0200 Updated werk description --- .werks/653 | 4 ++-- ChangeLog | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.werks/653 b/.werks/653 index d620d39..9adc377 100644 --- a/.werks/653 +++ b/.werks/653 @@ -1,4 +1,4 @@ -Title: script to extract hw/sw inventory data in csv format +Title: script to extract HW/SW-Inventory data in CSV format Level: 1 Component: inv Compatible: compat @@ -6,7 +6,7 @@ Version: 1.2.5i6 Date: 1409393403 Class: feature -This script extracts data from the hw/sw inventory into various configurable relations, +This script extracts data from the HW/SW-Inventory into various configurable relations, which are written into csv files. Configuration of the relations is carried out in the script itself in the dicts called relations. diff --git a/ChangeLog b/ChangeLog index 567a136..024a5bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,7 +178,7 @@ NOTE: Please refer to the migration notes! * 0652 windows software inventory gives some more details about OS and installed software... NOTE: Please refer to the migration notes! - * 0653 script to extract hw/sw inventory data in csv format... + * 0653 script to extract HW/SW-Inventory data in CSV format... * 0660 mk_inventory-ps1: new uses the Install Location as path for win_reg_uninstall * 0661 HW/SW-Inventory: install date of software packages no longer in unix timestamps but date format... NOTE: Please refer to the migration notes!

9 years, 8 months

Check_MK Git: check_mk: extract_inventory.py: new features:

by Goetz Golla

concatenate and md5sum, fixed columns Message-ID: <543fbf21.mxWq5Wd05rK88zG3%gg(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: 63721d6eaeab58291f6f4c8d28049a7a64963981 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63721d6eaeab58… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Oct 16 14:49:23 2014 +0200 extract_inventory.py: new features: concatenate and md5sum, fixed columns --- doc/treasures/inventory/extract_inventory.py | 101 ++++++++++++++++++++------ 1 file changed, 77 insertions(+), 24 deletions(-) diff --git a/doc/treasures/inventory/extract_inventory.py b/doc/treasures/inventory/extract_inventory.py index 6d2bfe9..9b53aae 100755 --- a/doc/treasures/inventory/extract_inventory.py +++ b/doc/treasures/inventory/extract_inventory.py @@ -28,10 +28,12 @@ # This script extracts data of the hardware inventory to csv files - relations = { "devices": { "columns": ( + ( "@hostname", "import_id" ), # special functions start with "@" + ( "!sla", "import_data_source_id" ), # fixed value is prepended with "!" + ( "!default", "import_org_level_2_id" ), ( "@hostname", "device_key" ), ( "hardware.system.manufacturer", "device_manufacturer" ), ( "hardware.system.family", "device_model" ), @@ -54,25 +56,27 @@ relations = { }, "inv_raw_arp": { "columns": ( + ( "software.packages:*.+@hostname+vendor+name+version", "import_id" ), ( "software.packages:*.vendor", "publisher" ), - ( "software.packages:*.summary", "product" ), + ( "software.packages:*.name", "product" ), ( "software.packages:*.version", "product_version" ), ( "@hostname", "import_device_id" ), ), "filter": { - "software.packages:*.package_type": "reg_uninstall", # nur aus registry + "software.packages:*.package_type": "registry", # nur aus registry }, "converter": {}, }, "inv_raw_file": { "columns": ( - ( "@hostname", "import_device_id" ), + ( "software.packages:*.+@hostname+name+path", "import_id" ), ( "software.packages:*.name", "file_name" ), ( "software.packages:*.size", "file_size" ), ( "software.packages:*.path", "file_path" ), ( "software.packages:*.vendor", "publisher" ), ( "software.packages:*.summary", "product" ), ( "software.packages:*.version", "product_version" ), + ( "@hostname", "import_device_id" ), ), "filter": { "software.packages:*.package_type": "exe", # nur exe files @@ -82,12 +86,14 @@ relations = { "inv_raw_generic(OS)": { "columns": ( ( "software.os.name", "generic_key" ), + ( "@hostname", "import_id" ), ), "filter": {}, "converter": {}, }, "inv_raw_generic(Linux)": { "columns": ( + ( "software.packages:*.+@hostname+name+version", "import_id" ), ( "software.packages:*.name", "name" ), ( "software.packages:*.version", "product_version" ), ( "@hostname", "import_device_id" ), @@ -99,7 +105,7 @@ relations = { }, } -import os, sys, re, time +import os, sys, re, time, hashlib omd_root = os.environ["OMD_ROOT"] @@ -124,8 +130,9 @@ def is_list(relation): is_list = False break for field in relation: - if ( is_list != (":*" in field) or not field.startswith(list_start) ) and not field.startswith("@"): - print "bad definition of relation, must be list or dict, not both" + if ( is_list != (":*" in field) or not field.startswith(list_start) ) \ + and not field.startswith("@") and not field.startswith("!"): + print "bad definition of relation, must be list or dict, not both:" sys.exit(1) return list_start @@ -166,6 +173,53 @@ def special_value(item, hostname): else: return "" +def no_list_get(hostname, field): + out_line = "" + if field.startswith("!"): + out_line = re.sub("^!", "", field) + else: + subtree = all_data[hostname] + for item in field.split("."): + if item.startswith("@"): # take subtree from special_value + subtree = special_value(item,hostname) + else: + try: + subtree = subtree[item] + except: + break + if type(subtree) in (str, int, float): + out_line = convert_it(relations[ofs]['converter'], subtree,field) + return out_line + +def list_get(hostname, list_start): + items = [] + subtree = all_data[hostname] + for item in list_start.split("."): + try: + subtree = subtree[item] + except: + print " %s does not exist in database of host" % item + if type(subtree) == list: + for package in subtree: + if filt_it(package, relations[ofs]): + continue + for field in elements: + if field: + field = re.sub(list_start+":\*.", "", field) + for item in field.split("."): + if item.startswith("@"): # take subtree vom special_value + value = special_value(item,hostname) + else: + try: + value = package[item] + except: + break + if type(value) in (str, int, float): + items.append(value) + else: + items.append("") + return items + # extract all data all_data = {} inventory_date = {} @@ -176,6 +230,7 @@ for hostname in os.listdir(inv_dir): all_data[hostname] = a inventory_date[hostname] = os.path.getmtime(fn) + # loop over all relations, create an output file for each relation for ofs in relations: ofn = out_dir + ofs @@ -184,31 +239,17 @@ for ofs in relations: print_line(out_rel, titles) elements = [col[0] for col in relations[ofs]["columns"]] list_start = is_list(elements) - print "starting", ofn if list_start == "": for hostname in all_data: + print "creating relation %s for %s" % ( ofs, hostname ) items = [] for field in elements: - if field: - subtree = all_data[hostname] - for item in field.split("."): - if item.startswith("@"): # take subtree vom special_value - subtree = special_value(item,hostname) - else: - try: - subtree = subtree[item] - except: - items.append("") - break - if type(subtree) in (str, int, float): - converted = convert_it(relations[ofs]['converter'], subtree,field) - items.append(converted) - else: - items.append("") + items.append(no_list_get(hostname, field)) print_line(out_rel, items) out_rel.close() else: for hostname in all_data: + print "creating relation %s for %s" % ( ofs, hostname ) subtree = all_data[hostname] for item in list_start.split("."): try: @@ -223,9 +264,21 @@ for ofs in relations: for field in elements: if field: field = re.sub(list_start+":\*.", "", field) + concat = "" for item in field.split("."): if item.startswith("@"): # take subtree vom special_value value = special_value(item,hostname) + elif item.startswith("+"): + for item2 in item.split("+"): + if item2: + if item2.startswith("@"): # take subtree vom special_value + concat += special_value(item2,hostname) + else: + try: + concat += package[item2] + except: + continue + value = hashlib.md5(concat).hexdigest() else: try: value = package[item]

9 years, 8 months

Check_MK Git: check_mk: Nicer output of cmk -L, show manpage titles now

by Mathias Kettner

Module: check_mk Branch: master Commit: 517f32033d26a137a97c711fcad43fb43aa0850a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=517f32033d26a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 14:29:12 2014 +0200 Nicer output of cmk -L, show manpage titles now --- modules/check_mk.py | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 1fd6522..b58a897 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -468,15 +468,13 @@ if __name__ == "__main__": # +----------------------------------------------------------------------+ def output_check_info(): - print "Available check types:" - print - print " plugin perf- in- " - print "Name type data vent. service description" - print "-------------------------------------------------------------------------" + all_check_manuals = all_manuals() + read_manpage_catalog() checks_sorted = check_info.items() + active_check_info.items() checks_sorted.sort() for check_type, check in checks_sorted: + man_filename = all_check_manuals.get(check_type) try: if 'command_line' in check: what = 'active' @@ -488,27 +486,15 @@ def output_check_info(): what = 'tcp' ty_color = tty_yellow - if check.get("has_perfdata", False): - p = tty_green + tty_bold + "yes" + tty_normal - else: - p = "no" - - if what == 'active': - i = '-' - elif check["inventory_function"] == None: - i = "no" - else: - i = tty_blue + tty_bold + "yes" + tty_normal - - if what == 'active': - descr = '-' + if man_filename: + title = file(man_filename).readlines()[0].split(":", 1)[1].strip() else: - descr = check["service_description"] + title = "(no man page present)" - print (tty_bold + "%-32s" + tty_normal + print (tty_bold + "%-44s" + tty_normal + ty_color + " %-6s " + tty_normal - + " %-3s %-3s %s") % \ - (check_type, what, p, i, descr) + + "%s") % \ + (check_type, what, title) except Exception, e: sys.stderr.write("ERROR in check_type %s: %s\n" % (check_type, e))

9 years, 8 months

Check_MK Git: check_mk: Updated several werks

by Mathias Kettner

Module: check_mk Branch: master Commit: 705c97c3a6e9ea7088bdbef3dd08c6610e73da2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=705c97c3a6e9ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 14:14:43 2014 +0200 Updated several werks --- .werks/276 | 2 +- .werks/661 | 2 +- .werks/711 | 2 +- .werks/946 | 2 +- ChangeLog | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.werks/276 b/.werks/276 index 87b3a92..fe4c819 100644 --- a/.werks/276 +++ b/.werks/276 @@ -1,4 +1,4 @@ -Title: nagios4 livestatus support +Title: Livestatus now supports Nagios 4 Level: 3 Component: livestatus Version: 1.2.5i1 diff --git a/.werks/661 b/.werks/661 index 1cec5c2..d8bc7d9 100644 --- a/.werks/661 +++ b/.werks/661 @@ -1,4 +1,4 @@ -Title: hw/sw-inventory: install date of software packages no longer in unix timestamps but date format +Title: HW/SW-Inventory: install date of software packages no longer in unix timestamps but date format Level: 1 Component: inv Compatible: incomp diff --git a/.werks/711 b/.werks/711 index 9ee035c..dfa0513 100644 --- a/.werks/711 +++ b/.werks/711 @@ -1,4 +1,4 @@ -Title: New rules based notifications +Title: New rule based notifications Level: 3 Component: notifications Version: 1.2.5i1 diff --git a/.werks/946 b/.werks/946 index 9a299da..bfa59d1 100644 --- a/.werks/946 +++ b/.werks/946 @@ -1,4 +1,4 @@ -Title: hw/sw inventory: fixed display bug for byte fields with the value 0 +Title: HW/SW-Inventory: fixed display bug for byte fields with the value 0 Level: 2 Component: inv Class: fix diff --git a/ChangeLog b/ChangeLog index dd7a354..011eeb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -180,7 +180,7 @@ NOTE: Please refer to the migration notes! * 0653 script to extract hw/sw inventory data in csv format... * 0660 mk_inventory-ps1: new uses the Install Location as path for win_reg_uninstall - * 0661 hw/sw-inventory: install date of software packages no longer in unix timestamps but date format... + * 0661 HW/SW-Inventory: install date of software packages no longer in unix timestamps but date format... NOTE: Please refer to the migration notes! * 0655 FIX: win_cpuinfo and mk_inventory.ps1 agent: unit of CPU speed fixed, fixes for long output lines in agent * 1379 FIX: Fixed filter "Host has inventory data"...

9 years, 8 months

Check_MK Git: check_mk: #1413 HW/ SW-Inventory implementation step one finished

by Mathias Kettner

Module: check_mk Branch: master Commit: 64f69c2e9e6829bb35054c9271bb3dfd6257395f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64f69c2e9e6829… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 14:17:28 2014 +0200 #1413 HW/SW-Inventory implementation step one finished Check_MK now has its own system for hardware/software inventory. The implementation has already been started a couple of months ago. This system is far from complete but already useful. A basic documentation is <a href="http://mathias-kettner.com/checkmk_inv.html">here</a>. --- .werks/1413 | 13 +++++++++++++ ChangeLog | 1 + 2 files changed, 14 insertions(+) diff --git a/.werks/1413 b/.werks/1413 new file mode 100644 index 0000000..4bbc839 --- /dev/null +++ b/.werks/1413 @@ -0,0 +1,13 @@ +Title: HW/SW-Inventory implementation step one finished +Level: 3 +Component: inv +Compatible: compat +Version: 1.2.5i6 +Date: 1413461701 +Class: feature + +Check_MK now has its own system for hardware/software inventory. +The implementation has already been started a couple of months +ago. This system is far from complete but already useful. +A basic documentation is +<a href="http://mathias-kettner.com/checkmk_inv.html">here</a>. diff --git a/ChangeLog b/ChangeLog index 011eeb8..567a136 100644 --- a/ChangeLog +++ b/ChangeLog @@ -182,6 +182,7 @@ * 0660 mk_inventory-ps1: new uses the Install Location as path for win_reg_uninstall * 0661 HW/SW-Inventory: install date of software packages no longer in unix timestamps but date format... NOTE: Please refer to the migration notes! + * 1413 HW/SW-Inventory implementation step one finished... * 0655 FIX: win_cpuinfo and mk_inventory.ps1 agent: unit of CPU speed fixed, fixes for long output lines in agent * 1379 FIX: Fixed filter "Host has inventory data"...

9 years, 8 months

Check_MK Git: check_mk: Fixed level of werk 432

by Mathias Kettner

Module: check_mk Branch: master Commit: 06a2a619706abc4c49ce26567facca161737f079 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06a2a619706abc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 14:11:50 2014 +0200 Fixed level of werk 432 --- .werks/432 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/432 b/.werks/432 index 0de6035..b55cf5f 100644 --- a/.werks/432 +++ b/.werks/432 @@ -1,5 +1,5 @@ Title: stulz_humidity: Fixed syntax error -Level: 3 +Level: 1 Component: checks Class: fix State: unknown

9 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014