Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: f4483e3719c07a60e97624a8ed52cac882b365af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4483e3719c07a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 14 16:15:34 2018 +0100 fixed pylint errors Change-Id: If552fbecd6f3e7cbbaefb59d5804fd9b6e6e557b --- agents/plugins/mk_inotify | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/agents/plugins/mk_inotify b/agents/plugins/mk_inotify index 9c43788..bdd4408 100755 --- a/agents/plugins/mk_inotify +++ b/agents/plugins/mk_inotify @@ -218,14 +218,14 @@ def do_output(what, event): map_events = { # Mode Mask Report_filestats (currently unused) - "access" : (pyinotify.IN_ACCESS, False), - "open" : (pyinotify.IN_OPEN, False), - "create" : (pyinotify.IN_CREATE, False), - "delete" : (pyinotify.IN_DELETE, False), - "modify" : (pyinotify.IN_MODIFY, False), - "movedto" : (pyinotify.IN_MOVED_TO, False), - "movedfrom": (pyinotify.IN_MOVED_FROM, False), - "moveself" : (pyinotify.IN_MOVE_SELF, False), + "access" : (pyinotify.IN_ACCESS, False), # pylint: disable=no-member + "open" : (pyinotify.IN_OPEN, False), # pylint: disable=no-member + "create" : (pyinotify.IN_CREATE, False), # pylint: disable=no-member + "delete" : (pyinotify.IN_DELETE, False), # pylint: disable=no-member + "modify" : (pyinotify.IN_MODIFY, False), # pylint: disable=no-member + "movedto" : (pyinotify.IN_MOVED_TO, False), # pylint: disable=no-member + "movedfrom": (pyinotify.IN_MOVED_FROM, False), # pylint: disable=no-member + "moveself" : (pyinotify.IN_MOVE_SELF, False), # pylint: disable=no-member } class NotifyEventHandler(pyinotify.ProcessEvent):

6 years, 3 months

agent_netapp: suppressed lots of pylint warnings

by Andreas Boesl

Module: check_mk Branch: master Commit: 13c143ef34d9c75fecfacd0bd776a4a0d7a3dba4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13c143ef34d9c7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 14 16:20:54 2018 +0100 agent_netapp: suppressed lots of pylint warnings Change-Id: I776145d18d876230d3d35dd7f468e2a0dab77b73 --- agents/special/agent_netapp | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 8829241..626c882 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -158,8 +158,8 @@ else: if opt_legacy: try: - from NaElement import * - from NaServer import * + from NaElement import * # pylint: disable=import-error + from NaServer import * # pylint: disable=import-error except Exception, e: sys.stderr.write("Unable to import the files NaServer.py/NaElement.py.\nThese files are "\ "provided by the NetApp Managability SDK and must be put into "\ @@ -170,12 +170,12 @@ else: import base64 import requests try: - from requests.packages.urllib3.exceptions import InsecureRequestWarning - requests.packages.urllib3.disable_warnings(InsecureRequestWarning) + from requests.packages.urllib3.exceptions import InsecureRequestWarning # pylint: disable=import-error + requests.packages.urllib3.disable_warnings(InsecureRequestWarning) # pylint: disable=no-member except: pass - requests.packages.urllib3.util.ssl_.DEFAULT_CIPHERS += ":" + ":".join([ + requests.packages.urllib3.util.ssl_.DEFAULT_CIPHERS += ":" + ":".join([ # pylint: disable=no-member "DH+3DES", "DH+HIGH", "ECDH+3DES", @@ -185,7 +185,6 @@ else: ]) - try: # lxml was quite promising in our test environment: Uses 2 times less CPU resources # Unfortunaly, it is not a builtin module and need to be installed manually with @@ -566,17 +565,17 @@ def query_nodes(what, node_attribute = "node-name"): global nodes, section_errors if opt_legacy: if not nodes: - node_query = NaElement("system-get-node-info-iter") - node_list = server.invoke_elem(node_query) + node_query = NaElement("system-get-node-info-iter") # pylint: disable=undefined-variable + node_list = server.invoke_elem(node_query) # pylint: disable=no-member nodes = [] for instance in node_list.child_get("attributes-list").children_get(): nodes.append(instance.child_get_string("system-name")) results = {} for node in nodes: - query = NaElement(what) + query = NaElement(what) # pylint: disable=undefined-variable query.child_add_string(node_attribute, node) - response = server.invoke_elem(query) + response = server.invoke_elem(query) # pylint: disable=no-member if response.results_status() == "failed": section_errors.append("In class %s: %s" % (what, response.results_reason())) continue @@ -670,16 +669,16 @@ def query(what, return_toplevel_node = False): def query_counters(what): instance_uuids = [] if opt_legacy: - counter_query = NaElement("perf-object-get-instances") + counter_query = NaElement("perf-object-get-instances") # pylint: disable=undefined-variable counter_query.child_add_string("objectname", what) # In clustermode there is no "get all" command for performance counters # We need to determine the instance names first and add them to the query if netapp_mode == "clustermode": - instance_query = NaElement("perf-object-instance-list-info-iter") + instance_query = NaElement("perf-object-instance-list-info-iter") # pylint: disable=undefined-variable instance_query.child_add_string("objectname", what) - instance_query_response = server.invoke_elem(instance_query) + instance_query_response = server.invoke_elem(instance_query) # pylint: disable=no-member instance_list = instance_query_response.child_get("attributes-list") if instance_list: for instance_data in instance_list.children_get(): @@ -688,7 +687,7 @@ def query_counters(what): # Nothing to query.. return - instances_to_query = NaElement("instance-uuids") + instances_to_query = NaElement("instance-uuids") # pylint: disable=no-member for uuid in instance_uuids: instances_to_query.child_add_string("instance-uuid", uuid) counter_query.child_add(instances_to_query) @@ -696,7 +695,7 @@ def query_counters(what): return # Query counters - response = server.invoke_elem(counter_query) + response = server.invoke_elem(counter_query) # pylint: disable=undefined-variable if response.results_status() == "failed": section_errors.append("In counter %s: %s" % (what, response.results_reason())) else: @@ -805,7 +804,7 @@ try: if opt_legacy: if opt_debug: print "Running in legacy mode" - server = NaServer(host_address,1,8) + server = NaServer(host_address,1,8) # pylint: disable=undefined-variable server.set_admin_user(user, secret) server.set_timeout(opt_timeout) server.set_transport_type("HTTPS") @@ -1004,7 +1003,7 @@ try: for node, entry in cluster_status.items(): # Small trick to improve formatting if opt_legacy: - container = NaElement("container") + container = NaElement("container") # pylint: disable=undefined-variable container.child_add(entry) else: container = NetAppNode("container") @@ -1270,7 +1269,7 @@ try: for volume in volumes.children_get(): # Small trick improve formatting if opt_legacy: - container = NaElement("container") + container = NaElement("container") # pylint: disable=undefined-variable container.child_add(volume) else: container = NetAppNode("container")

6 years, 3 months

5789 FIX agent_ucs_bladecenter: removed legacy debug feature,

by Andreas Boesl

which import the UcsSdk python module Message-ID: <5aa94266.9lFJMSNMA5885nlU%ab(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: cb002ecdcc44533302d3c5844e1fb283aae5e2dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb002ecdcc4453… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 14 16:04:45 2018 +0100 5789 FIX agent_ucs_bladecenter: removed legacy debug feature, which import the UcsSdk python module Change-Id: I02fc21899ff6044af72e76e123c77ac1b08dea3d --- .werks/5789 | 10 +++++++ agents/special/agent_ucs_bladecenter | 56 +++++++++--------------------------- 2 files changed, 24 insertions(+), 42 deletions(-) diff --git a/.werks/5789 b/.werks/5789 new file mode 100644 index 0000000..c8f9aea --- /dev/null +++ b/.werks/5789 @@ -0,0 +1,10 @@ +Title: agent_ucs_bladecenter: removed legacy debug feature, which import the UcsSdk python module +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521039829 +Class: fix + + diff --git a/agents/special/agent_ucs_bladecenter b/agents/special/agent_ucs_bladecenter index 872b69f..8459513 100755 --- a/agents/special/agent_ucs_bladecenter +++ b/agents/special/agent_ucs_bladecenter @@ -50,7 +50,7 @@ OPTIONS: short_options = 'hu:p:' long_options = [ - 'help', 'username=', 'password=', 'debug', 'ucssdk', 'no-cert-check' + 'help', 'username=', 'password=', 'debug', 'no-cert-check' ] try: @@ -63,16 +63,12 @@ opt_debug = False opt_username = "" opt_password = "" opt_verify = True -opt_ucssdk = False for o,a in opts: if o in [ '--debug' ]: opt_debug = True elif o in [ '-u', '--username' ]: opt_username = a - elif o in [ '--ucssdk' ]: - opt_ucssdk = True - from UcsSdk import * elif o in [ '-p', '--password' ]: opt_password = a elif o in [ '--no-cert-check' ]: @@ -156,21 +152,8 @@ class Server: return self.communicate(payload, {"classname": classname}) -if not opt_ucssdk: - handle = Server(host_address) - handle.login(opt_username, opt_password) -else: - # Use the UcsSdk to query the data. This loads 35MB(!) of python code... - try: - handle = UcsHandle() - if opt_debug: - handle.SetDumpXml() # Debug telegrams - handle.Login(host_address, username = opt_username, password = opt_password) - except: - sys.stderr.write("Cannot connect to UCS Bladecenter. Maybe you provided " \ - "the wrong credentials. Please check your connection settings " \ - "and try again") - +handle = Server(host_address) +handle.login(opt_username, opt_password) for entry, fields in [ ## FANS @@ -225,28 +208,17 @@ for entry, fields in [ print entry continue - if not opt_ucssdk: - response = handle.get_class(entry) - elements = get_pattern('<%(entry)s (.*?)/>' % {"entry": entry}, response) - for element in elements: - sys.stdout.write("%s\t" % entry) - values = [] - for field in fields: - tmp_field = field[0].lower()+ field[1:] # workaround - value = get_pattern('%s="(.*?)"' % tmp_field, element)[0] - if value: - values.append("%s %s" % (field, value)) - print "\t".join(values) - else: - # Use UcsSdk to query the data (used for debugging) - for obj in handle.GetManagedObject(None, entry): - sys.stdout.write("%s\t" % entry) - values = [] - for field in fields: - value = getattr(obj, field) - if value: - values.append("%s %s" % (field, value)) - print "\t".join(values) + response = handle.get_class(entry) + elements = get_pattern('<%(entry)s (.*?)/>' % {"entry": entry}, response) + for element in elements: + sys.stdout.write("%s\t" % entry) + values = [] + for field in fields: + tmp_field = field[0].lower()+ field[1:] # workaround + value = get_pattern('%s="(.*?)"' % tmp_field, element)[0] + if value: + values.append("%s %s" % (field, value)) + print "\t".join(values) except Exception, e: print e if opt_debug:

6 years, 3 months

agent_hp_msa: suppressed pylint errors

by Andreas Boesl

Module: check_mk Branch: master Commit: be515d21d7291fc97db62c7d29f6f67c006e8696 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be515d21d7291f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 14 16:38:30 2018 +0100 agent_hp_msa: suppressed pylint errors Change-Id: I68eabd3f410273e7c18434853c9419a67c65ff55 --- agents/special/agent_hp_msa | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_hp_msa b/agents/special/agent_hp_msa index ea073ab..c00449f 100755 --- a/agents/special/agent_hp_msa +++ b/agents/special/agent_hp_msa @@ -29,8 +29,8 @@ import getopt, sys, socket, traceback, re, hashlib import requests try: - from requests.packages.urllib3.exceptions import InsecureRequestWarning - requests.packages.urllib3.disable_warnings(InsecureRequestWarning) + from requests.packages.urllib3.exceptions import InsecureRequestWarning # pylint: disable=import-error + requests.packages.urllib3.disable_warnings(InsecureRequestWarning) # pylint: disable=no-member except: pass

6 years, 3 months

agent_vsphere: fixed pylint error

by Andreas Boesl

Module: check_mk Branch: master Commit: cef80bcdf5d8afd6f8c518d6e2f953f7accd1ac2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cef80bcdf5d8af… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 14 16:34:22 2018 +0100 agent_vsphere: fixed pylint error Change-Id: I4b042875469a4344cef766904c6794d8cf550b4c --- agents/special/agent_vsphere | 1 - 1 file changed, 1 deletion(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index e272957..ca5d0d3 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1152,7 +1152,6 @@ def connect_to_server(): "and try again. This error is not related to the login credentials. Error message: %r" % e def retrieve_systeminfo(): - global systeminfo # Retrieve basic data, which requires no login payload = telegram_list["systeminfo"] reply_code, reply_msg, reply_headers, reply_data = query_server(payload)

6 years, 3 months

agent_storeonce: fixed pylint errors

by Andreas Boesl

Module: check_mk Branch: master Commit: c524124d06feb483222bc8bad5fa02d4b22270a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c524124d06feb4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 14 16:36:27 2018 +0100 agent_storeonce: fixed pylint errors Change-Id: I88b584b378df0c9c126d9d794f9fef5e61f2f597 --- agents/special/agent_storeonce | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/agents/special/agent_storeonce b/agents/special/agent_storeonce index 7da76f8..ff484c7 100755 --- a/agents/special/agent_storeonce +++ b/agents/special/agent_storeonce @@ -28,7 +28,7 @@ import re import sys, getopt import requests import xml.etree.ElementTree as ET -from requests.packages.urllib3.exceptions import InsecureRequestWarning +from requests.packages.urllib3.exceptions import InsecureRequestWarning # pylint: disable=import-error def usage(): sys.stderr.write("""Check_MK StoreOnce @@ -75,7 +75,7 @@ for o,a in opts: def query(url): if opt_cert == False: - requests.packages.urllib3.disable_warnings(InsecureRequestWarning) + requests.packages.urllib3.disable_warnings(InsecureRequestWarning) # pylint: disable=no-member response = requests.get(url, auth = (args_dict["username"], args_dict["password"]), verify=opt_cert) raw_xml = response.text # Remove namespace nonsense @@ -86,10 +86,7 @@ def query(url): output_lines = [] def output(line): - if type(line) not in [str, unicode]: - output_lines.append(pprint.pformat(line)) - else: - output_lines.append(line) + output_lines.append(line) def process_cluster_info():

6 years, 3 months

agent_jolokia: fixed pylint errors

by Andreas Boesl

Module: check_mk Branch: master Commit: 01f5f70b9a12f8fc259106064ed3378393704068 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01f5f70b9a12f8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 14 16:37:05 2018 +0100 agent_jolokia: fixed pylint errors Change-Id: I3f180ce72576f2d914bf75c638a264b82e903ff3 --- agents/special/agent_jolokia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_jolokia b/agents/special/agent_jolokia index 4f6ca9f..4f4acd8 100755 --- a/agents/special/agent_jolokia +++ b/agents/special/agent_jolokia @@ -150,7 +150,7 @@ def fetch_var(protocol, server, port, path, suburi, cert_path, itemspec): json_data = conn.read() if opt_verbose: - sys.stderr.write("Result: %s\n\n" % data) + sys.stderr.write("Result: %s\n\n" % json_data) except Exception, e: if opt_debug: raise

6 years, 3 months

agent_3par: suppressed pylint errors

by Andreas Boesl

Module: check_mk Branch: master Commit: 82de9031c0bc818a9854eef690860705688df53f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82de9031c0bc81… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 14 16:33:44 2018 +0100 agent_3par: suppressed pylint errors Change-Id: I8a36090deeefb2c56850e1347631bd09471ed67f --- agents/special/agent_3par | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/special/agent_3par b/agents/special/agent_3par index 55bd78c..d949983 100755 --- a/agents/special/agent_3par +++ b/agents/special/agent_3par @@ -121,9 +121,9 @@ except requests.exceptions.RequestException as e: sys.exit(1) # Status code should be 201. -if not req.status_code == requests.codes.CREATED: +if not req.status_code == requests.codes.CREATED: # pylint: disable=no-member sys.stderr.write("Wrong status code: %s. Expected: %s \n" % (req.status_code, - requests.codes.CREATED)) + requests.codes.CREATED)) # pylint: disable=no-member sys.exit(1) else: try: @@ -153,7 +153,7 @@ req = requests.delete("%s/credentials/%s" % (url, headers["X-HP3PAR-WSAPI-Sessio timeout=10, verify=verify) -if not req.status_code == requests.codes.OK: +if not req.status_code == requests.codes.OK: # pylint: disable=no-member sys.stderr.write("Wrong status code: %s. Expected: %s \n" % (req.status_code, - requests.codes.OK)) + requests.codes.OK)) # pylint: disable=no-member sys.exit(1)

6 years, 3 months

agent_allnet_ip_sensoric: fixed pylint errors

by Andreas Boesl

Module: check_mk Branch: master Commit: 8f821345b384506dafbaedda1788ebab57d2fa7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f821345b38450… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 14 16:37:35 2018 +0100 agent_allnet_ip_sensoric: fixed pylint errors Change-Id: Ic31686d3d195b1f5cc201afded99190712422e00 --- agents/special/agent_allnet_ip_sensoric | 1 - 1 file changed, 1 deletion(-) diff --git a/agents/special/agent_allnet_ip_sensoric b/agents/special/agent_allnet_ip_sensoric index a1ac483..c6085bd 100755 --- a/agents/special/agent_allnet_ip_sensoric +++ b/agents/special/agent_allnet_ip_sensoric @@ -86,7 +86,6 @@ class RequestError(Exception): pass def get_allnet_ip_sensoric_info(): - global g_device, g_version url = 'http://%s/xml/sensordata.xml' % (host_address) headers = {

6 years, 3 months

Add some more or less helpful type annotations.

by Sven Panne

Module: check_mk Branch: master Commit: c7ea343b8a903c4c3ef7e82db086964a7741d550 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7ea343b8a903c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 14 16:08:15 2018 +0100 Add some more or less helpful type annotations. Currently the typing is horrible, caused by the excessive use of highly polymorphic dictionaries. We *really* have to stop representing things like this, otherwise we'll never escape maintenance hell... Change-Id: I9566dca0e1f4366728c4af6182f23897d3c64a85 --- cmk/ec/defaults.py | 8 +++++++- cmk/ec/export.py | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/cmk/ec/defaults.py b/cmk/ec/defaults.py index d933ae8..2c9a2bf 100644 --- a/cmk/ec/defaults.py +++ b/cmk/ec/defaults.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. """Defaults for rule pack and configuration""" +from typing import Any, AnyStr, Dict, List # pylint: disable=unused-import import cmk.log @@ -34,10 +35,14 @@ import cmk.log try: _ except NameError: - _ = lambda x: x # Fake i18n when not available + # Fake i18n when not available + def _(string): + # type: (AnyStr) -> AnyStr + return string def default_rule_pack(rules): + # type: (List[Dict[str, Any]]) -> Dict[str, object] """Returns the default rule pack""" return { "id": "default", @@ -48,6 +53,7 @@ def default_rule_pack(rules): def default_config(): + # type: () -> Dict[str, object] """Returns the default configuration""" return { "rules": [], # old pre 1.2.7i1 format. Only used if rule_packs is empty diff --git a/cmk/ec/export.py b/cmk/ec/export.py index b1bb825..3f196e6 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -36,6 +36,7 @@ import pprint import UserDict from enum import Enum from pathlib2 import Path +from typing import Any, Dict, Iterable, List, Optional, Tuple # pylint: disable=unused-import import cmk.paths import cmk.store @@ -65,8 +66,8 @@ class MkpRulePackProxy(UserDict.DictMixin): # be bound to it's referenced object upon initialization. Unfortunately, # this is not possible because the mknotifyd.mk could specify referenced # objects as well. - self.id_ = rule_pack_id - self.rule_pack = None + self.id_ = rule_pack_id # type: str + self.rule_pack = None # type: Dict[str, Any] def __getitem__(self, key): return self.rule_pack[key] @@ -80,11 +81,22 @@ class MkpRulePackProxy(UserDict.DictMixin): def __repr__(self): return '%s("%s")' % (self.__class__.__name__, self.id_) + # __iter__ and __len__ are only defined as a workaround for a buggy entry + # in the typeshed + def __iter__(self): + for k in self.keys(): + yield k + + def __len__(self): + return len(self.keys()) + def keys(self): + # type: () -> List[str] """List of keys of this rule pack""" return self.rule_pack.keys() def bind_to(self, mkp_rule_pack): + # type: (Dict[str, Any]) -> None """Binds this rule pack to the given MKP rule pack""" if self.id_ != mkp_rule_pack['id']: raise MkpRulePackBindingError( @@ -94,6 +106,7 @@ class MkpRulePackProxy(UserDict.DictMixin): @property def is_bound(self): + # type: () -> bool """Has this rule pack been bound via bind_to()?""" return self.rule_pack is not None @@ -121,6 +134,7 @@ class RulePackType(Enum): # pylint: disable=too-few-public-methods @staticmethod def type_of(rule_pack, id_to_mkp): + # type: (Dict[str, Any], Dict[Any, Any]) -> RulePackType """ Returns the type of rule pack for a given rule pack ID to MKP mapping. """ @@ -137,6 +151,7 @@ class RulePackType(Enum): # pylint: disable=too-few-public-methods def rule_pack_dir(): + # type: () -> Path """ Returns the default WATO directory of the Event Console. """ @@ -146,6 +161,7 @@ def rule_pack_dir(): def mkp_rule_pack_dir(): + # type: () -> Path """ Returns the default directory for rule pack exports of the Event Console. @@ -156,6 +172,7 @@ def mkp_rule_pack_dir(): def read_rule_packs(context): + # type: (Dict[str, Any]) -> None """ Read rule packs from rules.mk into the variable context. Context has to be a dict with the keys rules and rule_packs. @@ -178,6 +195,7 @@ def read_rule_packs(context): def read_exported_rule_packs(context): + # type: (Dict[str, Any]) -> Dict[str, Any] """ Read exported rule packs into the variable context. The exported rule packs may already be part of an MKP. Context has to be a @@ -190,6 +208,7 @@ def read_exported_rule_packs(context): def remove_exported_rule_pack(id_): + # type: (str) -> None """ Removes the .mk file representing the exported rule pack. """ @@ -198,6 +217,7 @@ def remove_exported_rule_pack(id_): def bind_to_rule_pack_proxies(rule_packs, mkp_rule_packs): + # type: (Any, Any) -> None """ Binds all proxy rule packs of the variable rule_packs to the corresponding mkp_rule_packs. @@ -214,6 +234,7 @@ def bind_to_rule_pack_proxies(rule_packs, mkp_rule_packs): def load_rule_packs(): + # type: () -> Tuple[Any, Any] """ Returns the legacy rules and the rule packs (including MKP rule packs) of a site. Proxy objects in the rule packs are already bound to the referenced @@ -234,6 +255,7 @@ def load_rule_packs(): def save_rule_packs(legacy_rules, rule_packs, pretty_print=False, dir_=None): + # type: (List[Any], List[Dict[str, Any]], bool, Optional[Path]) -> None """ Saves the given legacy rules and rule packs to rules.mk. By default it is saved to the default directory for rule packs. If dir_ is given it @@ -258,6 +280,7 @@ def save_rule_packs(legacy_rules, rule_packs, pretty_print=False, dir_=None): def export_rule_pack(rule_pack, pretty_print=False, dir_=None): + # type: (Dict[str, Any], bool, Optional[Path]) -> None """ Export the representation of a rule pack (i.e. a dict) to a .mk file accessible by the WATO module Extension Packages. In case @@ -288,6 +311,7 @@ def export_rule_pack(rule_pack, pretty_print=False, dir_=None): def add_rule_pack_proxies(file_names): + # type: (Iterable[str]) -> None """ Adds rule pack proxy objects to the list of rule packs given a list of file names. The file names without the file extension are used as @@ -301,6 +325,7 @@ def add_rule_pack_proxies(file_names): def override_rule_pack_proxy(rule_pack_nr, rule_packs): + # type: (str, Dict[str, Any]) -> None """ Replaces a MkpRulePackProxy by a working copy of the underlying rule pack. """ @@ -312,6 +337,7 @@ def override_rule_pack_proxy(rule_pack_nr, rule_packs): def release_packaged_rule_packs(file_names): + # type: (Iterable[str]) -> None """ This function synchronizes the rule packs in rules.mk and the rule packs packaged in a MKP upon release of that MKP. The following cases have @@ -342,6 +368,7 @@ def release_packaged_rule_packs(file_names): def remove_packaged_rule_packs(file_names, delete_export=True): + # type: (Iterable[str], bool) -> None """ This function synchronizes the rule packs in rules.mk and the packaged rule packs of a MKP upon deletion of that MKP. When a modified or an unmodified MKP is @@ -364,6 +391,7 @@ def remove_packaged_rule_packs(file_names, delete_export=True): def rule_pack_id_to_mkp(package_info): + # type: (Any) -> Dict[str, Any] """ Returns a dictionary of rule pack ID to MKP package for a given package_info. The package info has to be in the format defined by cmk_base/packaging.py. @@ -371,6 +399,7 @@ def rule_pack_id_to_mkp(package_info): MKP exists, the value of that mapping is None. """ def mkp_of(rule_pack_file): + # type: (str) -> Any """Find the MKP for the given file""" for mkp, content in package_info.get('installed', {}).iteritems(): if rule_pack_file in content.get('files', {}).get('ec_rule_packs', []):

6 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
...
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