Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

5490 ra32e_power, ra32e_sensors, ra32e_sensors.heatindex,

by Tom Baerwinkel

ra32e_sensors.humidity, ra32e_sensors.power, ra32e_sensors.voltage, ra32e_switch: new checks to monitor AVTECH Room Alert 32E devices Message-ID: <5a9d0725.fNBcNilAJys8lJ2M%tb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 3cd1ef2dbd54ce720fb2db62df4f8bfbf3e813a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cd1ef2dbd54ce… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jan 18 18:26:05 2018 +0100 5490 ra32e_power, ra32e_sensors, ra32e_sensors.heatindex, ra32e_sensors.humidity, ra32e_sensors.power, ra32e_sensors.voltage, ra32e_switch: new checks to monitor AVTECH Room Alert 32E devices Change-Id: Ief51995f1d2acd17e7831e38b44705f9e769bb90 --- .werks/5490 | 10 ++ checkman/ra32e_power | 17 +++ checkman/ra32e_sensors | 21 +++ checkman/ra32e_sensors.heatindex | 21 +++ checkman/ra32e_sensors.humidity | 21 +++ checkman/ra32e_sensors.power | 18 +++ checkman/ra32e_sensors.voltage | 17 +++ checkman/ra32e_switch | 17 +++ checks/ra32e_power | 52 +++++++ checks/ra32e_sensors | 254 +++++++++++++++++++++++++++++++ checks/ra32e_switch | 55 +++++++ checks/temperature.include | 4 +- tests/checks/test_ra32e_power_check.py | 40 +++++ tests/checks/test_ra32e_sensors_check.py | 101 ++++++++++++ tests/checks/test_ra32e_switch_check.py | 48 ++++++ 15 files changed, 694 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3cd1ef2dbd…

6 years, 3 months

Extend already existing enum class instead of fiddling around with strings.

by Sven Panne

Module: check_mk Branch: master Commit: ae2e68e2794aec78916f354674a35f7018c60363 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae2e68e2794aec… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 5 09:11:09 2018 +0100 Extend already existing enum class instead of fiddling around with strings. More concise, more type-safe and even more efficient. Change-Id: I7012873878eb1cf312280ec7466111f89b481a22 --- livestatus/src/AndingFilter.cc | 8 +++--- livestatus/src/AndingFilter.h | 9 +++---- livestatus/src/Filter.cc | 37 +++++++++++++++++++++++++++ livestatus/src/Filter.h | 13 ++++++++++ livestatus/src/OringFilter.cc | 8 +++--- livestatus/src/OringFilter.h | 9 +++---- livestatus/src/Query.cc | 57 ++++++++++++++++++------------------------ livestatus/src/Query.h | 12 +++------ livestatus/src/StatsColumn.cc | 3 ++- 9 files changed, 92 insertions(+), 64 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ae2e68e279…

6 years, 3 months

clang-formatted.

by Sven Panne

Module: check_mk Branch: master Commit: 561c8203770df140d257db0d7da4f46186728b5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=561c8203770df1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 5 09:33:13 2018 +0100 clang-formatted. Change-Id: Ic44e1febaa7ae29863832a795844948a23018565 --- agents/windows/Environment.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/agents/windows/Environment.h b/agents/windows/Environment.h index c1aa0bd..79f942f 100644 --- a/agents/windows/Environment.h +++ b/agents/windows/Environment.h @@ -55,10 +55,16 @@ public: virtual std::string logDirectory() const { return _log_directory; } virtual std::string binDirectory() const { return _bin_directory; } - virtual std::string logwatchStatefile() const { return _logwatch_statefile; } - virtual std::string eventlogStatefile() const { return _eventlog_statefile; } - - virtual const JobHandle<0> &workersJobObject() const { return _workers_job_object; } + virtual std::string logwatchStatefile() const { + return _logwatch_statefile; + } + virtual std::string eventlogStatefile() const { + return _eventlog_statefile; + } + + virtual const JobHandle<0> &workersJobObject() const { + return _workers_job_object; + } virtual bool withStderr() const { return _with_stderr; }

6 years, 3 months

5744 Export of rule packs in MKP packages

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1c4a365308b012806808fc21ac251f20ec204b34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c4a365308b012… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Feb 26 09:19:23 2018 +0100 5744 Export of rule packs in MKP packages Rule packs of the Event Console can now be exported in MKP packages, i.e. they can be downloaded, versioned, and shared with other Check_MK installations. This is e.g. useful in setups with independent instances where rule packs can now be defined centrally in one instance and distributed to other instances as predefined packages. For distributed instances the primary mechanism to synchronize rule packs remains the synchronization via WATO. To export a rule pack it has to be made exportable by clicking on the corresponding action in the rule pack overview of the WATO module Event Console. After that the rule pack is available for MKP export in the WATO module Extension Packages, i.e. it can be seen in the packaged files when a package is created or edited. If a rule pack is exported in a MKP it cannot be deleted directly in the WATO module Event Console anymore and it's ID and title cannot be changed. The rules of the rule pack can still be modified via the edit rules menu. If a rule of a MKP rule pack is modified, deleted or a new rule is created the MKP rule pack becomes a modified MKP rule pack. This means that the modified version of the rule pack becomes valid, but the exported MKP rule pack remains unchanged. To synchronize the MKP rule pack with the modified MKP rule pack there are two options: the modified rule pack can be resetted to the MKP version or the MKP can be updated by the modified version. Both options are available via the corresponding action of the rule pack in the WATO module Event Console. If a MKP including Event Console rule packs is uploaded to a site the included rule packs will be added to the end of the existing rule packs. They can be moved freely between the existing rule packs without changing the MKP. Furthermore, rule packs provided in a MKP can be enabled and disabled without restrictions. Note however that the information if a rule pack is enabled or disabled is persisted in the MKP. This makes it possible to ship e.g. three rule packs for different versions of a software which are disabled by default. After uploading the MKP the rule pack for a specific version can be activated. If a MKP with exported rule packs is deleted the rule packs provided by that MKP are deleted as well. To keel the rule packs and to remove the MKP the MKP has to be dissolved. As a result the rule packs that were provided by that MKP are still available. After dissolving a MKP the rule packs will be exportable. In a distributed monitoring setup there are the two existing options "Replicate Event Console configuration to this site" and "Replicate extensions (MKPs and files in ~/local/)" which have an impact on exportable and exported rule packs. By enabling the replication of the event console configuration all Event Console rule packs are synchronized with slave sites, but only by enabling the replication of MKPs the MKP information of rule packs is synchronized. This has an implication on the representation and behaviour of rule packs of a slave sites if the WATO configuration of the slave site is enabled. If for example only the replication of the event console configuration is enabled the slave site will show a synchronized MKP rule pack as exportable but not as a rule pack provided by a MKP. Therefore, rule packs can be provided by the master and bundled in MKPs by the slave site. If the rule pack export is used it is not advisable to use the MKP replication without the replication of the Event Console configuration because the rule packs are provided to the slave in .mk files, but they WILL NOT be recognized by the Event Console. The preferred method to share only specific rule packs is to disable both replication options and to upload MKPs containing these rule packs to the corresponding slave sites. To avoid errors in a distributed monitoring setup the rule pack export SHOULD only be used when ALL slave sites support the MKP rule pack export. If a slave site does not support the rule pack export either the replication of the Event Console configuration should be disabled for that site or the export of rule packs should not be used at all. Change-Id: Idd415c7025dcb5c58803946782c337fb6b5e5a7d --- .werks/5744 | 69 +++++ bin/mkeventd | 37 ++- cmk/{event_console.py => ec/defaults.py} | 20 +- cmk/ec/export.py | 373 ++++++++++++++++++++++++ cmk_base/packaging.py | 83 ++++-- web/htdocs/images/button_cached.png | Bin 0 -> 3246 bytes web/htdocs/images/button_release_mkp.png | Bin 0 -> 4096 bytes web/htdocs/images/button_release_mkp_yellow.png | Bin 0 -> 3813 bytes web/htdocs/images/button_sync_mkp.png | Bin 0 -> 3994 bytes web/htdocs/images/icon_mkps.png | Bin 0 -> 3487 bytes web/htdocs/images/icon_new_mkp.png | Bin 0 -> 4046 bytes web/htdocs/images/icon_release_mkp.png | Bin 0 -> 4096 bytes web/htdocs/mkeventd.py | 35 ++- web/htdocs/valuespec.py | 11 +- web/htdocs/watolib.py | 21 +- web/plugins/wato/mkeventd.py | 304 ++++++++++++------- 16 files changed, 776 insertions(+), 177 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1c4a365308…

6 years, 3 months

Moved gitbugs away

by Lars Michelsen

6 years, 3 months

5878 FIX Fixes sorting of host tag groups

by Lars Michelsen

Module: check_mk Branch: master Commit: 304905a9d300e18e1b1f752a8be578da9bf28aec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=304905a9d300e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 07:33:58 2018 +0100 5878 FIX Fixes sorting of host tag groups The sorting of the WATO host tags was broken in the 1.5 releases. Change-Id: I51b63447648986c12123b1a103aad70813f467ed --- .werks/5878 | 10 ++++++++++ web/htdocs/wato.py | 19 ++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.werks/5878 b/.werks/5878 new file mode 100644 index 0000000..5488573 --- /dev/null +++ b/.werks/5878 @@ -0,0 +1,10 @@ +Title: Fixes sorting of host tag groups +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520231638 +Class: fix + +The sorting of the WATO host tags was broken in the 1.5 releases. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 76b4529..47e29c4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11802,7 +11802,6 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): def __init__(self): super(ModeHostTags, self).__init__() self._hosttags, self._auxtags = self._load_hosttags() - self._effective_tag_groups = watolib.get_effective_tag_groups(self._hosttags) def title(self): @@ -11931,11 +11930,13 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): empty_text = _("You haven't defined any tag groups yet."), searchable = False, sortable = False) - if not self._effective_tag_groups: + effective_tag_groups = self._get_effective_tag_groups() + + if not effective_tag_groups: table.end() return - for nr, entry in enumerate(self._effective_tag_groups): + for nr, entry in enumerate(effective_tag_groups): tag_id, title, choices = entry[:3] # fourth: tag dependency information topic, title = map(_u, watolib.parse_hosttag_title(title)) table.row() @@ -11950,11 +11951,14 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): else: html.icon_button(make_action_link([("mode", "hosttags"), ("_move", str(-nr))]), _("Move this tag group one position up"), "up") - if nr == len(self._effective_tag_groups) - 1: + + if nr == len(effective_tag_groups) - 1 \ + or watolib.is_builtin_host_tag_group(effective_tag_groups[nr+1][0]): html.empty_icon_button() else: html.icon_button(make_action_link([("mode", "hosttags"), ("_move", str(nr))]), _("Move this tag group one position down"), "down") + html.icon_button(edit_url, _("Edit this tag group"), "edit") html.icon_button(delete_url, _("Delete this tag group"), "delete") @@ -11980,6 +11984,7 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): searchable = False) aux_tags = watolib.get_effective_aux_tags(self._auxtags) + effective_tag_groups = self._get_effective_tag_groups() if not aux_tags: table.end() @@ -12001,10 +12006,14 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): table.text_cell(_("Title"), _u(title)) table.text_cell(_("Topic"), _u(topic) or '') table.text_cell(_("Tags using this auxiliary tag"), - ", ".join(self._get_tags_using_aux_tag(self._effective_tag_groups, tag_id))) + ", ".join(self._get_tags_using_aux_tag(effective_tag_groups, tag_id))) table.end() + def _get_effective_tag_groups(self): + return watolib.get_effective_tag_groups(self._hosttags) + + def _get_tags_using_aux_tag(self, tag_groups, aux_tag): used_tags = set() for tag_def in tag_groups:

6 years, 3 months

Removed long deprecated summary host related code

by Lars Michelsen

Module: check_mk Branch: master Commit: 73a427e4ecbf4409eb7753ad1fd885e165af8aa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73a427e4ecbf44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 2 16:01:26 2018 +0100 Removed long deprecated summary host related code Change-Id: I0509559e60c7ccb46f0d6e4f131b8688f2801bc9 --- web/htdocs/bi.py | 4 +--- web/plugins/icons/builtin.py | 23 ----------------------- web/plugins/sidebar/shipped.py | 22 ++-------------------- web/plugins/visuals/filters.py | 5 ----- 4 files changed, 3 insertions(+), 51 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 56344b6..4b1b786 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -138,7 +138,7 @@ def load_services(only_hosts): g_services_by_hostname = {} # Create optional host filter - filter_txt = 'Filter: custom_variable_names < _REALNAME\n' # drop summary hosts + filter_txt = '' if only_hosts: # Only fetch the requested hosts host_filter = [] @@ -685,7 +685,6 @@ class BISitedataManager(object): def _query_data(self, only_sites): - filter_txt = 'Filter: custom_variable_names < _REALNAME\n' # drop summary hosts try: sites.live().set_only_sites(only_sites) sites.live().set_prepend_site(True) @@ -693,7 +692,6 @@ class BISitedataManager(object): data = sites.live().query( "GET hosts\n" - +filter_txt+ "Columns: name custom_variable_names custom_variable_values " "services childs parents alias\n" "Cache: reload\n" diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 9c3d10d..e95dd7f 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -264,29 +264,6 @@ multisite_icons_and_actions['status_acknowledged'] = { } #. -# .--Real-Host-----------------------------------------------------------. -# | ____ _ _ _ _ | -# | | _ \ ___ __ _| | | | | | ___ ___| |_ | -# | | |_) / _ \/ _` | |_____| |_| |/ _ \/ __| __| | -# | | _ < __/ (_| | |_____| _ | (_) \__ \ |_ | -# | |_| \_\___|\__,_|_| |_| |_|\___/|___/\__| | -# | | -# +----------------------------------------------------------------------+ -# | | -# '----------------------------------------------------------------------' - -def paint_realhost_link_image(what, row, tags, host_custom_vars): - # Link to detail host if this is a summary host - if "_REALNAME" in host_custom_vars: - newrow = row.copy() - newrow["host_name"] = host_custom_vars["_REALNAME"] - return 'detail', _("Detailed host infos"), url_to_view(newrow, 'host') - -multisite_icons_and_actions['realhost'] = { - 'paint': paint_realhost_link_image, -} - -#. # .--Perfgraph-----------------------------------------------------------. # | ____ __ _ | # | | _ \ ___ _ __ / _| __ _ _ __ __ _ _ __ | |__ | diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 20cc2e2..8dc45bd 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -281,11 +281,6 @@ def render_hosts(mode): query = "GET hosts\nColumns: name state worst_service_state\nLimit: 100\n" view = "host" - if mode == "summary": - query += "Filter: custom_variable_names >= _REALNAME\n" - else: - query += "Filter: custom_variable_names < _REALNAME\n" - if mode == "problems": view = "problemsofhost" # Exclude hosts and services in downtime @@ -358,16 +353,6 @@ sidebar_snapins["hosts"] = { "styles" : snapin_allhosts_styles, } -sidebar_snapins["summary_hosts"] = { - "title" : _("Summary Hosts"), - "description" : _("A summary state of all summary hosts (summary hosts hold " - "aggregated service states and are a feature of Check_MK)"), - "render" : lambda: render_hosts("summary"), - "allowed" : [], - "refresh" : True, - "styles" : snapin_allhosts_styles, -} - sidebar_snapins["problem_hosts"] = { "title" : _("Problem Hosts"), "description" : _("A summary state of all hosts that have a problem, with " @@ -392,7 +377,6 @@ def render_hostmatrix(): sites.live().set_prepend_site(True) query = "GET hosts\n" \ "Columns: name state has_been_checked worst_service_state scheduled_downtime_depth\n" \ - "Filter: custom_variable_names < _REALNAME\n" \ "Limit: 901\n" hosts = sites.live().query(query) sites.live().set_prepend_site(False) @@ -590,8 +574,7 @@ def get_tactical_overview_data(extra_filter_headers): "Stats: host_staleness >= %s\n" % configured_staleness_threshold + \ "Stats: host_scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n" \ - "Filter: custom_variable_names < _REALNAME\n" + \ - extra_filter_headers + + extra_filter_headers service_query = \ "GET services\n" \ @@ -611,8 +594,7 @@ def get_tactical_overview_data(extra_filter_headers): "Stats: host_scheduled_downtime_depth = 0\n" \ "Stats: service_scheduled_downtime_depth = 0\n" \ "StatsAnd: 3\n" \ - "Filter: host_custom_variable_names < _REALNAME\n" + \ - extra_filter_headers + + extra_filter_headers # In case the user is not allowed to see unrelated events ec_filters = "" diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index f31cc59..3002855 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -682,11 +682,6 @@ class FilterNagiosExpression(FilterTristate): def filter_code(self, infoname, positive): return positive and self.pos or self.neg - -declare_filter(120, FilterNagiosExpression("host", "summary_host", _("Is summary host"), - "Filter: host_custom_variable_names >= _REALNAME\n", - "Filter: host_custom_variable_names < _REALNAME\n")) - declare_filter(250, FilterNagiosFlag("service", "service_process_performance_data", _("Processes performance data"))) declare_filter(251, FilterNagiosExpression("service", "has_performance_data", _("Has performance data"), "Filter: service_perf_data != \n",

6 years, 3 months

Minor cleanup; Added color info

by Simon Betz

Module: check_mk Branch: master Commit: bd579e8b34ec71db0359ea450ba24f7a7d92b664 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd579e8b34ec71… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 5 07:55:56 2018 +0100 Minor cleanup; Added color info Change-Id: I888dbf60c4b2f037015590c8dc3dfd689ddc4c78 --- checks/printer_supply | 121 +++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/checks/printer_supply b/checks/printer_supply index a7dffd7..18e1686 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -66,16 +66,16 @@ check_config_variables.append("printer_supply_some_remaining_status") def printer_supply_fix_infos(info): colors = [] new_info = [] - for index, line in enumerate(info): - line_0 = line[0] # give chance for latin1->utf8 decoding + for index, (description, max_capacity, level, class_, color) in enumerate(info): + # give chance for latin1->utf8 decoding + line_0 = description # For toners or drum units add the color (if available) if line_0.startswith('Toner Cartridge') \ or line_0.startswith('Image Drum Unit'): - if line[4]: - colors += [ line[4] ] - color = line[4] - elif line[4] == '' and colors: + if color: + colors += [ color ] + elif color == '' and colors: color = colors[index - len(colors)] else: color = None @@ -85,24 +85,61 @@ def printer_supply_fix_infos(info): if " S/N:" in line_0: line_0 = line_0[:line_0.find(" S/N:")] - new_info.append([line_0] + line[1:]) + new_info.append([line_0, max_capacity, level, class_, color]) return new_info def inventory_printer_supply(info): # Ignore devices which show -2 for current value and -2 for max value -> useless # Also fix trailing zero bytes (seen on HP Jetdirect 143) - return [ (line[0].rstrip('\0'), {}) - for line in printer_supply_fix_infos(info) - if not (line[1] == '-2' and line[2] == '-2') and line[2] and len(line[1]) > 0 ] # ignore useless devices + return [(description.rstrip('\0'), {}) + for description, max_capacity, level, class_, color in printer_supply_fix_infos(info) + # ignore useless devices + if not (max_capacity == '-2' and level == '-2') and level and len(max_capacity) > 0 ] def check_printer_supply(item, params, info): - for line in printer_supply_fix_infos(info): - if line[0].rstrip('\0') == item: - maxlevel = int(line[1]) - current = saveint(line[2]) + if type(params) == tuple: + if len(params) == 2: + params = { "levels" : params } + else: + params = { + "levels" : params[:2], + "upturn_toner" : params[2], + } + + for description, max_capacity, level, class_, color in printer_supply_fix_infos(info): + if description.rstrip('\0') == item: + max_capacity = int(max_capacity) + level = saveint(level) + + color_info = "" + if color and color.lower() not in item.lower(): + color_info = "[%s] " % color + + # Assume 100% as maximum when 0 is reported + # Saw some toner cartridge reporting value=0 and max_capacity=0 on empty toner + if max_capacity == 0: + max_capacity = 100 + warn, crit = params["levels"] + perfdata = [("pages", level, warn / 100.0 * max_capacity, + crit / 100.0 * max_capacity, 0, max_capacity)] + + # handle cases with partial data + if max_capacity == -2 or level in [ -3, -2, -1 ]: # no percentage possible + if level == -1 or max_capacity == -1: + return 0, "%sThere are no restrictions on this supply" % color_info + elif level == -3: + return params.get("some_remaining", printer_supply_some_remaining_status),\ + "%sSome remaining" % color_info, perfdata + elif level == -2: + return 3, "%s Unknown level" % color_info + elif max_capacity == -2: + # no percentage possible. We compare directly against levels + return 0, "%sLevel: %d" % (color_info, level), [("pages", level)] + + leftperc = 100.0 * float(level) / max_capacity # When unit type is # 1 = other # 3 = supplyThatIsConsumed @@ -111,59 +148,23 @@ def check_printer_supply(item, params, info): # but when the remaining space if this supply is a receptacle # # This table can be missing on some devices. Assume type 3 in this case. - if line[3] == '': - unit_type = 3 - else: - unit_type = int(line[3]) - - if type(params) == tuple: - if len(params) == 2: - params = { "levels" : params } - else: - params = { - "levels" : params[:2], - "upturn_toner" : params[2], - } - - warn, crit = params["levels"] - upturn = params.get("upturn_toner", False) - - # Assume 100% as maximum when 0 is reported - # Saw some toner cartridge reporting value=0 and maxlevel=0 on empty toner - if maxlevel == 0: - maxlevel = 100 - - perfdata = [ ("pages", current, warn / 100.0 * maxlevel, crit / 100.0 * maxlevel, 0, maxlevel ) ] - - # handle cases with partial data - if maxlevel == -2 or current in [ -3, -2, -1 ]: # no percentage possible - if current == -1 or maxlevel == -1: - return (0, "there are no restrictions on this supply") - elif current == -3: - state = params.get("some_remaining", printer_supply_some_remaining_status) - return state, "Some remaining", perfdata - elif current == -2: - return (3, "current level is unknown") - elif maxlevel == -2: - # no percentage possible. We compare directly against levels - return (0, "current level is %d" % current, [("pages", current)]) - - leftperc = 100.0 * float(current) / maxlevel - - if unit_type == 4: + if class_ == '4': leftperc = 100 - leftperc + # Some printers handle the used / remaining material differently # With the upturn option we can toggle the point of view (again) - if upturn: + if params.get("upturn_toner", False): leftperc = 100 - leftperc - infotext = "%.0f%% (warn/crit at %.0f%% / %.0f%%)" % (leftperc, warn, crit) + infotext = "%sRemaining: %.0f%%" % (color_info, leftperc) + state = 0 if leftperc <= crit: - return (2, infotext, perfdata) + state = 2 elif leftperc <= warn: - return (1, infotext, perfdata) - else: - return (0, infotext, perfdata) + state = 1 + if state: + infotext += " (warn/crit at %.0f%%/%.0f%%)" % (warn, crit) + return state, infotext, perfdata check_info["printer_supply"] = {

6 years, 3 months

5739 mbg_lantime_ng_refclock.gps: support for more substates

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 951f207eace8beb2d386330a81fcf15c396fd2e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=951f207eace8be… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Feb 5 19:12:14 2018 +0100 5739 mbg_lantime_ng_refclock.gps: support for more substates Change-Id: I75aa360e17a651e28cf4f8e78d661f7a30eb799f --- .werks/5739 | 10 + checks/mbg_lantime_ng_refclock | 286 ++++++++++++++------------- tests/checks/checktestlib.py | 29 ++- tests/checks/test_mbg_lantime_ng_refclock.py | 61 ++++++ 4 files changed, 244 insertions(+), 142 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=951f207eac…

6 years, 4 months

5743 cisco_ip_sla: show source and target address in service output

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 95d9bcbb6fdecb3a60e2ff6b483f16fb35684c87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95d9bcbb6fdecb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Feb 23 17:31:46 2018 +0100 5743 cisco_ip_sla: show source and target address in service output Change-Id: I78ec09267864bba56842155927b190d171245c77 --- .werks/5743 | 10 ++++++++++ checks/cisco_ip_sla | 16 +++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.werks/5743 b/.werks/5743 new file mode 100644 index 0000000..6e52112 --- /dev/null +++ b/.werks/5743 @@ -0,0 +1,10 @@ +Title: cisco_ip_sla: show source and target address in service output +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519403476 +Class: feature + + diff --git a/checks/cisco_ip_sla b/checks/cisco_ip_sla index 9b4a5cb..5101919 100644 --- a/checks/cisco_ip_sla +++ b/checks/cisco_ip_sla @@ -38,7 +38,7 @@ factory_settings['cisco_ip_sla_default_levels'] = { def parse_cisco_ip_sla(info): # since the RTT Index, Owner and Tag don't have to be set we use # indices for the different items - precisions, info = info[0], info[1:] + precisions = [list_.pop() for list_ in info[0]] precisions = {str(i): 'ms' if p[0] == '1' else 'us' for i, p in enumerate(precisions)} @@ -90,8 +90,20 @@ def parse_cisco_ip_sla(info): '10': 'application specific error', } + def to_ip_address(int_list): + if len(int_list) == 4: + return '%d.%d.%d.%d' % tuple(int_list) + elif len(int_list) == 6: + return '%d:%d:%d:%d:%d:%d' % tuple(int_list) + else: + raise ValueError('Failed to convert %s to IP Address' % repr(int_list)) + #contains description, parse function, unit and type contents = [ + ( # rttMonEchoAdminEntry + ('Target address', to_ip_address, '', None), + ('Source address', to_ip_address, '', None), + ), ( # rttMonCtrlAdminEntry ('Owner', None, '', None), ('Tag', None, '', None), @@ -183,6 +195,8 @@ check_info['cisco_ip_sla'] = { '.1.3.6.1.4.1.9.1.2068', ], 'snmp_info': [('.1.3.6.1.4.1.9.9.42.1.2.2.1', [ + BINARY(2), # rttMonEchoAdminTargetAddress + BINARY(6), # rttMonEchoAdminSourceAddress # only needed to determine the unit (ms/us) 37, # rttMonEchoAdminPrecision ]),

6 years, 4 months

← Newer
1
...
26
27
28
29
30
31
32
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018