Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: added rule for smoke detectors

by Simon Betz

Module: check_mk Branch: master Commit: 19a370576ded3b4238d5974661b32c64244e5df7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19a370576ded3b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jul 10 11:19:01 2015 +0200 added rule for smoke detectors --- web/plugins/wato/check_parameters.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 33e3ea8..5803c9d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7210,6 +7210,22 @@ register_check_parameters( ) register_check_parameters( + subgroup_environment, + "smoke", + _("Smoke Detection"), + Tuple( + help = _("For devices which measure smoke in percent"), + elements = [ + Percentage(title = _("Warning at"), allow_int = True, default_value= 1), + Percentage(title = _("Critical at"), allow_int = True, default_value= 5), + ]), + TextAscii( + title = _("Sensor ID"), + help = _("The identifier of the sensor.")), + "first", +) + +register_check_parameters( subgroup_environment, "apc_ats_output", _("APC Automatic Transfer Switch Output"),

9 years, 2 months

Check_MK Git: check_mk: Edited werk text

by Bastian Kuhn

Module: check_mk Branch: master Commit: 07da1aee56392101dde5bb5339ac8132b22ea2fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07da1aee563921… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 13 12:50:41 2015 +0200 Edited werk text --- .werks/1270 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1270 b/.werks/1270 index f7f6920..f24e165 100644 --- a/.werks/1270 +++ b/.werks/1270 @@ -1,4 +1,4 @@ -Title: Multsite site Hostfilters for views can no be negated +Title: Multsite site Hostfilters for views can now be negated Level: 1 Component: multisite Compatible: compat diff --git a/ChangeLog b/ChangeLog index a1851b7..eb72c82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,7 +57,7 @@ * 2391 SEC: Auth cookie is using "secure" flag when HTTPS request detected... * 2392 SEC: Auth cookie is always using "httponly" flag... * 1268 The Snapins "Folders" and "Tree of Folders" can now be used by users without wato permission - * 1270 Multsite site Hostfilters for views can no be negated + * 1270 Multsite site Hostfilters for views can now be negated * 2314 FIX: Availability: fixed exception when grouping by host or service group * 2361 FIX: Fix exception for missing key 'title' in certain cases of older customized views * 2379 FIX: Plugin-Output: Fixed handling of URLs within output of check_http...

9 years, 2 months

Check_MK Git: check_mk: #1270 Multsite site Hostfilters for views can no be negated

by Bastian Kuhn

Module: check_mk Branch: master Commit: f90f4bcf9e61954fd07697cb4ee1fdfd60646163 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f90f4bcf9e6195… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 13 11:36:45 2015 +0200 #1270 Multsite site Hostfilters for views can no be negated --- .werks/1270 | 9 +++++++++ ChangeLog | 1 + web/plugins/visuals/filters.py | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/1270 b/.werks/1270 new file mode 100644 index 0000000..f7f6920 --- /dev/null +++ b/.werks/1270 @@ -0,0 +1,9 @@ +Title: Multsite site Hostfilters for views can no be negated +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i3 +Date: 1436780167 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index adfc796..a1851b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ * 2391 SEC: Auth cookie is using "secure" flag when HTTPS request detected... * 2392 SEC: Auth cookie is always using "httponly" flag... * 1268 The Snapins "Folders" and "Tree of Folders" can now be used by users without wato permission + * 1270 Multsite site Hostfilters for views can no be negated * 2314 FIX: Availability: fixed exception when grouping by host or service group * 2361 FIX: Fix exception for missing key 'title' in certain cases of older customized views * 2379 FIX: Plugin-Output: Fixed handling of URLs within output of check_http... diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 004969b..7c75a7c 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -82,13 +82,13 @@ class FilterUnicode(FilterText): return "" # filter title info column htmlvar -declare_filter(100, FilterText("hostregex", _("Hostname"), "host", "host_name", "host_regex", "~~"), +declare_filter(100, FilterText("hostregex", _("Hostname"), "host", "host_name", "host_regex", "~~" , True), _("Search field allowing regular expressions and partial matches")) -declare_filter(101, FilterText("host", _("Hostname (exact match)"), "host", "host_name", "host", "="), +declare_filter(101, FilterText("host", _("Hostname (exact match)"), "host", "host_name", "host", "=", True), _("Exact match, used for linking")) -declare_filter(102, FilterUnicode("hostalias", _("Hostalias"), "host", "host_alias", "hostalias", "~~"), +declare_filter(102, FilterUnicode("hostalias", _("Hostalias"), "host", "host_alias", "hostalias", "~~", True), _("Search field allowing regular expressions and partial matches")) declare_filter(200, FilterUnicode("serviceregex", _("Service"), "service", "service_description", "service_regex", "~~"),

9 years, 2 months

Check_MK Git: check_mk: #2458 FIX FreeBSD-Agent: Fixed uptime calculation

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b8b15cddc0bea448486939e9829ac354f6f7c3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b8b15cddc0bea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 13 11:22:15 2015 +0200 #2458 FIX FreeBSD-Agent: Fixed uptime calculation --- .werks/2458 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.freebsd | 7 ++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.werks/2458 b/.werks/2458 new file mode 100644 index 0000000..4e8df57 --- /dev/null +++ b/.werks/2458 @@ -0,0 +1,10 @@ +Title: FreeBSD-Agent: Fixed uptime calculation +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1436779297 + + diff --git a/ChangeLog b/ChangeLog index 47d7f52..adfc796 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ NOTE: Please refer to the migration notes! * 2400 FIX: windows_if.ps1: fixed exception in plugin when an interface team had no members * 2374 FIX: md: Fix exception for certain outputs of certain special MD configurations... + * 2458 FIX: FreeBSD-Agent: Fixed uptime calculation Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 24f90b8..e35aded 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -180,12 +180,9 @@ echo `sysctl -n vm.loadavg | tr -d '{}'` `top -b -n 1 | grep -E '^[0-9]+ process # Calculate the uptime in seconds since epoch compatible to /proc/uptime in linux echo '<<<uptime>>>' - up_seconds=$(( `date +%s` - `sysctl -n kern.boottime | cut -f1 -d\, | awk '{print $4}'`)) +up_seconds=$(( `date +%s` - `sysctl -n kern.boottime | cut -f1 -d\, | awk '{print $4}'`)) idle_seconds=$(ps axw | grep idle | grep -v grep | awk '{print $4}' | cut -f1 -d\: ) - -# second value can be grabbed from "idle" process cpu time / num_cores -echo "$idle_seconds $up_seconds" - +echo "$up_seconds $idle_seconds" # Platten- und RAID-Status von LSI-Controlleren, falls vorhanden #if which cfggen > /dev/null ; then

9 years, 2 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: be477de9310682788a0472e88c8283385a0622b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be477de9310682… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 13 11:21:21 2015 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 0af87fa..721cbb1 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2458 +2478

9 years, 2 months

Check_MK Git: check_mk: #2401 windows agent: changed executionpolicy for powershell scripts to unrestricted

by Andreas Boesl

Module: check_mk Branch: master Commit: 3b8f33efc80c067b5b071dcf857577d3f3492aeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b8f33efc80c06… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 13 09:49:33 2015 +0200 #2401 windows agent: changed executionpolicy for powershell scripts to unrestricted Powershell scripts were previously called with the execution policy <i>RemoteSigned</i> which did not work properly on certain windows systems. --- .werks/2401 | 11 +++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 183808 -> 183808 bytes agents/windows/check_mk_agent.msi | Bin 734720 -> 734720 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 183808 bytes agents/windows/install_agent-64.exe | Bin 179044 -> 179048 bytes agents/windows/install_agent.exe | Bin 160003 -> 160001 bytes 11 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/2401 b/.werks/2401 new file mode 100644 index 0000000..bd23d03 --- /dev/null +++ b/.werks/2401 @@ -0,0 +1,11 @@ +Title: windows agent: changed executionpolicy for powershell scripts to unrestricted +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1436773665 +Class: feature + +Powershell scripts were previously called with the execution policy <i>RemoteSigned</i> +which did not work properly on certain windows systems. + diff --git a/ChangeLog b/ChangeLog index 3a93a3b..47d7f52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 2129 db_ checks: new mk_db2.linux agent supporting the existing db2_ checks * 1269 esx_vsphere_counters.diskio: Check now uses the default diskstat implementation... NOTE: Please refer to the migration notes! + * 2401 windows agent: changed executionpolicy for powershell scripts to unrestricted... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/agents/windows/build_version b/agents/windows/build_version index ca55a6c..8f897c8 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -198 +202 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 666b0f4..19646d0 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 3ca66e0..256dcef 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 1c2cd52..7ff2878 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2783,7 +2783,7 @@ char *add_interpreter(char *path, char *newpath) // 1.) The powershell interpreter needs to be in PATH // 2.) The execution policy needs to allow the script execution // -> Get-ExecutionPolicy / Set-ExecutionPolicy - snprintf(newpath, 256, "powershell.exe -NoLogo -ExecutionPolicy RemoteSigned \"& \'%s\'\"", path); + snprintf(newpath, 256, "powershell.exe -NoLogo -ExecutionPolicy Unrestricted \"& \'%s\'\"", path); return newpath; } else if (!strcmp(path + strlen(path) - 3, ".pl")) { diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index eedb2d9..5ab11c7 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 3db52a5..ef72fa6 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 0573dc3..34c227c 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 7ef306c..849a609 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 1c31b2d..9c19565 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 2 months

Check_MK Git: check_mk: #2397 FIX Fixed wrong confirm text in distributed setup when activating foreign changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 0d639213a87e51f5a10a8e0390cb103fecf9cd60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d639213a87e51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 13 09:29:46 2015 +0200 #2397 FIX Fixed wrong confirm text in distributed setup when activating foreign changes --- .werks/2397 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/2397 b/.werks/2397 new file mode 100644 index 0000000..d9b93df --- /dev/null +++ b/.werks/2397 @@ -0,0 +1,10 @@ +Title: Fixed wrong confirm text in distributed setup when activating foreign changes +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1436772548 + + diff --git a/ChangeLog b/ChangeLog index 145acba..3a93a3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 2346 FIX: Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules * 2372 FIX: Avoid freezing WATO during bulk discovery if hosts do not respond in a timely manner * 1267 FIX: Fixed confirm activating foreign changes dialog... + * 2397 FIX: Fixed wrong confirm text in distributed setup when activating foreign changes Notifications: * 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4266db0..7d07670 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4735,7 +4735,7 @@ def mode_changelog(phase): html.context_button(_("Audit Log"), make_link([("mode", "auditlog")]), "auditlog") elif phase == "action": - action = html.var("_action") + action = html.var("_action", html.var("_siteaction")) if action == "activate": # Let host validators do their work defective_hosts = validate_all_hosts([], force_all = True) @@ -4755,10 +4755,14 @@ def mode_changelog(phase): (config.alias_of_user(user_id), count, _("changes")) table += '</table>' - if action == "activate": + if action in [ "activate", "sync_restart", "restart" ]: title = _("Confirm activating foreign changes") text = _("There are some changes made by your colleagues that you will " "activate if you proceed:") + elif action == "sync": + title = _("Confirm synchronizing foreign changes") + text = _("There are some changes made by your colleagues that you will " + "synchronize if you proceed:") else: title = _("Confirm discarding foreign changes") text = _("There are some changes made by your colleagues that you will "

9 years, 2 months

Check_MK Git: check_mk: #2374 FIX md: Fix exception for certain outputs of certain special MD configurations

by Mathias Kettner

Module: check_mk Branch: master Commit: 1002e24e8815903571bce8fab0c09bde2b91f599 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1002e24e881590… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 10 16:39:10 2015 +0200 #2374 FIX md: Fix exception for certain outputs of certain special MD configurations The parser in the check did not handle lines with the format F+: 1463055360 blocks 64K chunks 2 near-copies [4/3] [UU_U] F-: correctly. This has been fixed. --- .werks/2374 | 17 +++++++++++++++++ ChangeLog | 1 + checks/md | 19 +++++++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/.werks/2374 b/.werks/2374 new file mode 100644 index 0000000..8e4d139 --- /dev/null +++ b/.werks/2374 @@ -0,0 +1,17 @@ +Title: md: Fix exception for certain outputs of certain special MD configurations +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1436539095 + +The parser in the check did not handle lines with the format + +F+: + 1463055360 blocks 64K chunks 2 near-copies [4/3] [UU_U] +F-: + +correctly. This has been fixed. + diff --git a/ChangeLog b/ChangeLog index 0ce53b6..145acba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * 1266 FIX: cisco_mem_asa: Special memory check for cisco asa devices.... NOTE: Please refer to the migration notes! * 2400 FIX: windows_if.ps1: fixed exception in plugin when an interface team had no members + * 2374 FIX: md: Fix exception for certain outputs of certain special MD configurations... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/md b/checks/md index 505941e..291340c 100644 --- a/checks/md +++ b/checks/md @@ -93,6 +93,20 @@ # unused devices: <none> # ---------------------------------------------------------- +# And now for something completely different: +# --------------------------------------------------------- +# Personalities : [raid1] [raid10] +# md1 : active raid10 sdd6[3] sdb6[1] sda6[0] +# 1463055360 blocks 64K chunks 2 near-copies [4/3] [UU_U] +# +# md0 : active raid1 sdd1[3] sdb1[1] sda1[0] +# 104320 blocks [4/3] [UU_U] +# +# unused devices: <none> +# --------------------------------------------------------- + +# TODO: Write a parse function! + def inventory_md(info): inventory = [] for line in info: @@ -107,6 +121,7 @@ def inventory_md(info): inventory.append( (device, None) ) return inventory + def check_md(item, _no_params, info): raid_state = '' its_next = False @@ -135,7 +150,7 @@ def check_md(item, _no_params, info): elif state_next: if num_disks == expected_disks and active_disks == working_disks: return (0, 'raid active, disk state is %s %s' % (disk_state_1, disk_state_2)) - if len(line) > 6 and line[-6] != '': + if len(line) > 6 and line[-6] != '' and "speed=" in line[-1]: build_state_1 = line[-6] build_state_2 = line[-4] build_est = line[-2].partition('=')[2] @@ -144,7 +159,7 @@ def check_md(item, _no_params, info): (disk_state_1, disk_state_2, expected_disks, build_state_1, build_state_2, build_speed, build_est)) return (2, 'disk state is %s %s (expected %d disks to be up)' % (disk_state_1, disk_state_2, expected_disks)) - return (2, 'no raid device %s' % item) + return (2, 'no RAID device %s' % item)

9 years, 2 months

Check_MK Git: check_mk: #1269 esx_vsphere_counters.diskio:

by Bastian Kuhn

Check now uses the default diskstat implementation Message-ID: <559fb19d.gUUVfWdEQpb+QN8T%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: f8d965e8823e63e8bba321b81b2f73ac2398ea0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8d965e8823e63… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jul 10 13:50:44 2015 +0200 #1269 esx_vsphere_counters.diskio: Check now uses the default diskstat implementation The Check has now more metricts and also levels can be configured now. Sadly a rediscovery is needed because the internal name has changed and also the graphs has new names what means that the graphs will start over. --- .werks/1269 | 11 +++++++++++ ChangeLog | 2 ++ checks/esx_vsphere_counters | 45 +++++++++++++++++++++---------------------- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/.werks/1269 b/.werks/1269 new file mode 100644 index 0000000..9049cc7 --- /dev/null +++ b/.werks/1269 @@ -0,0 +1,11 @@ +Title: esx_vsphere_counters.diskio: Check now uses the default diskstat implementation +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i3 +Date: 1436528825 +Class: feature + +The Check has now more metricts and also levels can be configured now. Sadly a rediscovery is needed because the internal name has changed +and also the graphs has new names what means that the graphs will start over. + diff --git a/ChangeLog b/ChangeLog index c4bc800..2710c05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ * 2285 Modified checks for printer pages: canon_pages, printer_pages, printer_pages_ricoh, printer_pages.include... NOTE: Please refer to the migration notes! * 2129 db_ checks: new mk_db2.linux agent supporting the existing db2_ checks + * 1269 esx_vsphere_counters.diskio: Check now uses the default diskstat implementation... + NOTE: Please refer to the migration notes! * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index 54727da..37ef200 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -72,40 +72,39 @@ def inventory_esx_vsphere_counters_diskio(info): for counter, item, value, unit in info: if counter == 'disk.read' and item == '': - return [(None, None)] + return [("SUMMARY", {})] -def check_esx_vsphere_counters_diskio(_no_item, _no_params, info): +def check_esx_vsphere_counters_diskio(item, params, info): if not info: raise MKCounterWrapped("Counter data is missing") - - read_bytes = 0 - write_bytes = 0 - reads = 0 - writes = 0 - latency = 0 - for counter, item, value, unit in info: - if item == '': + values = {} + values['read_throughput'] = 0 + values['write_throughput'] = 0 + values['read_ios'] = 0 + values['write_ios'] = 0 + values['latency'] = 0 + for counter, esx_item, value, unit in info: + if esx_item == '': if counter == 'disk.read': - read_bytes = int(value) * 1024 + values['read_throughput'] = int(value) * 1024 elif counter == 'disk.write': - write_bytes = int(value) * 1024 + values['write_throughput'] = int(value) * 1024 elif counter == 'disk.numberRead': - reads += int(value) + values['read_ios'] += int(value) elif counter == 'disk.numberWrite': - writes += int(value) + values['write_ios'] += int(value) elif counter == 'disk.deviceLatency': - latency = max(latency, int(value)) - - return 0, "%s/sec read, %s/sec write, IOs: %.2f/sec, latency: %d ms" % ( - get_bytes_human_readable(read_bytes), get_bytes_human_readable(write_bytes), reads + writes, latency), \ - [ ("read", read_bytes), ("write", write_bytes), ("ios", reads + writes), ("latency" , latency) ] + values['latency'] = max(values['latency'], int(value)) + return check_diskstat_dict(item, params, {"SUMMARY" : values}) check_info['esx_vsphere_counters.diskio'] = { - 'inventory_function' : inventory_esx_vsphere_counters_diskio, - 'check_function' : check_esx_vsphere_counters_diskio, - 'service_description': 'Disk IO SUMMARY', - 'has_perfdata': True, + 'inventory_function' : inventory_esx_vsphere_counters_diskio, + 'check_function' : check_esx_vsphere_counters_diskio, + 'service_description' : 'Disk IO', + 'has_perfdata' : True, + 'group' : 'diskstat', + 'includes' : [ "diskstat.include" ], }

9 years, 2 months

Check_MK Git: check_mk: Fixed Typo in manpage

by Mathias Kettner

Module: check_mk Branch: master Commit: d930d67e442a223e9938422583e51d9a969d2c55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d930d67e442a22… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 10 13:08:06 2015 +0200 Fixed Typo in manpage --- checkman/check_sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/check_sql b/checkman/check_sql index f969826..ce2873e 100644 --- a/checkman/check_sql +++ b/checkman/check_sql @@ -16,7 +16,7 @@ description: State, text and the performance data are being returned. The check works with MySQL, Postgresql, MSSQL and Oracle databases using the - python drivers MySQLdb, psycopg2, pymssqlm and cx_Oracle. For cx_Oracle the + python drivers MySQLdb, psycopg2, pymssql and cx_Oracle. For cx_Oracle the Oracle instantclient needs to be installed as well, and the LD_LIBRARY_PATH needs to be modified to point to the libclntsh.so of that package.

9 years, 2 months

← Newer
1
...
15
16
17
18
19
20
21
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015