Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

Semi-automatic fix typecheck idioms cmk/gui

by Óscar Nájera

Module: check_mk Branch: master Commit: 4a9ef26ce89ddac07d4a7ab34e560d3369edb3a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a9ef26ce89dda… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 12 10:49:23 2018 +0100 Semi-automatic fix typecheck idioms cmk/gui CMK-837 Change-Id: Ib0a7d2feccbf26b39a196b53947f6abb9c069c1a --- cmk/gui/bi.py | 18 ++++++------ cmk/gui/config.py | 6 ++-- cmk/gui/dashboard.py | 6 ++-- cmk/gui/forms.py | 8 +++--- cmk/gui/htmllib.py | 28 +++++++++---------- cmk/gui/http.py | 4 +-- cmk/gui/login.py | 6 ++-- cmk/gui/metrics.py | 4 +-- cmk/gui/mkeventd.py | 2 +- cmk/gui/mobile.py | 2 +- cmk/gui/multitar.py | 8 +++--- cmk/gui/notify.py | 4 +-- cmk/gui/pagetypes.py | 2 +- cmk/gui/table.py | 2 +- cmk/gui/userdb.py | 4 +-- cmk/gui/valuespec.py | 78 ++++++++++++++++++++++++++-------------------------- cmk/gui/views.py | 18 ++++++------ cmk/gui/visuals.py | 10 +++---- cmk/gui/watolib.py | 26 +++++++++--------- 19 files changed, 118 insertions(+), 118 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4a9ef26ce8…

5 years, 10 months

Add missing None check for werk 6417 to fix integration tests

by Tom Baerwinkel

Module: check_mk Branch: master Commit: c8dc9985c27c7c267d3ebccab1d61640078f6678 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8dc9985c27c7c… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Nov 12 14:56:26 2018 +0100 Add missing None check for werk 6417 to fix integration tests Change-Id: I99bcb368bc44b6a153c2b28a204b594bf2169a19 --- cmk/gui/plugins/userdb/user_attributes.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmk/gui/plugins/userdb/user_attributes.py b/cmk/gui/plugins/userdb/user_attributes.py index 66e699a..3972a42 100644 --- a/cmk/gui/plugins/userdb/user_attributes.py +++ b/cmk/gui/plugins/userdb/user_attributes.py @@ -125,6 +125,8 @@ class DisableNotificationsUserAttribute(UserAttribute): forth=self._transform_disable_notification) def _transform_disable_notification(self, p): + if p is None: + return {} if isinstance(p, bool): if p: return {"disable": True}

5 years, 10 months

Add python module boto3 for AWS communication

by Simon Betz

Module: check_mk Branch: master Commit: 93a2e7ad4bbb2da26a4abb1b4cb7be719cd39700 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93a2e7ad4bbb2d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 12 12:59:00 2018 +0100 Add python module boto3 for AWS communication Change-Id: I75763d9a3e3e6fbbe736f390fc645f842aa1f08d --- Pipfile | 2 +- omd/packages/python-modules/Makefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 1e8f0ba..3f5f0b8 100644 --- a/Pipfile +++ b/Pipfile @@ -92,7 +92,7 @@ requests-oauthlib = "==1.0.0" # needed by azure stuff urllib3 = "==1.24" # needed by azure stuff Werkzeug = "==0.14.1" # Added for the GUI passlib = "==1.7.1" # Added for the GUI - +boto3 = "==1.9.42" # needed for aws stuff [requires] python_version = "2.7" diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 6d9d031..584c843 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -157,6 +157,8 @@ MODULES += urllib3-1.24.tar.gz # Added for the GUI MODULES += Werkzeug-0.14.1.tar.gz MODULES += passlib-1.7.1.tar.gz +# Added for AWS special agent +MODULES += boto3-1.9.42.tar.gz .PHONY: build check-freetds install skel clean

5 years, 10 months

further refactoring

by Moritz Kiemer

Module: check_mk Branch: master Commit: 3d1b87ff4bc9e4f4b6612af2a746d5eefd85c2b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d1b87ff4bc9e4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Nov 12 14:00:32 2018 +0100 further refactoring Remove some more duplicate code and try to separate computation from writing to stdout. Change-Id: I6ae9d75a2c106475478847f299f9c9e859a11271 --- agents/plugins/mk_jolokia | 61 ++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index c7c4be7..328d64c 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -306,6 +306,17 @@ def _get_queries(do_search, inst, itemspec, title, path, mbean, mbean_search_res for mbean_exp in paths] +def _process_queries(inst, queries): + for mbean_path, title, itemspec in queries: + try: + for item, out_title, value in fetch_metric(inst, mbean_path, title, itemspec): + yield item, out_title, value + except (IOError, socket.timeout): + raise SkipInstance() + except () if DEBUG else Exception: + continue + + def query_instance(inst): try: prepare_http_opener(inst) @@ -321,24 +332,16 @@ def query_instance(inst): # TODO: Untie mbean_search_results / query calculation and jolokia_metrics processing mbean_search_results = {} - sys.stdout.write('<<<jolokia_metrics>>>\n') - # Fetch the general information first - for var in QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst["product"], []): - mbean, path, title, itemspec, do_search = var - - queries = _get_queries(do_search, inst, itemspec, title, path, mbean, mbean_search_results) + shipped_vars = QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst["product"], []) + custom_vars = inst.get("custom_vars") - for mbean_path, title, itemspec in queries: - try: - for out_item, out_title, out_value in fetch_metric(inst, mbean_path, title, - itemspec): - sys.stdout.write("%s %s %s\n" % (out_item, out_title, out_value)) - except (IOError, socket.timeout): - raise SkipInstance() - except () if DEBUG else Exception: - continue + sys.stdout.write('<<<jolokia_metrics>>>\n') + for result in generate_values(inst, shipped_vars, mbean_search_results): + sys.stdout.write(' '.join(map(str, result)) + '\n') - output_custom_vars(inst, mbean_search_results) + sys.stdout.write('<<<jolokia_generic>>>\n') + for result in generate_values(inst, custom_vars, mbean_search_results): + sys.stdout.write(' '.join(map(str, result)) + '\n') def prepare_http_opener(inst): @@ -388,26 +391,18 @@ def output_jolokia_info(inst): raise SkipInstance() -def output_custom_vars(inst, mbean_search_results): - custom_vars = inst.get("custom_vars") - if not custom_vars: - return - - sys.stdout.write('<<<jolokia_generic>>>\n') - for var in custom_vars: - mbean, path, title, itemspec, do_search, value_type = var +def generate_values(inst, var_list, mbean_search_results): + for var in var_list: + mbean, path, title, itemspec, do_search = var[:5] + value_type = var[5] if len(var) >= 6 else None queries = _get_queries(do_search, inst, itemspec, title, path, mbean, mbean_search_results) - for mbean_path, title, itemspec in queries: - try: - for out_item, out_title, out_value in fetch_metric(inst, mbean_path, title, - itemspec): - sys.stdout.write("%s %s %s %s\n" % (out_item, out_title, out_value, value_type)) - except (IOError, socket.timeout): - raise SkipInstance() - except () if DEBUG else Exception: - continue + for item, title, value in _process_queries(inst, queries): + if value_type: + yield item, title, value, value_type + else: + yield item, title, value def yield_configured_instances():

5 years, 10 months

bring back: ignore empty status texts

by Moritz Kiemer

Module: check_mk Branch: master Commit: 906ceb51c16bd6ed36301b83728646378ab7797b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=906ceb51c16bd6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Nov 12 12:09:37 2018 +0100 bring back: ignore empty status texts Change-Id: I8c839b6b664d6d87d60d45f566ca3bcd1fd00715 --- cmk_base/checking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 9af4b25..7d40784 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -463,7 +463,7 @@ def _sanitize_yield_check_result(result, is_snmp): st, text, perf = _sanitize_tuple_check_result(subresult, allow_missing_infotext=True) status = cmk_base.utils.worst_service_state(st, status) - if text != None: + if text: infotexts.append(text + ["", "(!)", "(!!)", "(?)"][st]) if perf != None:

5 years, 10 months

Changed unit test symlinks to reflect the python module hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: 364f00c3b6f74eab83edce9a712853b4a9b2140a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=364f00c3b6f74e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 12 13:28:20 2018 +0100 Changed unit test symlinks to reflect the python module hierarchy Change-Id: I4870f1cc0a01715cac7d034fde3ea2e980799fc6 --- tests/unit/cmk/cee | 1 + tests/unit/cmk/gui/cee | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/unit/cmk/cee b/tests/unit/cmk/cee new file mode 120000 index 0000000..c9cb3b1 --- /dev/null +++ b/tests/unit/cmk/cee @@ -0,0 +1 @@ +../../../enterprise/tests/unit/cmk/cee \ No newline at end of file diff --git a/tests/unit/cmk/gui/cee b/tests/unit/cmk/gui/cee new file mode 120000 index 0000000..8de95c4 --- /dev/null +++ b/tests/unit/cmk/gui/cee @@ -0,0 +1 @@ +../../../../enterprise/tests/unit/cmk/gui/cee \ No newline at end of file

5 years, 10 months

reduce pylint warnings to two

by Moritz Kiemer

Module: check_mk Branch: master Commit: b18d4e88ce1f4c30686fee88a39e949bc68532c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b18d4e88ce1f4c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Nov 12 11:48:39 2018 +0100 reduce pylint warnings to two Change-Id: Ib318f1f7a4510ac978e780a8860eb40134065d45 --- agents/plugins/mk_jolokia | 120 +++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 66 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 82b7a76..c7c4be7 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -42,8 +42,8 @@ except ImportError: sys.stdout.write("Error: Missing JSON library for Agent Plugin mk_jolokia\n") exit() -opt_verbose = '--verbose' in sys.argv -opt_debug = '--debug' in sys.argv +VERBOSE = '--verbose' in sys.argv +DEBUG = '--debug' in sys.argv class SkipInstance(Exception): @@ -59,9 +59,9 @@ class PreemptiveBasicAuthHandler(urllib2.HTTPBasicAuthHandler): def http_request(self, req): url = req.get_full_url() realm = None - user, pw = self.passwd.find_user_password(realm, url) - if pw: - raw = "%s:%s" % (user, pw) + user, pwd = self.passwd.find_user_password(realm, url) + if pwd: + raw = "%s:%s" % (user, pwd) auth = 'Basic %s' % base64.b64encode(raw).strip() req.add_unredirected_header(self.auth_header, auth) return req @@ -104,9 +104,9 @@ class HTTPSAuthHandler(urllib2.HTTPSHandler): def https_open(self, req): # do_open expects a class as the first parameter but getConnection will act # as a facotry function - return self.do_open(self.getConnection, req) + return self.do_open(self.get_connection, req) - def getConnection(self, host, timeout): + def get_connection(self, host, _timeout): return HTTPSValidatingConnection( host, ca_file=self.__ca_file, key_file=self.__key, cert_file=self.__cert) @@ -117,16 +117,14 @@ def fetch_url_get(base_url, path, function): else: url = base_url + "/" - if opt_verbose: + if VERBOSE: sys.stderr.write("DEBUG: Fetching: %s\n" % url) try: json_data = urllib2.urlopen(url).read() - if opt_verbose: + if VERBOSE: sys.stderr.write("DEBUG: Result: %s\n\n" % json_data) - except Exception, e: - if opt_debug: - raise - sys.stderr.write("ERROR: %s\n" % e) + except () if DEBUG else Exception, exc: + sys.stderr.write("ERROR: %s\n" % exc) return [] return json_data @@ -149,16 +147,14 @@ def fetch_url_post(base_url, path, service_url, service_user, service_password, data["target"]["user"] = service_user data["target"]["password"] = service_password - if opt_verbose: + if VERBOSE: sys.stderr.write("DEBUG: Fetching: %s\n" % base_url) try: json_data = urllib2.urlopen(base_url, data=json.dumps(data)).read() - if opt_verbose: + if VERBOSE: sys.stderr.write("DEBUG: Result: %s\n\n" % json_data) - except Exception, e: - if opt_debug: - raise - sys.stderr.write("ERROR: %s\n" % e) + except () if DEBUG else Exception, exc: + sys.stderr.write("ERROR: %s\n" % exc) return [] return json_data @@ -183,8 +179,8 @@ def fetch_var(protocol, try: obj = json.loads(json_data) - except Exception, e: - sys.stderr.write('ERROR: Invalid json code (%s)\n' % e) + except (ValueError, TypeError), exc: + sys.stderr.write('ERROR: Invalid json code (%s)\n' % exc) sys.stderr.write(' Response %s\n' % json_data) return [] @@ -197,7 +193,7 @@ def fetch_var(protocol, # take the first items first value. # {'Catalina:host=localhost,path=\\/test,type=Manager': {'activeSessions': 0}} if 'value' not in obj: - if opt_verbose: + if VERBOSE: sys.stderr.write("ERROR: not found: %s\n" % path) return [] val = obj.get('value', None) @@ -211,23 +207,23 @@ def make_item_list(path, value, itemspec): if isinstance(value, str): value = value.replace(r'\/', '/') return [(path, value)] - else: - result = [] - for key, subvalue in value.items(): - # Handle filtering via itemspec - miss = False - while itemspec and '=' in itemspec[0]: - if itemspec[0] not in key: - miss = True - break - itemspec = itemspec[1:] - if miss: - continue - item = extract_item(key, itemspec) - if not item: - item = (key,) - result += make_item_list(path + item, subvalue, []) - return result + + result = [] + for key, subvalue in value.items(): + # Handle filtering via itemspec + miss = False + while itemspec and '=' in itemspec[0]: + if itemspec[0] not in key: + miss = True + break + itemspec = itemspec[1:] + if miss: + continue + item = extract_item(key, itemspec) + if not item: + item = (key,) + result += make_item_list(path + item, subvalue, []) + return result # Example: @@ -313,11 +309,11 @@ def _get_queries(do_search, inst, itemspec, title, path, mbean, mbean_search_res def query_instance(inst): try: prepare_http_opener(inst) - except Exception, e: - if opt_debug: + except () if DEBUG else Exception, exc: + if DEBUG: raise sys.stdout.write('<<<jolokia_info>>>\n') - sys.stderr.write("ERROR: %s\n" % e) + sys.stderr.write("ERROR: %s\n" % exc) raise SkipInstance() output_jolokia_info(inst) @@ -327,7 +323,7 @@ def query_instance(inst): sys.stdout.write('<<<jolokia_metrics>>>\n') # Fetch the general information first - for var in global_vars + specific_vars.get(inst["product"], []): + for var in QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst["product"], []): mbean, path, title, itemspec, do_search = var queries = _get_queries(do_search, inst, itemspec, title, path, mbean, mbean_search_results) @@ -337,14 +333,9 @@ def query_instance(inst): for out_item, out_title, out_value in fetch_metric(inst, mbean_path, title, itemspec): sys.stdout.write("%s %s %s\n" % (out_item, out_title, out_value)) - except IOError: + except (IOError, socket.timeout): raise SkipInstance() - except socket.timeout: - raise SkipInstance() - except: - if opt_debug: - raise - # Simply ignore exceptions. Need to be removed for debugging + except () if DEBUG else Exception: continue output_custom_vars(inst, mbean_search_results) @@ -383,12 +374,12 @@ def output_jolokia_info(inst): sys.stdout.write('<<<jolokia_info>>>\n') if server_info: - d = dict(server_info) - version = d.get(('info', 'version'), "unknown") - product = d.get(('info', 'product'), "unknown") + info_dict = dict(server_info) + version = info_dict.get(('info', 'version'), "unknown") + product = info_dict.get(('info', 'product'), "unknown") if inst.get("product"): product = inst["product"] - agentversion = d.get(('agent',), "unknown") + agentversion = info_dict.get(('agent',), "unknown") sys.stdout.write("%s %s %s %s\n" % (inst["instance"], product, version, agentversion)) else: sys.stdout.write("%s ERROR\n" % (inst["instance"],)) @@ -413,14 +404,9 @@ def output_custom_vars(inst, mbean_search_results): for out_item, out_title, out_value in fetch_metric(inst, mbean_path, title, itemspec): sys.stdout.write("%s %s %s %s\n" % (out_item, out_title, out_value, value_type)) - except IOError: - raise SkipInstance() - except socket.timeout: + except (IOError, socket.timeout): raise SkipInstance() - except: - if opt_debug: - raise - # Simply ignore exceptions. Need to be removed for debugging + except () if DEBUG else Exception: continue @@ -490,7 +476,7 @@ def yield_configured_instances(): yield config -global_vars = [ +QUERY_SPECS_GENERIC = [ ("java.lang:type=Memory", "NonHeapMemoryUsage/used", "NonHeapMemoryUsage", [], False), ("java.lang:type=Memory", "NonHeapMemoryUsage/max", "NonHeapMemoryMax", [], False), ("java.lang:type=Memory", "HeapMemoryUsage/used", "HeapMemoryUsage", [], False), @@ -546,7 +532,7 @@ global_vars = [ [], True), ] -specific_vars = { +QUERY_SPECS_SPECIFIC = { "weblogic": [ ("*:*", "CompletedRequestCount", None, ["ServerRuntime"], False), ("*:*", "QueueLength", None, ["ServerRuntime"], False), @@ -573,9 +559,11 @@ specific_vars = { False),], } -# ( '*:j2eeType=WebModule,name=/--/localhost/-/%(app)s,*/state', None, [ "name" ]), -# ( '*:j2eeType=Servlet,WebModule=/--/localhost/-/%(app)s,name=%(servlet)s,*/requestCount', None, [ "WebModule", "name" ]), -# ( "Catalina:J2EEApplication=none,J2EEServer=none,WebModule=*,j2eeType=Servlet,name=*", None, [ "WebModule", "name" ]), +# ('*:j2eeType=WebModule,name=/--/localhost/-/%(app)s,*/state', None, [ "name" ]), +# ('*:j2eeType=Servlet,WebModule=/--/localhost/-/%(app)s,name=%(servlet)s,*/requestCount', +# None, [ "WebModule", "name" ]), +# ("Catalina:J2EEApplication=none,J2EEServer=none,WebModule=*,j2eeType=Servlet,name=*", +# None, [ "WebModule", "name" ]), # We have to deal with socket timeouts. Python > 2.6 # supports timeout parameter for the urllib2.urlopen method

5 years, 10 months

remove compatibility code

by Moritz Kiemer

Module: check_mk Branch: master Commit: 632a56ffc2078b528233ab0971d2d47f66d327ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=632a56ffc2078b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Nov 12 10:44:56 2018 +0100 remove compatibility code Change-Id: I306268723c64582597b38724f42095ed0a035ee9 --- agents/plugins/mk_jolokia | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 0cb05dd..82b7a76 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -328,14 +328,7 @@ def query_instance(inst): sys.stdout.write('<<<jolokia_metrics>>>\n') # Fetch the general information first for var in global_vars + specific_vars.get(inst["product"], []): - # support old and new configuration format so we stay compatible with older - # configuration files - if len(var) == 3: - path, title, itemspec = var - mbean, path = path.split("/", 1) - do_search = False - else: - mbean, path, title, itemspec, do_search = var + mbean, path, title, itemspec, do_search = var queries = _get_queries(do_search, inst, itemspec, title, path, mbean, mbean_search_results) @@ -412,6 +405,7 @@ def output_custom_vars(inst, mbean_search_results): sys.stdout.write('<<<jolokia_generic>>>\n') for var in custom_vars: mbean, path, title, itemspec, do_search, value_type = var + queries = _get_queries(do_search, inst, itemspec, title, path, mbean, mbean_search_results) for mbean_path, title, itemspec in queries:

5 years, 10 months

6857 FIX Fixed broken links in about snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: b242b760b016760a1e6f113658c11673a0513f9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b242b760b01676… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 12 13:33:46 2018 +0100 6857 FIX Fixed broken links in about snapin Fixed broken links in about snapin and removed version information which is already shown in the header. The links are now opened in a new window/tab instead of the right frame. Change-Id: I66558ef27340696d9039ceab5db117d99391f5ea --- .werks/6857 | 13 +++++++++++++ cmk/gui/plugins/sidebar/about.py | 16 ++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.werks/6857 b/.werks/6857 new file mode 100644 index 0000000..5647710 --- /dev/null +++ b/.werks/6857 @@ -0,0 +1,13 @@ +Title: Fixed broken links in about snapin +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541779730 + +Fixed broken links in about snapin and removed version information which is +already shown in the header. The links are now opened in a new window/tab +instead of the right frame. diff --git a/cmk/gui/plugins/sidebar/about.py b/cmk/gui/plugins/sidebar/about.py index a244ef1..5c2866e 100644 --- a/cmk/gui/plugins/sidebar/about.py +++ b/cmk/gui/plugins/sidebar/about.py @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import cmk - from cmk.gui.i18n import _ from cmk.gui.globals import html from . import SidebarSnapin, snapin_registry, bulletlink @@ -43,17 +41,11 @@ class About(SidebarSnapin): @classmethod def description(cls): - return _("Version information and Links to webpage, documentation, " - "and download of Check_MK") + return _("Links to webpage, documentation and download of Check_MK") def show(self): - html.write(_("Version: ") + cmk.__version__) html.open_ul() - bulletlink(_("Homepage"), "https://mathias-kettner.com/index.html") - bulletlink(_("Documentation"), "https://mathias-kettner.com/cms.html") - bulletlink(_("Download"), "https://mathias-kettner.com/download.php") + bulletlink(_("Homepage"), "https://mathias-kettner.com/check_mk.html", target="_blank") + bulletlink(_("Documentation"), "https://mathias-kettner.com/cms.html", target="_blank") + bulletlink(_("Download"), "https://mathias-kettner.com/download.php", target="_blank") html.close_ul() - - @classmethod - def allowed_roles(cls): - return ["admin", "user", "guest"]

5 years, 10 months

Fixed description of about snapin

by Marcel Arentz

Module: check_mk Branch: master Commit: 4e853090236668a1b62b0eb9d613e03dfb936b0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e853090236668… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Nov 12 12:38:26 2018 +0100 Fixed description of about snapin Change-Id: I840e91d0b5c35f878e70f939b0aa46f5156f9e3e --- cmk/gui/plugins/sidebar/about.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/sidebar/about.py b/cmk/gui/plugins/sidebar/about.py index 11a25c4..a244ef1 100644 --- a/cmk/gui/plugins/sidebar/about.py +++ b/cmk/gui/plugins/sidebar/about.py @@ -43,8 +43,8 @@ class About(SidebarSnapin): @classmethod def description(cls): - return _("Version information and Links to Documentation, " - "Homepage and Download of Check_MK") + return _("Version information and Links to webpage, documentation, " + "and download of Check_MK") def show(self): html.write(_("Version: ") + cmk.__version__)

5 years, 10 months

← Newer
1
...
31
32
33
34
35
36
37
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018