Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

8669 win_video: now inventorizes memory of graphic cards for Windows hosts

by Marcel Schulte

Module: check_mk Branch: master Commit: 6770c21e2d30a50775b7f92dfd03241a9ee84f77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6770c21e2d30a5… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Thu Mar 16 12:25:54 2017 +0100 8669 win_video: now inventorizes memory of graphic cards for Windows hosts Memory of graphic cards is now gathered and shown in HW/SW inventory views of Windows hosts. Change-Id: I49d66acbe0a4901839a6161e7cf184d6f8a45cf5 --- .werks/8669 | 12 ++++++++++++ agents/windows/plugins/mk_inventory.vbs | 2 +- inventory/win_video | 3 +++ web/plugins/views/inventory.py | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/8669 b/.werks/8669 new file mode 100644 index 0000000..bd7b94f --- /dev/null +++ b/.werks/8669 @@ -0,0 +1,12 @@ +Title: win_video: now inventorizes memory of graphic cards for Windows hosts +Level: 1 +Component: inv +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489663402 + +Memory of graphic cards is now gathered and shown in HW/SW inventory views of Windows hosts. + diff --git a/agents/windows/plugins/mk_inventory.vbs b/agents/windows/plugins/mk_inventory.vbs index b5623c1..6b5b7cc 100644 --- a/agents/windows/plugins/mk_inventory.vbs +++ b/agents/windows/plugins/mk_inventory.vbs @@ -255,7 +255,7 @@ Call getWMIObject("Win32_diskDrive",diskVars) ' Graphics Adapter Call startSection("win_video",58,timeUntil) -adapterVars = Array( "Name", "Description", "Caption", "AdapterCompatibility", "VideoModeDescription", "VideoProcessor", "DriverVersion", "DriverDate", "MaxMemorySupported") +adapterVars = Array( "Name", "Description", "Caption", "AdapterCompatibility", "VideoModeDescription", "VideoProcessor", "DriverVersion", "DriverDate", "MaxMemorySupported", "AdapterRAM") Call getWMIObject("Win32_VideoController",adapterVars) ' Network Adapter diff --git a/inventory/win_video b/inventory/win_video index 8733530..e56ed96 100644 --- a/inventory/win_video +++ b/inventory/win_video @@ -61,6 +61,9 @@ def inv_win_video(info): array["driver_version"] = value elif varname == "DriverDate": array["driver_date"] = int(time.mktime(time.strptime(value.split(".")[0], "%Y%m%d%H%M%S"))) + elif varname == "AdapterRAM": + array["graphic_memory"] = saveint(value) + node.append(array) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index cb95f9f..55bed31 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -703,6 +703,7 @@ inventory_displayhints.update({ ".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:*.graphic_memory" : { "title" : _("Memory"), "paint" : "bytes_rounded" }, ".hardware.nwadapter:" : { "title" : _("Network Adapters"), }, ".hardware.nwadapter:*." : { "title" : _("Network Adapter %d"), },

7 years, 3 months

8670 win_networkadapter: added network adapters to inventory of Windows hosts

by Marcel Schulte

Module: check_mk Branch: master Commit: 17cf994749d95ac119cd8fdbb73c803d19f9cbbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17cf994749d95a… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Thu Mar 16 13:07:10 2017 +0100 8670 win_networkadapter: added network adapters to inventory of Windows hosts The inventory plugin now gathers information on network adapters of Windows hosts. This information is then shown in HW/SW inventory of the host as "Hardware -> Network Adapters." Change-Id: I8f47a37a92990ff928e2bf0c4e998814fb837df2 --- .werks/8670 | 11 ++++ agents/windows/plugins/mk_inventory.vbs | 34 ++++++++++++ inventory/win_networkadapter | 93 +++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 12 +++++ 4 files changed, 150 insertions(+) diff --git a/.werks/8670 b/.werks/8670 new file mode 100644 index 0000000..f993b44 --- /dev/null +++ b/.werks/8670 @@ -0,0 +1,11 @@ +Title: win_networkadapter: added network adapters to inventory of Windows hosts +Level: 1 +Component: inv +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489665801 + +The inventory plugin now gathers information on network adapters of Windows hosts. This information is then shown in HW/SW inventory of the host as "Hardware -> Network Adapters." diff --git a/agents/windows/plugins/mk_inventory.vbs b/agents/windows/plugins/mk_inventory.vbs index c0b2ee7..b5623c1 100644 --- a/agents/windows/plugins/mk_inventory.vbs +++ b/agents/windows/plugins/mk_inventory.vbs @@ -120,6 +120,35 @@ Sub getWMIObject2(strClass,arrVars) Next End Sub +Sub getNetworkAdapter(arrVars) + Set objClass = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\cimv2") + Set Entries = objClass.ExecQuery("Select * from Win32_NetworkAdapter") + Set AdapterConfigs = objClass.ExecQuery("Select * from Win32_NetworkAdapterConfiguration") + + For Each entry in Entries + ' Only handle Adapters with a MAC address + If entry.ServiceName <> "AsyncMac" And Len(entry.MACAddress) > 0 Then + For Each item in entry.Properties_ + ' if it is in arrVars + If UBound(filter(arrVars, item.name)) = 0 Then + If isArray(item.value) Then + outPut(item.name & ": " & join(item.value)) + Else + outPut(item.name & ": " & item.value) + End If + End If + Next + + For Each adapterCfg in AdapterConfigs + If entry.name = adapterCfg.Description Then + outPut("Address: " & join(adapterCfg.IPAddress)) + outPut("Subnet: " & join(adapterCfg.IPSubnet)) + outPut("DefaultGateway: " & join(adapterCfg.DefaultIPGateway)) + End If + Next + End If + Next +End Sub Sub RecurseForExecs(strFolderPath) Dim objFolder : Set objFolder = fso.GetFolder(strFolderPath) @@ -229,6 +258,11 @@ Call startSection("win_video",58,timeUntil) adapterVars = Array( "Name", "Description", "Caption", "AdapterCompatibility", "VideoModeDescription", "VideoProcessor", "DriverVersion", "DriverDate", "MaxMemorySupported") Call getWMIObject("Win32_VideoController",adapterVars) +' Network Adapter +Call startSection("win_networkadapter",58,timeUntil) +adapterVars = Array("ServiceName", "MACAddress", "AdapterType", "DeviceID", "NetworkAddresses", "Speed") +Call getNetworkAdapter(adapterVars) + ' Installed Software Call startSection("win_wmi_software",124,timeUntil) swVars = Array( "ProductName", "Publisher", "VersionString", "InstallDate", "Language") diff --git a/inventory/win_networkadapter b/inventory/win_networkadapter new file mode 100644 index 0000000..aeaed89 --- /dev/null +++ b/inventory/win_networkadapter @@ -0,0 +1,93 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 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- +# tails. 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_networkadapter:sep(58)>>> +# AdapterType: Ethernet 802.3 +# DeviceID: 7 +# MACAddress: 08:00:27:9C:F8:39 +# Name: Intel(R) PRO/1000 MT-Desktopadapter +# NetworkAddresses: +# ServiceName: E1G60 +# Speed: 1000000000 +# Address: 192.168.178.26 +# Subnet: 255.255.255.0 +# DefaultGateway: 192.168.178.1 + +def inv_win_networkadapter(info): + node = inv_tree_list("hardware.nwadapter:") + array = {} + first_varname = None + addrtypes = {} + for line in info: + if len(line) > 2: + line = [ line[0], ":".join(line[1:]) ] + varname, value = line + varname = re.sub(" *","", varname) + value = re.sub("^ ", "", value) + + if first_varname and varname == first_varname: + # Looks like we have a new instance + node.append(array) + array = {} + + if not first_varname: + first_varname = varname + + if varname == "Name": + array["name"] = value + elif varname == "AdapterType": + array["type"] = value + elif varname == "MACAddress": + array["macaddress"] = value + elif varname == "Speed": + array["speed"] = int(value) + elif varname == "Address": + for address in value.split(' '): + addrtype = "ipv4" + if ':' in address: + addrtype = "ipv6" + addrtypes.setdefault(addrtype + "_address", []).append(address) + elif varname == "Subnet": + for address in value.split(' '): + addrtype = "ipv6" + if '.' in address: + addrtype = "ipv4" + #addrtypes.setdefault(addrtype, {}).setdefault("subnet", []).append(address) + addrtypes.setdefault(addrtype + "_subnet", []).append(address) + elif varname == "DefaultGateway": + array["gateway"] = value + + for addrtype in addrtypes: + array[addrtype] = ', '.join(addrtypes[addrtype]) + #for type in addrtypes[addrtype]: + # array[addrtype + '_' + type] = ', '.join(addrtypes[addrtype][type]) + node.append(array) + + +inv_info['win_networkadapter'] = { + "inv_function" : inv_win_networkadapter, +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 263256a..cb95f9f 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -704,6 +704,18 @@ inventory_displayhints.update({ ".hardware.video:*.driver_date" : { "title" : _("Driver Date"), "short" : _("Driver Date") }, ".hardware.video:*.driver_version" : { "title" : _("Driver Version"), "short" : _("Driver Version") }, + ".hardware.nwadapter:" : { "title" : _("Network Adapters"), }, + ".hardware.nwadapter:*." : { "title" : _("Network Adapter %d"), }, + ".hardware.nwadapter:*.name" : { "title" : _("Name"), }, + ".hardware.nwadapter:*.type" : { "title" : _("Type"), }, + ".hardware.nwadapter:*.macaddress" : { "title" : _("Physical Address (MAC)"), }, + ".hardware.nwadapter:*.speed" : { "title" : _("Speed"), "paint" : "nic_speed", }, + ".hardware.nwadapter:*.ipv4_address" : { "title" : _("IPv4 Address"), }, + ".hardware.nwadapter:*.ipv4_subnet" : { "title" : _("IPv4 Subnet"), }, + ".hardware.nwadapter:*.ipv6_address" : { "title" : _("IPv6 Address"), }, + ".hardware.nwadapter:*.ipv6_subnet" : { "title" : _("IPv6 Subnet"), }, + ".hardware.nwadapter:*.gateway" : { "title" : _("Gateway"), }, + ".software." : { "title" : _("Software"), "icon" : "software" }, ".software.os." : { "title" : _("Operating System") }, ".software.os.name" : { "title" : _("Name"), "short" : _("Operating System") },

7 years, 3 months

8668 FIX ipmi: fixed handling of units containing spaces

by Marcel Schulte

Module: check_mk Branch: master Commit: 0cefe2253790bcf8d5702e52d78bc9a67d76f5b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cefe2253790bc… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Mar 15 16:36:06 2017 +0100 8668 FIX ipmi: fixed handling of units containing spaces Fixed ipmi check in case agent provides units like "Degrees C", containing spaces. Those units cause issues with RRD creation. Spaces are now replaces by underscores. Change-Id: I0e5ad1a990ce50f8f00a0ab7c7d93639a84e2403 (cherry picked from commit 34214c5d08b5e11c58cf90abb9e3732d13d58046) --- .werks/8668 | 11 +++++++++++ checks/ipmi | 2 ++ 2 files changed, 13 insertions(+) diff --git a/.werks/8668 b/.werks/8668 new file mode 100644 index 0000000..409a183 --- /dev/null +++ b/.werks/8668 @@ -0,0 +1,11 @@ +Title: ipmi: fixed handling of units containing spaces +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.4.0b4 +Date: 1489591985 +Class: fix + +Fixed ipmi check in case agent provides units like "Degrees C", containing spaces. Those units cause issues with RRD creation. +Spaces are now replaces by underscores. diff --git a/checks/ipmi b/checks/ipmi index f18f2ac..a3952cd 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -185,6 +185,8 @@ def parse_ipmi(info): if parsed[name]["unit"] in [ "unspecified", "" ]: parsed[name]["unit"] = None + elif parsed[name]["unit"] != None: + parsed[name]["unit"] = parsed[name]["unit"].replace(" ", "_") return parsed

7 years, 3 months

Merge comment/downtime column implementations in the NEB and CMC.

by Sven Panne

Module: check_mk Branch: master Commit: 743fb3bb6f82e3dd036a3f8d1e952d686717911a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=743fb3bb6f82e3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 20 12:11:20 2017 +0100 Merge comment/downtime column implementations in the NEB and CMC. Change-Id: I6084ade21536598dc3ac22b598a0524e040702cd --- livestatus/src/CommentColumn.cc | 93 ++++++++++++++ .../src/{DownCommColumn.h => CommentColumn.h} | 41 +++--- livestatus/src/DownCommColumn.cc | 140 --------------------- livestatus/src/DowntimeColumn.cc | 87 +++++++++++++ livestatus/src/DowntimeColumn.h | 61 +++++++++ livestatus/src/Makefile.am | 3 +- livestatus/src/TableHosts.cc | 25 ++-- livestatus/src/TableServices.cc | 23 ++-- 8 files changed, 287 insertions(+), 186 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=743fb3bb6f…

7 years, 3 months

Yet another IWYU fix to work around the versionits... :-/

by Sven Panne

Module: check_mk Branch: master Commit: 710a59d61925d590f496dbd63bbfa4e81aa29368 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=710a59d61925d5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 20 12:10:04 2017 +0100 Yet another IWYU fix to work around the versionits... :-/ Change-Id: I419180f7b99ca7d87045d51f3190648e34e3f5a1 --- livestatus/src/TableLog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/TableLog.h b/livestatus/src/TableLog.h index 103b9c2..319d01b 100644 --- a/livestatus/src/TableLog.h +++ b/livestatus/src/TableLog.h @@ -28,7 +28,7 @@ // IWYU pragma: no_include <bits/shared_ptr.h> #include "config.h" // IWYU pragma: keep #include <ctime> -#include <memory> +#include <memory> // IWYU pragma: keep #include <string> #include "Table.h" #include "contact_fwd.h"

7 years, 3 months

More IWYU fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 2dbc8adddf4f62d67dd617a33dda3ae32289e276 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dbc8adddf4f62… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 20 09:46:37 2017 +0100 More IWYU fixes. Things are complicated by the fact that there are different versions of the standard C++ headers out there. In addition, IWYU versions differ a bit, too.. :-/ Change-Id: I86261b96fad51f544f31c9dbb76538317c8cbcd1 --- livestatus/src/DowntimesOrComments.h | 2 +- livestatus/src/HostServiceState.h | 8 +++++++- livestatus/src/LogCache.h | 1 - livestatus/src/Query.cc | 7 +++++++ livestatus/src/Query.h | 2 +- livestatus/src/Store.cc | 1 + livestatus/src/StringUtils.cc | 6 ++++-- livestatus/src/StringUtils.h | 8 ++++---- livestatus/src/Table.cc | 3 ++- livestatus/src/Table.h | 2 +- livestatus/src/TableComments.cc | 1 + livestatus/src/TableContacts.cc | 1 - livestatus/src/TableDowntimes.cc | 2 +- livestatus/src/TableHostGroups.cc | 2 +- livestatus/src/TableHostGroups.h | 2 +- livestatus/src/TableServiceGroups.cc | 2 +- livestatus/src/TableServiceGroups.h | 2 +- livestatus/src/TableStateHistory.h | 1 + livestatus/src/auth.h | 8 ++++---- livestatus/src/module.cc | 1 - livestatus/src/unixcat.cc | 1 - 21 files changed, 39 insertions(+), 24 deletions(-) diff --git a/livestatus/src/DowntimesOrComments.h b/livestatus/src/DowntimesOrComments.h index fd0e2a8..3ab368e 100644 --- a/livestatus/src/DowntimesOrComments.h +++ b/livestatus/src/DowntimesOrComments.h @@ -28,8 +28,8 @@ #include "config.h" // IWYU pragma: keep #include <map> #include <memory> -#include "DowntimeOrComment.h" // IWYU pragma: keep #include "nagios.h" +class DowntimeOrComment; class Logger; class DowntimesOrComments { diff --git a/livestatus/src/HostServiceState.h b/livestatus/src/HostServiceState.h index 94f688c..c7bf6a9 100644 --- a/livestatus/src/HostServiceState.h +++ b/livestatus/src/HostServiceState.h @@ -29,9 +29,15 @@ #include <ctime> #include <string> // for string #include <vector> -#include "nagios.h" // IWYU pragma: keep class HostServiceState; +// for host/service, ugly... +#ifdef CMC +#include "cmc.h" +#else +#include "nagios.h" +#endif + typedef std::vector<HostServiceState *> HostServices; typedef void *HostServiceKey; diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 2625eec..d1363ca 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -31,7 +31,6 @@ #include <map> #include <mutex> #include "FileSystem.h" -#include "nagios.h" // IWYU pragma: keep class Column; class Logfile; class Logger; diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index f1e84c8..7d5d9d6 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -44,6 +44,13 @@ #include "strutil.h" #include "waittriggers.h" +// for find_contact, ugly... +#ifdef CMC +#include "cmc.h" +#else +#include "nagios.h" +#endif + extern unsigned long g_max_response_size; using std::chrono::duration_cast; diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index be641b9..08200d3 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -40,8 +40,8 @@ #include "RendererBrokenCSV.h" #include "StatsColumn.h" #include "VariadicFilter.h" +#include "contact_fwd.h" #include "data_encoding.h" -#include "nagios.h" // IWYU pragma: keep #include "opids.h" class Aggregator; class Column; diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index cc91d09..2678a57 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -30,6 +30,7 @@ #include <ostream> #include <utility> #include <vector> +#include "DowntimeOrComment.h" // IWYU pragma: keep #include "EventConsoleConnection.h" #include "InputBuffer.h" #include "Logger.h" diff --git a/livestatus/src/StringUtils.cc b/livestatus/src/StringUtils.cc index c6ee095..89e1319 100644 --- a/livestatus/src/StringUtils.cc +++ b/livestatus/src/StringUtils.cc @@ -24,12 +24,14 @@ // IWYU pragma: no_include <type_traits> #include "StringUtils.h" +#include <algorithm> +#include <cctype> +#include <sstream> + #ifdef CMC #include <arpa/inet.h> #include <sys/socket.h> #endif -#include <cctype> -#include <sstream> using std::pair; using std::string; diff --git a/livestatus/src/StringUtils.h b/livestatus/src/StringUtils.h index 2561e04..699d5f2 100644 --- a/livestatus/src/StringUtils.h +++ b/livestatus/src/StringUtils.h @@ -26,14 +26,14 @@ #define StringUtils_h #include "config.h" // IWYU pragma: keep -#ifdef CMC -#include <netinet/in.h> -#endif -#include <algorithm> // IWYU pragma: keep #include <string> #include <utility> #include <vector> +#ifdef CMC +#include <netinet/in.h> +#endif + namespace mk { std::string unsafe_tolower(const std::string &str); #ifdef CMC diff --git a/livestatus/src/Table.cc b/livestatus/src/Table.cc index 5e39478..50802e4 100644 --- a/livestatus/src/Table.cc +++ b/livestatus/src/Table.cc @@ -22,6 +22,8 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +// IWYU pragma: no_include "cmc.h" +// IWYU pragma: no_include "nagios.h" #include "Table.h" #include <cassert> #include <ostream> @@ -30,7 +32,6 @@ #include "Logger.h" #include "MonitoringCore.h" #include "StringUtils.h" -#include "contact_fwd.h" using mk::starts_with; using std::move; diff --git a/livestatus/src/Table.h b/livestatus/src/Table.h index 80195a7..66b2edf 100644 --- a/livestatus/src/Table.h +++ b/livestatus/src/Table.h @@ -31,7 +31,7 @@ #include <memory> #include <string> #include <utility> -#include "nagios.h" // IWYU pragma: keep +#include "contact_fwd.h" class Column; class DynamicColumn; class Logger; diff --git a/livestatus/src/TableComments.cc b/livestatus/src/TableComments.cc index ec8e43f..964f396 100644 --- a/livestatus/src/TableComments.cc +++ b/livestatus/src/TableComments.cc @@ -37,6 +37,7 @@ #include "TableHosts.h" #include "TableServices.h" #include "auth.h" +#include "nagios.h" using std::make_unique; using std::string; diff --git a/livestatus/src/TableContacts.cc b/livestatus/src/TableContacts.cc index 3dbc6b9..7396036 100644 --- a/livestatus/src/TableContacts.cc +++ b/livestatus/src/TableContacts.cc @@ -34,7 +34,6 @@ #include "OffsetStringColumn.h" #include "Query.h" #include "TimeperiodColumn.h" -#include "contact_fwd.h" #include "nagios.h" using std::make_unique; diff --git a/livestatus/src/TableDowntimes.cc b/livestatus/src/TableDowntimes.cc index 4588470..8cb32fd 100644 --- a/livestatus/src/TableDowntimes.cc +++ b/livestatus/src/TableDowntimes.cc @@ -27,7 +27,6 @@ #include <utility> #include "Column.h" #include "DowntimeOrComment.h" -#include "DowntimesOrComments.h" // IWYU pragma: keep #include "MonitoringCore.h" #include "OffsetBoolColumn.h" #include "OffsetIntColumn.h" @@ -38,6 +37,7 @@ #include "TableHosts.h" #include "TableServices.h" #include "auth.h" +#include "nagios.h" using std::make_unique; using std::string; diff --git a/livestatus/src/TableHostGroups.cc b/livestatus/src/TableHostGroups.cc index 920c490..3c861d3 100644 --- a/livestatus/src/TableHostGroups.cc +++ b/livestatus/src/TableHostGroups.cc @@ -30,7 +30,7 @@ #include "OffsetStringColumn.h" #include "Query.h" #include "auth.h" -#include "contact_fwd.h" +#include "nagios.h" using std::make_unique; using std::string; diff --git a/livestatus/src/TableHostGroups.h b/livestatus/src/TableHostGroups.h index 2fac3ef..78b403d 100644 --- a/livestatus/src/TableHostGroups.h +++ b/livestatus/src/TableHostGroups.h @@ -28,7 +28,7 @@ #include "config.h" // IWYU pragma: keep #include <string> #include "Table.h" -#include "nagios.h" // IWYU pragma: keep +#include "contact_fwd.h" class MonitoringCore; class Query; diff --git a/livestatus/src/TableServiceGroups.cc b/livestatus/src/TableServiceGroups.cc index 40e2e65..86f0f43 100644 --- a/livestatus/src/TableServiceGroups.cc +++ b/livestatus/src/TableServiceGroups.cc @@ -30,7 +30,7 @@ #include "ServiceListColumn.h" #include "ServiceListStateColumn.h" #include "auth.h" -#include "contact_fwd.h" +#include "nagios.h" using std::make_unique; using std::string; diff --git a/livestatus/src/TableServiceGroups.h b/livestatus/src/TableServiceGroups.h index c8fa140..1269bca 100644 --- a/livestatus/src/TableServiceGroups.h +++ b/livestatus/src/TableServiceGroups.h @@ -28,7 +28,7 @@ #include "config.h" // IWYU pragma: keep #include <string> #include "Table.h" -#include "nagios.h" // IWYU pragma: keep +#include "contact_fwd.h" class MonitoringCore; class Query; diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index c54f7d7..b2f91c1 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -28,6 +28,7 @@ // IWYU pragma: no_include <bits/shared_ptr.h> #include "config.h" // IWYU pragma: keep #include <map> +#include <memory> // IWYU pragma: keep #include <string> #include "LogCache.h" #include "Logfile.h" diff --git a/livestatus/src/auth.h b/livestatus/src/auth.h index 2d1b0bc..0b42b14 100644 --- a/livestatus/src/auth.h +++ b/livestatus/src/auth.h @@ -28,16 +28,16 @@ #include "config.h" // IWYU pragma: keep #ifdef CMC -class Contact; +#include "contact_fwd.h" #else -#include "nagios.h" // IWYU pragma: keep +#include "nagios.h" #endif enum class AuthorizationKind { loose = 0, strict = 1 }; #ifdef CMC -inline Contact *unknown_auth_user() { - return reinterpret_cast<Contact *>(0xdeadbeaf); +inline contact *unknown_auth_user() { + return reinterpret_cast<contact *>(0xdeadbeaf); } #else extern AuthorizationKind g_service_authorization; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index dc4cf9a..8f2af50 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -32,7 +32,6 @@ #include <sys/select.h> #include <sys/socket.h> #include <sys/stat.h> -#include <sys/types.h> // IWYU pragma: keep #include <sys/un.h> #include <unistd.h> #include <chrono> diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc index 514154b..2da2d9c 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -26,7 +26,6 @@ #include <sys/select.h> #include <sys/socket.h> #include <sys/stat.h> -#include <sys/types.h> // IWYU pragma: keep #include <sys/un.h> #include <unistd.h> #include <cerrno>

7 years, 3 months

4523 FIX tsm_stagingpools, tsm_storagepools: Fixed numerical data handling , ie. util and size may contain ", "

by Simon Betz

Module: check_mk Branch: master Commit: f7c03c64a51baa6af04a8cfe5e5a119a63010eb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7c03c64a51baa… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 20 10:20:31 2017 +0100 4523 FIX tsm_stagingpools, tsm_storagepools: Fixed numerical data handling, ie. util and size may contain "," Change-Id: Iaee34a77656ec140d74ef4b9e79b6ece4487f9dc --- .werks/4523 | 11 +++++++++++ checks/tsm_stagingpools | 2 +- checks/tsm_storagepools | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/4523 b/.werks/4523 new file mode 100644 index 0000000..4349c4a --- /dev/null +++ b/.werks/4523 @@ -0,0 +1,11 @@ +Title: tsm_stagingpools, tsm_storagepools: Fixed numerical data handling, ie. util and size may contain "," +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.4.0b5 +Date: 1490001366 + + diff --git a/checks/tsm_stagingpools b/checks/tsm_stagingpools index db613b5..7d33770 100644 --- a/checks/tsm_stagingpools +++ b/checks/tsm_stagingpools @@ -52,7 +52,7 @@ def parse_tsm_stagingpools(info): item = inst + " / " + pool parsed.setdefault( item, {} ) parsed[item].setdefault( node, [] ) - parsed[item][node].append( util ) + parsed[item][node].append( util.replace(",", ".") ) for line in info: node = line[0] diff --git a/checks/tsm_storagepools b/checks/tsm_storagepools index ea62eb2..94e7b63 100644 --- a/checks/tsm_storagepools +++ b/checks/tsm_storagepools @@ -52,7 +52,7 @@ def parse_tsm_storagepools(info): item = name else: item = inst + " / " + name - parsed.setdefault(item, {"type" : stype, "size" : size}) + parsed.setdefault(item, {"type" : stype, "size" : size.replace(",", ".")}) return parsed

7 years, 3 months

IWYU fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 963eab30eca625a34d91e1be16da1b6732be0130 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=963eab30eca625… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 20 08:00:53 2017 +0100 IWYU fixes. Change-Id: I40f5a3319d1d61ab5f160bb9696dbf01da8f9d77 --- livestatus/src/TableLog.cc | 1 + livestatus/src/TableStateHistory.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 6bc5347..73c9c84 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -25,6 +25,7 @@ #include "TableLog.h" #include <cstdint> #include <map> +#include <memory> #include <mutex> #include <utility> #include "Column.h" diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index 4c71806..c54f7d7 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -28,7 +28,6 @@ // IWYU pragma: no_include <bits/shared_ptr.h> #include "config.h" // IWYU pragma: keep #include <map> -#include <memory> #include <string> #include "LogCache.h" #include "Logfile.h"

7 years, 3 months

Extended our core abstraction layer to handle downtimes and comments.

by Sven Panne

Module: check_mk Branch: master Commit: 1cb5630c8e3b94baa086b5dd49dfc02c3da4ea3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cb5630c8e3b94… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 17 08:31:17 2017 +0100 Extended our core abstraction layer to handle downtimes and comments. This simplifies things *quite* a bit, removes tons of #ifdefs and makes it possible to merge column implementations (in an upcoming change). Change-Id: Ia595391952fb01d9204a65dbdc6406a3a5671299 --- livestatus/src/AttributeListAsIntColumn.h | 7 +- livestatus/src/AttributeListColumn.h | 7 +- livestatus/src/BlobColumn.h | 7 +- livestatus/src/Column.h | 7 +- livestatus/src/ContactGroupsColumn.cc | 1 + livestatus/src/ContactGroupsColumn.h | 2 +- livestatus/src/ContactGroupsMemberColumn.cc | 1 + livestatus/src/ContactGroupsMemberColumn.h | 4 +- livestatus/src/ContactsColumn.h | 7 +- livestatus/src/CustomTimeperiodColumn.h | 1 + livestatus/src/CustomVarsDictColumn.h | 7 +- livestatus/src/CustomVarsDictFilter.h | 7 +- livestatus/src/CustomVarsListFilter.h | 7 +- livestatus/src/CustomVarsNamesColumn.h | 7 +- livestatus/src/CustomVarsValuesColumn.h | 7 +- livestatus/src/DoubleAggregator.cc | 1 + livestatus/src/DoubleColumn.h | 7 +- livestatus/src/DoubleFilter.h | 7 +- livestatus/src/DownCommColumn.cc | 140 ++++++++++++++++------------ livestatus/src/DownCommColumn.h | 26 +++--- livestatus/src/DowntimesOrComments.cc | 6 -- livestatus/src/DowntimesOrComments.h | 1 - livestatus/src/HostContactsColumn.cc | 1 + livestatus/src/HostContactsColumn.h | 2 +- livestatus/src/HostGroupsColumn.h | 1 + livestatus/src/HostListColumn.h | 2 +- livestatus/src/HostListFilter.cc | 1 + livestatus/src/HostListFilter.h | 7 +- livestatus/src/HostListStateColumn.h | 2 +- livestatus/src/HostSpecialIntColumn.cc | 1 + livestatus/src/HostSpecialIntColumn.h | 2 +- livestatus/src/IntAggregator.cc | 1 + livestatus/src/IntColumn.h | 7 +- livestatus/src/IntFilter.h | 7 +- livestatus/src/ListFilter.h | 7 +- livestatus/src/LogwatchListColumn.cc | 2 + livestatus/src/LogwatchListColumn.h | 7 +- livestatus/src/MetricsColumn.h | 4 +- livestatus/src/MonitoringCore.h | 21 +++++ livestatus/src/NullColumn.h | 7 +- livestatus/src/OffsetBoolColumn.h | 7 +- livestatus/src/OffsetIntColumn.h | 7 +- livestatus/src/OffsetStringMacroColumn.h | 1 + livestatus/src/OffsetTimeColumn.h | 7 +- livestatus/src/PerfdataAggregator.cc | 1 + livestatus/src/ServiceContactsColumn.cc | 1 + livestatus/src/ServiceContactsColumn.h | 2 +- livestatus/src/ServiceGroupsColumn.h | 1 + livestatus/src/ServiceListColumn.h | 2 +- livestatus/src/ServiceListFilter.cc | 1 + livestatus/src/ServiceListFilter.h | 7 +- livestatus/src/ServiceListStateColumn.h | 2 +- livestatus/src/ServiceSpecialIntColumn.cc | 1 + livestatus/src/ServiceSpecialIntColumn.h | 2 +- livestatus/src/StatusSpecialIntColumn.h | 7 +- livestatus/src/Store.cc | 22 ++--- livestatus/src/Store.h | 13 ++- livestatus/src/StringColumn.h | 7 +- livestatus/src/StringFilter.h | 7 +- livestatus/src/Table.cc | 1 + livestatus/src/TableComments.cc | 19 ++-- livestatus/src/TableComments.h | 30 +----- livestatus/src/TableContacts.cc | 1 + livestatus/src/TableDowntimes.cc | 18 ++-- livestatus/src/TableDowntimes.h | 30 +----- livestatus/src/TableEventConsole.h | 7 +- livestatus/src/TableEventConsoleEvents.cc | 35 +------ livestatus/src/TableEventConsoleEvents.h | 34 +------ livestatus/src/TableEventConsoleHistory.cc | 19 +--- livestatus/src/TableEventConsoleHistory.h | 23 +---- livestatus/src/TableHostGroups.cc | 1 + livestatus/src/TableHosts.cc | 31 +++--- livestatus/src/TableHosts.h | 31 +----- livestatus/src/TableHostsByGroup.cc | 9 +- livestatus/src/TableHostsByGroup.h | 21 +---- livestatus/src/TableLog.cc | 37 ++------ livestatus/src/TableLog.h | 20 +--- livestatus/src/TableServiceGroups.cc | 1 + livestatus/src/TableServices.cc | 31 +++--- livestatus/src/TableServices.h | 31 +----- livestatus/src/TableServicesByGroup.cc | 9 +- livestatus/src/TableServicesByGroup.h | 21 +---- livestatus/src/TableServicesByHostGroup.cc | 9 +- livestatus/src/TableServicesByHostGroup.h | 20 +--- livestatus/src/TableStateHistory.cc | 32 ++----- livestatus/src/TableStateHistory.h | 22 +---- livestatus/src/TimeColumn.h | 7 +- livestatus/src/TimePointerColumn.h | 6 -- livestatus/src/TimeperiodColumn.cc | 1 + livestatus/src/TimeperiodColumn.h | 7 +- livestatus/src/contact_fwd.h | 35 +++++++ livestatus/src/module.cc | 50 +++++++++- 92 files changed, 376 insertions(+), 720 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1cb5630c8e…

7 years, 3 months

4505 FIX Fixed broken links of logwatch and OMD * status services on services page

by Lars Michelsen

Module: check_mk Branch: master Commit: 49782c6d531f15a1693738adb41f9113d0f78cfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49782c6d531f15… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 17 11:38:19 2017 +0100 4505 FIX Fixed broken links of logwatch and OMD * status services on services page Change-Id: I8b4ddde73e996a797308b73645c345385f26d478 --- .werks/4505 | 10 ++++++++++ checks/omd_status | 1 - web/htdocs/wato.py | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/4505 b/.werks/4505 new file mode 100644 index 0000000..c80aa45 --- /dev/null +++ b/.werks/4505 @@ -0,0 +1,10 @@ +Title: Fixed broken links of logwatch and OMD * status services on services page +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489747076 +Class: fix + + diff --git a/checks/omd_status b/checks/omd_status index de163b8..1da1172 100644 --- a/checks/omd_status +++ b/checks/omd_status @@ -121,6 +121,5 @@ check_info["omd_status"] = { 'inventory_function' : inventory_omd_status, 'parse_function' : parse_omd_status, 'service_description' : 'OMD %s status', - 'group' : 'omd_status', 'node_info' : True, } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5b887d8..29073ad 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3291,7 +3291,9 @@ class ModeDiscovery(WatoMode): def _get_ruleset_name(self, check_source, check_type, checkgroup): - if checkgroup: + if checkgroup == "logwatch": + return "logwatch_rules" + elif checkgroup: return "checkgroup_parameters:" + checkgroup elif check_source == "active": return "active_checks:" + check_type

7 years, 3 months

← Newer
1
...
9
10
11
12
13
14
15
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017