[checkmk-commits] 4336 diskstat: now detects NVMe drives, eg. solid-state drives

Module: check_mk Branch: master Commit: 2885a346254e964a3221a1cfed49cdc619cdd424 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2885a346254e96… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Thu Feb 2 15:28:03 2017 +0100 4336 diskstat: now detects NVMe drives, eg. solid-state drives Change-Id: I90b5a1632d5d84fd363724b2619d5caf2777fed7 --- .werks/4336 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4336 b/.werks/4336 new file mode 100644 index 0000000..360ab1d --- /dev/null +++ b/.werks/4336 @@ -0,0 +1,9 @@ +Title: diskstat: now detects NVMe drives, eg. solid-state drives +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486045514 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 86d940d..5b9fcc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 4215 hp_webmgmt_status: Now also displays device model and serial number * 4332 check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option... * 4334 mssql_instance: now the connection status is configurable + * 4336 diskstat: now detects NVMe drives, eg. solid-state drives * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 146cd70..092a571 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -395,7 +395,7 @@ fi # Performancecounter Platten echo '<<<diskstat>>>' date +%s -egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*|dasd[a-z]*|bcache[0-9]+) ' < /proc/diskstats +egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*|dasd[a-z]*|bcache[0-9]+|nvme[0-9]+n[0-9]+) ' < /proc/diskstats if type dmsetup >/dev/null ; then echo '[dmsetup_info]' dmsetup info -c --noheadings --separator ' ' -o name,devno,vg_name,lv_name