Checkmk git commits September 2014

checkmk-commits@lists.checkmk.com

5 participants
195 discussions

Check_MK Git: check_mk: cmk-plugins-statistics: omit parameters for legacy checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 8b2f194fc4302b41aaf7be01b59bf98009cc47f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b2f194fc4302b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 16:25:10 2014 +0200 cmk-plugins-statistics: omit parameters for legacy checks --- doc/treasures/cmk-plugin-statistics | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/treasures/cmk-plugin-statistics b/doc/treasures/cmk-plugin-statistics index ee2171b..f993220 100755 --- a/doc/treasures/cmk-plugin-statistics +++ b/doc/treasures/cmk-plugin-statistics @@ -15,6 +15,7 @@ echo -e "GET services\nColumns: host_name check_command" \ | unixcat "$LIVE_SOCKET" \ | sort -u \ | cut -d\; -f2 \ + | cut -d\! -f1 \ | sort \ | uniq -c \ | sort -rn

10 years, 1 month

Check_MK Git: check_mk: #1111 vCenter monitoring: greatly improved performance (at least 40 times faster)

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f607efdb209ac15f3729a007e0674cee270a421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f607efdb209ac… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 12 16:06:05 2014 +0200 #1111 vCenter monitoring: greatly improved performance (at least 40 times faster) The pysphere API is no longer used when monitoring ESX vCenter systems. We are now using much simpler tools to evaluate the vCenter response instead, thus saving quite a lot of cpu time. Depending on the number of ESX Hosts and virtualmachines you will see a performance increase by a factor of 40-200. <br><br> Note:<br> If the "Compatibility mode" is set in WATO the old "pysphere" version is still being used. This option remains for older (<5.0) ESX versions. --- .werks/1111 | 17 + ChangeLog | 1 + agents/special/agent_vsphere | 698 +++++++++++++++++++++++++++++------------- 3 files changed, 509 insertions(+), 207 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0f607efdb2…

10 years, 1 month

Check_MK Git: check_mk: mysql.innodb_io: fix UNKNOWN, due to recent diskstat change

by Mathias Kettner

Module: check_mk Branch: master Commit: aee66f05a8d3c7c9b1552811dbbb2a6c5fbaf833 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aee66f05a8d3c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 15:50:14 2014 +0200 mysql.innodb_io: fix UNKNOWN, due to recent diskstat change --- checks/mysql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/mysql b/checks/mysql index c71a922..15de35f 100644 --- a/checks/mysql +++ b/checks/mysql @@ -142,7 +142,7 @@ def inventory_mysql_iostat(info): def check_mysql_iostat(item, params, info): values = parse_mysql(info) - line = [ None, values["Innodb_data_read"] / 512, values["Innodb_data_written"] / 512] + line = [ None, None, values["Innodb_data_read"] / 512, values["Innodb_data_written"] / 512] return check_diskstat_line(time.time(), 'innodb_io', params, line)

10 years, 1 month

Check_MK Git: check_mk: hpux_lunstats: fix UNKNOWN, due to recent diskstat change

by Mathias Kettner

Module: check_mk Branch: master Commit: 73c94a34394e3753fca1a3d0643d073de901ccc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73c94a34394e37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 15:47:56 2014 +0200 hpux_lunstats: fix UNKNOWN, due to recent diskstat change --- checks/hpux_lunstats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/hpux_lunstats b/checks/hpux_lunstats index bc45337..530a358 100644 --- a/checks/hpux_lunstats +++ b/checks/hpux_lunstats @@ -62,7 +62,7 @@ def hpux_lunstats_convert(info): bytes_read = int(right) / 512 elif left == 'Bytes written': bytes_written = int(right) / 512 - luns.append((lun, bytes_read, bytes_written)) + luns.append((None, lun, bytes_read, bytes_written)) return luns def check_hpux_lunstats(item, params, info):

10 years, 1 month

Check_MK Git: check_mk: diskstat: fix summary mode, fix aix_diskiod

by Mathias Kettner

Module: check_mk Branch: master Commit: 0f669c3222eea95b2667f1ea8c5d55a5ed431f9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f669c3222eea9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 15:45:30 2014 +0200 diskstat: fix summary mode, fix aix_diskiod --- checks/aix_diskiod | 5 +++-- checks/diskstat.include | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/aix_diskiod b/checks/aix_diskiod index e10224c..cd250e4 100644 --- a/checks/aix_diskiod +++ b/checks/aix_diskiod @@ -46,8 +46,8 @@ def aix_diskiod_convert(info): converted = [] - for device, tm_act, kbps, tps, kb_read, kb_written in info: - converted.append((device, int(kb_read) * 1024, int(kb_written) * 1024)) + for node_info, device, tm_act, kbps, tps, kb_read, kb_written in info: + converted.append((node_info, device, int(kb_read) * 1024, int(kb_written) * 1024)) return converted @@ -63,6 +63,7 @@ check_info["aix_diskiod"] = { 'inventory_function': inventory_aix_diskiod, 'service_description': 'Disk IO %s', 'has_perfdata': True, + 'node_info': True, 'group': 'disk_io', 'includes': [ "diskstat.include" ], } diff --git a/checks/diskstat.include b/checks/diskstat.include index 015acce..6d2690e 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -224,7 +224,7 @@ def check_diskstat_generic(item, params, this_time, info, mode='sectors'): if ' ' in devname: continue summary_line = map(lambda e: e[0] + int(e[1]), zip(summary_line, line[2:])) - return check_diskstat_line(this_time, "SUMMARY", params, [''] + summary_line, mode) + return check_diskstat_line(this_time, "SUMMARY", params, [None, ''] + summary_line, mode) # single mode result = ""

10 years, 1 month

Check_MK Git: check_mk: winperf_phydisk: fix UNKNOWN, make compatible again with diskstat.include

by Mathias Kettner

Module: check_mk Branch: master Commit: a14f10f33b004fa9fd991af0fd2b02f597f52f28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a14f10f33b004f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 15:36:29 2014 +0200 winperf_phydisk: fix UNKNOWN, make compatible again with diskstat.include --- checks/winperf_phydisk | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index b32a3cd..7c267bd 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -63,36 +63,39 @@ check_includes['winperf_phydisk'] = [ "diskstat.include" ] def winperf_phydisk_convert(info): + # node_info has been activated. This check simply ignores this + # for now. # In case disk performance counters are not enabled, the agent sends # an almost empty section, where the second line is missing completely if len(info) == 1: return [] - disks = [ d.split('_')[-1] for d in info[1][2:-1] ] + disks = [ d.split('_')[-1] for d in info[1][3:-1] ] for line in info[2:]: - if line[0] == '-14': - disk_read_bytes = [ int(x) / 512 for x in line[1:-2] ] - elif line[0] == '-12': - disk_write_bytes = [ int(x) / 512 for x in line[1:-2] ] - elif line[0] == '-20': - disk_reads = [ int(x) for x in line[1:-2] ] - elif line[0] == '-18': - disk_writes = [ int(x) for x in line[1:-2] ] - elif line[0] == '1168': # Average Disk Read Queue Length - disk_readq_ctrs = [ int(x) for x in line[1:-2] ] - elif line[0] == '1170': # Average Disk Read Queue Length - disk_writeq_ctrs = [ int(x) for x in line[1:-2] ] + if line[1] == '-14': + disk_read_bytes = [ int(x) / 512 for x in line[2:-2] ] + elif line[1] == '-12': + disk_write_bytes = [ int(x) / 512 for x in line[2:-2] ] + elif line[1] == '-20': + disk_reads = [ int(x) for x in line[2:-2] ] + elif line[1] == '-18': + disk_writes = [ int(x) for x in line[2:-2] ] + elif line[1] == '1168': # Average Disk Read Queue Length + disk_readq_ctrs = [ int(x) for x in line[2:-2] ] + elif line[1] == '1170': # Average Disk Read Queue Length + disk_writeq_ctrs = [ int(x) for x in line[2:-2] ] # Missing columns are donted by negative values (Linux sends here latency # information) empty = [ -1 for x in disks ] + none = [ None for x in disks ] # Used as dummy node info - return zip(disks, disk_read_bytes, disk_write_bytes, disk_reads, disk_writes, empty, disk_readq_ctrs, disk_writeq_ctrs) + return zip(none, disks, disk_read_bytes, disk_write_bytes, disk_reads, disk_writes, empty, disk_readq_ctrs, disk_writeq_ctrs) def inventory_winperf_phydisk(info): return inventory_diskstat_generic(winperf_phydisk_convert(info)) def check_winperf_phydisk(item, params, info): - this_time = int(float(info[0][0])) + this_time = int(time.time()) return check_diskstat_generic(item, params, this_time, winperf_phydisk_convert(info)) @@ -100,6 +103,7 @@ check_info["winperf_phydisk"] = { 'check_function': check_winperf_phydisk, 'inventory_function': inventory_winperf_phydisk, 'service_description': 'Disk IO %s', + 'node_info': True, 'has_perfdata': True, 'group': 'disk_io', }

10 years, 1 month

Check_MK Git: check_mk: Renamed script in treasures

by Mathias Kettner

Module: check_mk Branch: master Commit: 0ea225b1c790c42f0fdafc7b2edc4b94fab1ec4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ea225b1c790c4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 14:18:24 2014 +0200 Renamed script in treasures --- doc/treasures/{cmk_delete_host.py => cmk-delete-host} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/treasures/cmk_delete_host.py b/doc/treasures/cmk-delete-host similarity index 100% rename from doc/treasures/cmk_delete_host.py rename to doc/treasures/cmk-delete-host

10 years, 1 month

Check_MK Git: check_mk: win_printers.ps1: fix syntax error with invalid non-Ascii dash

by Mathias Kettner

Module: check_mk Branch: master Commit: 9e1027985cf73d4bc9ef007d137657521ebbb199 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e1027985cf73d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 11 17:28:45 2014 +0200 win_printers.ps1: fix syntax error with invalid non-Ascii dash --- agents/windows/plugins/win_printers.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/win_printers.ps1 b/agents/windows/plugins/win_printers.ps1 index f5489e7..2e8cd0f 100644 --- a/agents/windows/plugins/win_printers.ps1 +++ b/agents/windows/plugins/win_printers.ps1 @@ -17,7 +17,7 @@ $pswindow.buffersize = $newsize ### -Write-Host NoNewLine "<<<win_printers>>>" +Write-Host -NoNewLine "<<<win_printers>>>" $Data_Set1 = Get-WMIObject Win32_PerfFormattedData_Spooler_PrintQueue | Select Name, @{Expression={$_.jobs};Label="CurrentJobs"} $Data_Set2 = Get-WmiObject win32_printer | select name, printerstatus, detectederrorstate

10 years, 1 month

Check_MK Git: check_mk: Added script for makeing a statistics of used check plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: 6a9d4ebbaae0cc7d2ae3eadbe74616e99d8d8c4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a9d4ebbaae0cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 14:18:19 2014 +0200 Added script for makeing a statistics of used check plugins --- doc/treasures/cmk-plugin-statistics | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/treasures/cmk-plugin-statistics b/doc/treasures/cmk-plugin-statistics new file mode 100755 index 0000000..ee2171b --- /dev/null +++ b/doc/treasures/cmk-plugin-statistics @@ -0,0 +1,20 @@ +#!/bin/bash +# This script makes a statistics of the usage of the various check plugins. +# It makes a Livestatus-Connection and outputs a list of plugins and the +# information on how many different hosts this plugin is being used. + +if [ "$OMD_ROOT" ] ; then + LIVE_SOCKET=$OMD_ROOT/tmp/run/live +elif [ -z "$LIVE_SOCKET" ] ; then + echo "Please do an 'export LIVE_SOCKET=/path/to/your/livestatus/socket'" >&2 + echo "and then call me again." >&2 + exit 1 +fi + +echo -e "GET services\nColumns: host_name check_command" \ + | unixcat "$LIVE_SOCKET" \ + | sort -u \ + | cut -d\; -f2 \ + | sort \ + | uniq -c \ + | sort -rn

10 years, 1 month

Check_MK Git: check_mk: #1399 FIX Fix left-over tac processes when showing Event Console history

by Mathias Kettner

Module: check_mk Branch: master Commit: 0c2d6c3ec331fa112f405290febe4b8fe794b748 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c2d6c3ec331fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 15:22:15 2014 +0200 #1399 FIX Fix left-over tac processes when showing Event Console history When you show the Event Console history and run into a soft or hard query limit (of usually 1,000 or 5,000 entries), then every time one <tt>tac</tt> process was left over. This has been fixed. --- .werks/1399 | 12 ++++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 9 ++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/1399 b/.werks/1399 new file mode 100644 index 0000000..0a2f0ee --- /dev/null +++ b/.werks/1399 @@ -0,0 +1,12 @@ +Title: Fix left-over tac processes when showing Event Console history +Level: 2 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i6 +Date: 1410528075 + +When you show the Event Console history and run into a soft or hard +query limit (of usually 1,000 or 5,000 entries), then every time one +<tt>tac</tt> process was left over. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 452c646..b13a75c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,6 +123,7 @@ * 1148 Allow execution of actions when cancelling events... * 1395 Event Console can now create notifications via Check_MK RBN... * 1007 FIX: check_mkevents: fix case where events contain binary zeroes + * 1399 FIX: Fix left-over tac processes when showing Event Console history... HW/SW-Inventory: * 0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 122f8a5..ee18dc5 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -577,14 +577,13 @@ def parse_history_file(path, headers, filters, greptexts, limit): cmd = 'tac "%s"' % path if greptexts: cmd += ' | grep -i -e %s' % ".*".join(greptexts) - grep = subprocess.Popen(cmd, shell = True, close_fds=True, stdout=subprocess.PIPE) - logfile = grep.stdout + grep = subprocess.Popen(cmd, shell=True, close_fds=True, stdout=subprocess.PIPE) - for line in logfile: + for line in grep.stdout: line_no += 1 if limit != None and len(entries) > limit: - if greptexts: - os.kill(grep.pid, 15) + grep.kill() + grep.wait() break try:

10 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2014