Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: lnx_video, win_video: added inventory function and agent for linux video cards, modified windows inventory function

by Goetz Golla

Module: check_mk Branch: master Commit: 28589543751652344d53df9e631c7cd61b44bbfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28589543751652… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sun Jul 6 20:17:45 2014 +0200 lnx_video, win_video: added inventory function and agent for linux video cards, modified windows inventory function --- .werks/627 | 8 +++++ ChangeLog | 1 + agents/plugins/mk_inventory.linux | 4 +++ inventory/lnx_video | 62 +++++++++++++++++++++++++++++++++++++ inventory/win_video | 17 +++++----- web/plugins/views/inventory.py | 8 ++++- 6 files changed, 90 insertions(+), 10 deletions(-) diff --git a/.werks/627 b/.werks/627 new file mode 100644 index 0000000..3ab82a1 --- /dev/null +++ b/.werks/627 @@ -0,0 +1,8 @@ +Title: lnx_video, win_video: added inventory function and agent for linux video cards, modified windows inventory function +Level: 1 +Component: inv +Version: 1.2.5i5 +Date: 1404670606 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 590b48f..d164279 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ HW/SW-Inventory: * 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 * 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/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 75a1e8d..d7d89bd 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -50,6 +50,10 @@ then uname -m uname -r fi + if type lspci > /dev/null ; then + echo "<<<lnx_vga:sep(58):persist($UNTIL)>>>" + lspci -v -s $(lspci | grep VGA | cut -d" " -f 1) + fi fi diff --git a/inventory/lnx_video b/inventory/lnx_video new file mode 100644 index 0000000..08cd57e --- /dev/null +++ b/inventory/lnx_video @@ -0,0 +1,62 @@ +#!/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 +# <<<lnx_video>>> +# 05:00.0 VGA compatible controller: Advanced Micro Devices [AMD] nee ATI Cape Verde PRO [Radeon HD 7700 Series] (prog-if 00 [VGA controller]) +# Subsystem: Hightech Information System Ltd. Device 200b +# Flags: bus master, fast devsel, latency 0, IRQ 58 +# Memory at d0000000 (64-bit, prefetchable) [size=256M] +# Memory at fe8c0000 (64-bit, non-prefetchable) [size=256K] +# I/O ports at c000 [size=256] +# Expansion ROM at fe8a0000 [disabled] [size=128K] +# Capabilities: [48] Vendor Specific Information: Len=08 <?> +# Capabilities: [50] Power Management version 3 +# Capabilities: [58] Express Legacy Endpoint, MSI 00 +# Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+ +# Capabilities: [100] Vendor Specific Information: ID=0001 Rev=1 Len=010 <?> +# Capabilities: [150] Advanced Error Reporting +# Capabilities: [270] #19 +# Kernel driver in use: fglrx_pci + + +def inv_lnx_video(info): + node = inv_tree("hardware.video:") + array = {} + for line in info: + if len(line) > 1: + if re.search("VGA compatible controller", line[1]): + array["name"] = line[2] + elif line[0] == "Subsystem": + array["subsystem"] = line[1] + elif line[0] == "Kernel driver in use": + array["driver"] = line[1] + node.append(array) + + +inv_info['lnx_video'] = { + "inv_function" : inv_lnx_video, +} diff --git a/inventory/win_video b/inventory/win_video index e50a2e5..4eebf19 100644 --- a/inventory/win_video +++ b/inventory/win_video @@ -37,20 +37,19 @@ def inv_win_video(info): - node = inv_tree("hardware.video.") + node = inv_tree("hardware.video:") + array = {} for varname, value in info: varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) - if varname == "Description": - node["description"] = value - elif varname == "Name": - node["product"] = value - elif varname == "VideoModeDescription": - node["video_mode"] = value + if varname == "Name": + array["name"] = value elif varname == "DriverVersion": - node["driver_version"] = value + array["driver_version"] = value elif varname == "DriverDate": - node["driver_date"] = int(time.mktime(time.strptime(value.split(".")[0], "%Y%m%d%H%M%S"))) + array["driver_date"] = int(time.mktime(time.strptime(value.split(".")[0], "%Y%m%d%H%M%S"))) + node.append(array) + inv_info['win_video'] = { "inv_function" : inv_win_video, diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 95027fa..7ba2214 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -572,7 +572,13 @@ inventory_displayhints.update({ ".hardware.memory.arrays:*.devices:*.speed" : { "title" : _("Speed"), "paint" : "hz", }, ".hardware.system." : { "title" : _("System") }, ".hardware.harddisks." : { "title" : _("Hard Disks") }, - ".hardware.video." : { "title" : _("Video Cards") }, + ".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") }, ".software." : { "title" : _("Software"), "icon" : "software" }, ".software.os." : { "title" : _("Operating System") },

10 years, 3 months

Check_MK Git: check_mk: ibm_imm_health: Trying to recognice newer versions of IBM IMM now too

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 537364b53443244f6cf557c4dc9a626b356c0c50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=537364b5344324… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 4 16:01:29 2014 +0200 ibm_imm_health: Trying to recognice newer versions of IBM IMM now too --- .werks/998 | 8 ++++++++ ChangeLog | 1 + checks/ibm_imm_health | 11 +++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/998 b/.werks/998 new file mode 100644 index 0000000..5949e7c --- /dev/null +++ b/.werks/998 @@ -0,0 +1,8 @@ +Title: ibm_imm_health: Trying to recognice newer versions of IBM IMM now too +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1404482411 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9228911..6b6bb5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 0997 New checks and a special agent for ALLNET IP Sensoric devices... * 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 * 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/checks/ibm_imm_health b/checks/ibm_imm_health index 28d822d..1b0cafd 100644 --- a/checks/ibm_imm_health +++ b/checks/ibm_imm_health @@ -26,6 +26,14 @@ # Author: Michael Nieporte <micha.nieporte(a)gmail.com> - Based on rsa_health by Mathias Kettner +def ibm_imm_health_scan(oid): + print "running" + if oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips") or \ + oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" sh4a"): + return True + else: + return False + def inventory_ibm_imm_health(info): if len(info) > 0: return [(None, None)] @@ -57,6 +65,5 @@ check_info["ibm_imm_health"] = { 'inventory_function': inventory_ibm_imm_health, 'service_description': 'System health', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.3.1', ['4']), - 'snmp_scan_function': lambda oid: \ - oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips"), + 'snmp_scan_function': ibm_imm_health_scan, }

10 years, 3 months

Check_MK Git: check_mk: SEC index start URL can not be used to redirect to absolute URLs anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 31611e42584dd0836ddab2ed80e72bb9aa561443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31611e42584dd0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 4 15:27:14 2014 +0200 SEC index start URL can not be used to redirect to absolute URLs anymore An attacker could make a user open up an URL to a compromised website which the does not want to open index.py?start_url=http://(url to compromised URL). --- .werks/1052 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/main.py | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.werks/1052 b/.werks/1052 new file mode 100644 index 0000000..448b622 --- /dev/null +++ b/.werks/1052 @@ -0,0 +1,10 @@ +Title: index start URL can not be used to redirect to absolute URLs anymore +Level: 1 +Component: multisite +Class: security +State: unknown +Version: 1.2.5i5 +Date: 1404480323 + +An attacker could make a user open up an URL to a compromised website which the +does not want to open index.py?start_url=http://(url to compromised URL). diff --git a/ChangeLog b/ChangeLog index 48cb0d8..f10cf0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... * 1033 New Mutisite filter for the number of services a host has... * 0949 quicksearch: now able to search for multiple hosts at once... + * 1052 SEC: index start URL can not be used to redirect to absolute URLs anymore... * 0945 FIX: Sidebar snapin "Problem hosts": Now excludes hosts and services in downtime * 1036 FIX: doc/treasures/downtime: fix --url option, better error output diff --git a/web/htdocs/main.py b/web/htdocs/main.py index c0e4815..338ad16 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -28,6 +28,11 @@ import defaults, config def page_index(): start_url = html.var("start_url", config.start_url) + # Prevent redirecting to absolute URL which could be used to redirect + # users to compromised pages + if '://' in start_url: + start_url = config.start_url + # Do not cache the index page -> caching problems when page is accessed # while not logged in #html.req.headers_out.add("Cache-Control", "max-age=7200, public");

10 years, 3 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: d123f0547a50e1e7a702fcf33ea21cfca3550eb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d123f0547a50e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 4 15:24:54 2014 +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 bcbb007..e255a85 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1052 +1072

10 years, 3 months

Check_MK Git: check_mk: FIX: of the fix of fc_port

by Goetz Golla

Module: check_mk Branch: master Commit: c85c56d2988c1bc9422d34e1e9aa199e829e3183 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c85c56d2988c1b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 15:12:40 2014 +0200 FIX: of the fix of fc_port --- checks/fc_port | 2 +- web/plugins/perfometer/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/fc_port b/checks/fc_port index 7d14c79..beda840 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -150,7 +150,7 @@ def check_fc_port(item, params, info): speedmsg = "assuming %g GBit/s" % gbit else: gbit = wirespeed * 8.0 / ( 1000.0 * 1000.0 * 1000.0 ) # in GBit/sec - speedmsg = "%.1f GBit/s" % gb + speedmsg = "%.1f GBit/s" % gbit output.append(speedmsg) # Now check rates of various counters diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index cf8ff84..5e35c6a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -459,7 +459,7 @@ perfometers["check_mk-esx_vsphere_counters.if"] = perfometer_check_mk_if perfometers["check_mk-hitachi_hnas_fc_if"] = perfometer_check_mk_if def perfometer_check_mk_fc_port(row, check_command, perf_data): - unit = "Byte/s" + unit = "B" return perfometer_bandwidth( in_traffic = savefloat(perf_data[0][1]), out_traffic = savefloat(perf_data[5][1]),

10 years, 3 months

Check_MK Git: check_mk: fc_port check displays maximum bandwith of port in GBit/sec, but throughput in GByte/sec

by Goetz Golla

Module: check_mk Branch: master Commit: 1e34bb4e5fc5477aad19d2eb4e28f863008fe2aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e34bb4e5fc547… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 15:04:56 2014 +0200 fc_port check displays maximum bandwith of port in GBit/sec, but throughput in GByte/sec --- checks/fc_port | 21 +++++++++++++++------ web/plugins/perfometer/check_mk.py | 12 +++++++++++- web/plugins/wato/check_parameters.py | 2 +- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/checks/fc_port b/checks/fc_port index 11129c0..7d14c79 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -144,13 +144,13 @@ def check_fc_port(item, params, info): wirespeed = savefloat(portinfo[0][4]) * 1000.0 # speed in Bytes/sec, 0 if unknown if wirespeed == 0: - # let user specify assumed speed via check parameter, default is 2.0 GByte/sec - gb = params.get("assumed_speed", 2.0) - wirespeed = gb * 1000.0 * 1000.0 * 1000.0 # in Bytes/sec - speedmsg = "assuming %g GB/s" % gb + # let user specify assumed speed via check parameter, default is 16.0 GBit/sec + gbit = params.get("assumed_speed", 16.0) + wirespeed = gb * 1000.0 * 1000.0 * 1000.0 / 8.0 # in Bytes/sec + speedmsg = "assuming %g GBit/s" % gbit else: - gb = wirespeed / ( 1000.0 * 1000.0 * 1000.0 ) # in GByte/sec - speedmsg = "%.1f GB/s" % gb + gbit = wirespeed * 8.0 / ( 1000.0 * 1000.0 * 1000.0 ) # in GBit/sec + speedmsg = "%.1f GBit/s" % gb output.append(speedmsg) # Now check rates of various counters @@ -297,6 +297,15 @@ def check_fc_port(item, params, info): return (summarystate, ', '.join(output), perfdata) +check_config_variables.append("fc_port_admstates") +check_config_variables.append("fc_port_opstates") +check_config_variables.append("fc_port_phystates") +check_config_variables.append("fc_port_no_inventory_types") +check_config_variables.append("fc_port_no_inventory_admstates") +check_config_variables.append("fc_port_no_inventory_opstates") +check_config_variables.append("fc_port_no_inventory_phystates") +check_config_variables.append("fc_port_inventory_use_portname") + check_info["fc_port"] = { 'check_function' : check_fc_port, 'inventory_function' : inventory_fc_port, diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index ce4958c..cf8ff84 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -457,7 +457,17 @@ perfometers["check_mk-hpux_if"] = perfometer_check_mk_if perfometers["check_mk-mcdata_fcport"] = perfometer_check_mk_if perfometers["check_mk-esx_vsphere_counters.if"] = perfometer_check_mk_if perfometers["check_mk-hitachi_hnas_fc_if"] = perfometer_check_mk_if -perfometers["check_mk-fc_port"] = perfometer_check_mk_if + +def perfometer_check_mk_fc_port(row, check_command, perf_data): + unit = "Byte/s" + return perfometer_bandwidth( + in_traffic = savefloat(perf_data[0][1]), + out_traffic = savefloat(perf_data[5][1]), + in_bw = savefloat(perf_data[0][6]), + out_bw = savefloat(perf_data[5][6]), + unit = unit + ) +perfometers["check_mk-fc_port"] = perfometer_check_mk_fc_port def perfometer_check_mk_brocade_fcport(row, check_command, perf_data): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7651d21..a07012f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5253,7 +5253,7 @@ register_check_parameters( title = _("Assumed link speed"), help = _("If the automatic detection of the link speed does " "not work you can set the link speed here."), - unit = _("GByte/s") + unit = _("GBit/s") ) ), ("rxcrcs",

10 years, 3 months

Check_MK Git: check_mk: FIX veeam_jobs: agent now supports output lines longer than 80 chars

by Goetz Golla

Module: check_mk Branch: master Commit: 450afce44272ac80ec9f82cf2cbfb89b7e59d42d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=450afce44272ac… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 14:54:42 2014 +0200 FIX veeam_jobs: agent now supports output lines longer than 80 chars --- .werks/626 | 8 ++++++++ ChangeLog | 1 + agents/windows/plugins/veeam_backup_status.ps1_ | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/626 b/.werks/626 new file mode 100644 index 0000000..a6a0f7f --- /dev/null +++ b/.werks/626 @@ -0,0 +1,8 @@ +Title: veeam_jobs: agent now supports output lines longer than 80 chars +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1404478421 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index cafddd8..48cb0d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 0948 FIX: mk_inventory.ps1: increased caching time to 14400, fixed incorrect default cachefile path * 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 Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/agents/windows/plugins/veeam_backup_status.ps1_ b/agents/windows/plugins/veeam_backup_status.ps1_ index 0a4d754..9d73a79 100644 --- a/agents/windows/plugins/veeam_backup_status.ps1_ +++ b/agents/windows/plugins/veeam_backup_status.ps1_ @@ -115,7 +115,9 @@ foreach ($myJob in $myBackupJobs) } # Final output -"$myJobsText" + "$myTaskText" +write-host $myJobsText +write-host $myTaskText +# "$myJobsText" + "$myTaskText" # END OF TRY

10 years, 3 months

Check_MK Git: check_mk: ChangeLog

by Goetz Golla

Module: check_mk Branch: master Commit: eca370afbf09341553ef1106e60c5a15eb48416b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca370afbf0934… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 14:52:57 2014 +0200 ChangeLog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0b06b4f..cafddd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,7 +59,7 @@ * 0988 FIX: livedump: Fix exception in case no contact groups are defined for a service HW/SW-Inventory: - * 0625 inventory now read the kernel version and architecture for linux and windows + * 0625 hw/sw inventory now reads the kernel version and architecture for linux and 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...

10 years, 3 months

Check_MK Git: check_mk: werk subject corrected

by Goetz Golla

Module: check_mk Branch: master Commit: 83bf1bcf0b242122ec9251b636853db4cdb19948 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83bf1bcf0b2421… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 14:49:57 2014 +0200 werk subject corrected --- .werks/625 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/625 b/.werks/625 index 3e70ba1..429c3b1 100644 --- a/.werks/625 +++ b/.werks/625 @@ -1,4 +1,4 @@ -Title: inventory now read the kernel version and architecture for linux and windows +Title: hw/sw inventory now reads the kernel version and architecture for linux and windows Level: 1 Component: inv Version: 1.2.5i5

10 years, 3 months

Check_MK Git: check_mk: inventory now read the kernel version and architecture for linux and windows

by Goetz Golla

Module: check_mk Branch: master Commit: a061673df67d85d1031daf312cecc93b459aaa4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a061673df67d85… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 12:42:24 2014 +0200 inventory now read the kernel version and architecture for linux and windows --- .werks/625 | 8 ++++++++ ChangeLog | 1 + agents/plugins/mk_inventory.linux | 14 +++++++++++--- inventory/lnx_uname | 9 ++++----- inventory/win_os | 2 +- web/plugins/views/inventory.py | 2 +- 6 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.werks/625 b/.werks/625 new file mode 100644 index 0000000..3e70ba1 --- /dev/null +++ b/.werks/625 @@ -0,0 +1,8 @@ +Title: inventory now read the kernel version and architecture for linux and windows +Level: 1 +Component: inv +Version: 1.2.5i5 +Date: 1404470499 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 0d6e465..d447ed0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ * 0988 FIX: livedump: Fix exception in case no contact groups are defined for a service HW/SW-Inventory: + * 0625 inventory now read the kernel version and architecture for linux and 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/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 2f2ece1..75a1e8d 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -31,17 +31,25 @@ then echo -n "$f|" ; tr \\n \| < $f | sed 's/|$//' ; echo fi done - + # CPU Information. We need just the first one if [ -e /proc/cpuinfo ] ; then echo "<<<lnx_cpuinfo:sep(58):persist($UNTIL)>>>" - sed 's/[[:space:]]*:[[:space:]]*/:/' < /proc/cpuinfo | grep -v '^flags' + sed 's/[[:space:]]*:[[:space:]]*/:/' < /proc/cpuinfo fi - + # Information about main board, memory, etc. if type dmidecode >/dev/null ; then echo "<<<dmidecode:sep(58):persist($UNTIL)>>>" dmidecode -q | sed 's/\t/:/g' fi + + # Information about kernel architecture + if type uname >/dev/null ; then + echo "<<<lnx_uname:persist($UNTIL)>>>" + uname -m + uname -r + fi + fi diff --git a/inventory/lnx_uname b/inventory/lnx_uname index 314156a..73b8492 100644 --- a/inventory/lnx_uname +++ b/inventory/lnx_uname @@ -30,11 +30,10 @@ def inv_lnx_uname(info): node = inv_tree("software.os.") - line = info[0] - if len(line) >= 6: - node["kernel"] = line[1:6] - if len(line) >= 13: - node["arch"] = line[-2] + if len(info) >= 1: + node["arch"] = info[0][0] + if len(info) >= 2: + node["kernel_version"] = info[1][0] inv_info['lnx_uname'] = { "inv_function" : inv_lnx_uname, diff --git a/inventory/win_os b/inventory/win_os index 98f7eb6..37c4439 100644 --- a/inventory/win_os +++ b/inventory/win_os @@ -33,7 +33,7 @@ def inv_win_os(info): line = info[0] if len(line) == 6: node["name"] = line[1] - node["kernel"] = line[2] + node["kernel_version"] = line[2] if line[3] == "64-Bit": node["arch"] = "x86_64" else: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 9d51510..95027fa 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -577,7 +577,7 @@ inventory_displayhints.update({ ".software." : { "title" : _("Software"), "icon" : "software" }, ".software.os." : { "title" : _("Operating System") }, ".software.os.name" : { "title" : _("Name"), "short" : _("Operating System") }, - ".software.os.kernel" : { "title" : _("Kernel Version"), "short" : _("Kernel") }, + ".software.os.kernel_version" : { "title" : _("Kernel Version"), "short" : _("Kernel") }, ".software.os.arch" : { "title" : _("Kernel Architecture"), "short" : _("Architecture") }, ".software.os.service_pack" : { "title" : _("Service Pack"), "short" : _("Service Pack") }, ".software.packages:" : { "title" : _("Packages"), "icon" : "packages", "render": render_inv_dicttable,

10 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits