Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Remove obsolete comment

by Mathias Kettner

Module: check_mk Branch: master Commit: 8b33cde80deb890488ad71ae9e8a47aa22bb12dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b33cde80deb89… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 21 10:32:53 2015 +0100 Remove obsolete comment --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index d66beb5..d52e6bd 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1600,7 +1600,7 @@ def all_matching_hosts(tags, hostlist): def convert_service_ruleset(ruleset): new_rules = [] for rule in ruleset: - rule, rule_options = get_rule_options(rule) # Das könnte man einmal umbauen und so lassen (8 sec von 137) + rule, rule_options = get_rule_options(rule) if rule_options.get("disabled"): continue

9 years, 8 months

Check_MK Git: check_mk: #1846 Keep track of changes of software and hardware

by Mathias Kettner

Module: check_mk Branch: master Commit: 350b01ff75e6951421cce0c4a24492f3f1d88dd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=350b01ff75e695… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 20 17:46:54 2015 +0100 #1846 Keep track of changes of software and hardware The HW/SW-Inventory module now keeps tracks of changes of the hardware and software on a system: Each time an inventory is being done the outcome is being compared with the data from the last time. If a change has been detected, a copy of the previous inventory data is being stored for later reference (in <tt>var/check_mk/inventory_archive</tt>). The check <tt>HW/SW Inventory</tt> can be configured with the WATO ruleset Do hardware/software Inventory to report a WARN or CRIT state if one of hardware or software has changed. Secondly - if you are viewing details of a host - a button Inventory History brings you to a new view of the historic development of the host's hardware and software. At the beginning this button is hidden behind the [...]-button (as usual). The history shows you each point of time where at least one item of the inventory data has changed. That way you can easily keep track of new installed software, exchanged hard disks, BIOS updates and much more. --- .werks/1846 | 23 +++ ChangeLog | 1 + checks/check_cmk_inv | 8 +- doc/treasures/liveproxy/liveproxyd | 15 ++ modules/check_mk.py | 12 +- modules/inventory.py | 113 ++++++++++---- web/htdocs/inventory.py | 172 +++++++++++++++++++- web/htdocs/status.css | 5 + web/htdocs/views.css | 8 + web/htdocs/views.py | 8 +- web/plugins/views/datasources.py | 2 +- web/plugins/views/inventory.py | 302 ++++++++++++++++++++++++++++++------ web/plugins/views/sorters.py | 4 +- web/plugins/visuals/infos.py | 5 + web/plugins/wato/inventory.py | 36 +++-- 15 files changed, 614 insertions(+), 100 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=350b01ff75…

9 years, 8 months

Check_MK Git: check_mk: Fixed shortly introduced bug in service discovery check

by Lars Michelsen

Module: check_mk Branch: master Commit: cc353620b26fbd3d915ecb5ef5d8b072fa7f7d59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc353620b26fbd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 20 16:42:49 2015 +0100 Fixed shortly introduced bug in service discovery check --- modules/discovery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/discovery.py b/modules/discovery.py index d5c6270..5254f28 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -173,7 +173,7 @@ def check_discovery(hostname, ipaddress=None): total_check_output += output return status else: - sys.stdout.write(nagios_state_names[status] + " - " + output) + sys.stdout.write(core_state_names[status] + " - " + output) sys.exit(status)

9 years, 8 months

Check_MK Git: check_mk: new section for inventory checks: esx_systeminfo

by Andreas Boesl

Module: check_mk Branch: master Commit: 77f8c5a2451a19cf3270f82f28ac1ec1134413dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77f8c5a2451a19… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 20 16:41:50 2015 +0100 new section for inventory checks: esx_systeminfo --- agents/special/agent_vsphere | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index ea61a51..505aa9d 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -559,7 +559,11 @@ systemfields = [ ("perfManager", None), ("sessionManager", None), ("licenseManager", None), - ("propertyCollector", None) + ("propertyCollector", None), + ("version", None), + ("build", None), + ("vendor", None), + ("osType", None), ] systeminfo = {} @@ -688,6 +692,10 @@ if not error: print "Version: %.1f" % systeminfo["apiVersion"] print "AgentOS: %s" % systeminfo["name"] + print "<<<esx_systeminfo>>>" + for entry in systeminfo.items(): + print "%s %s" % entry + ########################### # Licenses ###########################

9 years, 8 months

Check_MK Git: check_mk: Fixed shortly introduced problems with diskstat discovery

by Lars Michelsen

Module: check_mk Branch: master Commit: 8116520226afc6a33227ea76f49767ebd28a6c6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8116520226afc6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 20 16:38:48 2015 +0100 Fixed shortly introduced problems with diskstat discovery --- modules/check_mk_base.py | 21 ++++++++++++++------- modules/discovery.py | 10 +++++----- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index a530599..28d1749 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -261,21 +261,28 @@ class MKCheckTimeout(Exception): # extra sections (new feature since 1.2.7i1) only the main section # raises exceptions. Error in extra sections are silently ignored # and the info is replaced with None. -def get_info_for_check(hostname, ipaddress, infotype, max_cachefile_age=None, ignore_check_interval=False): - - if infotype in check_info: - extra_sections = check_info[infotype]["extra_sections"] +def get_info_with_extra_sections(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval, info_func): + if section_name in check_info: + extra_sections = check_info[section_name]["extra_sections"] if extra_sections: - info = [ get_host_info(hostname, ipaddress, infotype, max_cachefile_age, ignore_check_interval) ] + info = [ info_func(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval) ] for es in extra_sections: try: - info.append(get_host_info(hostname, ipaddress, es, max_cachefile_age, ignore_check_interval=False)) + info.append(info_func(hostname, ipaddress, es, max_cachefile_age, ignore_check_interval=False)) except: info.append(None) return info - return get_host_info(hostname, ipaddress, infotype, max_cachefile_age, ignore_check_interval) + return info_func(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval) + +def get_info_for_check(hostname, ipaddress, section_name, max_cachefile_age=None, ignore_check_interval=False): + return get_info_with_extra_sections(hostname, ipaddress, section_name, + max_cachefile_age, ignore_check_interval, info_func=get_host_info) +def get_info_for_inventory(hostname, ipaddress, section_name, use_caches): + return get_info_with_extra_sections(hostname, ipaddress, section_name, + use_caches and inventory_max_cachefile_age or 0, + ignore_check_interval=True, info_func=get_realhost_info) # This is the main function for getting information needed by a # certain check. It is called once for each check type. For SNMP this diff --git a/modules/discovery.py b/modules/discovery.py index 59ce57c..d5c6270 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -349,13 +349,10 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches): try: info = None # default in case of exception - info = get_realhost_info(hostname, ipaddress, section_name, - use_caches and inventory_max_cachefile_age or 0, ignore_check_interval=True) - + info = get_info_for_inventory(hostname, ipaddress, section_name, use_caches) except MKAgentError, e: if str(e): raise - except MKSNMPError, e: if str(e): raise @@ -368,7 +365,10 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches): # During inventory we behave like a non-cluster. We do not know # yet if the service is going to be clustered! if check_info[check_type]["node_info"]: - info = [ [None] + line for line in info ] + if check_info[section_name]["extra_sections"]: + info = [ sec and [ [None] + line for line in sec ] or None for sec in info ] + else: + info = [ [None] + line for line in info ] # Now do the actual inventory try:

9 years, 8 months

Check_MK Git: check_mk: #1525 viprinet_temp: Now uses new Temperature WATO rule

by Konstantin Büttner

Module: check_mk Branch: master Commit: 232dc36562eef649d1fdca4f706041a159944eef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=232dc36562eef6… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jan 20 14:44:31 2015 +0100 #1525 viprinet_temp: Now uses new Temperature WATO rule This check is no longer in the room_temperature group, but in the temperature group. Old rules will therefore no longer apply. --- .werks/1525 | 10 ++++++++++ ChangeLog | 2 ++ checks/viprinet_temp | 22 ++++------------------ 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.werks/1525 b/.werks/1525 new file mode 100644 index 0000000..3d6358b --- /dev/null +++ b/.werks/1525 @@ -0,0 +1,10 @@ +Title: viprinet_temp: Now uses new Temperature WATO rule +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1421761352 +Class: feature + +This check is no longer in the room_temperature group, but in the +temperature group. Old rules will therefore no longer apply. diff --git a/ChangeLog b/ChangeLog index 668c126..024d3ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,8 @@ * 1670 winperf_processor: fixed invalid check values on counter wrap... * 1524 kentix_temp: Now supports setting levels... NOTE: Please refer to the migration notes! + * 1525 viprinet_temp: Now uses new Temperature WATO rule... + NOTE: Please refer to the migration notes! * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/viprinet_temp b/checks/viprinet_temp index 5042be5..683e6d7 100644 --- a/checks/viprinet_temp +++ b/checks/viprinet_temp @@ -25,32 +25,18 @@ # Boston, MA 02110-1301 USA. def check_viprinet_temp(item, params, info): - state = 0 - value = saveint(info[0][item == "System"]) - state_info = "" - - warn = "" - crit = "" - if params: - warn, crit = params - if value > crit: - state_info = "(crit at %d°C)" % crit - state = 2 - elif value > warn: - state_info = "(warn at %d°C)" % warn - state = 1 - - infotext = "%s: %s°C %s" % (item, value, state_info) - return state, infotext, [("temp", value, warn, crit)] + reading = int(info[0][item == "System"]) + return check_temperature(reading, params) check_info["viprinet_temp"] = { 'check_function' : check_viprinet_temp, 'inventory_function' : lambda info: len(info) > 0 and [("CPU", None), ("System", None)] or [], 'service_description' : "Temperature %s", - 'group' : "room_temperature", + 'group' : "temperature", 'has_perfdata' : True, 'snmp_info' : (".1.3.6.1.4.1.35424.1.2", [3, 4]), 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'includes' : [ 'temperature.include' ] }

9 years, 8 months

Check_MK Git: check_mk: #1671 FIX windows agent: fixed gaps in eventlog monitoring after agent restart

by Andreas Boesl

Module: check_mk Branch: master Commit: 0a9784f7f5cd4ff02a976aba12962f77485b2565 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a9784f7f5cd4f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 20 14:23:44 2015 +0100 #1671 FIX windows agent: fixed gaps in eventlog monitoring after agent restart The windows eventlog monitoring was not entirely continuous. After the agent started it determined determined the initial record number for each eventlog. Per default the start number was the last record. Thus resulted in monitoring gaps as long as the windows was not running, e.g. windows startup. With this fix, the windows agent now uses a statefile (<tt>eventstate.txt</tt>) which contains the last processed eventrecord ids for each eventlog. On startup the statefile is read and the record numbers are set accordingly. --- .werks/1671 | 17 ++++ ChangeLog | 3 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 209920 -> 211968 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 209920 -> 211968 bytes agents/windows/check_mk_agent.cc | 118 ++++++++++++++++++++-- agents/windows/check_mk_agent.exe | Bin 178688 -> 180224 bytes agents/windows/check_mk_agent.msi | Bin 622592 -> 626176 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178688 -> 180224 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 160685 -> 161361 bytes agents/windows/install_agent.exe | Bin 157644 -> 158131 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 13 files changed, 130 insertions(+), 10 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0a9784f7f5…

9 years, 8 months

Check_MK Git: check_mk: kentix_temp: Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: f3a183b5f1a87a4df4c8fd1b9b4592ff8890a5d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3a183b5f1a87a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jan 20 13:23:34 2015 +0100 kentix_temp: Minor code cleanup --- checks/kentix_temp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/checks/kentix_temp b/checks/kentix_temp index d26f936..e4f02ea 100644 --- a/checks/kentix_temp +++ b/checks/kentix_temp @@ -30,11 +30,10 @@ def inventory_kentix_temp(info): def check_kentix_temp(item, params, info): value, lower_warn, upper_warn, alarm, text = info[0] - upper_warn = float(upper_warn) - lower_warn = float(lower_warn) temp = float(value)/10 - return check_temperature(temp, params, dev_levels = (upper_warn, upper_warn), dev_levels_lower = (lower_warn, lower_warn)) + return check_temperature(temp, params, dev_levels = (float(upper_warn), float(upper_warn)), + dev_levels_lower = (float(lower_warn), float(lower_warn))) check_info["kentix_temp"] = { 'check_function' : check_kentix_temp,

9 years, 8 months

Check_MK Git: check_mk: Changes description of werk

by Goetz Golla

Module: check_mk Branch: master Commit: 7c1bb1513e499282e2d1d320c7a3b1d00530fed9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c1bb1513e4992… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Jan 20 13:05:15 2015 +0100 Changes description of werk --- .werks/1853 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1853 b/.werks/1853 index dce9c70..4571c82 100644 --- a/.werks/1853 +++ b/.werks/1853 @@ -1,4 +1,4 @@ -Title: cisco_power, cisco_fan, cisco_temp_perf: fixed algorithm to determine check item for some special cases +Title: cisco_power, cisco_fan, cisco_temp_perf: fixed service description for some special cases Level: 1 Component: checks Compatible: incomp diff --git a/ChangeLog b/ChangeLog index a864c13..af17cee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,7 +87,7 @@ * 1844 FIX: oracle_crs_res: fix computation of node a ressource is running on... * 1852 FIX: solaris_multipath: this check now works with inventory to remember the number of total paths... NOTE: Please refer to the migration notes! - * 1853 FIX: cisco_power, cisco_fan, cisco_temp_perf: fixed algorithm to determine check item for some special cases... + * 1853 FIX: cisco_power, cisco_fan, cisco_temp_perf: fixed service description for some special cases... NOTE: Please refer to the migration notes! Multisite:

9 years, 8 months

Check_MK Git: check_mk: temperature.include: Fixed syntax errors

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7192caeadda10c8a06cf3b21ebc38380df3d787c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7192caeadda10c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jan 20 11:39:53 2015 +0100 temperature.include: Fixed syntax errors --- checks/temperature.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/temperature.include b/checks/temperature.include index 276106d..7b41d69 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -86,10 +86,10 @@ def check_temperature(reading, params, dev_unit = "c", return status # min that deals correctly with None - def minn(a,b) - if a = None: + def minn(a,b): + if a == None: return b - elif b = None: + elif b == None: return a else: return min(a,b)

9 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015