Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

4819 FIX f5_bigip_cluster_status.v11_2: Fixed wrong syntax in naming of the check plugin

by Marcel Arentz

Module: check_mk Branch: master Commit: d2ff88a9c9d10d865a2ac593e322cd6a765ef68a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2ff88a9c9d10d… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Jun 13 12:32:14 2017 +0200 4819 FIX f5_bigip_cluster_status.v11_2: Fixed wrong syntax in naming of the check plugin This bug led into the discovery error "missing check file". You will need to rediscover your checks to get this service working. Change-Id: Ib8c05e869e17b727b9e134ec1cf32a67be2d4e11 --- .werks/4819 | 11 +++++++++++ ...gip_cluster_status_v11_2 => f5_bigip_cluster_status.v11_2} | 0 checks/f5_bigip_cluster_status | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4819 b/.werks/4819 new file mode 100644 index 0000000..17884e3 --- /dev/null +++ b/.werks/4819 @@ -0,0 +1,11 @@ +Title: f5_bigip_cluster_status.v11_2: Fixed wrong syntax in naming of the check plugin +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i1 +Date: 1497349779 +Class: fix + +This bug led into the discovery error "missing check file". You will need +to rediscover your checks to get this service working. diff --git a/checkman/f5_bigip_cluster_status_v11_2 b/checkman/f5_bigip_cluster_status.v11_2 similarity index 100% rename from checkman/f5_bigip_cluster_status_v11_2 rename to checkman/f5_bigip_cluster_status.v11_2 diff --git a/checks/f5_bigip_cluster_status b/checks/f5_bigip_cluster_status index d857c76..1125e31 100644 --- a/checks/f5_bigip_cluster_status +++ b/checks/f5_bigip_cluster_status @@ -98,7 +98,7 @@ check_info["f5_bigip_cluster_status"] = { } -check_info["f5_bigip_cluster_status_v11_2"] = { +check_info["f5_bigip_cluster_status.v11_2"] = { "parse_function" : parse_f5_bigip_cluster_status, "check_function" : lambda x,y,z: check_f5_bigip_cluster_status(x,y,z, is_v11_2 = True), "inventory_function" : inventory_f5_bigip_cluster_status,

7 years

4828 FIX User notification rules can now be canceled

by Andreas Boesl

Module: check_mk Branch: master Commit: 42b03d4b681f8ae9d3bfffc1cf07d6243e0a19f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42b03d4b681f8a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 13 11:32:13 2017 +0200 4828 FIX User notification rules can now be canceled Previously, the cancel notification rule did only apply to global notification rules. Change-Id: Ice21bf51e0cbaefca3ad9f6af1afbf618421cbb3 --- .werks/4828 | 11 +++++++++++ modules/notify.py | 5 +++++ web/htdocs/wato.py | 3 +++ 3 files changed, 19 insertions(+) diff --git a/.werks/4828 b/.werks/4828 new file mode 100644 index 0000000..38eeb12 --- /dev/null +++ b/.werks/4828 @@ -0,0 +1,11 @@ +Title: User notification rules can now be canceled +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1497346214 +Class: fix + +Previously, the cancel notification rule did only apply to global notification rules. + diff --git a/modules/notify.py b/modules/notify.py index 2b8d67d..2157a08 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -523,6 +523,11 @@ def user_notification_rules(): for contactname in contactnames: contact = contacts[contactname] for rule in contact.get("notification_rules", []): + # User notification rules always use allow_disable + # This line here is for legacy reasons. Newer versions + # already set the allow_disable option in the rule configuration + rule["allow_disable"] = True + # Save the owner of the rule for later debugging rule["contact"] = contactname # We assume that the "contact_..." entries in the diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e3857c7..07f11e6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8637,6 +8637,9 @@ def mode_notification_rule(phase, profilemode): vs.validate_value(rule, "rule") + # User rules are always allow_disable + rule["allow_disable"] = True + if new and clone_nr >= 0: rules[clone_nr:clone_nr] = [ rule ] elif new:

7 years

Reserved 30 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 68b68c40199b43aa6dd2a2110b62bbb81e1b23e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68b68c40199b43… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 13 11:29:55 2017 +0200 Reserved 30 Werk IDS Change-Id: Ib0590cf4a30494c0222cc697f820065764902895 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 61dcbb9..056e7f5 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4828 +4858

7 years

Fixed werk version

by Lars Michelsen

Module: check_mk Branch: master Commit: d2d6de1ae65e364741e00bd990b75f0db14c7b6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2d6de1ae65e36… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 13 10:39:48 2017 +0200 Fixed werk version Change-Id: I04bdb77ddbba636bf51b008c5ad7798b11491a4f --- .werks/4053 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4053 b/.werks/4053 index 4bd63e1..273f195 100644 --- a/.werks/4053 +++ b/.werks/4053 @@ -3,7 +3,7 @@ Level: 1 Component: multisite Compatible: compat Edition: cre -Version: 1.4.0p2 +Version: 1.5.0i1 Date: 1496743605 Class: fix

7 years

Revert "Revert " 4797 FIX Removed deprecated global service discovery setting and added new standard rule ""

by Lars Michelsen

Module: check_mk Branch: master Commit: 28ba25c1a73e7275b241604ef182ed2e6bcf6a24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28ba25c1a73e72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 13 09:10:28 2017 +0200 Revert "Revert "4797 FIX Removed deprecated global service discovery setting and added new standard rule"" This reverts commit 174146cd2011fbc22c460c13b8514517fcf00a67. --- .werks/4797 | 13 +++++++++++++ web/htdocs/wato.py | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/4797 b/.werks/4797 new file mode 100644 index 0000000..addba29 --- /dev/null +++ b/.werks/4797 @@ -0,0 +1,13 @@ +Title: Removed deprecated global service discovery setting and added new standard rule +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496774354 + +Removed deprecated global service discovery setting for new created sites +and added a new standard rule which will execute every two hours a service +discovery. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1cb3acc..e3857c7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14387,7 +14387,6 @@ def create_sample_config(): "qmail_stats", ], "enable_rulebased_notifications": True, - "inventory_check_interval": 120, } ) @@ -14454,6 +14453,14 @@ def create_sample_config(): 'extra_service_conf:check_interval': [ ( 1440, [], ALL_HOSTS, [ "Check_MK HW/SW Inventory$" ], {'description': u'Restrict HW/SW-Inventory to once a day'} ), ], + + # Periodic service discovery + 'periodic_discovery': [ + ({'severity_unmonitored': 1, + 'severity_vanished': 0, + 'inventory_check_do_scan': True, + 'check_interval': 120.0}, [], ALL_HOSTS, {'description': u'Perform every two hours a service discovery'} ), + ], } rulesets = FolderRulesets(Folder.root_folder())

7 years

4715 FIX Web-API Calls updates. get_ruleset/get_sites: enforce output_format=python. set_ruleset now validates incoming data

by Andreas Boesl

Module: check_mk Branch: master Commit: c08a828750b352578726d638450513c396a1cf3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c08a828750b352… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 12 17:14:02 2017 +0200 4715 FIX Web-API Calls updates. get_ruleset/get_sites: enforce output_format=python. set_ruleset now validates incoming data Change-Id: I4f856f9ea18a68924759d3a547611a46c040e96e --- .werks/4715 | 10 ++++++++++ web/htdocs/webapi.py | 16 +++++++++++----- web/plugins/webapi/webapi.py | 25 +++++++++++++++++++------ 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/.werks/4715 b/.werks/4715 new file mode 100644 index 0000000..f31650d --- /dev/null +++ b/.werks/4715 @@ -0,0 +1,10 @@ +Title: Web-API Calls updates. get_ruleset/get_sites: enforce output_format=python. set_ruleset now validates incoming data +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1497280352 +Class: fix + + diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index dd1ebdb..f84f935 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -103,15 +103,21 @@ def page_api(): # Check if the data was sent with the correct data format # Some API calls only allow python code # TODO: convert the api_action dict into an object which handles the validation - required_format = api_actions[action].get("required_input_format") - if required_format: - if required_format != request_object["request_format"]: - raise MKUserError(None, "This API call requires a %s-encoded request parameter" % required_format) + required_input_format = api_actions[action].get("required_input_format") + if required_input_format: + if required_input_format != request_object["request_format"]: + raise MKUserError(None, "This API call requires a %s-encoded request parameter" % required_input_format) + + required_output_format = api_actions[action].get("required_output_format") + if required_output_format: + if required_output_format != html.output_format: + raise MKUserError(None, "This API call requires the parameter output_format=%s" % required_output_format) + + # The request_format parameter is not forwarded into the API action if "request_format" in request_object: del request_object["request_format"] - if api_actions[action].get("locking", True): lock_exclusive() # unlock is done automatically diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 45a6de2..e6528a8 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -625,9 +625,10 @@ class APICallRules(APICallCollection): required_permissions = ["wato.rulesets"] # wato.services ? return { "get_ruleset": { - "handler" : self._get, - "required_permissions": required_permissions, - "locking" : True, # locking? + "handler" : self._get, + "required_permissions" : required_permissions, + "required_output_format" : "python", + "locking" : True, # locking? }, "set_ruleset": { "handler" : self._set, @@ -701,6 +702,17 @@ class APICallRules(APICallCollection): rule_folder = Folder.folder(folder_path) rule_folder.need_permission("write") + # Verify all rules + rule_vs = Ruleset(ruleset_name).rulespec.valuespec + for folder_path, rules in new_ruleset.items(): + for rule in rules: + value = rule["value"] + try: + rule_vs.validate_datatype(value, "test_value") + rule_vs.validate_value(value, "test_value") + except MKException, e: + raise MKException("ERROR: %s. Affected Rule %r" % (str(e), rule)) + # Add new rulesets for folder_path, rules in new_ruleset.items(): @@ -866,9 +878,10 @@ class APICallSites(APICallCollection): required_permissions = ["wato.sites"] return { "get_site": { - "handler" : self._get, - "required_permissions" : required_permissions, - "locking" : False, + "handler" : self._get, + "required_permissions" : required_permissions, + "required_output_format" : "python", + "locking" : False, }, "set_site": { "handler" : self._set,

7 years

4789 FIX check_mk_agent.aix: Fixed computation of uptime

by Marcel Arentz

Module: check_mk Branch: master Commit: 0c25c42bf9912fc8650f916f1066ca00ca222034 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c25c42bf9912f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Jun 7 17:12:37 2017 +0200 4789 FIX check_mk_agent.aix: Fixed computation of uptime once a day the computation of uptime has been wrong. This bug occured only 1 hour a day, when the output of uptime did contain days and minutes but no hours. Change-Id: I9b709d79c0dd3dd1ec1bc0616fe7ee48591383df --- .werks/4789 | 12 ++++++++++++ agents/check_mk_agent.aix | 43 ++++++++++++++++++++++++++++++++----------- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/.werks/4789 b/.werks/4789 new file mode 100644 index 0000000..c876736 --- /dev/null +++ b/.werks/4789 @@ -0,0 +1,12 @@ +Title: check_mk_agent.aix: Fixed computation of uptime +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496848241 +Class: fix + +once a day the computation of uptime has been wrong. This bug occured only +1 hour a day, when the output of uptime did contain days and minutes but +no hours. diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 7df2f73..ad0996e 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -225,18 +225,39 @@ if [ -x /usr/sbin/sendmail ] ; then fi # uptime formats -# 12:55pm up 105 days, 21 hrs, 2 users, load average: 0.26, 0.26, 0.26 --> 9147600 -# 1:41pm up 105 days, 21:46, 2 users, load average: 0.28, 0.28, 0.27 --> 9150360 -# 05:26PM up 1:16, 1 user, load average: 0.33, 0.21, 0.20 --> 4560 -# 06:13PM up 2:03, 1 user, load average: 1.16, 1.07, 0.91 --> 7380 -# 08:43AM up 29 mins, 1 user, load average: 0.09, 0.18, 0.21 --> 1740 -# 08:47AM up 66 days, 18:34, 1 user, load average: 2.25, 2.43, 2.61 --> 5769240 +# 12:55pm up 105 days, 21 hrs, 2 users, load average: 0.26, 0.26, 0.26 --> 9147600 +# 1:41pm up 105 days, 21:46, 2 users, load average: 0.28, 0.28, 0.27 --> 9150360 +# 05:26PM up 1:16, 1 user, load average: 0.33, 0.21, 0.20 --> 4560 +# 06:13PM up 2:03, 1 user, load average: 1.16, 1.07, 0.91 --> 7380 +# 08:43AM up 29 mins, 1 user, load average: 0.09, 0.18, 0.21 --> 1740 +# 08:47AM up 66 days, 18:34, 1 user, load average: 2.25, 2.43, 2.61 --> 5769240 +# 08:45AM up 76 days, 34 mins, 1 user, load average: 2.25, 2.43, 2.61 --> 5769240 echo '<<<uptime>>>' -uptime | sed -e 's/^.*up//g' -e 's/user.*$//g' -e 's/hrs/0/g' -e 's/:/ /g' \ - -e 's/days,//g' -e 's/mins//g' -e 's/.[^,]*$//' \ - | awk '{if (NF == 3) a=86400*int($1)+3600*int($2)+60*int($3); \ - else if (NF == 2) a=3600*int($1)+60*int($2); \ - else a=60*int($1); printf("%d\n",a)}' +UPTIME=$(uptime | sed -e 's/^.*up//g' -e 's/[0-9] user.*//g') +if [[ $UPTIME == *"days"* ]]; then + DAYS=$(echo $UPTIME | sed -e 's/days,.*//g') +else + DAYS="0" +fi + +if [[ $UPTIME == *"hrs"* ]]; then + HOURS=$(echo $UPTIME | sed -e 's/hrs,.*//g' -e 's/.*,//g') +else + HOURS="0" +fi + +if [[ $UPTIME == *"mins"* ]]; then + MINS=$(echo $UPTIME | sed -e 's/mins,.*//g' -e 's/.*hrs,//g' -e 's/.*days,//g') +else + MINS="0" +fi + +if [[ $UPTIME == *":"* ]]; then + HOURS=$(echo $UPTIME | sed -e 's/.*days,//g' -e 's/:.*//g') + MINS=$(echo $UPTIME | sed -e 's/.*days,//g' -e 's/.*://g' -e 's/,.*//g') +fi + +echo $(((DAYS*86400)+(HOURS*3600)+(MINS*60))) if cd $PLUGINSDIR 2>/dev/null

7 years

4755 FIX Fixed possible error when processing piggyback monitoring data

by Lars Michelsen

Module: check_mk Branch: master Commit: 77b3bfc33f30b980db5e61351ae4a86b315ba357 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77b3bfc33f30b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 12 14:55:55 2017 +0200 4755 FIX Fixed possible error when processing piggyback monitoring data An error "OSError: [Errno 2] No such file or directory: '/omd/sites/*/tmp/check_mk/piggyback/'" could occur when using piggyback agent data (like it's done when monitoring ESX hosts / vcenters). The error message was visible in the cmc.log and looked like this: 2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> File "/omd/sites/mysite/share/check_mk/modules/check_mk_base.py", line 371, in get_host_info 2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> ignore_check_interval=True) 2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> File "/omd/sites/mysite/share/check_mk/modules/check_mk_base.py", line 506, in get_realhost_info 2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> piggy_output = get_piggyback_info(hostname) + get_piggyback_info(ipaddress) 2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> File "/omd/sites/mysite/share/check_mk/modules/check_mk_base.py", line 635, in get_piggyback_info 2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> for sourcehost, file_path in get_piggyback_files(hostname): 2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> File "/omd/sites/mysite/share/check_mk/modules/check_mk_base.py", line 612, in get_piggyback_files 2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> for sourcehost in os.listdir(dir): 2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> OSError: [Errno 2] No such file or directory: '/omd/sites/mysite/tmp/check_mk/piggyback/backedhost' This was some kind of race condition when one Check_MK helper cleaned up outdated piggyback files while another helper was reading the piggyback data. Change-Id: I09e1d61f473bf6d110421d7cf6330c6d37cbe74b --- .werks/4755 | 27 ++++++++++++++++++++++++ modules/check_mk_base.py | 53 ++++++++++++++++++++++++++++++++++++------------ 2 files changed, 67 insertions(+), 13 deletions(-) diff --git a/.werks/4755 b/.werks/4755 new file mode 100644 index 0000000..bbc8180 --- /dev/null +++ b/.werks/4755 @@ -0,0 +1,27 @@ +Title: Fixed possible error when processing piggyback monitoring data +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1497271655 + +An error "OSError: [Errno 2] No such file or directory: '/omd/sites/*/tmp/check_mk/piggyback/'" +could occur when using piggyback agent data (like it's done when monitoring ESX hosts / vcenters). + +The error message was visible in the cmc.log and looked like this: + +2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> File "/omd/sites/mysite/share/check_mk/modules/check_mk_base.py", line 371, in get_host_info +2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> ignore_check_interval=True) +2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> File "/omd/sites/mysite/share/check_mk/modules/check_mk_base.py", line 506, in get_realhost_info +2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> piggy_output = get_piggyback_info(hostname) + get_piggyback_info(ipaddress) +2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> File "/omd/sites/mysite/share/check_mk/modules/check_mk_base.py", line 635, in get_piggyback_info +2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> for sourcehost, file_path in get_piggyback_files(hostname): +2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> File "/omd/sites/mysite/share/check_mk/modules/check_mk_base.py", line 612, in get_piggyback_files +2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> for sourcehost in os.listdir(dir): +2017-06-06 06:39:36 [4] Check_MK helper [7231]: : >> OSError: [Errno 2] No such file or directory: '/omd/sites/mysite/tmp/check_mk/piggyback/backedhost' + +This was some kind of race condition when one Check_MK helper cleaned up outdated piggyback files +while another helper was reading the piggyback data. diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 0e1705b..90c0427 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -528,19 +528,46 @@ def add_persisted_info(hostname, info): def get_piggyback_files(hostname): files = [] dir = cmk.paths.tmp_dir + "/piggyback/" + hostname - if os.path.exists(dir): - for sourcehost in os.listdir(dir): - if sourcehost not in ['.', '..'] \ - and not sourcehost.startswith(".new."): - file_path = dir + "/" + sourcehost - - if cachefile_age(file_path) > piggyback_max_cachefile_age: - console.verbose("Piggyback file %s is outdated by %d seconds. Deleting it.\n" % - (file_path, cachefile_age(file_path) - piggyback_max_cachefile_age)) - os.remove(file_path) - continue - - files.append((sourcehost, file_path)) + + # remove_piggyback_info_from() may remove stale piggyback files of one source + # host and also the directory "hostname" when the last piggyback file for the + # current host was removed. This may cause the os.listdir() to fail. We treat + # this as regular case: No piggyback files for the current host. + try: + source_hosts = os.listdir(dir) + except OSError, e: + if e.errno == 2: # No such file or directory + return files + else: + raise + + for sourcehost in source_hosts: + if sourcehost in ['.', '..'] or sourcehost.startswith(".new."): + continue + + file_path = dir + "/" + sourcehost + + try: + file_age = cachefile_age(file_path) + except MKGeneralException, e: + continue # File might've been deleted. That's ok. + + # Cleanup outdated files + if file_age > piggyback_max_cachefile_age: + console.verbose("Piggyback file %s is outdated by %d seconds. Deleting it.\n" % + (file_path, file_age - piggyback_max_cachefile_age)) + + try: + os.remove(file_path) + except OSError, e: + if e.errno == 2: # No such file or directory + pass # Deleted in the meantime. That's ok. + else: + raise + + continue + + files.append((sourcehost, file_path)) return files

7 years

made plugin readable

by Marcel Arentz

Module: check_mk Branch: master Commit: 798500fd41f66a3c5f2a8c32fdc8478155426f12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=798500fd41f66a… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jun 12 14:46:08 2017 +0200 made plugin readable corrected indentation replaced tabs with spaces Change-Id: Id8d02d5cc0516aae0404a2f6712e497d50f55783 --- agents/plugins/smart | 81 ++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/agents/plugins/smart b/agents/plugins/smart index 0779c49..6e28c91 100755 --- a/agents/plugins/smart +++ b/agents/plugins/smart @@ -31,12 +31,11 @@ # SCSI protocol interface. megaraid_info() { - #PDINFO=$(MegaCli -PDlist -a0) if [ -z "$1" ]; then - PDINFO=$(megacli -PDlist -a0 -NoLog) + PDINFO=$(megacli -PDlist -a0 -NoLog) else - PDINFO=$($1 -PDlist -a0 -NoLog) + PDINFO=$($1 -PDlist -a0 -NoLog) fi echo "$PDINFO" | \ @@ -80,18 +79,18 @@ if which smartctl > /dev/null 2>&1 ; then # get the serials for all disks on the controller # if which tw_cli > /dev/null 2>&1 ; then - # support for only one controller at the moment - TWAC=$(tw_cli show | awk 'NR < 4 { next } { print $1 }' | head -n 1) - - # - add a trailing zero to handle case of unused slot - # trailing zeros are part of the device links in /dev/disk/by-id/... anyway - # - only the last 9 chars seem to be relevant - # (hopefully all this doesn't change with new kernels...) - eval `tw_cli /$TWAC show drivestatus | grep -E '^p[0-9]' | awk '{print $1 " " $7 "0"}' | while read twaminor serial ; do - twaminor=${twaminor#p} - serial=${serial:(-9)} - serial=AMCC_${serial}00000000000 - echo "$serial=$twaminor" + # support for only one controller at the moment + TWAC=$(tw_cli show | awk 'NR < 4 { next } { print $1 }' | head -n 1) + + # - add a trailing zero to handle case of unused slot + # trailing zeros are part of the device links in /dev/disk/by-id/... anyway + # - only the last 9 chars seem to be relevant + # (hopefully all this doesn't change with new kernels...) + eval `tw_cli /$TWAC show drivestatus | grep -E '^p[0-9]' | awk '{print $1 " " $7 "0"}' | while read twaminor serial ; do + twaminor=${twaminor#p} + serial=${serial:(-9)} + serial=AMCC_${serial}00000000000 + echo "$serial=$twaminor" done` else: echo "tw_cli not found" >&2 @@ -121,8 +120,8 @@ if which smartctl > /dev/null 2>&1 ; then continue fi - # Avoid duplicate entries for same device - if [ "${SEEN//.$N./}" != "$SEEN" ] ; then + # Avoid duplicate entries for same device + if [ "${SEEN//.$N./}" != "$SEEN" ] ; then continue fi SEEN="$SEEN.$N." @@ -131,32 +130,32 @@ if which smartctl > /dev/null 2>&1 ; then DNAME=${D#/dev/disk/by-id/scsi-} DNAME=${DNAME#/dev/disk/by-id/ata-} # 2012-01-25 Stefan Kaerst CDJ - special option in case vendor is AMCC - CMD= + CMD= if [ "$VEND" == "AMCC" -a -n "$TWAC" ]; then - DNAME=${DNAME#1} - [ -z "${!DNAME}" ] && continue - CMD="smartctl -d 3ware,${!DNAME} -v 9,raw48 -A /dev/twa0" - # create nice device name including model - MODEL=$(tw_cli /$TWAC/p${!DNAME} show model | head -n 1 | awk -F= '{ print $2 }') - MODEL=${MODEL## } - MODEL=${MODEL// /-} - DNAME=${DNAME#AMCC_} - DNAME="AMCC_${MODEL}_${DNAME%000000000000}" + DNAME=${DNAME#1} + [ -z "${!DNAME}" ] && continue + CMD="smartctl -d 3ware,${!DNAME} -v 9,raw48 -A /dev/twa0" + # create nice device name including model + MODEL=$(tw_cli /$TWAC/p${!DNAME} show model | head -n 1 | awk -F= '{ print $2 }') + MODEL=${MODEL## } + MODEL=${MODEL// /-} + DNAME=${DNAME#AMCC_} + DNAME="AMCC_${MODEL}_${DNAME%000000000000}" elif [ "$VEND" != "ATA" ] ; then - TEMP= - # create temperature output as expected by checks/smart - # this is a hack, TODO: change checks/smart to support SCSI-disks - eval `smartctl -d scsi -i -A $D | while read a b c d e ; do - [ "$a" == Serial ] && echo SN=$c - [ "$a" == Current -a "$b" == Drive -a "$c" == Temperature: ] && echo TEMP=$d - done` - [ -n "$TEMP" ] && CMD="echo 194 Temperature_Celsius 0x0000 000 000 000 Old_age Always - $TEMP (0 0 0 0)" - DNAME="${VEND}_${MODEL}_${SN}" - else - CMD="smartctl -d ata -v 9,raw48 -A $D" - fi - - [ -n "$CMD" ] && $CMD | grep Always | egrep -v '^190(.*)Temperature(.*)' | sed "s|^|$DNAME $VEND $MODEL |" + TEMP= + # create temperature output as expected by checks/smart + # this is a hack, TODO: change checks/smart to support SCSI-disks + eval `smartctl -d scsi -i -A $D | while read a b c d e ; do + [ "$a" == Serial ] && echo SN=$c + [ "$a" == Current -a "$b" == Drive -a "$c" == Temperature: ] && echo TEMP=$d + done` + [ -n "$TEMP" ] && CMD="echo 194 Temperature_Celsius 0x0000 000 000 000 Old_age Always - $TEMP (0 0 0 0)" + DNAME="${VEND}_${MODEL}_${SN}" + else + CMD="smartctl -d ata -v 9,raw48 -A $D" + fi + + [ -n "$CMD" ] && $CMD | grep Always | egrep -v '^190(.*)Temperature(.*)' | sed "s|^|$DNAME $VEND $MODEL |" done 2>/dev/null

7 years

Fixed compared version in recently added test

by Lars Michelsen

Module: check_mk Branch: master Commit: 53112dceb567a775800958a6fa1c4ac08a9bf307 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53112dceb567a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 12 13:21:39 2017 +0200 Fixed compared version in recently added test Change-Id: I1abe1e9f5131c2eccbbcc33895571fd8e70e730f --- tests/lib/test_werks.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tests/lib/test_werks.py b/tests/lib/test_werks.py index 7b38e4e..4eb489d 100644 --- a/tests/lib/test_werks.py +++ b/tests/lib/test_werks.py @@ -64,19 +64,7 @@ def test_write_precompiled_werks(tmpdir, site, monkeypatch): def test_werk_versions(site): - import cmk_base.utils - - # All versions are allowed in master branch. We only want to ensure that version specific - # branches don't have werks with newer version numbers. - v = cmk.omd_version() - if cmk_base.utils.is_daily_build_version(v): - branch = cmk_base.utils.branch_of_daily_build(v) - if branch == "master": - return - else: - v = branch - - parsed_version = cmk.werks.parse_check_mk_version(v) + parsed_version = cmk.werks.parse_check_mk_version(cmk.__version__) for werk_id, werk in cmk.werks.load().items(): parsed_werk_version = cmk.werks.parse_check_mk_version(werk["version"])

7 years

← Newer
1
...
16
17
18
19
20
21
22
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017