Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

Added remaining overrides in the Column hierarchy.

by Sven Panne

Module: check_mk Branch: master Commit: 6e3fd5cec666d536f7b85b05d515197fb1d98b4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e3fd5cec666d5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 14 10:55:39 2016 +0100 Added remaining overrides in the Column hierarchy. --- livestatus/src/AttributelistColumn.h | 2 +- livestatus/src/ContactgroupsColumn.h | 6 +++--- livestatus/src/ContactsColumn.h | 4 ++-- livestatus/src/DownCommColumn.h | 6 +++--- livestatus/src/DynamicColumn.h | 1 - livestatus/src/HostFileColumn.h | 2 +- livestatus/src/HostgroupsColumn.h | 6 +++--- livestatus/src/OffsetStringHostMacroColumn.h | 4 ++-- livestatus/src/OffsetStringServiceMacroColumn.h | 4 ++-- livestatus/src/ServicegroupsColumn.h | 6 +++--- livestatus/src/TimeColumnFilter.h | 2 +- 11 files changed, 21 insertions(+), 22 deletions(-) diff --git a/livestatus/src/AttributelistColumn.h b/livestatus/src/AttributelistColumn.h index 91c8f95..72340ac 100644 --- a/livestatus/src/AttributelistColumn.h +++ b/livestatus/src/AttributelistColumn.h @@ -54,7 +54,7 @@ public: Filter *createFilter(int opid, char *value) override; /* API of IntColumn */ - virtual int32_t getValue(void *data, Query *) { return getValue(data); } + int32_t getValue(void *data, Query *) override { return getValue(data); } unsigned long getValue(void *data); }; diff --git a/livestatus/src/ContactgroupsColumn.h b/livestatus/src/ContactgroupsColumn.h index a425014..3259b5b 100644 --- a/livestatus/src/ContactgroupsColumn.h +++ b/livestatus/src/ContactgroupsColumn.h @@ -38,9 +38,9 @@ public: ContactgroupsColumn(std::string name, std::string description, int offset, int indirect_offset) : ListColumn(name, description, indirect_offset), _offset(offset) {} void output(void *, Query *) override; - void *getNagiosObject(char *name); // return pointer to contact group - bool isNagiosMember(void *data, void *nagobject); - bool isEmpty(void *data); + void *getNagiosObject(char *name) override; // return pointer to contact group + bool isNagiosMember(void *data, void *nagobject) override; + bool isEmpty(void *data) override; }; #endif // ContactgroupsColumn_h diff --git a/livestatus/src/ContactsColumn.h b/livestatus/src/ContactsColumn.h index 7302d96..ea76767 100644 --- a/livestatus/src/ContactsColumn.h +++ b/livestatus/src/ContactsColumn.h @@ -38,8 +38,8 @@ public: ContactsColumn(std::string name, std::string description, int indirect_offset) : ListColumn(name, description, indirect_offset) {} int type() override { return COLTYPE_LIST; } - void *getNagiosObject(char *name); - bool isEmpty(void *data); + void *getNagiosObject(char *name) override; + bool isEmpty(void *data) override; void output(void *, Query *) override; }; diff --git a/livestatus/src/DownCommColumn.h b/livestatus/src/DownCommColumn.h index e702fbe..4757c32 100644 --- a/livestatus/src/DownCommColumn.h +++ b/livestatus/src/DownCommColumn.h @@ -43,9 +43,9 @@ public: : ListColumn(name, description, indirect_offset), _is_downtime(is_downtime), _with_info(with_info), _is_service(is_service), _with_extra_info(with_extra_info) {} int type() override { return COLTYPE_LIST; } void output(void *, Query *) override; - void *getNagiosObject(char *name); - bool isEmpty(void *data); - bool isNagiosMember(void *data, void *member); + void *getNagiosObject(char *name) override; + bool isEmpty(void *data) override; + bool isNagiosMember(void *data, void *member) override; }; #endif // DownCommColumn_h diff --git a/livestatus/src/DynamicColumn.h b/livestatus/src/DynamicColumn.h index 38aa08b..bf8f1e0 100644 --- a/livestatus/src/DynamicColumn.h +++ b/livestatus/src/DynamicColumn.h @@ -38,7 +38,6 @@ class DynamicColumn public: DynamicColumn(std::string name, std::string description, int indirect_offset) : _name(name), _description(description), _indirect_offset(indirect_offset) {} - virtual ~DynamicColumn() {} const char *name() const { return _name.c_str(); } const char *description() const { return _description.c_str(); } Column *createColumn(const char *arguments); diff --git a/livestatus/src/HostFileColumn.h b/livestatus/src/HostFileColumn.h index b4109d9..7fbb837 100644 --- a/livestatus/src/HostFileColumn.h +++ b/livestatus/src/HostFileColumn.h @@ -39,7 +39,7 @@ public: const char *suffice, int indirect_offset); // returns a buffer to be freed afterwards!! - char *getBlob(void *data, int *size); + char *getBlob(void *data, int *size) override; }; #endif // HostFileColumn_h diff --git a/livestatus/src/HostgroupsColumn.h b/livestatus/src/HostgroupsColumn.h index b9a67e8..9159beb 100644 --- a/livestatus/src/HostgroupsColumn.h +++ b/livestatus/src/HostgroupsColumn.h @@ -41,9 +41,9 @@ public: : ListColumn(name, description, indirect_offset), _offset(offset) {} int type() override { return COLTYPE_LIST; } void output(void *, Query *) override; - void *getNagiosObject(char *name); // return pointer to host group - bool isNagiosMember(void *data, void *nagobject); - bool isEmpty(void *data); + void *getNagiosObject(char *name) override; // return pointer to host group + bool isNagiosMember(void *data, void *nagobject) override; + bool isEmpty(void *data) override; private: objectlist *getData(void *); }; diff --git a/livestatus/src/OffsetStringHostMacroColumn.h b/livestatus/src/OffsetStringHostMacroColumn.h index 7eeba72..0f9e9b9 100644 --- a/livestatus/src/OffsetStringHostMacroColumn.h +++ b/livestatus/src/OffsetStringHostMacroColumn.h @@ -36,8 +36,8 @@ class OffsetStringHostMacroColumn : public OffsetStringMacroColumn public: OffsetStringHostMacroColumn(std::string name, std::string description, int offset, int indirect_offset = -1) : OffsetStringMacroColumn(name, description, offset, indirect_offset) {} - host *getHost(void *data); - service *getService(void *data); + host *getHost(void *data) override; + service *getService(void *data) override; }; #endif // OffsetStringHostMacroColumn_h diff --git a/livestatus/src/OffsetStringServiceMacroColumn.h b/livestatus/src/OffsetStringServiceMacroColumn.h index dfff759..3936eb5 100644 --- a/livestatus/src/OffsetStringServiceMacroColumn.h +++ b/livestatus/src/OffsetStringServiceMacroColumn.h @@ -36,8 +36,8 @@ class OffsetStringServiceMacroColumn : public OffsetStringMacroColumn public: OffsetStringServiceMacroColumn(std::string name, std::string description, int offset, int indirect_offset = -1) : OffsetStringMacroColumn(name, description, offset, indirect_offset) {} - host *getHost(void *data); - service *getService(void *data); + host *getHost(void *data) override; + service *getService(void *data) override; }; #endif // OffsetStringServiceMacroColumn_h diff --git a/livestatus/src/ServicegroupsColumn.h b/livestatus/src/ServicegroupsColumn.h index aff4e59..74a70a9 100644 --- a/livestatus/src/ServicegroupsColumn.h +++ b/livestatus/src/ServicegroupsColumn.h @@ -41,9 +41,9 @@ public: : ListColumn(name, description, indirect_offset), _offset(offset) {} int type() override { return COLTYPE_LIST; } void output(void *, Query *) override; - void *getNagiosObject(char *name); // return pointer to service group - bool isEmpty(void *data); - bool isNagiosMember(void *data, void *nagobject); + void *getNagiosObject(char *name) override; // return pointer to service group + bool isEmpty(void *data) override; + bool isNagiosMember(void *data, void *nagobject) override; private: objectlist *getData(void *); }; diff --git a/livestatus/src/TimeColumnFilter.h b/livestatus/src/TimeColumnFilter.h index 4a99c4d..e7c2572 100644 --- a/livestatus/src/TimeColumnFilter.h +++ b/livestatus/src/TimeColumnFilter.h @@ -36,7 +36,7 @@ class TimeColumnFilter : public IntColumnFilter public: TimeColumnFilter(IntColumn *column, int opid, char *value) : IntColumnFilter(column, opid, value) {} - virtual int32_t convertRefValue(); + virtual int32_t convertRefValue() override; }; #endif // TimeColumnFilter_h

8 years, 8 months

Re-added virtual destructor which was accidentally removed.

by Sven Panne

Module: check_mk Branch: master Commit: 2c1f631dde19f1799ba7e73b26f29c056b98a67a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c1f631dde19f1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 14 11:28:37 2016 +0100 Re-added virtual destructor which was accidentally removed. --- livestatus/src/DynamicColumn.cc | 3 +++ livestatus/src/DynamicColumn.h | 1 + 2 files changed, 4 insertions(+) diff --git a/livestatus/src/DynamicColumn.cc b/livestatus/src/DynamicColumn.cc index a9972d6..e281e0a 100644 --- a/livestatus/src/DynamicColumn.cc +++ b/livestatus/src/DynamicColumn.cc @@ -24,6 +24,9 @@ #include "DynamicColumn.h" +DynamicColumn::~DynamicColumn() +{ +} Column *DynamicColumn::createColumn(const char *arguments) { diff --git a/livestatus/src/DynamicColumn.h b/livestatus/src/DynamicColumn.h index bf8f1e0..3c3771f 100644 --- a/livestatus/src/DynamicColumn.h +++ b/livestatus/src/DynamicColumn.h @@ -38,6 +38,7 @@ class DynamicColumn public: DynamicColumn(std::string name, std::string description, int indirect_offset) : _name(name), _description(description), _indirect_offset(indirect_offset) {} + virtual ~DynamicColumn(); const char *name() const { return _name.c_str(); } const char *description() const { return _description.c_str(); } Column *createColumn(const char *arguments);

8 years, 8 months

Removed Column::setExtraOffset, it was just a lazy way to extend the constructor.

by Sven Panne

Module: check_mk Branch: master Commit: 5c14e320e4cc0c56887496c47be82d8a50b39c37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c14e320e4cc0c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 14 11:29:16 2016 +0100 Removed Column::setExtraOffset, it was just a lazy way to extend the constructor. --- livestatus/src/AttributelistColumn.h | 21 +++++++++++++-------- livestatus/src/Column.cc | 11 ++++++----- livestatus/src/Column.h | 8 +++++--- livestatus/src/IntColumn.h | 12 +++++++----- 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/livestatus/src/AttributelistColumn.h b/livestatus/src/AttributelistColumn.h index 72340ac..bb0be54 100644 --- a/livestatus/src/AttributelistColumn.h +++ b/livestatus/src/AttributelistColumn.h @@ -25,7 +25,7 @@ #ifndef AttributelistColumn_h #define AttributelistColumn_h -#include "config.h" // IWYU pragma: keep +#include "config.h" // IWYU pragma: keep #include <stdint.h> #include <string> #include "Column.h" @@ -39,23 +39,28 @@ class Query; Columns of the type COLTYPE_INT to be of that type. */ -class AttributelistColumn : public IntColumn -{ +class AttributelistColumn : public IntColumn { int _offset; bool _show_list; + public: - AttributelistColumn(std::string name, std::string description, int offset, int indirect_offset, bool show_list) - : IntColumn(name, description, indirect_offset), _offset(offset), _show_list(show_list) {} + AttributelistColumn(std::string name, std::string description, int offset, + int indirect_offset, bool show_list, + int extra_offset = -1) + : IntColumn(name, description, indirect_offset, extra_offset) + , _offset(offset) + , _show_list(show_list) + { + } - /* API of Column */ + // API of Column int type() override { return _show_list ? COLTYPE_LIST : COLTYPE_INT; } std::string valueAsString(void *data, Query *) override; void output(void *, Query *) override; Filter *createFilter(int opid, char *value) override; - /* API of IntColumn */ + // API of IntColumn int32_t getValue(void *data, Query *) override { return getValue(data); } - unsigned long getValue(void *data); }; diff --git a/livestatus/src/Column.cc b/livestatus/src/Column.cc index 5e570a4..354b784 100644 --- a/livestatus/src/Column.cc +++ b/livestatus/src/Column.cc @@ -27,11 +27,12 @@ using std::string; -Column::Column(string name, string description, int indirect_offset) - : _name(name) - , _description(description) - , _indirect_offset(indirect_offset) - , _extra_offset(-1) +Column::Column(string name, string description, int indirect_offset, + int extra_offset) + : _name(name) + , _description(description) + , _indirect_offset(indirect_offset) + , _extra_offset(extra_offset) { } diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index 9c4a56b..92b0ca1 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -49,17 +49,19 @@ class Column int _extra_offset; public: - Column(std::string name, std::string description, int indirect_offset); + Column(std::string name, std::string description, int indirect_offset, + int extra_offset = -1); virtual ~Column() {} + const char *name() const { return _name.c_str(); } const char *description() const { return _description.c_str(); } + void *shiftPointer(void *data); + virtual std::string valueAsString(void *, Query *) { return "invalid"; } virtual int type() = 0; virtual void output(void *data, Query *) = 0; virtual bool mustDelete() { return false; } // true for dynamic Columns to be deleted after Query virtual Filter *createFilter(int, char *) { return 0; } - void *shiftPointer(void *data); - void setExtraOffset(int o) { _extra_offset = o; } }; #endif // Column_h diff --git a/livestatus/src/IntColumn.h b/livestatus/src/IntColumn.h index 0d9ff8f..e47ff79 100644 --- a/livestatus/src/IntColumn.h +++ b/livestatus/src/IntColumn.h @@ -25,7 +25,7 @@ #ifndef IntColumn_h #define IntColumn_h -#include "config.h" // IWYU pragma: keep +#include "config.h" // IWYU pragma: keep #include <stdint.h> #include <string> #include "Column.h" @@ -33,11 +33,13 @@ class Filter; class Query; -class IntColumn : public Column -{ +class IntColumn : public Column { public: - IntColumn(std::string name, std::string description, int indirect_offset) - : Column(name, description, indirect_offset) {} + IntColumn(std::string name, std::string description, int indirect_offset, + int extra_offset = -1) + : Column(name, description, indirect_offset, extra_offset) + { + } virtual int32_t getValue(void *data, Query *) = 0; void output(void *, Query *) override; int type() override { return COLTYPE_INT; }

8 years, 8 months

#2882 Reorganize BI configuration into packs, add contacts and permissions

by Mathias Kettner

Module: check_mk Branch: master Commit: 9a457ef3a884cbdfa41cb05ae36c3169ed769142 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a457ef3a884cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 14 11:17:01 2016 +0100 #2882 Reorganize BI configuration into packs, add contacts and permissions The WATO module for configuring Business Intelligence (BI) has been reorganized. The configuration is now split up into Packs. This has been made for two reasons: LI:It makes the configuration of large BI environments easier LI:It allows to delegate BI configuration to normal users Each pack contains rules and aggregations. A rule or aggregation in one pack can refer to rules in another pack. Each BI pack can have a list of contact groups. A new permission has been introduced: Business Intelligence Rules and Aggregations. Per default this is set for normal users. It allows a normal user to configure rules and aggregations in a BI pack if that user is in one of the listed contact groups of that pack. A pack can have the checkbox Allow all users to refer to rules contained in this pack set. That way a user can use rule from a pack where he is not a contact for. So the admin can put some basic rules there that can be used but not changed by other. Your existing BI configuration will automatically be converted the next time you use the WATO Bi modul. All existing rules and aggregations will be put in to one BI pack with the name Default Pack. --- .werks/2882 | 32 ++ ChangeLog | 3 + web/.gitignore | 1 + web/htdocs/bi.py | 12 + web/htdocs/images/button_bi_rules.png | Bin 0 -> 2203 bytes web/htdocs/images/icon_bi_rules.png | Bin 0 -> 2203 bytes web/plugins/config/bi.py | 1 + web/plugins/wato/bi.py | 595 +++++++++++++++++++++++++-------- web/plugins/wato/builtin_modules.py | 2 +- 9 files changed, 502 insertions(+), 144 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9a457ef3a8…

8 years, 8 months

Added 'override' specifier for the Column hierarchy.

by Sven Panne

Module: check_mk Branch: master Commit: 66adb970d53f1f7cf121304070e716cd5abc2e73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66adb970d53f1f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 14 09:58:49 2016 +0100 Added 'override' specifier for the Column hierarchy. --- livestatus/src/AttributelistColumn.h | 8 ++++---- livestatus/src/BlobColumn.h | 4 ++-- livestatus/src/ContactgroupsColumn.h | 2 +- livestatus/src/ContactgroupsMemberColumn.h | 2 +- livestatus/src/ContactsColumn.h | 4 ++-- livestatus/src/CustomVarsColumn.h | 6 +++--- livestatus/src/DoubleColumn.h | 8 ++++---- livestatus/src/DownCommColumn.h | 4 ++-- livestatus/src/EmptyColumn.h | 4 ++-- livestatus/src/GlobalCountersColumn.h | 6 +++--- livestatus/src/HostContactsColumn.h | 2 +- livestatus/src/HostgroupsColumn.h | 4 ++-- livestatus/src/HostlistColumn.h | 6 +++--- livestatus/src/IntColumn.h | 8 ++++---- livestatus/src/ListColumn.h | 4 ++-- livestatus/src/MetricsColumn.h | 4 ++-- livestatus/src/NullColumn.h | 4 ++-- livestatus/src/OffsetStringMacroColumn.h | 6 +++--- livestatus/src/OffsetTimeColumn.h | 6 +++--- livestatus/src/ServiceContactsColumn.h | 2 +- livestatus/src/ServicegroupsColumn.h | 4 ++-- livestatus/src/ServicelistColumn.h | 6 +++--- livestatus/src/StringColumn.h | 8 ++++---- livestatus/src/TimePointerColumn.h | 6 +++--- 24 files changed, 59 insertions(+), 59 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=66adb970d5…

8 years, 8 months

#2890 cisco_nexus_cpu, cisco_oldcpu: new checks for Cisco devices which do not support CPU utilization information from CISCO PROCESS MIB

by Simon Betz

Module: check_mk Branch: master Commit: 9e546a50067168e15d19a2ba63427673703dc9ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e546a50067168… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 14 09:55:56 2016 +0100 #2890 cisco_nexus_cpu, cisco_oldcpu: new checks for Cisco devices which do not support CPU utilization information from CISCO PROCESS MIB --- .werks/2890 | 9 ++++++++ ChangeLog | 1 + checkman/cisco_nexus_cpu | 16 ++++++++++++++ checkman/cisco_oldcpu | 17 ++++++++++++++ checks/cisco_nexus_cpu | 55 ++++++++++++++++++++++++++++++++++++++++++++++ checks/cisco_oldcpu | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 153 insertions(+) diff --git a/.werks/2890 b/.werks/2890 new file mode 100644 index 0000000..ca33ffe --- /dev/null +++ b/.werks/2890 @@ -0,0 +1,9 @@ +Title: cisco_nexus_cpu, cisco_oldcpu: new checks for Cisco devices which do not support CPU utilization information from CISCO PROCESS MIB +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1452761536 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 170cbe1..553f681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 2915 supermicro.smart: new check to monitor harddisk health on snmp-enabled supermicro devices * 1321 sap.dialog: It is now possible to configure levels for FrontEndNetTime, ResponseTime and UsersLoggedIn * 2916 checkpoint_fan, checkpoint_firewall, checkpoint_ha_problems, checkpoint_ha_status, checkpoint_powersupply, checkpoint_svn_status, checkpoint_temp, checkpoint_voltage: New checks for various aspects of checkpoint firewalls + * 2890 cisco_nexus_cpu, cisco_oldcpu: new checks for Cisco devices which do not support CPU utilization information from CISCO PROCESS MIB * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checkman/cisco_nexus_cpu b/checkman/cisco_nexus_cpu new file mode 100644 index 0000000..a409b73 --- /dev/null +++ b/checkman/cisco_nexus_cpu @@ -0,0 +1,16 @@ +title: Cisco Nexus Devices: CPU utilization +agents: snmp +catalog: hw/network/cisco +license: GPL +distribution: check_mk +description: + This check monitors the CPU utilization of Cisco Nexus devices + which do not support CPU information from CISCO-PROCESS-MIB. + + Default levels are 80, 90 percent. These are configurable. + +perfdata: + The CPU utilization. + +inventory: + One service is created. diff --git a/checkman/cisco_oldcpu b/checkman/cisco_oldcpu new file mode 100644 index 0000000..34379ce --- /dev/null +++ b/checkman/cisco_oldcpu @@ -0,0 +1,17 @@ +title: Old Cisco Devices: CPU utilization +agents: snmp +catalog: hw/network/cisco +license: GPL +distribution: check_mk +description: + This check monitors the CPU utilization of old Cisco devices + which do not support CPU information from CISCO-PROCESS-MIB, + e.g. 'Cisco Catalyst 3850 Series'. + + Default levels are 80, 90 percent. These are configurable. + +perfdata: + The CPU utilization. + +inventory: + One service is created. diff --git a/checks/cisco_nexus_cpu b/checks/cisco_nexus_cpu new file mode 100644 index 0000000..9da6942 --- /dev/null +++ b/checks/cisco_nexus_cpu @@ -0,0 +1,55 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 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. + + +# .1.3.6.1.4.1.9.9.305.1.1.1.0 1 --> CISCO-SYSTEM-EXT-MIB::cseSysCPUUtilization.0 + + +cisco_nexus_cpu_default_levels = (80.0, 90.0) + + +def inventory_cisco_nexus_cpu(info): + if info[0][0]: + return [ (None, "cisco_nexus_cpu_default_levels") ] + + +def check_cisco_nexus_cpu(_no_item, params, info): + return check_cpu_util(float(info[0][0]), params) + + +check_info['cisco_nexus_cpu'] = { + 'inventory_function' : inventory_cisco_nexus_cpu, + 'check_function' : check_cisco_nexus_cpu, + 'service_description' : 'CPU utilization', + 'has_perfdata' : True, + 'snmp_info' : (".1.3.6.1.4.1.9.9.305.1.1.1.0", [ "" ]), + 'snmp_scan_function' : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ + and "nx-os" in oid(".1.3.6.1.2.1.1.1.0").lower() \ + and not oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.*") \ + and oid(".1.3.6.1.4.1.9.9.305.1.1.1.0"), + 'group' : "cpu_utilization", + 'includes' : [ "cpu_util.include" ], +} diff --git a/checks/cisco_oldcpu b/checks/cisco_oldcpu new file mode 100644 index 0000000..8b550ec --- /dev/null +++ b/checks/cisco_oldcpu @@ -0,0 +1,55 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 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. + + +# .1.3.6.1.4.1.9.2.1.57.0 13 --> OLD-CISCO-CPU-MIB::avgBusy1.0 + + +cisco_oldcpu_default_levels = (80.0, 90.0) + + +def inventory_cisco_oldcpu(info): + if info[0][0]: + return [ (None, "cisco_oldcpu_default_levels") ] + + +def check_cisco_oldcpu(_no_item, params, info): + return check_cpu_util(float(info[0][0]), params) + + +check_info['cisco_oldcpu'] = { + 'inventory_function' : inventory_cisco_oldcpu, + 'check_function' : check_cisco_oldcpu, + 'service_description' : 'CPU utilization', + 'has_perfdata' : True, + 'snmp_info' : (".1.3.6.1.4.1.9.2.1", [ "57" ]), + # For old cisco catalyst devices (1745) which do not support newer snmp data + # e.g. 'Cisco Catalyst 3850 Series Switches' + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.9.1.1745") \ + and not oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.*") \ + and oid(".1.3.6.1.4.1.9.2.1.57.0"), + 'group' : "cpu_utilization", +}

8 years, 8 months

fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: e1842f89709ffc34751b51d9884fe6162334173b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1842f89709ffc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 14 09:37:29 2016 +0100 fixed typo --- checkman/cisco_cpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/cisco_cpu b/checkman/cisco_cpu index 82c5431..cfe9136 100644 --- a/checkman/cisco_cpu +++ b/checkman/cisco_cpu @@ -11,7 +11,7 @@ description: {.1.3.6.1.4.1.9.9.109.1.1.1.1.8.1 = cpmCPUTotal5minRev} - The latter is depreceated by cisco and will only be used if {cpmCPUTotal5minRev} + The latter is deprecated by cisco and will only be used if {cpmCPUTotal5minRev} is unavailable.

8 years, 8 months

Link C++ support library statically, so the target system can have a different one.

by Sven Panne

Module: check_mk Branch: master Commit: f9d7b3b29ab794a1b758671b373f06489cdb3d3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9d7b3b29ab794… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 14 09:22:41 2016 +0100 Link C++ support library statically, so the target system can have a different one. --- livestatus/src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 4c736c2..42bcb5b 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -55,7 +55,7 @@ livestatus_so_CFLAGS = -fPIC livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES) -rm -f plugin.so - $(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -lstdc++ + $(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++ all-local: livestatus.o

8 years, 8 months

#2889 snmp_extended_info: new inventory function which discovers the model name and serial number

by Simon Betz

Module: check_mk Branch: master Commit: 4d193c1b689575f93d05d6f18073f4851ab53515 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d193c1b689575… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 14 09:10:46 2016 +0100 #2889 snmp_extended_info: new inventory function which discovers the model name and serial number The information about model name and serial number is discovered on all SNMP devices on which the OIDs "1.3.6.1.2.1.47.1.1.1.1.4.1" or "1.3.6.1.2.1.47.1.1.1.1.4.1001" have value zero. This means the device itself. --- .werks/2889 | 11 ++++++++ ChangeLog | 1 + inventory/snmp_extended_info | 56 ++++++++++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 2 ++ 4 files changed, 70 insertions(+) diff --git a/.werks/2889 b/.werks/2889 new file mode 100644 index 0000000..ad05caa --- /dev/null +++ b/.werks/2889 @@ -0,0 +1,11 @@ +Title: snmp_extended_info: new inventory function which discovers the model name and serial number +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.7i4 +Date: 1452758542 +Class: feature + +The information about model name and serial number is discovered on all SNMP devices on which +the OIDs "1.3.6.1.2.1.47.1.1.1.1.4.1" or "1.3.6.1.2.1.47.1.1.1.1.4.1001" have value zero. +This means the device itself. diff --git a/ChangeLog b/ChangeLog index c8db707..170cbe1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -266,6 +266,7 @@ HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... * 2440 VMware ESX inventory: Now able to display ESX hostsystems and virtualmachines of clusters + * 2889 snmp_extended_info: new inventory function which discovers the model name and serial number... * 2667 FIX: solaris_mem: fix exception in inventory plugin * 2714 FIX: Fixed visibility of folding arrows by making them dark * 2439 FIX: solaris_prtdiag: Can now handle Oracle Corporation SUN FIRE X4170 M2 SERVER... diff --git a/inventory/snmp_extended_info b/inventory/snmp_extended_info new file mode 100644 index 0000000..9f5c9e5 --- /dev/null +++ b/inventory/snmp_extended_info @@ -0,0 +1,56 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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. + + +# .1.3.6.1.2.1.47.1.1.1.1.4.1 0 --> ENTITY-MIB::entPhysicalContainedIn.1 +# .1.3.6.1.2.1.47.1.1.1.1.11.1 SMG0926A0CR --> ENTITY-MIB::entPhysicalSerialNum.1 +# .1.3.6.1.2.1.47.1.1.1.1.13.1 WS-C6509 --> ENTITY-MIB::entPhysicalModelName.1 + + + +def inv_snmp_extended_info(info): + node = inv_tree("hardware.system.") + + if len(info) >= 3: + if info[0][0].split(".")[-1] == "0": + node["serial_number"] = info[1][0].split(".")[-1] + node["model_name"] = info[2][0].split(".")[-1] + elif info[0][1].split(".")[-1] == "0": + node["serial_number"] = info[1][1].split(".")[-1] + node["model_name"] = info[2][1].split(".")[-1] + + return node + + +inv_info['snmp_extended_info'] = { + 'inv_function' : inv_snmp_extended_info, + 'snmp_info' : ('.1.3.6.1.2.1.47.1.1.1.1', [ + "4", # entPhysicalContainedIn.1 + "11", # entPhysicalSerialNum.1 + "13" # entPhysicalModelName.1 + ], [ "1", "1001" ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.47.1.1.1.1.*"), +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 9016478..1fb802b 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -571,6 +571,8 @@ inventory_displayhints.update({ ".hardware.memory.arrays:*.devices:*.speed" : { "title" : _("Speed"), "paint" : "hz", }, ".hardware.system." : { "title" : _("System") }, ".hardware.system.product" : { "title" : _("Product") }, + ".hardware.system.serial_number" : { "title" : _("Serial Number") }, + ".hardware.system.model_name" : { "title" : _("Model Name") }, ".hardware.storage." : { "title" : _("Storage") }, ".hardware.storage.disks:" : { "title" : _("Block Devices") }, ".hardware.storage.disks:*." : { "title" : _("Block Device %d") },

8 years, 8 months

Made TableServices::addColumns static and adapted call sites.

by Sven Panne

Module: check_mk Branch: master Commit: c27b3313b7bb5d7a9725e77fe692ab33eed78456 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c27b3313b7bb5d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 14 08:05:00 2016 +0100 Made TableServices::addColumns static and adapted call sites. Now all TableFOO::addColumns methods are static, and this is much less confusing: What they actually implement is a combination of delegating constructors and multiple inheritance. Still not nice, but much clearer... --- livestatus/src/TableDownComm.cc | 2 +- livestatus/src/TableLog.cc | 2 +- livestatus/src/TableServices.cc | 3 ++- livestatus/src/TableServices.h | 2 +- livestatus/src/TableStateHistory.cc | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index 1d217d5..d08f4d4 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -93,7 +93,7 @@ TableDownComm::TableDownComm(bool is_downtime) } TableHosts::addColumns(this, "host_", (char *)&(ref->_host) - (char *)ref); - g_table_services->addColumns(this, "service_", (char *)&(ref->_service) - (char *)ref, false /* no hosts table */); + TableServices::addColumns(this, "service_", (char *)&(ref->_service) - (char *)ref, false /* no hosts table */); } TableDownComm::~TableDownComm() diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 69b4871..2914ebe 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -105,7 +105,7 @@ void TableLog::addColumns(Table *table, string prefix, int indirect_offset, bool if (add_host) TableHosts::addColumns(table, "current_host_", (char *)&(ref->_host) - (char *)ref); if (add_services) - g_table_services->addColumns(table, "current_service_", (char *)&(ref->_service) - (char *)ref, false /* no hosts table */); + TableServices::addColumns(table, "current_service_", (char *)&(ref->_service) - (char *)ref, false /* no hosts table */); TableContacts::addColumns(table, "current_contact_", (char *)&(ref->_contact) - (char *)ref); TableCommands::addColumns(table, "current_command_", (char *)&(ref->_command) - (char *)ref); } diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 09360c2..7956182 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -207,6 +207,7 @@ TableServices::TableServices(bool by_group, bool by_hostgroup) } +// static void TableServices::addColumns(Table *table, string prefix, int indirect_offset, bool add_hosts) { /* es fehlt noch: double-Spalten, unsigned long spalten, etliche weniger wichtige @@ -399,7 +400,7 @@ void TableServices::addColumns(Table *table, string prefix, int indirect_offset, "A list of all comments of the service with id, author, comment, entry type and entry time", indirect_offset, false, true, true, true)); if (add_hosts) - TableHosts::addColumns(this, "host_", (char *)(&svc.host_ptr) - ref); + TableHosts::addColumns(table, "host_", (char *)(&svc.host_ptr) - ref); table->addColumn(new CustomVarsColumn(prefix + "custom_variable_names", "A list of the names of all custom variables of the service", (char *)(&svc.custom_variables) - ref, indirect_offset, CVT_VARNAMES)); diff --git a/livestatus/src/TableServices.h b/livestatus/src/TableServices.h index ea49d6c..0f04854 100644 --- a/livestatus/src/TableServices.h +++ b/livestatus/src/TableServices.h @@ -46,7 +46,7 @@ public: void *findObject(char *objectspec); void add(service *svc); void answerQuery(Query *); - void addColumns(Table *, std::string prefix, int indirect_offset, bool add_hosts); + static void addColumns(Table *, std::string prefix, int indirect_offset, bool add_hosts); }; #endif // TableServices_h diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 74b182f..f0cdf9e 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -155,7 +155,7 @@ void TableStateHistory::addColumns(Table *table) // join host and service tables TableHosts::addColumns(table, "current_host_", (char *)&(ref->_host) - (char *)ref); - g_table_services->addColumns(table, "current_service_", (char *)&(ref->_service) - (char *)ref, false /* no hosts table */); + TableServices::addColumns(table, "current_service_", (char *)&(ref->_service) - (char *)ref, false /* no hosts table */); } LogEntry *TableStateHistory::getPreviousLogentry()

8 years, 8 months

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016