Checkmk git commits August 2014

checkmk-commits@lists.checkmk.com

5 participants
225 discussions

Check_MK Git: check_mk: #0654 oracle_instance: now also monitors the log mode

by Goetz Golla

Module: check_mk Branch: master Commit: 6545588d6d67fa699dc808c01ae88adc478bdfdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6545588d6d67fa… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sat Aug 30 13:10:33 2014 +0200 #0654 oracle_instance: now also monitors the log mode --- .werks/654 | 9 +++++++++ ChangeLog | 1 + checks/oracle_instance | 9 +++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/654 b/.werks/654 new file mode 100644 index 0000000..d0997d2 --- /dev/null +++ b/.werks/654 @@ -0,0 +1,9 @@ +Title: oracle_instance: now also monitors the log mode +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1409397002 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6d81f87..529707a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 1146 nfsmounts: supported by AIX agent now... * 1103 windows agent: now able to omit context text of logfiles... * 1150 netstat: new check for monitoring TCP/UDP connections and Linux and AIX... + * 0654 oracle_instance: now also monitors the log mode * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checks/oracle_instance b/checks/oracle_instance index 0e86525..ba98fca 100644 --- a/checks/oracle_instance +++ b/checks/oracle_instance @@ -56,10 +56,15 @@ def check_oracle_instance(item, _no_params, info): # ORACLE is sick and cannot handle timezone changes >:-P up_seconds = max(0, int(up_seconds)) infotext += ", Logins %s, Version %s, Role %s, " \ - "%s, Force-Logging %s, Up since %s (%s)" % ( + "%s, Force-Logging %s, Up since %s (%s), Log Mode %s" % ( logins.lower(), version, database_role, \ archiver, force_logging, time.strftime("%F %T", time.localtime(time.time() - up_seconds)), \ - get_age_human_readable(up_seconds)) + get_age_human_readable(up_seconds), log_mode) + + # log_mode should not be "NOARCHIVELOG" + if log_mode == 'NOARCHIVELOG': + state = max(state,1) + infotext += "(!)" perfdata = [('uptime', up_seconds)] return state, infotext, perfdata

9 years, 8 months

Check_MK Git: check_mk: #0653 script to extract hw/ sw inventory data in csv format

by Goetz Golla

Module: check_mk Branch: master Commit: c7020b3f001a7ae3f5886d4b2f9116fcd0f65dd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7020b3f001a7a… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sat Aug 30 12:12:50 2014 +0200 #0653 script to extract hw/sw inventory data in csv format This script extracts data from the hw/sw inventory into various configurable relations, which are written into csv files. Configuration of the relations is carried out in the script itself in the dicts called relations. --- .werks/653 | 12 ++ ChangeLog | 1 + doc/treasures/inventory/extract_inventory.py | 200 ++++++++++++++++++++++++++ 3 files changed, 213 insertions(+) diff --git a/.werks/653 b/.werks/653 new file mode 100644 index 0000000..d620d39 --- /dev/null +++ b/.werks/653 @@ -0,0 +1,12 @@ +Title: script to extract hw/sw inventory data in csv format +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.5i6 +Date: 1409393403 +Class: feature + +This script extracts data from the hw/sw inventory into various configurable relations, +which are written into csv files. Configuration of the relations is carried out in the +script itself in the dicts called relations. + diff --git a/ChangeLog b/ChangeLog index 593b619..6d81f87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ NOTE: Please refer to the migration notes! * 0652 windows software inventory gives some more details about OS and installed software... NOTE: Please refer to the migration notes! + * 0653 script to extract hw/sw inventory data in csv format... 1.2.5i5: diff --git a/doc/treasures/inventory/extract_inventory.py b/doc/treasures/inventory/extract_inventory.py new file mode 100755 index 0000000..a4f75d5 --- /dev/null +++ b/doc/treasures/inventory/extract_inventory.py @@ -0,0 +1,200 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Author: Goetz Golla, gg(a)mathias-kettner.de + +# This script extracts data of the hardware inventory to csv files + + +relations = { + "devices": { + "columns": ( + ( "@hostname", "device_key" ), + ( "hardware.system.manufacturer", "device_manufacturer" ), + ( "hardware.system.family", "device_model" ), + ( "hardware.system.serial", "serial_number" ), + ( "software.os.name", "operating_system" ), + ( "software.os.install_date", "installation date" ), + ( "hardware.cpu.cpus", "cpu_chip_count" ), + ( "hardware.cpu.cores", "cpu_core_count" ), + ( "hardware.cpu.max_speed", "cpu_speed" ), + ( "hardware.cpu.model", "cpu_name" ), + ), + "filter": {}, + }, + "inv_raw_arp": { + "columns": ( + ( "software.packages:*.vendor", "publisher" ), + ( "software.packages:*.summary", "product" ), + ( "software.packages:*.version", "product_version" ), + ), + "filter": { + "software.packages:*.package_type": "reg_uninstall", # nur aus registry + }, + }, + "inv_raw_file": { + "columns": ( + ( "software.packages:*.name", "file_name" ), + ( "software.packages:*.size", "file_size" ), + ( "software.packages:*.path", "file_path" ), + ( "software.packages:*.vendor", "publisher" ), + ( "software.packages:*.summary", "product" ), + ( "software.packages:*.version", "product_version" ), + ), + "filter": { + "software.packages:*.package_type": "exe", # nur exe files + }, + }, + "inv_raw_generic(OS)": { + "columns": ( + ( "software.os.name", "generic_key" ), + ), + "filter": {}, + }, + "inv_raw_generic(Linux)": { + "columns": ( + ( "software.packages:*.name", "name" ), + ( "software.packages:*.version", "product_version" ), + ), + "filter": { + "software.packages:*.package_type": "deb", # nur exe files + }, + }, +} + +import os, sys, re + +omd_root = os.environ["OMD_ROOT"] + +# both directories need to have a trailing slash "/" ! +inv_dir = "%s/var/check_mk/inventory/" % omd_root +out_dir = "/var/tmp/" + +if not omd_root: + print "This script is only executable as site user" + sys.exit(1) + +def is_list(relation): + list_start = "" + if type(relation) == dict: # filter is a dict + relation = relation.keys() + is_list = (":*" in relation[0]) + if is_list: + list_start = relation[0].split(":")[0] + for field in relation: + if is_list != (":*" in field) or not field.startswith(list_start): + print "bad definition of relation, must be list or dict, not both" + sys.exit(1) + return list_start + +def filt_it(package, relation): + filt_start = is_list(relation["filter"]) + elements = [col[0] for col in relation["columns"]] + list_start = is_list(elements) + if filt_start != list_start: # do not filter if filter does not fit + return False + for field in relation["filter"].keys(): + if field: + should_be = relation["filter"][field] + field = re.sub(list_start+":\*.", "", field) + for item in field.split("."): + value = package[item] + if type(value) in (str, int, float) and value == should_be: + return False + return True + +def print_line(out_rel, hostname, items): + out_rel.write("\"%s\"" % hostname) + for item in items: + out_rel.write(", \"%s\"" % item) + out_rel.write("\n") + + +# extract all data +all_data = {} +for hostname in os.listdir(inv_dir): + fn = inv_dir + hostname + if os.path.isfile(fn): + a = eval(open(fn,'r').read()) + all_data[hostname] = a + +# loop over all relations, create an output file for each relation +for ofs in relations: + ofn = out_dir + ofs + out_rel = open(ofn,'w') + titles = [col[1] for col in relations[ofs]["columns"]] + print_line(out_rel, "hostname", titles) + elements = [col[0] for col in relations[ofs]["columns"]] + list_start = is_list(elements) + print "starting", ofn + if list_start == "": + for hostname in all_data: + items = [] + for field in elements: + if field: + subtree = all_data[hostname] + for item in field.split("."): + try: + subtree = subtree[item] + except: + items.append("") + break + if type(subtree) in (str, int, float): + items.append(subtree) + else: + items.append("") + print_line(out_rel, hostname, items) + out_rel.close() + else: + for hostname in all_data: + subtree = all_data[hostname] + for item in list_start.split("."): + try: + subtree = subtree[item] + except: + print "does not exist" + sys.exit(1) + if type(subtree) == list: + for package in subtree: + if filt_it(package, relations[ofs]): + continue + items = [] + for field in elements: + if field: + field = re.sub(list_start+":\*.", "", field) + for item in field.split("."): + try: + value = package[item] + except: + items.append("") + break + if type(value) in (str, int, float): + items.append(value) + else: + items.append("") + print_line(out_rel, hostname, items) + #out_rel.write("\n") + out_rel.close()

9 years, 8 months

Check_MK Git: check_mk: #0652 windows software inventory gives some more details about OS and installed software

by Goetz Golla

Module: check_mk Branch: master Commit: b308cef32e08abc84ba623d75c16cdc9625b7c46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b308cef32e08ab… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sat Aug 30 11:42:47 2014 +0200 #0652 windows software inventory gives some more details about OS and installed software most notably the installation date of the OS and a description and version number for exe files --- .werks/652 | 10 ++++++++++ ChangeLog | 2 ++ agents/windows/plugins/mk_inventory.ps1 | 12 ++++++------ inventory/win_exefiles | 5 ++++- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.werks/652 b/.werks/652 new file mode 100644 index 0000000..0c7d8fc --- /dev/null +++ b/.werks/652 @@ -0,0 +1,10 @@ +Title: windows software inventory gives some more details about OS and installed software +Level: 1 +Component: inv +Compatible: incomp +Version: 1.2.5i6 +Date: 1409391576 +Class: feature + +most notably the installation date of the OS and a description and version number for exe files + diff --git a/ChangeLog b/ChangeLog index ecaca25..593b619 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,8 @@ HW/SW-Inventory: * 0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path... NOTE: Please refer to the migration notes! + * 0652 windows software inventory gives some more details about OS and installed software... + NOTE: Please refer to the migration notes! 1.2.5i5: diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index 1bb89b0..8882b5a 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -1,4 +1,5 @@ [Console]::OutputEncoding = [System.Text.Encoding]::UTF8 +write-output "" # workaround to prevent the byte order mark to be at the beginning of the first section $name = (Get-Item env:\Computername).Value $separator = "|" # filename for timestamp @@ -30,7 +31,7 @@ Get-WmiObject Win32_Processor -ComputerName $name | Select Name,Manufacturer,Cap # OS Version write-host "<<<win_os:sep(124):persist($until)>>>" -Get-WmiObject Win32_OperatingSystem -ComputerName $name -Recurse | foreach-object { write-host -separator $separator $_.csname, $_.caption, $_.version, $_.OSArchitecture, $_.servicepackmajorversion, $_.ServicePackMinorVersion } +Get-WmiObject Win32_OperatingSystem -ComputerName $name -Recurse | foreach-object { write-host -separator $separator $_.csname, $_.caption, $_.version, $_.OSArchitecture, $_.servicepackmajorversion, $_.ServicePackMinorVersion, $_.InstallDate } # Memory #Get-WmiObject Win32_PhysicalMemory -ComputerName $name | select BankLabel,DeviceLocator,Capacity,Manufacturer,PartNumber,SerialNumber,Speed @@ -54,15 +55,14 @@ Get-WmiObject Win32_VideoController -ComputerName $name | Select Name, Descripti # Installed Software write-host "<<<win_wmi_software:sep(124):persist($until)>>>" -Get-WmiObject -Class Win32_Product -ComputerName $name | foreach-object { write-host -separator $separator $_.Name, $_.Vendor, $_.Version, $_.InstallDate } -Get-WmiObject Win32_Product -ComputerName $name | foreach-object { write-host -separator $separator $_.Name, $_.Vendor, $_.Version, $_.InstallDate } +Get-WmiObject Win32_Product -ComputerName $name | foreach-object { write-host -separator $separator $_.Name, $_.Vendor, $_.Version, $_.InstallDate } # Search Registry write-host "<<<win_reg_uninstall:sep(124):persist($until)>>>" $paths = @("HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall") foreach ($path in $paths) { - Get-ChildItem $path -Recurse | foreach-object { $path2 = $path+"\"+$_.PSChildName; get-ItemProperty -path $path2 | - foreach-object { write-host -separator $separator $_.DisplayName, $_.Publisher, $_.PSParentPath, $_.PSChildName, $_.DisplayVersion, $_.EstimatedSize, $_.InstallDate }} + Get-ChildItem $path -Recurse | foreach-object { $path2 = $path+"\"+$_.PSChildName; get-ItemProperty -path $path2 | + foreach-object { write-host -separator $separator $_.DisplayName, $_.Publisher, $path, $_.PSChildName, $_.DisplayVersion, $_.EstimatedSize, $_.InstallDate }} } # Search exes @@ -72,7 +72,7 @@ foreach ($item in $paths) { if ((Test-Path $item -pathType container)) { - Get-ChildItem -Path $item -include *.exe -Recurse | foreach-object { write-host -separator $separator $_.Fullname, $_.LastWriteTime, $_.Length } + Get-ChildItem -Path $item -include *.exe -Recurse | foreach-object { write-host -separator $separator $_.Fullname, $_.LastWriteTime, $_.Length, $_.VersionInfo.FileDescription, $_.VersionInfo.ProductVersion, $_.VersionInfo.ProductName } } } diff --git a/inventory/win_exefiles b/inventory/win_exefiles index a04d61c..c9935a0 100644 --- a/inventory/win_exefiles +++ b/inventory/win_exefiles @@ -33,7 +33,7 @@ def inv_win_exefiles(info): paclist = inv_tree("software.packages:") - for full_name, write_time, size in info: + for full_name, write_time, size, description, product_version, product_name in info: parts = full_name.split('\\') entry = { "name" : parts[-1], @@ -41,6 +41,9 @@ def inv_win_exefiles(info): "package_type" : "exe", "install_date" : write_time, "size" : int(size), + "version" : product_version, + "summary" : description, + "vendor" : product_name, } paclist.append(entry)

9 years, 8 months

Check_MK Git: check_mk: Updated bug entries #1007

by Goetz Golla

Module: check_mk Branch: master Commit: c30af94aa27680902201ff204bd6d956f1e11e35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c30af94aa27680… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sat Aug 30 11:06:03 2014 +0200 Updated bug entries #1007 --- .bugs/1007 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/1007 b/.bugs/1007 index 1f99c8d..768fc1b 100644 --- a/.bugs/1007 +++ b/.bugs/1007 @@ -1,4 +1,4 @@ -Title: liveproxyd erkennt sehr langsame Verbindungen noch nicht gut genug +Title: liveproxyd does not handle very slow and stalled connections well Component: multisite State: open Date: 2014-08-29 16:07:35

9 years, 8 months

Check_MK Git: check_mk: Updated bug entries #1007

by Goetz Golla

Module: check_mk Branch: master Commit: 49f5d2d732ba1960d1196998289309ee11da067d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49f5d2d732ba19… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sat Aug 30 11:04:33 2014 +0200 Updated bug entries #1007 --- .bugs/1007 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/1007 b/.bugs/1007 new file mode 100644 index 0000000..1f99c8d --- /dev/null +++ b/.bugs/1007 @@ -0,0 +1,10 @@ +Title: liveproxyd erkennt sehr langsame Verbindungen noch nicht gut genug +Component: multisite +State: open +Date: 2014-08-29 16:07:35 +Targetversion: future +Class: nastiness + +In case of network problems in a distributed monitoring setup liveproxyd still has problems identifying +a slow connection with a lot of packet loss. It does not declare the connection as dead, and as a consequence +the load of the monitoring server can get very high, making it essentially unusable.

9 years, 8 months

Check_MK Git: check_mk: Moved check man pages to the right section ( environment)

by Goetz Golla

Module: check_mk Branch: master Commit: 024ed33278e0a6ff6f744291d99acce4f8f040ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=024ed33278e0a6… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sat Aug 30 11:03:14 2014 +0200 Moved check man pages to the right section (environment) --- checkman/kentix_humidity | 2 +- checkman/kentix_temp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/kentix_humidity b/checkman/kentix_humidity index 8fa5874..ee70cc8 100644 --- a/checkman/kentix_humidity +++ b/checkman/kentix_humidity @@ -1,6 +1,6 @@ title: Kentix MultiSensor-RACK: Humidity Sensor agents: snmp -catalog: hw/server/kentix +catalog: hw/environment/kentix license: GPL distribution: check_mk description: diff --git a/checkman/kentix_temp b/checkman/kentix_temp index 5cbb478..5d0108c 100644 --- a/checkman/kentix_temp +++ b/checkman/kentix_temp @@ -1,6 +1,6 @@ title: Kentix MultiSensor-RACK: Temperature Sensor agents: snmp -catalog: hw/server/kentix +catalog: hw/environment/kentix license: GPL distribution: check_mk description:

9 years, 8 months

Check_MK Git: check_mk: Updated Werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: f335269e419c63ddd418078eefac4cdfec65099e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f335269e419c63… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 29 18:18:52 2014 +0200 Updated Werk description --- .werks/190 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/190 b/.werks/190 index 403345e..56f54cb 100644 --- a/.werks/190 +++ b/.werks/190 @@ -1,4 +1,4 @@ -Title: docsis_signal_quality: New Check to monitor Signal Qualtiy on Devices with DOCSIS MIB +Title: docsis_channels_upstream: New check for monitoring upstream channels on cable modems with DOCSIS MIB Level: 1 Component: checks Version: 1.2.5i6 diff --git a/ChangeLog b/ChangeLog index c1a9919..ecaca25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ * 1068 livedump: Added optional check interval (detect staleness) / option to encrypt mails... * 1093 windows agent: performance counter can now be specified by name... * 0189 docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB - * 0190 docsis_signal_quality: New Check to monitor Signal Qualtiy on Devices with DOCSIS MIB + * 0190 docsis_channels_upstream: New check for monitoring upstream channels on cable modems with DOCSIS MIB * 0193 docsis_cm_status: New Check Status Check for Cable Modems with Docsis MIB. * 1070 printer_input/printer_output: New checks to monitor input/output sub-units of printers... * 0196 esx_vsphere_hostsystem: New subcheck for maintenance mode...

9 years, 8 months

Check_MK Git: check_mk: Removed print

by Mathias Kettner

Module: check_mk Branch: master Commit: 8cffe0283cddacd6a5f901d0c55812dd6ba52062 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cffe0283cddac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 29 18:17:49 2014 +0200 Removed print --- checks/docsis_channels_upstream | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/docsis_channels_upstream b/checks/docsis_channels_upstream index 586863f..2a7f30a 100644 --- a/checks/docsis_channels_upstream +++ b/checks/docsis_channels_upstream @@ -55,7 +55,6 @@ def check_docsis_channels_upstream(item, params, info): noise_db = float(signal_noise) / 10 infotext = "Signal/Noise ratio: %.2f dB" % noise_db warn, crit = params['signal_noise'] - print warn, crit levels = " (warn/crit at %.1f/%.1f dB)" % ( warn, crit ) state = 0 if noise_db <= crit:

9 years, 8 months

Check_MK Git: check_mk: docsis_channels_upstream: new check for upstream channels of DOCSIS modems

by Mathias Kettner

Module: check_mk Branch: master Commit: 9bc255c286c476ddcfc1a36156fee8b989e122cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bc255c286c476… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 29 18:17:21 2014 +0200 docsis_channels_upstream: new check for upstream channels of DOCSIS modems --- checkman/docsis_signal_quality | 17 ----- checks/docsis_channels_upstream | 130 ++++++++++++++++++++++++++++++++++ checks/docsis_signal_quality | 99 -------------------------- checks/if.include | 2 +- web/plugins/perfometer/check_mk.py | 14 ---- web/plugins/wato/check_parameters.py | 64 ++++++----------- 6 files changed, 153 insertions(+), 173 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9bc255c286…

9 years, 8 months

Check_MK Git: check_mk: docsis_downstream_channels: better output for Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: 7c7d5ca2d1d8464a8c107304a669092a988421b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c7d5ca2d1d846… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 29 16:36:11 2014 +0200 docsis_downstream_channels: better output for Perf-O-Meter --- web/plugins/perfometer/check_mk.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 703eb2d..9f6f354 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1156,7 +1156,7 @@ def perfometer_voltage(row, check_command, perf_data): perfometers["check_mk-bintec_sensors.voltage"] = perfometer_voltage -def perfometer_fec( row, check_command, perf_data ): +def perfometer_fec(row, check_command, perf_data): total = float(perf_data[3][1]) corrected = ( int(perf_data[1][1]) / total ) * 100 uncorrected = ( int(perf_data[2][1]) / total ) * 100 @@ -1170,8 +1170,8 @@ def perfometer_fec( row, check_command, perf_data ): perfometers["check_mk-docsis_signal_quality"] = perfometer_fec -def perfometer_mhz( row, check_command, perf_data ): - mhz_current = int(perf_data[0][1]) - return str(mhz_current) + " Mhz", perfometer_logarithmic(mhz_current, 50, 2, "#da6") +def perfometer_dbmv(row, check_command, perf_data): + dbmv = float(perf_data[0][1]) + return "%.1f dBmV" % dbmv, perfometer_logarithmic(dbmv, 50, 2, "#da6") -perfometers["check_mk-docsis_channels_downstream"] = perfometer_mhz +perfometers["check_mk-docsis_channels_downstream"] = perfometer_dbmv

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2014