Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

Use discover of the check_api in Kubernetes checks

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4d5c83b4907b421bd42c97954c8b665eee53f9bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d5c83b4907b42… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Nov 20 09:43:24 2018 +0100 Use discover of the check_api in Kubernetes checks Change-Id: I59c6a6c6fefa5102ee87b80fbe9f01216101a8aa --- checks/k8s_component_statuses | 7 +------ checks/k8s_namespaces | 7 +++---- checks/k8s_persistent_volume_claims | 8 +++----- checks/k8s_persistent_volumes | 7 +++---- checks/k8s_roles | 7 +------ checks/k8s_storage_classes | 7 +------ 6 files changed, 12 insertions(+), 31 deletions(-) diff --git a/checks/k8s_component_statuses b/checks/k8s_component_statuses index c4b8473..f441feb 100644 --- a/checks/k8s_component_statuses +++ b/checks/k8s_component_statuses @@ -30,11 +30,6 @@ def parse_k8s_component_statuses(info): return json.loads(info[0][0]) -def inventory_k8s_component_statuses(parsed): - for component in parsed: - yield component, {} - - @get_parsed_item_data def check_k8s_component_statuses(item, _no_params, conditions): for condition in conditions: @@ -48,7 +43,7 @@ def check_k8s_component_statuses(item, _no_params, conditions): check_info['k8s_component_statuses'] = { 'parse_function': parse_k8s_component_statuses, - 'inventory_function': inventory_k8s_component_statuses, + 'inventory_function': discover(), 'check_function': check_k8s_component_statuses, 'service_description': 'Component %s', } diff --git a/checks/k8s_namespaces b/checks/k8s_namespaces index b8a9509..0df4bf6 100644 --- a/checks/k8s_namespaces +++ b/checks/k8s_namespaces @@ -30,10 +30,9 @@ def parse_k8s_namespaces(info): return json.loads(info[0][0]) -def inventory_k8s_namespaces(parsed): - for namespace, status in parsed.iteritems(): - if status.get('status').get('phase', '') == 'Active': - yield namespace, {} +@discover +def inventory_k8s_namespaces(_namespace, status): + return status.get('status', {}).get('phase', '') == 'Active' @get_parsed_item_data diff --git a/checks/k8s_persistent_volume_claims b/checks/k8s_persistent_volume_claims index b64e120..2f9a1e1 100644 --- a/checks/k8s_persistent_volume_claims +++ b/checks/k8s_persistent_volume_claims @@ -30,11 +30,9 @@ def parse_k8s_persistent_volume_claims(info): return json.loads(info[0][0]) -def inventory_k8s_persistent_volume_claims(parsed): - for claim, data in parsed.iteritems(): - if data.get('phase', '') != 'Bound': - continue - yield claim, {} +@discover +def inventory_k8s_persistent_volume_claims(_claim, data): + return data.get('phase', '') == 'Bound' @get_parsed_item_data diff --git a/checks/k8s_persistent_volumes b/checks/k8s_persistent_volumes index dc8480b..f8d5cfa 100644 --- a/checks/k8s_persistent_volumes +++ b/checks/k8s_persistent_volumes @@ -30,10 +30,9 @@ def parse_k8s_persistent_volumes(info): return json.loads(info[0][0]) -def inventory_k8s_persistent_volumes(parsed): - for pc, status in parsed.iteritems(): - if status.get('status').get('phase', '') == 'Bound': - yield pc, {} +@discover +def inventory_k8s_persistent_volumes(_pv, status): + return status.get('status', {}).get('phase', '') == 'Bound' @get_parsed_item_data diff --git a/checks/k8s_roles b/checks/k8s_roles index b71e3ae..6ebeacc 100644 --- a/checks/k8s_roles +++ b/checks/k8s_roles @@ -30,11 +30,6 @@ def parse_k8s_roles(info): return json.loads(info[0][0]) -def inventory_k8s_roles(parsed): - for role in parsed: - yield role, {} - - @get_parsed_item_data def check_k8s_roles(item, _no_params, role): age = time.time() - role['creation_timestamp'] @@ -49,7 +44,7 @@ def check_k8s_roles(item, _no_params, role): check_info['k8s_roles'] = { 'parse_function': parse_k8s_roles, - 'inventory_function': inventory_k8s_roles, + 'inventory_function': discover(), 'check_function': check_k8s_roles, 'service_description': 'Role %s', } diff --git a/checks/k8s_storage_classes b/checks/k8s_storage_classes index b9b8cae..609c31f 100644 --- a/checks/k8s_storage_classes +++ b/checks/k8s_storage_classes @@ -30,11 +30,6 @@ def parse_k8s_storage_classes(info): return json.loads(info[0][0]) -def inventory_k8s_storage_classes(parsed): - for storage_name in parsed: - yield storage_name, {} - - @get_parsed_item_data def check_k8s_storage_classes(_no_item, _no_params, storage): reclaim_policy = storage.get('reclaim_policy') @@ -48,7 +43,7 @@ def check_k8s_storage_classes(_no_item, _no_params, storage): check_info['k8s_storage_classes'] = { 'parse_function': parse_k8s_storage_classes, - 'inventory_function': inventory_k8s_storage_classes, + 'inventory_function': discover(), 'check_function': check_k8s_storage_classes, 'service_description': 'Storage class %s', }

5 years, 10 months

Dynamic configuration: Additional steps

by Lars Michelsen

Module: check_mk Branch: master Commit: 24d77e5aa059ea2f5e72ac1bfa21711e77a64b38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24d77e5aa059ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 5 08:42:52 2018 +0100 Dynamic configuration: Additional steps * Add global setting for configuring the Web API connection of the DCD. By default it uses the site local Web API and the Check_MK default "automation" user (in case it's available). * Connection manager is now managing the configured connections in dedicated threads. * Implemented connector plugin API cmk.cee.dcd.connectors.utils. * Add sample piggyback connector which is able to create and delete hosts based on the locally available piggyback data. * Add basic Web API client class (most parts have been borrowed from tests/testlib/__init__.py). Currently only host actions are needed. * Add tests for a lot of the new parts. CMK-1143 CMK-1144 Change-Id: Ib5d00a5844d8ef9e6377fcb1697ae2963331fac8 --- tests/unit/cmk/gui/test_watolib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/cmk/gui/test_watolib.py b/tests/unit/cmk/gui/test_watolib.py index a2da5c5..50271f9 100644 --- a/tests/unit/cmk/gui/test_watolib.py +++ b/tests/unit/cmk/gui/test_watolib.py @@ -113,6 +113,7 @@ def test_registered_configvars(): 'context_buttons_to_show', 'crash_report_target', 'dcd_log_levels', + 'dcd_web_api_connection', 'debug', 'debug_livestatus_queries', 'debug_rules',

5 years, 10 months

6650 FIX winperf_processor.util predictive levels retrieval

by Óscar Nájera

Module: check_mk Branch: master Commit: f146a72c4d47ee7a68ea48b21ab1d89a1f81ec0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f146a72c4d47ee… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 19 18:55:40 2018 +0100 6650 FIX winperf_processor.util predictive levels retrieval Werk 6126 changed the metric name(performance data value) but missed changing this name in the variable for retrieval of data to generate the predictive levels. If retrieval of rrd is gives a response but without data, then exception is raised too. Change-Id: I5bfc24bdd0ace8b1b6c0235ef2a724957c289a9c --- .werks/6650 | 16 ++++++++++++++++ checks/cpu_util.include | 2 +- cmk_base/prediction.py | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/6650 b/.werks/6650 new file mode 100644 index 0000000..f7d4270 --- /dev/null +++ b/.werks/6650 @@ -0,0 +1,16 @@ +Title: winperf_processor.util predictive levels retrieval +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0p8 +Date: 1542729817 +Class: fix + +Werk 6126 changed the metric name(performance data value) but missed +changing this name in the variable for retrieval of data to generate the +predictive levels. + +If retrieval of rrd is gives a response but without data, then exception is +raised too. + diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 919a52d..30090ae 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -69,7 +69,7 @@ def check_cpu_util(util, params, this_time=None, cores=None): if "average" in params: util_avg = get_average("cpu_utilization.avg", this_time, util, params["average"]) check_against = util_avg - perfvar = "avg" + perfvar = "util_average" infotext += ", %dmin average: %.1f%%" % (params["average"], util_avg) else: check_against = util diff --git a/cmk_base/prediction.py b/cmk_base/prediction.py index cba43f1..13bba2b 100644 --- a/cmk_base/prediction.py +++ b/cmk_base/prediction.py @@ -65,7 +65,7 @@ def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime raise raise MKGeneralException("Cannot get historic metrics via Livestatus: %s" % e) - if not response: + if not response or not response[3:]: raise MKGeneralException("Got no historic metrics") step, values = response[2], response[3:]

5 years, 10 months

fix install-global dependency

by Alex Zurhake

Module: check_mk Branch: master Commit: 27b96dbde07a91f30f10efda11c5136fd91edac8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27b96dbde07a91… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Nov 21 09:24:37 2018 +0100 fix install-global dependency Change-Id: I8068599f73433a8dbdb396537ee6ba4b69704ccc --- omd/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index dd3df58..35be6b5 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -72,6 +72,7 @@ NEW_VERSION_STRING := $(subst /,-,$(NEW_VERSION)) PRE_INSTALL := $(BUILD_HELPER_DIR)/pre-install PRE_SKEL := $(BUILD_HELPER_DIR)/pre-skel +PRE_CMA := $(BUILD_HELPER_DIR)/pre-cma .PHONY: install-global @@ -117,7 +118,7 @@ install: $(addsuffix -install,$(PACKAGES)) chmod -R o+Xr $(DESTDIR)$(OMD_ROOT) -$(PRE_SKEL): install +$(PRE_SKEL): install-global # Install skeleton files (subdirs skel/ in packages' directories) mkdir -p $(DESTDIR)$(OMD_ROOT)/skel @set -e ; cd packages ; for p in $(PACKAGES) ; do \ @@ -178,7 +179,7 @@ clean: $(addsuffix -clean,$(PACKAGES)) # Create installations files that do not lie beyond /omd/versions/$(OMD_VERSION) # and files not owned by a specific package. -install-global: +install-global: install # Create link to default version ln -s $(OMD_VERSION) $(DESTDIR)$(OMD_BASE)/versions/default @@ -319,16 +320,16 @@ setversion: test: t/test_all.sh -cma-pre: check-edition +$(PRE_CMA): check-edition # make the cmc the default core sed -i 's/default)/default) echo "cmc"; exit;/g' packages/omd/CORE.hook # enable the event console by default sed -i 's/default)/default) echo "on"; exit;/g' packages/check_mk/MKEVENTD.hook -cma-install: +cma-install: $(PACKAGES) $(CMA_PRE) make -C packages/cma install -cma: cma-pre $(PACKAGES) cma-install pack +cma: cma-install pack # Create info file to mark minimal cma firmware version requirement @if [ "$(DISTRO_CODE)" = "stretch" ]; then \

5 years, 10 months

Refactored config variable registration to plugin registry API

by Lars Michelsen

Module: check_mk Branch: master Commit: cf1995cf6a05756945b9216405d7a0a9eaaccef9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf1995cf6a0575… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 20 13:28:50 2018 +0100 Refactored config variable registration to plugin registry API * Previously configuration variable groups were not cleanly registered. They were created implicitly by using them and optionally adding an entry to the dictionary returned by configvar_order(). The groups now need to be declared by creating a subclass of the base class ConfigVariableGroup and registering it to the config_variable_group_registry. * Configuration variables are now also registered using our standard plugin registry approach. For the moment we have added a compatibility wrapper to keep the register_configvar() function calls working. During the next days / weeks we plan to remove the register_configvar() calls and replace them with the new registration logic. CMK-1309 Change-Id: I799f77d3c8518285bffb3b2055d2ad71452edc66 --- cmk/gui/plugins/wato/__init__.py | 8 +- cmk/gui/plugins/wato/check_mk_configuration.py | 215 +++++++++++++++---------- cmk/gui/plugins/wato/globals_notification.py | 30 ++-- cmk/gui/plugins/wato/omd_configuration.py | 28 ++-- cmk/gui/plugins/wato/utils/__init__.py | 6 +- cmk/gui/plugins/watolib/utils.py | 136 +++++++++++++--- cmk/gui/wato/__init__.py | 1 - cmk/gui/wato/mkeventd.py | 111 ++++++++----- cmk/gui/wato/pages/global_settings.py | 70 ++++---- cmk/gui/wato/pages/sites.py | 20 +-- cmk/gui/watolib.py | 21 +-- tests/unit/cmk/gui/test_watolib.py | 212 ++++++++++++++++++++++++ 12 files changed, 630 insertions(+), 228 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cf1995cf6a…

5 years, 10 months

Fix some bandit findings

by Lars Michelsen

Module: check_mk Branch: master Commit: f269e109ed804fd508750f13533720615d6d1910 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f269e109ed804f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 20 16:29:01 2018 +0100 Fix some bandit findings * Fix issues in files we deliver and some helper scripts * Suppress warnings in internal helper scripts and scripts we are about to drop soon(TM) Change-Id: I5e7ad8703a3756eb1cf137f9adec287a421a9023 --- active_checks/check_sftp | 3 +- agents/plugins/plesk_backups | 6 ++-- doc/helpers/figheader | 7 +++-- .../Event_Console/nsca2mkeventd/nsca2mkeventd | 2 +- scripts/autodetect.py | 11 ++++--- scripts/make_package_info | 2 +- werk | 34 ++++++++++++---------- 7 files changed, 36 insertions(+), 29 deletions(-) diff --git a/active_checks/check_sftp b/active_checks/check_sftp index f3919cc..9cbf335 100755 --- a/active_checks/check_sftp +++ b/active_checks/check_sftp @@ -167,7 +167,8 @@ def file_available(working_dir): def create_testfile(paths): path = paths["local_put_path"] if not os.path.isfile(path): - os.system('echo "This is a test by Check_MK" > %s' % path) + with open(path, "w") as f: + f.write("This is a test by Check_MK\n") def put_file(paths): diff --git a/agents/plugins/plesk_backups b/agents/plugins/plesk_backups index d4d95b2..58d31cb 100755 --- a/agents/plugins/plesk_backups +++ b/agents/plugins/plesk_backups @@ -33,7 +33,8 @@ import datetime import sys import time -from ftplib import FTP +# Bandit complains about insecure protocol (B321). THis is the only possible protocol. Allow it. +from ftplib import FTP # nosec import MySQLdb @@ -95,7 +96,8 @@ for domain, p in domains.iteritems(): output.append('%s 4' % domain) # Backup nicht konfiguriert continue - ftp = FTP( + # Bandit complains about insecure protocol (B321). THis is the only possible protocol. Allow it. + ftp = FTP( # nosec p['backup_ftp_settinghost'], p['backup_ftp_settinglogin'], p['backup_ftp_settingpassword'], diff --git a/doc/helpers/figheader b/doc/helpers/figheader index 431e02e..35e87f7 100755 --- a/doc/helpers/figheader +++ b/doc/helpers/figheader @@ -1,6 +1,7 @@ #!/usr/bin/python -import os, sys +import sys +import subprocess if sys.argv[1] == '--css': first = "/*-" @@ -38,7 +39,9 @@ sepmid = sep + '-' * (width - len(sep) - 1) + '+' title = " ".join(sys.argv[1:]) first_line = first + "-" + title print first_line + '-' * (width - len(first_line) - 1) + '.' -for line in os.popen("figlet -c -w %d '%s'" % (width - 7, title), "r"): +for line in subprocess.Popen(["figlet", "-c", "-w", "%s" % (width - 7), title], + shell=False, + stdout=subprocess.PIPE).stdout: line = line[:-1] print(cont + "|%-" + str(width - len(cont) - 2) + "s|") % line print sepmid diff --git a/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd b/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd index 7dbde5c..40682ac 100755 --- a/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd +++ b/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd @@ -167,7 +167,7 @@ def create_pipe(): if not os.path.exists(g_pipe_path): os.mkfifo(g_pipe_path) - os.chmod(g_pipe_path, 0666) + os.chmod(g_pipe_path, 0660) log("Created pipe '%s' for receiving commands from nsca" % g_pipe_path) diff --git a/scripts/autodetect.py b/scripts/autodetect.py index 6b6a008..9f8b822 100755 --- a/scripts/autodetect.py +++ b/scripts/autodetect.py @@ -148,7 +148,7 @@ def find_apache_properties(nagiosuser, nagios_htdocs_dir): apache_conffile = None apache_confdir = None httpd_root = "" - for line in os.popen("%s -V 2>&1" % apache_binary): + for line in os.popen("%s -V 2>&1" % apache_binary): # nosec parts = line.split() if parts[0] == "-D" and len(parts) > 1: p = parts[1].split("=") @@ -229,7 +229,6 @@ def find_apache_properties(nagiosuser, nagios_htdocs_dir): except: if opt_debug: raise - pass except: if opt_debug: @@ -237,8 +236,8 @@ def find_apache_properties(nagiosuser, nagios_htdocs_dir): apache_confdir = None nagios_htpasswd_file = None - www_groups = os.popen("id -nG " + wwwuser).read().split() - nagios_groups = os.popen("id -nG " + nagiosuser).read().split() + www_groups = os.popen("id -nG " + wwwuser).read().split() # nosec + nagios_groups = os.popen("id -nG " + nagiosuser).read().split() # nosec common_groups = [g for g in www_groups if g in nagios_groups] if len(common_groups) > 1: if 'nagios' in common_groups: @@ -447,7 +446,7 @@ try: # Nagios version result['nagios_version'] = "" - for line in os.popen(result["nagios_binary"] + " --version 2>/dev/null"): + for line in os.popen(result["nagios_binary"] + " --version 2>/dev/null"): # nosec if line.startswith("Nagios Core") or line.startswith("Icinga Core"): result['nagios_version'] = line.split()[2] @@ -504,7 +503,7 @@ try: for stats_name in ["stats", "tats"]: try: stats_bin = result['nagios_binary'] + stats_name - for line in os.popen(stats_bin + " 2>/dev/null"): + for line in os.popen(stats_bin + " 2>/dev/null"): # nosec if line.startswith("Status File:"): parts = line.split() nagios_status_file = parts[-1] diff --git a/scripts/make_package_info b/scripts/make_package_info index e14726c..fc86576 100755 --- a/scripts/make_package_info +++ b/scripts/make_package_info @@ -22,7 +22,7 @@ for part in parts: tarfile = part + ".tar.gz" filelist = [] filelists[part] = filelist - for fn in os.popen("tar tzf %s" % tarfile, "r"): + for fn in os.popen("tar tzf %s" % tarfile, "r"): # nosec fn = fn.strip() if not fn.endswith("/"): filelist.append(fn) diff --git a/werk b/werk index 5c59a0a..8959701 100755 --- a/werk +++ b/werk @@ -185,7 +185,7 @@ def change_werk_version(werk_id, new_version): def git_add(werk): - os.system("git add %d" % werk["id"]) + os.system("git add %d" % werk["id"]) # nosec def git_commit(werk, custom_files): @@ -204,19 +204,20 @@ def git_commit(werk, custom_files): files_to_commit.append("%s/%s" % (git_top_level(), entry)) os.chdir(g_base_dir) - os.system( - "git commit %s -m %s" % (" ".join(files_to_commit), - quote_shell_string(title + "\n\n" + werk["description"]))) + cmd = "git commit %s -m %s" % (" ".join(files_to_commit), + quote_shell_string(title + "\n\n" + werk["description"])) + os.system(cmd) # nosec else: if something_in_git_index(): dash_a = '' - os.system("cd '%s' ; git add .werks" % git_top_level()) + os.system("cd '%s' ; git add .werks" % git_top_level()) # nosec else: dash_a = '-a' - os.system("git commit %s -m %s" % - (dash_a, quote_shell_string(title + "\n\n" + werk["description"]))) + cmd = "git commit %s -m %s" % (dash_a, + quote_shell_string(title + "\n\n" + werk["description"])) + os.system(cmd) # nosec def git_top_level(): @@ -561,7 +562,7 @@ def get_werk_arg(args): def main_blame(args): id = get_werk_arg(args) - os.system("git blame %d" % id) + os.system("git blame %d" % id) # nosec def main_url(args): @@ -594,7 +595,7 @@ def main_resolve(args): def main_delete(args): for ids in args: - if 0 == os.system("git rm %s" % ids): + if 0 == os.system("git rm %s" % ids): # nosec sys.stdout.write("Deleted werk %s (%s).\n" % (ids, g_werks[int(ids)]["description"])) @@ -686,7 +687,7 @@ def edit_werk(werkid, custom_files=[], commit=True): if not editor: bail_out("No editor available (please set EDITOR).\n") - if 0 == os.system("bash -c '%s +8 %s'" % (editor, werkid)): + if 0 == os.system("bash -c '%s +8 %s'" % (editor, werkid)): # nosec load_werks() werk = g_werks[werkid] git_add(g_werks[werkid]) @@ -701,8 +702,9 @@ def main_commit(args): sys.stdout.write("Commiting:\n") for id in g_modified: list_werk(g_werks[id]) - if 0 == os.system("git commit -m 'Updated werk entries %s' ." % (", ".join( - ["#%04d" % id for id in g_modified]))): + cmd = "git commit -m 'Updated werk entries %s' ." % (", ".join( + ["#%04d" % id for id in g_modified])) + if 0 == os.system(cmd): # nosec sys.stdout.write("--> Successfully committed %d werks.\n" % len(g_modified)) else: bail_out("Cannot commit.") @@ -723,12 +725,12 @@ def main_pick(args): def werk_cherry_pick(commit_id, no_commit): # Cherry-pick the commit in question from the other branch - os.system("git cherry-pick --no-commit '%s'" % commit_id) + os.system("git cherry-pick --no-commit '%s'" % commit_id) # nosec # Find werks that have been cherry-picked and change their version # to our current version load_werks() # might have changed - for line in os.popen("git status --porcelain"): + for line in os.popen("git status --porcelain"): # nosec # M .werks/103 # M werk status, filename = line.strip().split(None, 1) @@ -740,7 +742,7 @@ def werk_cherry_pick(commit_id, no_commit): # Commit if not no_commit: - os.system("git commit -C '%s'" % commit_id) + os.system("git commit -C '%s'" % commit_id) # nosec else: sys.stdout.write("We don't commit yet. Here is the status:\n") @@ -808,7 +810,7 @@ def main_fetch_ids(args): sys.stdout.write( 'Reserved %d additional IDs now. You have %d reserved IDs now.\n' % (num, len(my_ids))) - if 0 == os.system("git commit -m 'Reserved %d Werk IDS' ." % num): + if 0 == os.system("git commit -m 'Reserved %d Werk IDS' ." % num): # nosec sys.stdout.write("--> Successfully committed reserved werk IDS. Please push it soon!\n") else: bail_out("Cannot commit.")

5 years, 10 months

fix pack dependencies

by Alex Zurhake

Module: check_mk Branch: master Commit: 213628bafcada0c41697d7b3c462776d60c7dd11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=213628bafcada0… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Nov 21 07:42:54 2018 +0100 fix pack dependencies Change-Id: Ib6e96c314673999cc6a68521d21e3677b0424f91 --- omd/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index d487f69..dd3df58 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -91,10 +91,10 @@ ifeq ($(EDITION),managed) $(MAKE) -C $(PACKAGE_DIR)/check_mk_managed endif -pack: check-edition +pack: skel #TODO: Define dependecies here correctly... -$(PRE_INSTALL): +$(PRE_INSTALL): check-edition rm -rf $(DESTDIR) mkdir -p $(DESTDIR)$(OMD_PHYSICAL_BASE) A="$(OMD_PHYSICAL_BASE)" ; ln -s $${A:1} $(DESTDIR)/omd @@ -117,7 +117,7 @@ install: $(addsuffix -install,$(PACKAGES)) chmod -R o+Xr $(DESTDIR)$(OMD_ROOT) -$(PRE_SKEL): +$(PRE_SKEL): install # Install skeleton files (subdirs skel/ in packages' directories) mkdir -p $(DESTDIR)$(OMD_ROOT)/skel @set -e ; cd packages ; for p in $(PACKAGES) ; do \ @@ -178,7 +178,7 @@ clean: $(addsuffix -clean,$(PACKAGES)) # Create installations files that do not lie beyond /omd/versions/$(OMD_VERSION) # and files not owned by a specific package. -install-global: install +install-global: # Create link to default version ln -s $(OMD_VERSION) $(DESTDIR)$(OMD_BASE)/versions/default

5 years, 10 months

Automatic fix undiomatic comparison to None

by Óscar Nájera

5 years, 10 months

Automatic migration of exception syntax

by Óscar Nájera

5 years, 10 months

Fixed usage of password store

by Simon Betz

Module: check_mk Branch: master Commit: 940d4f387edce1bdb77f2871363b43494b5b581c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=940d4f387edce1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 20 13:42:36 2018 +0100 Fixed usage of password store Change-Id: Ib63eac3eebe7caa65fc151d904d925b1dc16fba9 --- agents/special/agent_aws | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 60a1e84..97b5415 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -31,6 +31,8 @@ import sys import argparse import boto3 +import cmk.password_store + def parse_arguments(argv): parser = argparse.ArgumentParser(description=__doc__) @@ -41,8 +43,11 @@ def parse_arguments(argv): return parser.parse_args(argv) -def main(): - args = parse_arguments(sys.argv[1:]) +def main(args=None): + if args is None: + cmk.password_store.replace_passwords() + args = sys.argv[1:] + args = parse_arguments(args) if not args.aws_access_key_id or not args.aws_secret_access_key or not args.region: sys.stderr.write("Access key ID, secret access key and region must be set.\n")

5 years, 10 months

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