Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 8a2a80d9d4fd290d3aa5413c0d06ed84ef05acdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a2a80d9d4fd29… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 17 11:30:34 2018 +0100 Improved ignorance. Change-Id: I4ab841b55edbd4f4474b7ef2cc7e9900b98aec45 --- omd/packages/net-snmp/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/net-snmp/.gitignore b/omd/packages/net-snmp/.gitignore index eb57ae0..b1df7a5 100644 --- a/omd/packages/net-snmp/.gitignore +++ b/omd/packages/net-snmp/.gitignore @@ -1 +1 @@ -net-snmp-[0-9].[0-9].[0-9] +net-snmp-???????

6 years, 8 months

Bumped Boost version to 1.66.

by Sven Panne

Module: check_mk Branch: master Commit: cb9acbe7401ddf2b6517a85cff8eea2732ba408b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb9acbe7401ddf… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 17 11:12:15 2018 +0100 Bumped Boost version to 1.66. Change-Id: If02cc157c4568ec5a29bd6f93be0a24828280823 --- omd/packages/boost/Makefile | 2 +- .../{boost_1_64_0.tar.gz => boost_1_66_0.tar.gz} | Bin 95317845 -> 101669839 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/boost/Makefile b/omd/packages/boost/Makefile index 25a2667..de84fd4 100644 --- a/omd/packages/boost/Makefile +++ b/omd/packages/boost/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME := boost -VERSION := 1_64_0 +VERSION := 1_66_0 DIR := $(NAME)_$(VERSION) # For some obscure reason (GCC's dual ABI) we have to link all Boost stuff diff --git a/omd/packages/boost/boost_1_64_0.tar.gz b/omd/packages/boost/boost_1_66_0.tar.gz similarity index 82% rename from omd/packages/boost/boost_1_64_0.tar.gz rename to omd/packages/boost/boost_1_66_0.tar.gz index c0a7869..f0881e0 100644 Binary files a/omd/packages/boost/boost_1_64_0.tar.gz and b/omd/packages/boost/boost_1_66_0.tar.gz differ

6 years, 8 months

5486 Add permission for admins to see custom views and dashboards

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 7b27e65c1ea5b9a7da3e00ac46c20160cb14a20a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b27e65c1ea5b9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Jan 5 15:35:30 2018 +0100 5486 Add permission for admins to see custom views and dashboards Previously, admins could only see custom views, dashboards and reports of a user if the owner set the option "Make this view/dashboard/report available for other users". Now admins can see the views, dashboards and reports of all users. This also implies that admins are allowed to edit and clone these views. Change-Id: I4079adc1f960c5355ed4ca8e7d679049bbe7ad59 --- .werks/5486 | 13 +++++++++++++ web/htdocs/default_permissions.py | 7 +++++++ web/htdocs/visuals.py | 37 ++++++++++++++++++++----------------- 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/.werks/5486 b/.werks/5486 new file mode 100644 index 0000000..3872183 --- /dev/null +++ b/.werks/5486 @@ -0,0 +1,13 @@ +Title: Add permission for admins to see custom views, dashboards and reports +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1515161999 +Class: feature + +Previously, admins could only see custom views, dashboards and reports of a +user if the owner set the option "Make this view/dashboard/report available for +other users". Now admins can see the views, dashboards and reports of all +users. This also implies that admins are allowed to edit and clone these views. diff --git a/web/htdocs/default_permissions.py b/web/htdocs/default_permissions.py index fe89f56..4152535 100644 --- a/web/htdocs/default_permissions.py +++ b/web/htdocs/default_permissions.py @@ -38,6 +38,7 @@ loaded_with_language = False # | Declare general permissions for Multisite | # '----------------------------------------------------------------------' + def load_plugins(force): global loaded_with_language if loaded_with_language == current_language and not force: @@ -166,6 +167,7 @@ def load_plugins(force): loaded_with_language = current_language + # TODO: This has been obsoleted by pagetypes.py def declare_visual_permissions(what, what_plural): config.declare_permission("general.edit_" + what, @@ -188,6 +190,11 @@ def declare_visual_permissions(what, what_plural): _("Make own published %s override builtin %s for all users.") % (what_plural, what_plural), [ "admin" ]) + config.declare_permission("general.edit_foreign_" + what, + _("Edit foreign %s") % what_plural, + _("Allows to edit %s created by other users.") % what_plural, + [ "admin" ]) + config.declare_permission("general.delete_foreign_" + what, _("Delete foreign %s") % what_plural, _("Allows to delete %s created by other users.") % what_plural, diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 3efbccc..3fbf38e 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -268,7 +268,7 @@ def available(what, all_visuals): permprefix = what[:-1] def published_to_user(visual): - if visual["public"] == True: + if visual["public"] is True: return True if type(visual["public"]) == tuple and visual["public"][0] == "contact_groups": @@ -354,17 +354,17 @@ def page_list(what, title, visuals, custom_columns = None, # TODO: We hack in those visuals that already have been moved to pagetypes here if pagetypes.has_page_type("graph_collection"): - html.context_button(_("Graph Collections"), "graph_collections.py", "graph_collection") + html.context_button(_("Graph collections"), "graph_collections.py", "graph_collection") if pagetypes.has_page_type("custom_graph"): - html.context_button(_("Custom Graphs"), "custom_graphs.py", "custom_graph") + html.context_button(_("Custom graphs"), "custom_graphs.py", "custom_graph") if pagetypes.has_page_type("graph_tuning"): - html.context_button(_("Grap tunings"), "graph_tunings.py", "graph_tuning") - html.context_button(_("Bookmark Lists"), "bookmark_lists.py", "bookmark_list") + html.context_button(_("Graph tunings"), "graph_tunings.py", "graph_tuning") + html.context_button(_("Bookmark lists"), "bookmark_lists.py", "bookmark_list") html.end_context_buttons() # Deletion of visuals - delname = html.var("_delete") + delname = html.var("_delete") if delname and html.transaction_valid(): if config.user.may('general.delete_foreign_%s' % what): user_id = html.var('_user_id', config.user.id) @@ -388,23 +388,26 @@ def page_list(what, title, visuals, custom_columns = None, except MKUserError, e: html.user_error(e) - keys_sorted = visuals.keys() - keys_sorted.sort(cmp = lambda a,b: -cmp(a[0],b[0]) or cmp(a[1], b[1])) + keys_sorted = sorted(visuals.keys(), + cmp=lambda a, b: -cmp(a[0], b[0]) or cmp(a[1], b[1])) - custom = [] - builtin = [] + my_visuals, foreign_visuals, builtin_visuals = [], [], [] for (owner, visual_name) in keys_sorted: if owner == "" and not config.user.may("%s.%s" % (what_s, visual_name)): continue # not allowed to see this view visual = visuals[(owner, visual_name)] - if owner == config.user.id or \ - (visual["public"] and owner != '' and config.user_may(owner, "general.publish_" + what)): - custom.append((owner, visual_name, visual)) - elif visual["public"] and owner == "": - builtin.append((owner, visual_name, visual)) - - for title, items in [ (_('Custom'), custom), (_('Builtin'), builtin) ]: + if visual["public"] and owner == "": + builtin_visuals.append((owner, visual_name, visual)) + elif owner == config.user.id: + my_visuals.append((owner, visual_name, visual)) + elif (visual["public"] and owner != '' and config.user_may(owner, "general.publish_%s" % what)) or \ + config.user.may("general.edit_foreign_%s" % what): + foreign_visuals.append((owner, visual_name, visual)) + + for title, items in [(_('Customized'), my_visuals), + (_("Owned by other users"), foreign_visuals), + (_('Builtin'), builtin_visuals)]: html.open_h3() html.write(title) html.close_h3()

6 years, 8 months

5450 mgmt_snmp_uptime, mgmt_hr_fs: Added SNMP uptime and HOST RESOURCES filesystem checks for SNMP management boards

by Simon Betz

Module: check_mk Branch: master Commit: dcb07502e19c51700b5290d1e9cbd1ce13aae393 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcb07502e19c51… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 12 11:07:37 2017 +0100 5450 mgmt_snmp_uptime, mgmt_hr_fs: Added SNMP uptime and HOST RESOURCES filesystem checks for SNMP management boards Change-Id: Idb9ddb28ec702fc13fc33d75a93edf5fa1b032a7 --- .werks/5450 | 10 ++++++ checkman/mgmt_hr_fs | 29 ++++++++++++++++ checkman/mgmt_snmp_uptime | 15 ++++++++ checks/hr_fs | 64 +--------------------------------- checks/hr_fs.include | 87 +++++++++++++++++++++++++++++++++++++++++++++++ checks/mgmt_hr_fs | 47 +++++++++++++++++++++++++ checks/mgmt_snmp_uptime | 38 +++++++++++++++++++++ checks/snmp_uptime | 26 +++----------- checks/uptime.include | 34 ++++++++++++++++++ 9 files changed, 265 insertions(+), 85 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dcb07502e1…

6 years, 8 months

Fixed "ValueError: max() arg is an empty sequence" introduced yesterday when doing omd stop/start while having no site

by Lars Michelsen

Module: check_mk Branch: master Commit: 1fc1686b33e700d3006abb9656911b11d429bbaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fc1686b33e700… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 17 10:59:02 2018 +0100 Fixed "ValueError: max() arg is an empty sequence" introduced yesterday when doing omd stop/start while having no site Change-Id: Id1c6ec5c8fedee68ccfd43239d86259faff489e8 --- omd/packages/omd/omd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index b7261f8..ef3f0ea 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -3259,7 +3259,7 @@ def main_init_action(command, args, options={}): bare = "bare" in options parallel = "parallel" in options - max_site_len = max([ len(site_id) for site_id in all_sites() ]) + max_site_len = max([ 8 ] + [ len(site_id) for site_id in all_sites() ]) def parallel_output(site_id, line): sys.stdout.write(("%-"+str(max_site_len)+"s - %s") % (site_id, line))

6 years, 8 months

Standardised titles of 'Rule Properties'

by Simon Betz

Module: check_mk Branch: master Commit: 69dbae9e367669da6d916d411ade305d8962bae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69dbae9e367669… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 15 21:01:22 2018 +0100 Standardised titles of 'Rule Properties' Change-Id: I75329abfdfe95aba13bcd9f18b0e9ce800b22d9c --- web/htdocs/wato.py | 6 +++--- web/plugins/wato/bi.py | 13 +++++++------ web/plugins/wato/mkeventd.py | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f928306..3e4fe68 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7819,7 +7819,7 @@ def vs_notification_rule(userid = None): ] return Dictionary( - title = _("General Properties"), + title = _("Rule Properties"), elements = rule_option_elements() + section_override + generic_rule_match_conditions() @@ -7899,7 +7899,7 @@ def vs_notification_rule(userid = None): "match_checktype", "bulk", "contact_users", "contact_groups", "contact_emails", "contact_match_macros", "contact_match_groups" ], headers = [ - ( _("General Properties"), [ "description", "comment", "disabled", "docu_url", "allow_disable" ] ), + ( _("Rule Properties"), [ "description", "comment", "disabled", "docu_url", "allow_disable" ] ), ( _("Notification Method"), [ "notify_plugin", "notify_method", "bulk" ] ),] + contact_headers + [ @@ -17293,7 +17293,7 @@ syslog_facilities = [ def vs_rule_options(disabling=True): return Dictionary( - title = _("Rule Options"), + title = _("Rule Properties"), optional_keys = False, render = "form", elements = rule_option_elements(disabling), diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index bd35fe8..048918c 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1700,7 +1700,7 @@ class ModeBIEditRule(ModeBI): elements = [ ( "id", TextAscii( - title = _("Unique Rule ID"), + title = _("Rule ID"), help = _("The ID of the rule must be a unique text. It will be used as an internal key " "when rules refer to each other. The rule IDs will not be visible in the status " "GUI. They are just used within the configuration."), @@ -1716,14 +1716,15 @@ class ModeBIEditRule(ModeBI): "top level nodes this title must be unique. You can insert " "rule parameters like <tt>$FOO$</tt> or <tt>$BAR$</tt> here."), allow_empty = False, - size = 64, + size = 80, ), ), ( "comment", - TextUnicode( + TextAreaUnicode( title = _("Comment"), help = _("An arbitrary comment of this rule for you."), - size = 64, + cols = 80, + rows = 4, ), ), ( "params", @@ -1792,12 +1793,12 @@ class ModeBIEditRule(ModeBI): ] return Dictionary( - title = _("General Properties"), + title = _("Rule Properties"), optional_keys = False, render = "form", elements = elements, headers = [ - ( _("General Properties"), [ "id", "title", "comment", "params", "disabled" ]), + ( _("Rule Properties"), [ "id", "title", "docu_url", "comment", "params", "disabled" ]), ( _("Child Node Generation"), [ "nodes" ] ), ( _("Aggregation Function"), [ "aggregation", "state_messages" ], ), ] diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 1d43378..375b126 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -288,7 +288,7 @@ def vs_mkeventd_rule(rule_pack): help = _("A unique ID of this rule. Each event will remember the rule " "it was classified with by its rule ID."), allow_empty = False, - size = 12, + size = 24, )), ] + rule_option_elements()

6 years, 8 months

Fixed hard coded site path

by Lars Michelsen

Module: check_mk Branch: master Commit: 689ac8dd50ee301e1d07c771790e263e9cc22dca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=689ac8dd50ee30… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 17 10:40:33 2018 +0100 Fixed hard coded site path Change-Id: Ib3a324e6f1bf417aba9503570ee678695060fac2 --- tests/omd/test_python.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/omd/test_python.py b/tests/omd/test_python.py index 8f7cab3..50688de 100644 --- a/tests/omd/test_python.py +++ b/tests/omd/test_python.py @@ -66,4 +66,4 @@ def test_python_modules(site): import importlib for test_module_name in test_modules: module = importlib.import_module(test_module_name) - assert module.__file__.startswith("/omd/sites/heute/lib/python") + assert module.__file__.startswith(site.root)

6 years, 8 months

5618 FIX skype.sip_stack: Fixed "missing key" error which caused a check crash

by Simon Betz

Module: check_mk Branch: master Commit: bed81e57c162d8420b3cf3df8badc0fa0c3de0b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bed81e57c162d8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 16 13:21:25 2018 +0100 5618 FIX skype.sip_stack: Fixed "missing key" error which caused a check crash Above error was a result of different key notations for the same object, eg. in "skype.sip_stack" we got - "SIP - Incoming Responses Dropped /Sec" and - "SIP - Incoming Responses Dropped/sec" Now we normalize these keys by ignoring upper/lower case and spaces. Change-Id: I8a80f590154da1c59a65e66f728036ac0d19c959 --- .werks/5618 | 15 +++++++++++++++ checks/wmi.include | 15 +++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.werks/5618 b/.werks/5618 new file mode 100644 index 0000000..1e84f4e --- /dev/null +++ b/.werks/5618 @@ -0,0 +1,15 @@ +Title: skype.sip_stack: Fixed "missing key" error which caused a check crash +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516097649 +Class: fix + +Above error was a result of different key notations for +the same object, eg. in "skype.sip_stack" we got +- "SIP - Incoming Responses Dropped /Sec" and +- "SIP - Incoming Responses Dropped/sec" +Now we normalize these keys by ignoring upper/lower +case and spaces. diff --git a/checks/wmi.include b/checks/wmi.include index bdc7703..45f3e11 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -74,13 +74,14 @@ def parse_wmi_table(info, key="Name"): # MS apparently doesn't bother to provide a name # for base columns with performance counters header = prev_header + "_Base" + header = self._normalize_key(header) self.__headers[header] = index prev_header = header index += 1 self.__key_index = None if key_field is not None: try: - self.__key_index = self.__headers[key_field] + self.__key_index = self.__headers[self._normalize_key(key_field)] except KeyError, e: raise KeyError(e.message + " missing, valid keys: " + ", ".join(self.__headers.keys())) @@ -114,7 +115,7 @@ def parse_wmi_table(info, key="Name"): col_index = column else: try: - col_index = self.__headers[column] + col_index = self.__headers[self._normalize_key(column)] except KeyError, e: raise MKGeneralException(e.message + " missing, valid keys: " + ", ".join(self.__headers.keys())) @@ -136,6 +137,16 @@ def parse_wmi_table(info, key="Name"): def frequency(self): return self.__frequency + def _normalize_key(self, key): + # Different API versions may return different headers/keys + # for equal objects, eg. "skype.sip_stack": + # - "SIP - Incoming Responses Dropped /Sec" + # - "SIP - Incoming Responses Dropped/sec" + # For these cases we normalize these keys to be independent of + # upper/lower case and spaces. + return key.replace(" ", "").lower() + + try: info_iter = iter(info) res = None

6 years, 8 months

5601 hp_psu, hp_psu.temp: New checks to monitor the status and temperature of power supplies for HP switches

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2af6730cb9293ed6ac6fb815d7c1f60e301890ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2af6730cb9293e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jan 16 13:00:06 2018 +0100 5601 hp_psu, hp_psu.temp: New checks to monitor the status and temperature of power supplies for HP switches Change-Id: If1875718fc139a478006231b28d6f8bf86f5eaf2 --- .werks/5601 | 4 +- checkman/hp_psu | 15 +++++++ checkman/hp_psu.temp | 15 +++++++ checks/hp_psu | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 140 insertions(+), 2 deletions(-) diff --git a/.werks/5601 b/.werks/5601 index 1a82e5f..7849b1d 100644 --- a/.werks/5601 +++ b/.werks/5601 @@ -1,10 +1,10 @@ -Title: fortinet_controller_aps: New check which monitors the number of WiFi access points for Fortinet WLAN controller +Title: hp_psu, hp_psu.temp: New checks to monitor the status and temperature of power supplies for HP switches Level: 1 Component: checks Compatible: compat Edition: cre Version: 1.5.0i3 -Date: 1513762766 +Date: 1516103958 Class: feature diff --git a/checkman/hp_psu b/checkman/hp_psu new file mode 100644 index 0000000..e55d60d --- /dev/null +++ b/checkman/hp_psu @@ -0,0 +1,15 @@ +title: HP Switches: Power Supply Status +agents: SNMP +catalog: hw/network/hp +license: GPL +distribution: check_mk +description: + This check monitors the state of power supplies in HP switches. "maxstate" + is treated as UNKNOWN, "not present", "not plugged" and "permanent failure" as CRIT, + "failed" as WARN and "powered" as OK. + +item: + The power supplies' index. + +inventory: + One service per power supply is created. diff --git a/checkman/hp_psu.temp b/checkman/hp_psu.temp new file mode 100644 index 0000000..4baa4e5 --- /dev/null +++ b/checkman/hp_psu.temp @@ -0,0 +1,15 @@ +title: HP Switches: Power Supply Temperature +agents: SNMP +catalog: hw/network/hp +license: GPL +distribution: check_mk +description: + This check monitors the temperature of power supplies in HP switches. + + Upper and lower temperature levels are supported. + +item: + The power supplies' index. + +inventory: + One service per power supply is created. diff --git a/checks/hp_psu b/checks/hp_psu new file mode 100644 index 0000000..2b21187 --- /dev/null +++ b/checks/hp_psu @@ -0,0 +1,108 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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. + + +def parse_hp_psu(info): + parsed = { index : { "temp": int(temp), "status" : dev_status} + for index, dev_status, temp in info } + return parsed + + +# .--Temperature---------------------------------------------------------. +# | _____ _ | +# | |_ _|__ _ __ ___ _ __ ___ _ __ __ _| |_ _ _ _ __ ___ | +# | | |/ _ \ '_ ` _ \| '_ \ / _ \ '__/ _` | __| | | | '__/ _ \ | +# | | | __/ | | | | | |_) | __/ | | (_| | |_| |_| | | | __/ | +# | |_|\___|_| |_| |_| .__/ \___|_| \__,_|\__|\__,_|_| \___| | +# | |_| | +# '----------------------------------------------------------------------' + +factory_settings["hp_psu_temp_default_levels"] = { + "levels" : (70, 80), +} + +def inventory_hp_psu_temp(parsed): + for item in parsed: + yield item, {} + + +def check_hp_psu_temp(item, params, parsed): + return check_temperature(parsed[item]["temp"], params, item) + + + +check_info['hp_psu.temp'] = { + 'default_levels_variable' : "hp_psu_temp_default_levels", + 'inventory_function' : inventory_hp_psu_temp, + 'check_function' : check_hp_psu_temp, + 'service_description' : "Temperature Power Supply %s", + 'group' : "temperature", + 'includes' : [ "temperature.include" ], + 'has_perfdata' : True, +} + + +#. +# .--Status--------------------------------------------------------------. +# | ____ _ _ | +# | / ___|| |_ __ _| |_ _ _ ___ | +# | \___ \| __/ _` | __| | | / __| | +# | ___) | || (_| | |_| |_| \__ \ | +# | |____/ \__\__,_|\__|\__,_|___/ | +# | | +# '----------------------------------------------------------------------' + +def inventory_hp_psu(parsed): + for item in parsed: + yield item, None + + +def check_hp_psu(item, params, parsed): + + ps_statemap = { + "1" : (2, "Not present"), + "2" : (2, "Not plugged"), + "3" : (0, "Powered"), + "4" : (1, "Failed"), + "5" : (2, "Permanent Failure"), + "6" : (3, "Max"), + } + + return ps_statemap[parsed[item]["status"]] + + +check_info['hp_psu'] = { + 'parse_function' : parse_hp_psu, + 'inventory_function' : inventory_hp_psu, + 'check_function' : check_hp_psu, + 'service_description' : 'Power Supply Status %s', + 'snmp_info' : ('.1.3.6.1.4.1.11.2.14.11.5.1.55.1.1.1', [ # POWERSUPPLY_MIB: hpicfPsEntry + OID_END, # hpicfPsBayNum + "2", # hpicfPsState + "4", # hpicfPsTemp + ]), + 'snmp_scan_function' : lambda oid: "hp" in oid(".1.3.6.1.2.1.1.1.0").lower() and "5406rzl2" in oid(".1.3.6.1.2.1.1.1.0").lower(), +}

6 years, 8 months

Windows agent: don't put ipspec pointers in vector

by Jukka Aro

Module: check_mk Branch: master Commit: 8866d7a8b68b1a38cb00077b9f77f76ea1d76cbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8866d7a8b68b1a… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jan 12 10:34:06 2018 +0100 Windows agent: don't put ipspec pointers in vector Change-Id: I299a44b57e0fdaab3434d729936f120fc59a29fb --- agents/windows/ListenSocket.cc | 13 +++++---- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 30 ++++++++++--------- agents/windows/sections/SectionCheckMK.cc | 13 ++------- agents/windows/types.cc | 48 ++++++++++++++++++++----------- agents/windows/types.h | 10 ++++--- 6 files changed, 63 insertions(+), 53 deletions(-) diff --git a/agents/windows/ListenSocket.cc b/agents/windows/ListenSocket.cc index 43a810b..0ff2678 100644 --- a/agents/windows/ListenSocket.cc +++ b/agents/windows/ListenSocket.cc @@ -68,9 +68,9 @@ bool ListenSocket::check_only_from(sockaddr *ip) { for (only_from_t::const_iterator it_from = _source_whitelist.begin(); it_from != _source_whitelist.end(); ++it_from) { - ipspec *only_from = *it_from; + const ipspec &only_from = *it_from; - if (only_from->ipv6 != (ip->sa_family == AF_INET6)) { + if (only_from.ipv6 != (ip->sa_family == AF_INET6)) { // test ipv6 address only against ipv6 filter and ipv4 address // against ipv4 filter. // the only_from list already contains v4->v6 converted addresses @@ -82,8 +82,8 @@ bool ListenSocket::check_only_from(sockaddr *ip) { sockaddr_in6 *addrv6 = (sockaddr_in6 *)ip; for (int i = 0; i < 8 && match; ++i) { match = - only_from->ip.v6.address[i] == - (addrv6->sin6_addr.u.Word[i] & only_from->ip.v6.netmask[i]); + only_from.ip.v6.address[i] == + (addrv6->sin6_addr.u.Word[i] & only_from.ip.v6.netmask[i]); } if (match) { return true; @@ -91,8 +91,9 @@ bool ListenSocket::check_only_from(sockaddr *ip) { } else { uint32_t significant_bits = ((sockaddr_in *)ip)->sin_addr.S_un.S_addr & - only_from->ip.v4.netmask; - if (significant_bits == only_from->ip.v4.address) { + only_from.ip.v4.netmask; + + if (significant_bits == only_from.ip.v4.address) { return true; } } diff --git a/agents/windows/build_version b/agents/windows/build_version index 31410c0..e92e7e9 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3064 +3066 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4977b5d..7c65e75 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -928,27 +928,29 @@ void do_unpack_plugins(const char *plugin_filename, const Environment &env) { void postProcessOnlyFrom() { if (*s_config->support_ipv6) { // find all ipv4 specs, later insert a the same spec as a v6 adress. - std::vector<ipspec *> v4specs; - for (ipspec *spec : *s_config->only_from) { - if (!spec->ipv6) { + only_from_t v4specs; + v4specs.reserve(s_config->only_from->size()); + for (const auto &spec : *s_config->only_from) { + if (!spec.ipv6) { v4specs.push_back(spec); } } - for (ipspec *spec : v4specs) { + s_config->only_from->reserve(s_config->only_from->size() + v4specs.size()); + for (const auto &spec : v4specs) { // also add a v4->v6 coverted filter - ipspec *result = new ipspec(); + ipspec result{0}; // first 96 bits are fixed: 0:0:0:0:0:ffff - result->bits = 96 + spec->bits; - result->ipv6 = true; - memset(result->ip.v6.address, 0, sizeof(uint16_t) * 5); - result->ip.v6.address[5] = 0xFFFFu; - result->ip.v6.address[6] = - static_cast<uint16_t>(spec->ip.v4.address & 0xFFFFu); - result->ip.v6.address[7] = - static_cast<uint16_t>(spec->ip.v4.address >> 16); - netmaskFromPrefixIPv6(result->bits, result->ip.v6.netmask, + result.bits = 96 + spec.bits; + result.ipv6 = true; + memset(result.ip.v6.address, 0, sizeof(uint16_t) * 5); + result.ip.v6.address[5] = 0xFFFFu; + result.ip.v6.address[6] = + static_cast<uint16_t>(spec.ip.v4.address & 0xFFFFu); + result.ip.v6.address[7] = + static_cast<uint16_t>(spec.ip.v4.address >> 16); + netmaskFromPrefixIPv6(result.bits, result.ip.v6.netmask, s_winapi); s_config->only_from.add(result); } diff --git a/agents/windows/sections/SectionCheckMK.cc b/agents/windows/sections/SectionCheckMK.cc index 9b16aed..433bbc4 100644 --- a/agents/windows/sections/SectionCheckMK.cc +++ b/agents/windows/sections/SectionCheckMK.cc @@ -100,17 +100,8 @@ bool SectionCheckMK::produceOutputInner(std::ostream &out) { if (_only_from->size() == 0) { out << " 0.0.0.0/0\n"; } else { - for (const ipspec *is : *_only_from) { - if (is->ipv6) { - out << " " - << join(is->ip.v6.address, is->ip.v6.address + 7, ":") - << "/" << is->bits; - } else { - out << " " << (is->ip.v4.address & 0xff) << "." - << (is->ip.v4.address >> 8 & 0xff) << "." - << (is->ip.v4.address >> 16 & 0xff) << "." - << (is->ip.v4.address >> 24 & 0xff) << "/" << is->bits; - } + for (const auto &is : *_only_from) { + out << " " << is; } } return true; diff --git a/agents/windows/types.cc b/agents/windows/types.cc index fa1b36b..2e79e70 100644 --- a/agents/windows/types.cc +++ b/agents/windows/types.cc @@ -23,38 +23,38 @@ std::string from_string<std::string>(const WinApiAdaptor &, } template <> -ipspec *from_string<ipspec *>(const WinApiAdaptor &winapi, - const std::string &value) { - ipspec *result = new ipspec(); +ipspec from_string<ipspec>(const WinApiAdaptor &winapi, + const std::string &value) { + ipspec result{0}; char *slash_pos = strchr(value.c_str(), '/'); if (slash_pos != NULL) { // ipv4/ipv6 agnostic - result->bits = strtol(slash_pos + 1, NULL, 10); + result.bits = strtol(slash_pos + 1, NULL, 10); } else { - result->bits = 0; + result.bits = 0; } - result->ipv6 = strchr(value.c_str(), ':') != NULL; + result.ipv6 = strchr(value.c_str(), ':') != NULL; - if (result->ipv6) { - if (result->bits == 0) { - result->bits = 128; + if (result.ipv6) { + if (result.bits == 0) { + result.bits = 128; } - stringToIPv6(value.c_str(), result->ip.v6.address, winapi); - netmaskFromPrefixIPv6(result->bits, result->ip.v6.netmask, winapi); + stringToIPv6(value.c_str(), result.ip.v6.address, winapi); + netmaskFromPrefixIPv6(result.bits, result.ip.v6.netmask, winapi); // TODO verify that host part is 0 } else { - if (result->bits == 0) { - result->bits = 32; + if (result.bits == 0) { + result.bits = 32; } - stringToIPv4(value.c_str(), result->ip.v4.address); - netmaskFromPrefixIPv4(result->bits, result->ip.v4.netmask); + stringToIPv4(value.c_str(), result.ip.v4.address); + netmaskFromPrefixIPv4(result.bits, result.ip.v4.netmask); - if ((result->ip.v4.address & result->ip.v4.netmask) != - result->ip.v4.address) { + if ((result.ip.v4.address & result.ip.v4.netmask) != + result.ip.v4.address) { fprintf(stderr, "Invalid only_hosts entry: host part not 0: %s", value.c_str()); exit(1); @@ -62,3 +62,17 @@ ipspec *from_string<ipspec *>(const WinApiAdaptor &winapi, } return result; } + +std::ostream &operator<<(std::ostream &os, const ipspec &ips) { + if (ips.ipv6) { + os << join(ips.ip.v6.address, ips.ip.v6.address + 7, ":") << "/" + << ips.bits; + } else { + os << (ips.ip.v4.address & 0xff) << "." + << (ips.ip.v4.address >> 8 & 0xff) << "." + << (ips.ip.v4.address >> 16 & 0xff) << "." + << (ips.ip.v4.address >> 24 & 0xff) << "/" << ips.bits; + } + + return os; +} diff --git a/agents/windows/types.h b/agents/windows/types.h index 77e894e..3869de1 100644 --- a/agents/windows/types.h +++ b/agents/windows/types.h @@ -85,8 +85,12 @@ struct ipspec { }; template <> -ipspec *from_string<ipspec *>(const WinApiAdaptor &winapi, - const std::string &value); +ipspec from_string<ipspec>(const WinApiAdaptor &winapi, + const std::string &value); + +std::ostream &operator<<(std::ostream &os, const ipspec &ips); + +using only_from_t = std::vector<ipspec>; class StateParseError : public std::invalid_argument { public: @@ -94,8 +98,6 @@ public: : std::invalid_argument(what) {} }; -using only_from_t = std::vector<ipspec *>; - class OnScopeExit { public: OnScopeExit(const std::function<void()> &cleaner) : _cleaner(cleaner) {}

6 years, 8 months

← Newer
1
...
12
13
14
15
16
17
18
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018