Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Simon Betz

Module: check_mk Branch: master Commit: e3a53d31121eb0ea4fa61ac77f6b45e0165db1e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3a53d31121eb0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Nov 25 15:45:08 2016 +0100 4095 new filter host auxiliary tags --- .werks/4095 | 9 +++++++ ChangeLog | 1 + web/plugins/visuals/filters.py | 57 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/.werks/4095 b/.werks/4095 new file mode 100644 index 0000000..71087e0 --- /dev/null +++ b/.werks/4095 @@ -0,0 +1,9 @@ +Title: new filter host auxiliary tags +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i3 +Date: 1480085074 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a023526..fe41b15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ Multisite: * 4070 Added a painter for the service check period + * 4095 new filter host auxiliary tags * 3974 FIX: Sorting comments in hover menu of comments icon by time now * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... * 4046 FIX: Repaired html rendering.... diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 23c685d..f360a17 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1158,6 +1158,63 @@ class FilterHostTags(Filter): declare_filter(302, FilterHostTags()) + +class FilterHostAuxTags(Filter): + def __init__(self): + self.count = 3 + self.prefix = 'host_auxtags' + htmlvars = [ "%s_%d" % (self.prefix, num) + for num in range(self.count) ] + + Filter.__init__(self, + name = 'host_auxtags', + title = _('Host Auxiliary Tags'), + info = 'host', + htmlvars = htmlvars, + link_columns = [] + ) + + self.auxtags = config.wato_aux_tags + + + def display(self): + selection = [] + for num in range(self.count): + html.sorted_select( '%s_%d' % (self.prefix, num), + [("", "")] + self.auxtags ) + + + def host_auxtags_filter(self, tag): + return "Filter: custom_variables ~ TAGS (^|[ ])%s($|[ ])" % lqencode(tag) + + + def filter(self, infoname): + headers = [] + + # Do not restrict to a certain number, because we'd like to link to this + # via an URL, e.g. from the virtual host tree snapin + num = 0 + while html.has_var( '%s_%d' % (self.prefix, num) ): + this_tag = html.var( '%s_%d' % (self.prefix, num) ) + if this_tag: + headers.append( self.host_auxtags_filter( this_tag ) ) + num += 1 + + if headers: + return '\n'.join(headers) + '\n' + else: + return '' + + + def double_height(self): + return True + + + +declare_filter(302, FilterHostAuxTags()) + + + class FilterStarred(FilterTristate): def __init__(self, what): self.what = what

7 years, 10 months

4072 FIX Fixed multiple issues in BI availability when groups or names contain umlauts

by Lars Michelsen

Module: check_mk Branch: master Commit: ba5ff43bfe445678144fc40c1efa506d621882fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba5ff43bfe4456… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 25 15:24:16 2016 +0100 4072 FIX Fixed multiple issues in BI availability when groups or names contain umlauts --- .werks/4072 | 10 ++++++++++ ChangeLog | 3 ++- web/htdocs/htmllib.py | 4 ++-- web/htdocs/visuals.py | 12 ++++++++++++ web/plugins/visuals/bi.py | 8 ++++---- web/plugins/visuals/infos.py | 4 ++-- 6 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.werks/4072 b/.werks/4072 new file mode 100644 index 0000000..11c3236 --- /dev/null +++ b/.werks/4072 @@ -0,0 +1,10 @@ +Title: Fixed multiple issues in BI availability when groups or names contain umlauts +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480083735 + + diff --git a/ChangeLog b/ChangeLog index 0df8445..a023526 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,7 +23,7 @@ * 3751 FIX: jolokia_metrics: Discovery no longer crashes in case of error querying instance * 4088 FIX: ntp: fixed incomplete data handling * 4090 FIX: apc_rackpdu_power, apc_symmetra, apc_symmetra_input, apc_symmetra_output: some fixes... - * 4091 FIX: oracle_tablespace: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces + * 4091 FIX: oracle_tablespaces: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces * 4069 FIX: cmciii.phase: Fixed broken check with some devices... * 4092 FIX: if.include: fixed wrong calculated number of interfaces which are up in case of interface groups * 4093 FIX: oracle_tablespaces: Werk 3907 broke the space calculation... @@ -37,6 +37,7 @@ * 3980 FIX: Fixed possible flickering GUI when using Chrome and zooming the page * 3981 FIX: Views: Fixed context button displaying depending on usage * 4071 FIX: Removed notes_url from "LOG *" logwatch services... + * 4072 FIX: Fixed multiple issues in BI availability when groups or names contain umlauts WATO: * 3984 Permissions can now be filtered by providing a search term on the "edit role" page... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a74d3ad..97e6c0b 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1661,10 +1661,10 @@ class html(DeprecationWrapper): value = self.vars.get(var, "") self.hidden_field(var, value) else: # add *all* get variables, that are not set by any input! - for var, value in self.vars.items(): + for var in self.vars: if var not in self.form_vars and \ (var[0] != "_" or add_action_vars): # and var != "filled_in": - self.hidden_field(var, value) + self.hidden_field(var, self.get_unicode_input(var)) def hidden_field(self, *args, **kwargs): diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 96f38f4..e903a6e 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -933,6 +933,18 @@ class Filter: for varname in self.htmlvars: html.set_var(varname, value.get(varname)) + + +# TODO: We should merge this with Filter() and make all vars unicode ... +class FilterUnicodeFilter(Filter): + def value(self): + val = {} + for varname in self.htmlvars: + val[varname] = html.get_unicode_input(varname, '') + return val + + + def get_filter(name): return multisite_filters[name] diff --git a/web/plugins/visuals/bi.py b/web/plugins/visuals/bi.py index e5fd8c5..9028710 100644 --- a/web/plugins/visuals/bi.py +++ b/web/plugins/visuals/bi.py @@ -26,10 +26,10 @@ import bi -class BIGroupFilter(Filter): +class BIGroupFilter(FilterUnicodeFilter): def __init__(self): self.column = "aggr_group" - Filter.__init__(self, self.column, _("Aggregation group"), "aggr", [self.column], [self.column]) + FilterUnicodeFilter.__init__(self, self.column, _("Aggregation group"), "aggr", [self.column], [self.column]) def variable_settings(self, row): return [ (self.htmlvars[0], row[self.column]) ] @@ -54,7 +54,7 @@ class BIGroupFilter(Filter): declare_filter( 90, BIGroupFilter()) # how is either "regex" or "exact" -class BITextFilter(Filter): +class BITextFilter(FilterUnicodeFilter): def __init__(self, what, how="regex", suffix=""): self.how = how self.column = "aggr_" + what @@ -65,7 +65,7 @@ class BITextFilter(Filter): label = _('Aggregation output') if how == "exact": label += _(" (exact match)") - Filter.__init__(self, self.column + suffix, + FilterUnicodeFilter.__init__(self, self.column + suffix, label, "aggr", [self.column + suffix], [self.column]) def variable_settings(self, row): diff --git a/web/plugins/visuals/infos.py b/web/plugins/visuals/infos.py index 3504805..6fea49b 100644 --- a/web/plugins/visuals/infos.py +++ b/web/plugins/visuals/infos.py @@ -116,7 +116,7 @@ infos['aggr'] = { 'title' : _('BI Aggregation'), 'title_plural': _('BI Aggregations'), 'single_spec' : [ - ('aggr_name', TextAscii( + ('aggr_name', TextUnicode( title = _('Aggregation Name'), )), ], @@ -126,7 +126,7 @@ infos['aggr_group'] = { 'title' : _('BI Aggregation Group'), 'title_plural': _('BI Aggregation Groups'), 'single_spec' : [ - ('aggr_group', TextAscii( + ('aggr_group', TextUnicode( title = _('Aggregation group'), )), ],

7 years, 10 months

Unbreak the build.

by Sven Panne

Module: check_mk Branch: master Commit: c048e7346ca84b53f07216b74e73d165bf491f78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c048e7346ca84b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 25 15:24:10 2016 +0100 Unbreak the build. --- livestatus/src/TableHosts.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index b15260a..c39ded6 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -641,11 +641,11 @@ void TableHosts::addColumns(Table *table, const string &prefix, table->addColumn(new HostFileColumn( prefix + "mk_inventory", "The file content content of the Check_MK HW/SW-Inventory", - g_mk_inventory_path, "", indirect_offset, extra_offset)); + g_mk_inventory_path, "", false, indirect_offset, extra_offset)); table->addColumn(new HostFileColumn( prefix + "mk_inventory_gz", "The gzipped file content content of the Check_MK HW/SW-Inventory", - g_mk_inventory_path, ".gz", indirect_offset, extra_offset)); + g_mk_inventory_path, ".gz", false, indirect_offset, extra_offset)); extern char g_mk_logwatch_path[]; table->addColumn(new LogwatchListColumn(

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 1f12e9d28a8f24cd019e985be9fa7853298e8366 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f12e9d28a8f24… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 25 13:47:16 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/AttributeListColumn.h | 5 --- livestatus/src/Column.h | 6 +-- .../src/DynamicEventConsoleReplicationColumn.cc | 2 + livestatus/src/DynamicLogwatchFileColumn.cc | 2 +- livestatus/src/HostFileColumn.cc | 6 ++- livestatus/src/HostFileColumn.h | 14 ++++--- livestatus/src/Query.cc | 47 +++++++++------------- livestatus/src/Query.h | 9 ++--- livestatus/src/StatsColumn.cc | 16 ++++---- livestatus/src/StatsColumn.h | 24 +++++------ 10 files changed, 59 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1f12e9d28a…

7 years, 10 months

completion to bugfix #3952

by Marcel Arentz

Module: check_mk Branch: master Commit: d4107ede20a7b7f00b67fd638ec16feb7f3518e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4107ede20a7b7… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Nov 25 14:59:02 2016 +0100 completion to bugfix #3952 --- checks/diskstat | 3 +++ 1 file changed, 3 insertions(+) diff --git a/checks/diskstat b/checks/diskstat index b2681d2..5f3d6e2 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -304,6 +304,9 @@ def diskstat_convert_info(parsed): # with multipath names like "SDataCoreSANsymphony_DAT07-fscl" if multipath_info: for uuid, multipath in multipath_info.items(): + if "alias" not in multipath: + multipath["alias"] = "" + if multipath["device"] in converted_disks or \ "DM %s" % multipath["alias"] in converted_disks: for path in multipath["paths"]:

7 years, 10 months

4071 FIX Removed notes_url from "LOG *" logwatch services

by Lars Michelsen

Module: check_mk Branch: master Commit: bbf9c97f4d2dd43df417fe9bbf6ac9306231146a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbf9c97f4d2dd4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 25 13:55:15 2016 +0100 4071 FIX Removed notes_url from "LOG *" logwatch services In previous versions of Check_MK we created hard coded "notes URLs" for all services. This was done to make the logwatch pages automatically linked from 3rd party GUIs like the good old Nagios CGIs. These days we do not recommend nor support such GUIs, so we decided to drop this pre-created notes url definition. The "advantage" is now that you can now create a custom notes URL for these services. --- .werks/4071 | 14 ++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 5 ----- modules/nagios.py | 10 ++-------- web/plugins/icons/builtin.py | 3 --- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.werks/4071 b/.werks/4071 new file mode 100644 index 0000000..371e687 --- /dev/null +++ b/.werks/4071 @@ -0,0 +1,14 @@ +Title: Removed notes_url from "LOG *" logwatch services +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i3 +Date: 1480078379 +Class: fix + +In previous versions of Check_MK we created hard coded "notes URLs" for all services. +This was done to make the logwatch pages automatically linked from 3rd party GUIs +like the good old Nagios CGIs. These days we do not recommend nor support such GUIs, +so we decided to drop this pre-created notes url definition. + +The "advantage" is now that you can now create a custom notes URL for these services. diff --git a/ChangeLog b/ChangeLog index e9f625b..0df8445 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 3938 FIX: tactical overview: fixed wrong display of number of host/service problems... * 3980 FIX: Fixed possible flickering GUI when using Chrome and zooming the page * 3981 FIX: Views: Fixed context button displaying depending on usage + * 4071 FIX: Removed notes_url from "LOG *" logwatch services... WATO: * 3984 Permissions can now be filtered by providing a search term on the "edit role" page... diff --git a/modules/check_mk.py b/modules/check_mk.py index ed2ba6a..173df00 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2994,11 +2994,6 @@ def replace_macros(s, macros): return s -def logwatch_notes_url(hostname, filename): - return "/%s/nagios/logwatch.php?host=%s&file=%s" % \ - (omd_site(), urllib.quote(hostname), urllib.quote(make_utf8(filename))) - - #. # .--Main Functions------------------------------------------------------. # | __ __ _ _____ _ _ | diff --git a/modules/nagios.py b/modules/nagios.py index 6afab0b..1effcc0 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -296,12 +296,6 @@ define servicedependency { else: template = passive_service_template - # Hardcoded for logwatch check: Link to logwatch.php - if checkname == "logwatch": - logwatch = " notes_url\t\t\t" + (logwatch_notes_url(hostname, item)) + "\n" - else: - logwatch = ""; - # Services Dependencies for dep in deps: outfile.write("define servicedependency {\n" @@ -345,10 +339,10 @@ define servicedependency { host_name\t\t\t%s service_description\t\t%s check_interval\t\t%d -%s%s%s check_command\t\t\tcheck_mk-%s +%s%s check_command\t\t\tcheck_mk-%s } -""" % ( template, hostname, description.encode("utf-8"), check_interval, logwatch, +""" % ( template, hostname, description.encode("utf-8"), check_interval, extra_service_conf_of(hostname, description), action_cfg, checkname )) checknames_to_define.add(checkname) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 284f02e..42e2b30 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -492,9 +492,6 @@ def paint_notes(what, row, tags, host_custom_vars): if display_options.enabled(display_options.X): notes_url = row[what + "_notes_url_expanded"] check_command = row[what + "_check_command"] - if check_command == 'check_mk-logwatch' and \ - "check_mk/logwatch.py?host" in notes_url: - return # Ancient logwatch URL via notes_url. Ignore in order to avoid duplicate icon if notes_url: return 'notes', _('Custom Notes'), notes_url

7 years, 10 months

fixed werk text

by Simon Betz

Module: check_mk Branch: master Commit: 99eb9bc83f75c5d75b0c4680bfb26b225285bf29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99eb9bc83f75c5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Nov 25 13:26:04 2016 +0100 fixed werk text --- .werks/4091 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4091 b/.werks/4091 index eafa5a3..5bed8cb 100644 --- a/.werks/4091 +++ b/.werks/4091 @@ -1,4 +1,4 @@ -Title: oracle_tablespace: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces +Title: oracle_tablespaces: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces Level: 1 Component: checks Class: fix

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 523b6a9ce99fcc88c1fa8b08c7e060c9319ccf3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=523b6a9ce99fcc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 25 10:30:00 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/Column.cc | 4 ++ livestatus/src/Column.h | 2 + livestatus/src/DoubleColumn.cc | 13 +++-- livestatus/src/DoubleColumn.h | 2 + livestatus/src/IntColumn.cc | 9 +++- livestatus/src/IntColumn.h | 2 + livestatus/src/Makefile.am | 3 +- livestatus/src/OffsetPerfdataColumn.cc | 30 +++++++++++ livestatus/src/OffsetPerfdataColumn.h | 44 ++++++++++++++++ livestatus/src/OffsetTimeColumn.cc | 21 +++----- livestatus/src/OffsetTimeColumn.h | 33 +++++------- livestatus/src/StatsColumn.cc | 23 ++------- livestatus/src/TableComments.cc | 6 ++- livestatus/src/TableDowntimes.cc | 9 ++-- livestatus/src/TableEventConsole.h | 6 +-- livestatus/src/TableHosts.cc | 3 +- livestatus/src/TableLog.cc | 8 +-- livestatus/src/TableServices.cc | 38 +++++++------- livestatus/src/TableStateHistory.cc | 6 +-- .../src/{TimePointerColumn.cc => TimeColumn.cc} | 14 +++-- livestatus/src/TimeColumn.h | 59 ++++++++++++++++++++++ livestatus/src/TimePointerColumn.h | 17 ++++--- livestatus/src/strutil.cc | 7 --- livestatus/src/strutil.h | 1 - 24 files changed, 246 insertions(+), 114 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=523b6a9ce9…

7 years, 10 months

4094 apc_rackpdu_power: now detects all phases or banks connected to this pdu

by Simon Betz

Module: check_mk Branch: master Commit: 207de96260f436938822fd64a50d8c264b19b1bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=207de96260f436… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Nov 25 11:37:03 2016 +0100 4094 apc_rackpdu_power: now detects all phases or banks connected to this pdu --- .werks/4094 | 9 ++++++ ChangeLog | 2 ++ checks/apc_rackpdu_power | 76 ++++++++++++++++++++++++++++++++++++------------ 3 files changed, 68 insertions(+), 19 deletions(-) diff --git a/.werks/4094 b/.werks/4094 new file mode 100644 index 0000000..8b1b1da --- /dev/null +++ b/.werks/4094 @@ -0,0 +1,9 @@ +Title: apc_rackpdu_power: now detects all phases or banks connected to this pdu +Level: 1 +Component: checks +Compatible: incomp +Version: 1.4.0i3 +Date: 1480070189 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d1afcaa..e9f625b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ * 4087 netgear_fans, netgear_powersupplies, netgear_temp: new checks for Netgear Switches which support the FASTPATH-BOXSERVICES-PRIVATE MIB * 4089 oracle_tablespaces: file online states are now configurable if size info is available * 4096 avaya_chassis_card, avaya_chassis_ps, avaya_chassis_temp: New checks for Avaya devices... + * 4094 apc_rackpdu_power: now detects all phases or banks connected to this pdu + NOTE: Please refer to the migration notes! * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... diff --git a/checks/apc_rackpdu_power b/checks/apc_rackpdu_power index bfce1c7..99e2be1 100644 --- a/checks/apc_rackpdu_power +++ b/checks/apc_rackpdu_power @@ -24,27 +24,59 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Originally written / contributed by Dave Cundiff # .1.3.6.1.4.1.318.1.1.12.1.1.0 "sf9pdu1" --> PowerNet-MIB::rPDUIdentName.0 -# .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 160 --> PowerNet-MIB::rPDULoadStatusLoad.1 (measured in tenths of Amps) -# .1.3.6.1.4.1.318.1.1.12.2.2.1.1.3.1 12 --> PowerNet-MIB::rPDULoadPhaseConfigNearOverloadThreshold.phase1 -# .1.3.6.1.4.1.318.1.1.12.2.2.1.1.4.1 16 --> PowerNet-MIB::rPDULoadPhaseConfigOverloadThreshold.phase1 +# .1.3.6.1.4.1.318.1.1.12.1.9.0 1 --> PowerNet-MIB::rPDUIdentDeviceNumPhases.0 +# .1.3.6.1.4.1.318.1.1.12.1.16.0 0 --> PowerNet-MIB::rPDUIdentDevicePowerWatts.0 +# .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 160 --> PowerNet-MIB::rPDULoadStatusLoad.1 (measured in tenths of Amps) +# .1.3.6.1.4.1.318.1.1.12.2.3.1.1.3.1 1 --> PowerNet-MIB::rPDULoadStatusLoadState.1 + +# .1.3.6.1.4.1.318.1.1.12.1.1.0 FOOBAR --> PowerNet-MIB::rPDUIdentName.0 +# .1.3.6.1.4.1.318.1.1.12.1.9.0 1 --> PowerNet-MIB::rPDUIdentDeviceNumPhases.0$ +# .1.3.6.1.4.1.318.1.1.12.1.16.0 1587 --> PowerNet-MIB::rPDUIdentDevicePowerWatts.0 +# .1.3.6.1.4.1.318.1.1.12.2.1.4.0 2 --> PowerNet-MIB::rPDULoadDevNumBanks.0 +# .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 0 --> PowerNet-MIB::rPDULoadStatusLoad.1 +# .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.2 0 --> PowerNet-MIB::rPDULoadStatusLoad.2 +# .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.3 0 --> PowerNet-MIB::rPDULoadStatusLoad.3 +# .1.3.6.1.4.1.318.1.1.12.2.3.1.1.3.1 1 --> PowerNet-MIB::rPDULoadStatusLoadStates.1 +# .1.3.6.1.4.1.318.1.1.12.2.3.1.1.3.2 1 --> PowerNet-MIB::rPDULoadStatusLoadStates.2 +# .1.3.6.1.4.1.318.1.1.12.2.3.1.1.3.3 1 --> PowerNet-MIB::rPDULoadStatusLoadStates.3 + + +# examples num phase/banks: 1/0, => parsed = device phase +# 1/2, => parsed = device phase + 2 banks +# 3/0 => parsed = device phase + 3 phases def parse_apc_rackpdu_power(info): + def get_status_info(amperage_str, device_state): + return float(amperage_str) / 10, { + "1" : (0, "load normal"), + "2" : (2, "load low"), + "3" : (1, "load near over load"), + "4" : (2, "load over load"), }[device_state] + parsed = {} - for host, amperage_str, warn, crit in info: - amperage = float(amperage_str) / 10 + device_info, bank_info, phase_info = info + pdu_ident_name, power_str = device_info[0] + device_name = "Device %s" % pdu_ident_name + + parsed.setdefault( device_name, { "power" : float(power_str) } ) + + if len(device_info) == len(phase_info): + parsed[device_name]["current"] = get_status_info(*phase_info[0][1:]) + return parsed - if crit != "" and amperage >= int(crit): - status_info = (amperage, (2, "crit exceeded")) - elif warn != "" and amperage >= int(warn): - status_info = (amperage, (1, "warn exceeded")) - else: - status_info = amperage + if int(bank_info[0][0]): + parsed[device_name]["current"] = get_status_info(*phase_info[0][1:]) + phase_info = phase_info[1:] + name_part = "Bank" + else: + name_part = "Phase" - parsed.setdefault(host, {"current" : status_info}) + for oid_end, amperage_str, device_state in phase_info: + parsed.setdefault( "%s %s" % (name_part, oid_end), + { "current" : get_status_info( amperage_str, device_state ) } ) return parsed @@ -55,12 +87,18 @@ check_info["apc_rackpdu_power"] = { 'check_function' : check_elphase, 'service_description' : 'PDU %s', 'has_perfdata' : True, - 'snmp_info' : ('.1.3.6.1.4.1.318.1.1.12', [ - '1.1.0', # PowerNet-MIB::rPDUIdentName - '2.3.1.1.2.1', # PowerNet-MIB::rPDULoadStatusLoad - '2.2.1.1.3.1', # PowerNet-MIB::rPDULoadPhaseConfigNearOverloadThreshold - '2.2.1.1.4.1', # PowerNet-MIB::rPDULoadPhaseConfigOverloadThreshold - ]), + 'snmp_info' : [('.1.3.6.1.4.1.318.1.1.12.1', [ + '1', # PowerNet-MIB::rPDUIdentName + '16', # PowerNet-MIB::rPDUIdentDevicePowerWatts + ]), + ('.1.3.6.1.4.1.318.1.1.12.2.1', [ + '4', # PowerNet-MIB::rPDULoadDevNumBanks + ]), + ('.1.3.6.1.4.1.318.1.1.12.2.3.1.1', [ + OID_END, + '2', # PowerNet-MIB::rPDULoadStatusLoad + '3', # PowerNet-MIB::rPDULoadStatusLoadState + ])], 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("apc web/snmp") and \ oid(".1.3.6.1.4.1.318.1.1.12.1.1.0"), 'group' : 'el_inphase',

7 years, 10 months

Reserved 10 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7608768f2075bcbfc50c2cf5dc47f706cac33bf3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7608768f2075bc… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 25 11:27:07 2016 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 801c306..39604ea 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4096 +4106

7 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016