Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: check_mk_agent.linux: make run_cached available for plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: baee88ed4840126e8c360e4a306ac8783f08a73a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baee88ed484012… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 8 12:11:39 2014 +0200 check_mk_agent.linux: make run_cached available for plugins --- agents/check_mk_agent.linux | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 2429205..afb5de4 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -65,6 +65,7 @@ fi # Runs a command asynchronous by use of a cache file function run_cached () { + local section= if [ "$1" = -s ] ; then local section="echo '<<<$2>>>' ; " ; shift ; fi local NAME=$1 local MAXAGE=$2 @@ -99,6 +100,9 @@ function run_cached () { fi } +# Make run_cached available for subshells (plugins, local checks, etc.) +export -f run_cached + echo '<<<check_mk>>>' echo Version: 1.2.5i5 echo AgentOS: linux

10 years, 4 months

Check_MK Git: check_mk: win_disks: hardware inventory for physical disks in windows

by Goetz Golla

Module: check_mk Branch: master Commit: 8f98f990348cb84d59842606df40544b6b0eb86b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f98f990348cb8… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Jul 8 12:01:50 2014 +0200 win_disks: hardware inventory for physical disks in windows --- .werks/630 | 8 +++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 6 +-- inventory/win_disks | 88 +++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 12 ++++- 5 files changed, 111 insertions(+), 4 deletions(-) diff --git a/.werks/630 b/.werks/630 new file mode 100644 index 0000000..f556323 --- /dev/null +++ b/.werks/630 @@ -0,0 +1,8 @@ +Title: win_disks: hardware inventory for physical disks in windows +Level: 1 +Component: inv +Version: 1.2.5i5 +Date: 1404813662 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a0e167b..31a4a12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 0625 hw/sw inventory now reads the kernel version and architecture for linux and windows * 0627 lnx_video, win_video: added inventory function and agent for linux video cards, modified windows inventory function * 0629 improvements to windows sw/hw inventory (encoding, more details for sw inventory) + * 0630 win_disks: hardware inventory for physical disks in windows * 0167 FIX: mk_inventory.linux: Changed field separator from pipe to tab... * 1005 FIX: Fix exception when using pretty-print output format * 0946 FIX: hw/sw inventory: fixed display bug for byte fields with the value 0... diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index 48f1657..e828b30 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -43,8 +43,8 @@ write-host "<<<win_system:sep(58):persist($until)>>>" Get-WmiObject Win32_SystemEnclosure -ComputerName $name | Select Manufacturer,Name,Model,HotSwappable,InstallDate,PartNumber,SerialNumber # Hard-Disk -write-host "<<<win_disk:sep(58):persist($until)>>>" -Get-WmiObject win32_diskDrive -ComputerName $name | select Manufacturer,Model,Name,SerialNumber,InterfaceType,Size,Partitions +write-host "<<<win_disks:sep(58):persist($until)>>>" +Get-WmiObject win32_diskDrive -ComputerName $name | select Manufacturer,InterfaceType,Model,Name,SerialNumber,Size,MediaType # Graphics Adapter write-host "<<<win_video:sep(58):persist($until)>>>" @@ -64,7 +64,7 @@ foreach ($path in $paths) { foreach-object { write-host -separator $separator $_.DisplayName, $_.Publisher, $_.PSParentPath, $_.PSChildName, $_.DisplayVersion, $_.EstimatedSize, $_.InstallDate }} } -## Search exes +# Search exes write-host "<<<win_exefiles:sep(124):persist($until)>>>" $paths = @("d:\", "c:\Program Files", "c:\Program Files (x86)", "c:\Progs") foreach ($item in $paths) diff --git a/inventory/win_disks b/inventory/win_disks new file mode 100644 index 0000000..096d91f --- /dev/null +++ b/inventory/win_disks @@ -0,0 +1,88 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +# Example output: +# <<<win_disks:sep(58)>>> +# DeviceID : \\.\PHYSICALDRIVE0 +# Partitions : 2 +# InterfaceType : IDE +# Size : 32210196480 +# Caption : VBOX HARDDISK ATA Device +# Description : Laufwerk +# Manufacturer : (Standardlaufwerke) +# MediaType : Fixed hard disk media +# Model : VBOX HARDDISK ATA Device +# Name : \\.\PHYSICALDRIVE0 +# SerialNumber : 42566539323537333930652d3836636263352065 + +# CapabilityDescriptions : {Random Access, Supports Writing} +# BytesPerSector : 512 +# Index : 0 +# FirmwareRevision : 1.0 +# MediaLoaded : True +# Status : OK +# SectorsPerTrack : 63 +# TotalCylinders : 3916 +# TotalHeads : 255 +# TotalSectors : 62910540 +# TotalTracks : 998580 +# TracksPerCylinder : 255 +# Capabilities : {3, 4} +# Signature : 645875120 +# SCSIBus : 0 +# SCSILogicalUnit : 0 +# SCSIPort : 2 +# SCSITargetId : 0 + +def inv_win_disks(info): + print info + node = inv_tree("hardware.storage.disks:") + array = {} + for varname, value in info: + varname = re.sub(" *","", varname) + value = re.sub("^ ", "", value) + value = value.decode("cp437") + if varname == "Manufacturer": + array["vendor"] = value + elif varname == "InterfaceType": + array["bus"] = value + elif varname == "Model": + array["product"] = value + elif varname == "Name": + array["fsnode"] = value + elif varname == "SerialNumber": + array["serial"] = value + elif varname == "Size": + array["size"] = int(value) + elif varname == "MediaType": + array["type"] = value + array["local"] = True + node.append(array) + + +inv_info['win_disks'] = { + "inv_function" : inv_win_disks, +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 1437ff4..ddb0ee5 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -571,7 +571,17 @@ inventory_displayhints.update({ ".hardware.memory.arrays:*.devices:*.size" : { "title" : _("Size"), "paint" : "bytes", }, ".hardware.memory.arrays:*.devices:*.speed" : { "title" : _("Speed"), "paint" : "hz", }, ".hardware.system." : { "title" : _("System") }, - ".hardware.harddisks." : { "title" : _("Hard Disks") }, + ".hardware.storage." : { "title" : _("Storage") }, + ".hardware.storage.disks:" : { "title" : _("Block Devices") }, + ".hardware.storage.disks:*." : { "title" : _("Block Device %d") }, + ".hardware.storage.disks:*.vendor" : { "title" : _("Vendor") }, + ".hardware.storage.disks:*.local" : { "title" : _("Local") }, + ".hardware.storage.disks:*.bus" : { "title" : _("Bus") }, + ".hardware.storage.disks:*.product" : { "title" : _("Product") }, + ".hardware.storage.disks:*.fsnode" : { "title" : _("Filesystem Node") }, + ".hardware.storage.disks:*.serial" : { "title" : _("Serial Number") }, + ".hardware.storage.disks:*.size" : { "title" : _("Size") }, + ".hardware.storage.disks:*.type" : { "title" : _("Type") }, ".hardware.video:" : { "title" : _("Graphic Cards") }, ".hardware.video:*." : { "title" : _("Graphic Card %d") }, ".hardware.video:*.name" : { "title" : _("Graphic Card Name"), "short" : _("Card Name") },

10 years, 4 months

Check_MK Git: check_mk: sni_octopuse_cpu: added PNP graph definition and Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: 4c8c67bec3cc59c1a26459fa686b3db1523485ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c8c67bec3cc59… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 8 08:42:09 2014 +0200 sni_octopuse_cpu: added PNP graph definition and Perf-O-Meter --- .werks/1073 | 8 ++++++++ ChangeLog | 1 + pnp-templates/check_mk-sni_octopuse_cpu.php | 1 + pnp-templates/check_mk-winperf.cpuusage.php | 2 +- web/plugins/perfometer/check_mk.py | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1073 b/.werks/1073 new file mode 100644 index 0000000..e57781e --- /dev/null +++ b/.werks/1073 @@ -0,0 +1,8 @@ +Title: sni_octopuse_cpu: added PNP graph definition and Perf-O-Meter +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1404801715 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a0e167b..6231ef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 1041 aix_memory: new check for RAM and SWAP on AIX * 0998 ibm_imm_health: Trying to recognice newer versions of IBM IMM now too * 0628 raritan_pdu_inlet: now also monitors the three phases of the inlet + * 1073 sni_octopuse_cpu: added PNP graph definition and Perf-O-Meter * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/pnp-templates/check_mk-sni_octopuse_cpu.php b/pnp-templates/check_mk-sni_octopuse_cpu.php new file mode 120000 index 0000000..aa15f0d --- /dev/null +++ b/pnp-templates/check_mk-sni_octopuse_cpu.php @@ -0,0 +1 @@ +check_mk-winperf.cpuusage.php \ No newline at end of file diff --git a/pnp-templates/check_mk-winperf.cpuusage.php b/pnp-templates/check_mk-winperf.cpuusage.php index e9a2cbe..5b0f737 100644 --- a/pnp-templates/check_mk-winperf.cpuusage.php +++ b/pnp-templates/check_mk-winperf.cpuusage.php @@ -26,7 +26,7 @@ $opt[1] = "--vertical-label 'Percent' -l0 -u100 --title \"CPU Utilization of $hostname\" "; -$def[1] = "DEF:usage=$RRDFILE[1]:$DS[1]:AVERAGE"; +$def[1] = "DEF:usage=$RRDFILE[1]:$DS[1]:AVERAGE "; $def[1] .= "AREA:usage#60f020:\"CPU utilization\" "; $def[1] .= "LINE:usage#40d010 "; diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 955532e..1deff32 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -541,6 +541,7 @@ perfometers["check_mk-enterasys_cpu_util"] = perfometer_cpu_utilization perfometers["check_mk-juniper_trpz_cpu_util"] = perfometer_cpu_utilization perfometers["check_mk-ibm_svc_nodestats.cpu_util"] = perfometer_cpu_utilization perfometers["check_mk-ibm_svc_systemstats.cpu_util"] = perfometer_cpu_utilization +perfometers["check_mk-sni_octopuse_cpu"] = perfometer_cpu_utilization def perfometer_ps_perf(row, check_command, perf_data): perf_dict = dict([(p[0], float(p[1])) for p in perf_data])

10 years, 4 months

Check_MK Git: check_mk: improvements to windows sw/hw inventory (encoding, more details for sw inventory)

by Goetz Golla

Module: check_mk Branch: master Commit: 5bad3a061c553ec91feb37957d790ac543429a84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bad3a061c553e… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jul 7 22:59:33 2014 +0200 improvements to windows sw/hw inventory (encoding, more details for sw inventory) --- .werks/629 | 8 ++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 24 ++++++++++++++---------- inventory/win_bios | 1 + inventory/win_exefiles | 9 ++++++--- inventory/win_os | 2 +- inventory/win_reg_uninstall | 22 +++++++++++++--------- inventory/win_system | 1 + inventory/win_video | 1 + inventory/win_wmi_software | 6 +++--- web/plugins/views/inventory.py | 2 ++ 11 files changed, 51 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5bad3a061c…

10 years, 4 months

Check_MK Git: check_mk: FIX esx_vsphere_hostsystem.multipath:

by Bastian Kuhn

Fixed return state in case of paths in standby Message-ID: <53bab1c4.YtRUO7S3dSB4aegm%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: c9a6d767bd6ae502a0f75d8d1f92f94337fc5d93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9a6d767bd6ae5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 7 16:40:36 2014 +0200 FIX esx_vsphere_hostsystem.multipath: Fixed return state in case of paths in standby Thru a typo, the check used the count of paths in standby as status code. This is fixed now. --- .werks/177 | 9 +++++++++ ChangeLog | 1 + checks/esx_vsphere_hostsystem | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/177 b/.werks/177 new file mode 100644 index 0000000..37599c7 --- /dev/null +++ b/.werks/177 @@ -0,0 +1,9 @@ +Title: esx_vsphere_hostsystem.multipath: Fixed return state in case of paths in standby +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1404743995 + +Thru a typo, the check used the count of paths in standby as status code. This is fixed now. diff --git a/ChangeLog b/ChangeLog index ca4fb27..d867d28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 0626 FIX: veeam_jobs: agent now supports output lines longer than 80 chars * 1072 FIX: printer_supply: fix colors of Perf-O-Meter on HP OfficeJet... * 0950 FIX: check_mkevents: now able to resolve the hostname of the remote hosts... + * 0177 FIX: esx_vsphere_hostsystem.multipath: Fixed return state in case of paths in standby... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 09c6160..7c556ec 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -255,7 +255,7 @@ def check_esx_vsphere_hostsystem_multipath(item, params, info): if state_infos["standby"][1] > 0 and \ state_infos["standby"][1] != state_infos["active"][1]: standby_label = "(!)" - state = max(state_infos["standby"][1], state) + state = max(state_infos["standby"][0], state) else: state = 0 for state_name, state_values in state_infos.items():

10 years, 4 months

Check_MK Git: check_mk: inv: fix internal node declaractions

by Mathias Kettner

Module: check_mk Branch: master Commit: 56fa16a46c25c929d9eabb977fc6a00c919c1ff4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56fa16a46c25c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 7 16:24:40 2014 +0200 inv: fix internal node declaractions --- web/plugins/views/inventory.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 7ba2214..aabdad8 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -574,11 +574,11 @@ inventory_displayhints.update({ ".hardware.harddisks." : { "title" : _("Hard Disks") }, ".hardware.video:" : { "title" : _("Graphic Cards") }, ".hardware.video:*." : { "title" : _("Graphic Card %d") }, - ".hardware.video.*.name" : { "title" : _("Graphic Card Name"), "short" : _("Card Name") }, - ".hardware.video.*.subsystem" : { "title" : _("Vendor and Device ID"), "short" : _("Vendor") }, - ".hardware.video.*.driver" : { "title" : _("Driver"), "short" : _("Driver") }, - ".hardware.video.*.driver_date" : { "title" : _("Driver Date"), "short" : _("Driver Date") }, - ".hardware.video.*.driver_version" : { "title" : _("Driver Version"), "short" : _("Driver Version") }, + ".hardware.video:*.name" : { "title" : _("Graphic Card Name"), "short" : _("Card Name") }, + ".hardware.video:*.subsystem" : { "title" : _("Vendor and Device ID"), "short" : _("Vendor") }, + ".hardware.video:*.driver" : { "title" : _("Driver"), "short" : _("Driver") }, + ".hardware.video:*.driver_date" : { "title" : _("Driver Date"), "short" : _("Driver Date") }, + ".hardware.video:*.driver_version" : { "title" : _("Driver Version"), "short" : _("Driver Version") }, ".software." : { "title" : _("Software"), "icon" : "software" }, ".software.os." : { "title" : _("Operating System") },

10 years, 4 months

Check_MK Git: check_mk: Added whitepaper for storage inv tree

by Mathias Kettner

Module: check_mk Branch: master Commit: ef05a9b5ca5bc6b8f2402c5b6e703038019b4891 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef05a9b5ca5bc6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 7 16:24:54 2014 +0200 Added whitepaper for storage inv tree --- doc/drafts/LIESMICH.hardwareinventur | 150 ++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/doc/drafts/LIESMICH.hardwareinventur b/doc/drafts/LIESMICH.hardwareinventur index ab26c90..cc20275 100644 --- a/doc/drafts/LIESMICH.hardwareinventur +++ b/doc/drafts/LIESMICH.hardwareinventur @@ -206,3 +206,153 @@ RPM-Paket X", dann ist das X ja variabel. Dies könnten wir evtl. lösen, in dem wir den bestehenden Mechanismus zum Anzeigen von Service-Daten in Hosttabellen verwenden. + +---------------------------------------------------------------------- +Storage +---------------------------------------------------------------------- + +Storage (EMC, ...), 500 physikalische Platten, daraus dann X logische LUNs. + +PCI->Bus, Adapter, Device... + +SCSI-Devices (vom FibreChannel-Adapter), z.B. /dev/sdaz, /dev/sdaab + - Evtl. Partitionen +Multipath-Devices (z.B. Kombination aus sda, sdb, sdc und sdd) --> /dev/dm0 +Linux-Software-RAID (z.. /dev/dm0 und /dev/dm1 -> /dev/md0) + - Spiegelung von Platten + - Spiegelung von Filern +Das Ding dann z.B. mit kpartx wieder partitioniert! + +LVM-PVs z.B. /dev/dm0, kein eigenes Devices +LVM-VGs, bestehen aus mehreren PVs +LVM-LVs, wohnen in einer VG + +In den LVs können Dateisysteme wohnen. Oder Swap. Oder ORACLE ASM. + +- DR:BD +- Verschlüsselungen +- NFS, SMB, etc. + + +hardware.storage + .filesystems (-> Direkt die df-Tabelle) + :0 + .fsnode "/dev/vg-01/lv-backup" + .size 9823749827349823 + .used 2943847238947 + .type "ext3" + .mountpoint /srv/backup + .local True + .disk inv_reference(... zu Platte) + .partition inv_reference(... zu Partition) + :1 + .fsnode "/dev/vg-01/lv-unused" + .size 9823749827349823 + .used 2943847238947 + .type "swap" + .mountpoint None + .local True + :2 + .server "rablfals.local" + .volume "/wefoijweofijw" + .size 9823749827349823 + .used 2943847238947 + .type "nfs" + .mountpoint "/sapdata" + .local False + + .swapareas + :0 + .device "/dev/vg-01/lv-swap" + .size 9823749827349823 + .used 2943847238947 + + .devices (LUNs, Harddisks, letztlich alle Blockdevices, außer Partitionen??) + :1 + .fsnode "/dev/drbd0" + .bus "drbd" (alternativ: "fibrechannel", "iscsi", "ata") + .local False + .size 24392734983427497 + .vendor "drbd" + .partitions + :0 + .number 1 + .size 293847298347 + .fsnode "/dev/dm5" + + .disks # Jedes Blockdevice, dass faktisch Speicher hinzufügt. LUNs, Platten, DR:BD. Vor RAID + # Bus-Typen: "ata", "scsi", "fc", "iscsi", "drbd", ??? + # Bei HW-RAID-Platten gibt es (wahrscheinlich) keine fsnode, dafür aber ein + # .raid -> ID von dem RAID, wo sie verwendet wird + :0 + .fsnode "/dev/dm5" + .alias "Hirnibaldi" + .uuid "3600508b4001073510002c00002820000", + .bus "fc" + .paths [ "/dev/sda", "/dev/sdb", "/dev/sdc", "/dev/sdd" ], + .size 24392734983427497 + .wwn "9239487-23497823-479o-234-982734" + .local False + :1 + .fsnode "/dev/sda" + .bus "ata" (oder "scsi") + .size 24392734983427497 + .serial "MK-28348-IF" + .product "WDC-500cw" + .vendor "wdc" + .type "disk" ("ssd"??") + .local True + .partitions + :0 + .number 2 + .size 293847298347 + .fsnode "/dev/sda2" + .filesystem inv_reference("hardware.filesystems:2") + :0 + .number 5 + .size 2947298347 + .swaparea inv_reference("hardware.swapareas:1") + :2 + .bus "ata" (oder "scsi") + .fsnode "/dev/sdb" + .size 24392734983427497 + .serial "MK-28348-IF" + .product "WDC-500cw" + .vendor "wdc" + .type "disk" ("ssd"??") + .raid 0 # Referenz zu hardware.raid:0 + + .raid + # Hardware- oder Software-RAID + :0 + .size 24392734983427497 + .type "hw" + .fsnode "/dev/cciss/c0d0" + .harddisks + # Hier einfach den gleichen Datensatz von .disks nochmal reinhängen + :0 (symlink: @hardware.disks:17) + :1 + + .partitions + :0 + .number 1 + .size 293847298347 + .fsnode "/dev/cciss/c0d0p1" + + + :1 + .size 24392734983427497 + .type "sw" + .fsnode "/dev/md0" + .harddisks + :0 + .size 9928347923478 + .fsnode "/dev/sda" + .serial "WD-WCAP01993992" + .state "online" + :2 + .size 9928347923478 + .fsnode "/dev/sdb" + .serial "WD-WCAP01993992" + .state "online" +

10 years, 4 months

Check_MK Git: check_mk: FIX check_mkevents: now able to resolve the hostname of the remote hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: e28f764937b73bde4286b87a99cc15e0041c6059 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e28f764937b73b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 7 16:15:28 2014 +0200 FIX check_mkevents: now able to resolve the hostname of the remote hosts The check_mkevents plugin was not able to resolve remote hosts, which were specified with the FQDN. Conflicts: ChangeLog mkeventd/lib/check_mkevents.cc --- .werks/950 | 9 +++++++++ ChangeLog | 1 + mkeventd/lib/check_mkevents.cc | 24 ++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.werks/950 b/.werks/950 new file mode 100644 index 0000000..a56c38c --- /dev/null +++ b/.werks/950 @@ -0,0 +1,9 @@ +Title: check_mkevents: now able to resolve the hostname of the remote hosts +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1404742285 + +The check_mkevents plugin was not able to resolve remote hosts, which were specified with the FQDN. diff --git a/ChangeLog b/ChangeLog index 08679eb..ca4fb27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * 1043 FIX: printer_supply: fix value error in default parameters... * 0626 FIX: veeam_jobs: agent now supports output lines longer than 80 chars * 1072 FIX: printer_supply: fix colors of Perf-O-Meter on HP OfficeJet... + * 0950 FIX: check_mkevents: now able to resolve the hostname of the remote hosts... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index 37f0a16..8f1ceb1 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -33,6 +33,8 @@ #include <unistd.h> #include <sstream> #include <vector> +#include <netdb.h> + using namespace std; #ifndef AF_LOCAL @@ -48,12 +50,14 @@ void usage() printf("\n -a do not take into account acknowledged events.\n"); } + int main(int argc, char** argv) { // Parse arguments char *host = NULL; char *remote_host = NULL; char *remote_hostaddress = NULL; + char remote_hostipaddress[64]; int remote_port = 6558; char *application = NULL; bool ignore_acknowledged = false; @@ -96,7 +100,21 @@ int main(int argc, char** argv) } if (remote_host) { + struct hostent *he; + struct in_addr **addr_list; + remote_hostaddress = strtok(remote_host, ":"); + if ( (he = gethostbyname( remote_hostaddress ) ) == NULL) + { + printf("UNKNOWN - Unable to resolve remote host address: %s\n", remote_hostaddress); + return 3; + } + addr_list = (struct in_addr **) he->h_addr_list; + for(int i = 0; addr_list[i] != NULL; i++) + { + strcpy(remote_hostipaddress, inet_ntoa(*addr_list[i]) ); + } + char *port_str = strtok(NULL, ":"); if (port_str) remote_port = atoi(port_str); @@ -109,17 +127,19 @@ int main(int argc, char** argv) sock = socket(AF_INET, SOCK_STREAM, 0); tv.tv_sec = 10; setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (struct timeval *)&tv, sizeof(struct timeval)); + // Right now, there is no send timeout.. + // setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (struct timeval *)&tv, sizeof(struct timeval)); struct sockaddr_in addr; memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - inet_aton(remote_hostaddress, &addr.sin_addr); + inet_aton(remote_hostipaddress, &addr.sin_addr); addr.sin_port = htons(remote_port); if (0 > connect(sock, (struct sockaddr*) &addr, sizeof(struct sockaddr_in))) { printf("UNKNOWN - Cannot connect to event daemon via TCP %s:%d (%s)\n", - remote_hostaddress, remote_port, strerror(errno)); + remote_hostipaddress, remote_port, strerror(errno)); exit(3); } }

10 years, 4 months

Check_MK Git: check_mk: raritan_pdu_inlet: now also monitors the three phases of the inlet

by Goetz Golla

Module: check_mk Branch: master Commit: 3a370ba38e913255a0d17daa98fa2cecfd84c336 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a370ba38e9132… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jul 7 13:04:23 2014 +0200 raritan_pdu_inlet: now also monitors the three phases of the inlet --- .werks/628 | 8 ++++ ChangeLog | 1 + checkman/raritan_pdu_inlet | 2 +- checks/raritan_pdu_inlet | 81 ++++++++++++++++++++++-------------- web/plugins/perfometer/check_mk.py | 16 +++---- 5 files changed, 68 insertions(+), 40 deletions(-) diff --git a/.werks/628 b/.werks/628 new file mode 100644 index 0000000..87badd3 --- /dev/null +++ b/.werks/628 @@ -0,0 +1,8 @@ +Title: raritan_pdu_inlet: now also monitors the three phases of the inlet +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1404731026 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d164279..57df62b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 0175 logwatch.groups: New logwatch subcheck who can be used to group logfiles together.... * 1041 aix_memory: new check for RAM and SWAP on AIX * 0998 ibm_imm_health: Trying to recognice newer versions of IBM IMM now too + * 0628 raritan_pdu_inlet: now also monitors the three phases of the inlet * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checkman/raritan_pdu_inlet b/checkman/raritan_pdu_inlet index f615df8..146ff19 100644 --- a/checkman/raritan_pdu_inlet +++ b/checkman/raritan_pdu_inlet @@ -14,7 +14,7 @@ description: The state of the check reflects the state of the device. item: - The ID Number of the inlet and the sensor type. + The ID Number of the inlet and the sensor type, plus the phase. perfdata: Exactly one number: The measured value together with it's unit. diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet index bca7b73..2afedd8 100644 --- a/checks/raritan_pdu_inlet +++ b/checks/raritan_pdu_inlet @@ -76,47 +76,56 @@ states = { } def get_capability(cap_entry, id): + id = id - 1 bit = bin(ord(cap_entry))[2:][id] if bit == "1": return capabilities[id] def inventory_raritan_pdu_inlet(info): inventory = [] + i = 0 for line in info[1]: - i = int(line[0].split(".")[2]) -1 + i += 1 cap = get_capability(info[0][0][2][0],i) - if line[3] == "1" and cap: + if line[2] == "1" and cap: item = info[0][0][0] + "-" + cap inventory.append((item, None)) + item = info[0][0][0] + "-" + cap + "_L1" + inventory.append((item, None)) + item = info[0][0][0] + "-" + cap + "_L2" + inventory.append((item, None)) + item = info[0][0][0] + "-" + cap + "_L3" + inventory.append((item, None)) return inventory -def check_raritan_pdu_inlet(item, params, info): - state = 3 - message = "Sensor not found" - +def check_raritan_pdu_inlet(item, _no_params, info): + kinds = { "": 4, "_L1": 5, "_L2": 6, "_L3": 7 } label = info[0][0][0] name = info[0][0][1] + i = 0 for line in info[1]: - i = int(line[0].split(".")[2]) - 1 + i += 1 cap = get_capability(info[0][0][2][0],i) - if label + "-" + cap == item: - unit = units[int(line[1])] - digits = int(line[2]) - avail = line[3] - status = int(line[4]) - status_txt = states[status] - value = float(line[5]) / 10.0**digits - message = "sensor " + name - message += "status \"%s\", value %.2f %s" % (status_txt,value,unit) - perfdata = [ (cap, str(value)+unit) ] - if avail != "1" or status in ( 2, 6 ): - state = 2 - elif status == 4: - state = 0 - else: - state = 1 + for mark, index in kinds.iteritems(): + if cap and label + "-" + cap + mark == item: + unit = units[int(line[0])] + digits = int(line[1]) + avail = line[2] + status = int(line[3]) + status_txt = states[status] + value = float(line[index]) / 10.0**digits + message = "sensor " + name + message += "status \"%s\", value %.2f %s" % (status_txt,value,unit) + perfdata = [ (cap+mark, str(value)+unit) ] + if avail != "1" or status in ( 2, 6 ): + state = 2 + elif status == 4: + state = 0 + else: + state = 1 + return (state, message, perfdata) - return (state, message, perfdata) + return 3, "no such inlet data" check_info['raritan_pdu_inlet'] = { "inventory_function" : inventory_raritan_pdu_inlet, @@ -133,14 +142,24 @@ check_info['raritan_pdu_inlet'] = { ), ( ".1.3.6.1.4.1.13742.6", # Properties of the sensors [ - OID_END, - "3.3.4.1.6", # inletSensorUnits - "3.3.4.1.7", # inletDecimalDigits - "5.2.3.1.2", # inlet sensor availability - "5.2.3.1.3", # inlet sensor state - "5.2.3.1.4", # inlet sensor value + "3.3.4.1.6.1.1", # inletSensorUnits + "3.3.4.1.7.1.1", # inletDecimalDigits + "5.2.3.1.2.1.1", # inlet sensor availability + "5.2.3.1.3.1.1", # inlet sensor state + "5.2.3.1.4.1.1", # inlet sensor value + "5.2.4.1.4.1.1.1", # inlet sensor L1 value + "5.2.4.1.4.1.1.2", # inlet sensor L2 value + "5.2.4.1.4.1.1.3", # inlet sensor L3 value ] - )], + ), + #( ".1.3.6.1.4.1.13742.6.5.2.4.1.4.1.1", # Properties of the sensors + # [ + # "1", # inlet sensor values + # "2", # inlet sensor values + # "3", # inlet sensor values + # ] + #), + ], "snmp_scan_function" : lambda oid: \ oid(".1.3.6.1.4.1.13742.6.3.2.1.1.3.1").startswith("PX2-2") diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 5e35c6a..4ff230a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1061,21 +1061,21 @@ def perfometer_raritan_pdu_inlet(row, check_command, perf_data): unit = perf_data[0][2] display_str = perf_data[0][1] + " " + unit - if cap == "rmsCurrent": + if cap.startswith("rmsCurrent"): return display_str, perfometer_logarithmic(value, 1, 2, display_color) - elif cap == "unbalancedCurrent": + elif cap.startswith("unbalancedCurrent"): return display_str, perfometer_linear(value, display_color) - elif cap == "rmsVoltage": + elif cap.startswith("rmsVoltage"): return display_str, perfometer_logarithmic(value, 500, 2, display_color) - elif cap == "activePower": + elif cap.startswith("activePower"): return display_str, perfometer_logarithmic(value, 20, 2, display_color) - elif cap == "apparentPower": + elif cap.startswith("apparentPower"): return display_str, perfometer_logarithmic(value, 20, 2, display_color) - elif cap == "powerFactor": + elif cap.startswith("powerFactor"): return display_str, perfometer_linear(value * 100, display_color) - elif cap == "activeEnergy": + elif cap.startswith("activeEnergy"): return display_str, perfometer_logarithmic(value, 100000, 2, display_color) - elif cap == "apparentEnergy": + elif cap.startswith("apparentEnergy"): return display_str, perfometer_logarithmic(value, 100000, 2, display_color) return "unimplemented" , perfometer_linear(0, "#ffffff")

10 years, 4 months

Check_MK Git: check_mk: FIX printer_supply: fix colors of Perf-O-Meter on HP OfficeJet

by Mathias Kettner

Module: check_mk Branch: master Commit: 5f87e9078d2cc752bc122fc7f8fa7156bb39f96e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f87e9078d2cc7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 7 11:54:50 2014 +0200 FIX printer_supply: fix colors of Perf-O-Meter on HP OfficeJet All Perf-O-Meters were black, because the description ended with <tt>k</tt>, because of the word <tt>ink</tt>. This has been fixed. --- .werks/1072 | 10 ++++++++++ ChangeLog | 2 +- web/plugins/perfometer/check_mk.py | 12 ++++++------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.werks/1072 b/.werks/1072 new file mode 100644 index 0000000..53756e9 --- /dev/null +++ b/.werks/1072 @@ -0,0 +1,10 @@ +Title: printer_supply: fix colors of Perf-O-Meter on HP OfficeJet +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1404726833 + +All Perf-O-Meters were black, because the description ended with <tt>k</tt>, +because of the word <tt>ink</tt>. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 2660aa4..38ab9db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,7 +32,7 @@ * 0827 FIX: lnx_thermal: Not checking active trip points (e.g. cooling device triggers) anymore * 1043 FIX: printer_supply: fix value error in default parameters... * 0626 FIX: veeam_jobs: agent now supports output lines longer than 80 chars - + * 1072 FIX: printer_supply: fix colors of Perf-O-Meter on HP OfficeJet... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 5e35c6a..d563e64 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -668,18 +668,18 @@ def perfometer_check_mk_printer_supply(row, check_command, perf_data): s = row['service_description'].lower() fg_color = '#000000' - if 'black' in s or s[-1] == 'k': + if 'black' in s or ("ink" not in s and s[-1] == 'k'): colors = [ '#000000', '#6E6F00', '#6F0000' ] if left >= 60: - fg_color = '#ffffff' + fg_color = '#FFFFFF' elif 'magenta' in s or s[-1] == 'm': - colors = [ '#fc00ff', '#FC7FFF', '#FEDFFF' ] + colors = [ '#FC00FF', '#FC7FFF', '#FEDFFF' ] elif 'yellow' in s or s[-1] == 'y': - colors = [ '#ffff00', '#FEFF7F', '#FFFFCF' ] + colors = [ '#FFFF00', '#FEFF7F', '#FFFFCF' ] elif 'cyan' in s or s[-1] == 'c': - colors = [ '#00ffff', '#7FFFFF', '#DFFFFF' ] + colors = [ '#00FFFF', '#7FFFFF', '#DFFFFF' ] else: - colors = [ '#cccccc', '#ffff00', '#ff0000' ] + colors = [ '#CCCCCC', '#ffff00', '#ff0000' ] st = min(2, row['service_state']) color = colors[st]

10 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014