Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

megaraid_ldisks: Cleaned up check, introduced parse function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8c66de80fa1b6154e2a698ec469a4ba393551d74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c66de80fa1b61… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jul 20 13:38:14 2016 +0200 megaraid_ldisks: Cleaned up check, introduced parse function --- checks/megaraid_ldisks | 102 ++++++++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 47 deletions(-) diff --git a/checks/megaraid_ldisks b/checks/megaraid_ldisks index e2a6624..27f2ef3 100644 --- a/checks/megaraid_ldisks +++ b/checks/megaraid_ldisks @@ -37,62 +37,70 @@ def megaraid_ldisks_is_new_drive(l): return l.startswith('Virtual Disk:') or l.startswith('Virtual Drive:') \ or l.startswith('CacheCade Virtual Drive:') -def inventory_megaraid_ldisks(info): - inventory = [] - adapter = None - for line in info: - l = ' '.join(line) - if line[0] == "Adapter" and not l.endswith('No Virtual Drive Configured.'): - adapter = int(line[1]) - elif megaraid_ldisks_is_new_drive(l): - disk = int(l.split(': ')[1].split(' ')[0]) - inventory.append( ("%d/%d" % (adapter, disk), "", None) ) - return inventory -def check_megaraid_ldisks(item, _no_params, info): +def parse_megaraid_ldisks(info): + parsed = {} adapter = None - cache = None - write = None - found = False - result = 0 - infotext = '' + disk = None for line in info: - l = ' '.join(line) + l = " ".join(line) if line[0] == "Adapter" and not l.endswith('No Virtual Drive Configured.'): adapter = int(line[1]) elif megaraid_ldisks_is_new_drive(l): - if found: - break disk = int(l.split(': ')[1].split(' ')[0]) - found = "%d/%d" % (adapter, disk) == item - elif found: + item = "%d/%d" % (adapter, disk) + parsed[item] = {} + + elif item in parsed.keys(): + if line[0].startswith("State"): - state = " ".join(line[1:]).replace(': ', '') - infotext += "state is %s" % state - if state != "Optimal": - result = max(result, 2) - elif line[0].startswith("Default") and line[1].startswith("Cache"): - cache = " ".join(line[3:]).replace(': ', '') - elif line[0].startswith("Current") and line[1].startswith("Cache"): - state = " ".join(line[3:]).replace(': ', '') - if cache != state: - infotext += ", cache is %s, expected %s" % (state, cache) - result = max(result, 1) - elif line[0].startswith("Default") and line[1].startswith("Write"): - write = " ".join(line[3:]).replace(': ', '') - elif line[0].startswith("Current") and line[1].startswith("Write"): - state = " ".join(line[3:]).replace(': ', '') - if write != state: - infotext += ", write is %s, expected %s" % (write, cache) - result = max(result, 1) - if found: - return (result, infotext) - return (3, "no such adapter/logical disk found") + parsed[item]["state"] = l.split(":")[1].strip() + elif line[0].startswith("Default"): + if line[1].startswith("Cache"): + parsed[item]["default_cache"] = " ".join(line[3:]).replace(': ', '') + elif line[1].startswith("Write"): + parsed[item]["default_write"] = " ".join(line[3:]).replace(': ', '') + + elif line[0].startswith("Current"): + if line[1].startswith("Cache"): + parsed[item]["current_cache"] = " ".join(line[3:]).replace(': ', '') + elif line[1].startswith("Write"): + parsed[item]["current_write"] = " ".join(line[3:]).replace(': ', '') + return parsed + + +def inventory_megaraid_ldisks(parsed): + for item in parsed.keys(): + yield item, None + + +def check_megaraid_ldisks(item, _no_params, parsed): + raidstate = parsed[item]["state"] + if raidstate == "Optimal": + yield 0, "State is %s" % raidstate + else: + yield 2, "State is %s" % raidstate + + current_cache = parsed[item].get("current_cache") + default_cache = parsed[item].get("default_cache") + if default_cache: + if current_cache == default_cache: + yield 0, "Cache is %s" % current_cache + else: + yield 1, "Cache is %s, expected %s" % (current_cache, default_cache) + + current_write = parsed[item].get("current_write") + default_write = parsed[item].get("default_write") + if default_write: + if current_write == default_write: + yield 0, "Write is %s" % current_write + else: + yield 1, "Write is %s, expected %s" % (current_write, default_write) check_info["megaraid_ldisks"] = { - 'check_function': check_megaraid_ldisks, - 'inventory_function': inventory_megaraid_ldisks, - 'service_description': 'RAID Adapter/LDisk %s', - 'has_perfdata': True, + 'parse_function': parse_megaraid_ldisks, + 'check_function': check_megaraid_ldisks, + 'inventory_function': inventory_megaraid_ldisks, + 'service_description': 'RAID Adapter/LDisk %s', }

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: d5647e251ef77a5205a1d17f8983a32a8d002d65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5647e251ef77a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 20 13:08:23 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/HostFileColumn.cc | 4 +- livestatus/src/LogwatchListColumn.cc | 10 +-- livestatus/src/OffsetStringMacroColumn.cc | 2 +- livestatus/src/PerfdataAggregator.cc | 2 +- livestatus/src/Query.cc | 2 +- livestatus/src/Renderer.cc | 103 +++++++++++++++-------------- livestatus/src/Renderer.h | 56 ++++++++++------ livestatus/src/RendererCSV.cc | 13 ++-- livestatus/src/RendererCSV.h | 8 +-- livestatus/src/RendererJSON.cc | 19 +++--- livestatus/src/RendererJSON.h | 6 +- livestatus/src/RendererPython.cc | 22 +++--- livestatus/src/RendererPython.h | 6 +- livestatus/src/StringColumn.cc | 6 +- livestatus/src/TableEventConsole.h | 2 +- livestatus/src/TableStateHistory.cc | 9 +-- livestatus/src/mk_inventory.cc | 14 ++-- livestatus/src/mk_inventory.h | 3 +- livestatus/src/mk_logwatch.cc | 4 +- livestatus/src/mk_logwatch.h | 2 +- 20 files changed, 155 insertions(+), 138 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d5647e251e…

8 years, 2 months

Several fixex and minor improvements to current password store implementation ;

by Lars Michelsen

Module: check_mk Branch: master Commit: df61d05214b6d200bbbf9ef4c3bb759aadef3c68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df61d05214b6d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 20 09:57:29 2016 +0200 Several fixex and minor improvements to current password store implementation; --- bin/.f12 | 2 +- bin/{pwquery.sh => pwquery} | 2 +- checks/check_http | 7 ++--- lib/passwordstore.py | 2 +- web/htdocs/valuespec.py | 49 +++++++++++++++++++++++---------- web/htdocs/wato.py | 3 ++ web/plugins/userdb/user_attributes.py | 21 +++++++++----- 7 files changed, 56 insertions(+), 30 deletions(-) diff --git a/bin/.f12 b/bin/.f12 index f9f022e..5b9bf09 100644 --- a/bin/.f12 +++ b/bin/.f12 @@ -4,7 +4,7 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} OMD_ROOT=/omd/sites/${SITE} make -sudo install -m 755 mkeventd mkeventd_open514 mkevent mkbackup $OMD_ROOT/bin/ +sudo install -m 755 mkeventd mkeventd_open514 mkevent mkbackup pwquery $OMD_ROOT/bin/ sudo chown root.omd $OMD_ROOT/bin/mkeventd_open514 sudo chmod 4750 $OMD_ROOT/bin/mkeventd_open514 echo "Installed to $OMD_ROOT/bin" diff --git a/bin/pwquery.sh b/bin/pwquery similarity index 94% rename from bin/pwquery.sh rename to bin/pwquery index 86d5f36..10b6124 100755 --- a/bin/pwquery.sh +++ b/bin/pwquery @@ -9,7 +9,7 @@ shift export PYTHONPATH=$OMD_ROOT/lib/python:$OMD_ROOT/local/lib/python $OMD_ROOT/bin/python $OMD_ROOT/lib/python/cmk/passwordstore.py\ - --get $1 --user $2\ + --get $1\ --keydir $OMD_ROOT/var/check_mk/private_keys\ --file $OMD_ROOT/var/check_mk/passwords.json diff --git a/checks/check_http b/checks/check_http index 0f8a4f8..7ac64b6 100644 --- a/checks/check_http +++ b/checks/check_http @@ -96,16 +96,13 @@ def check_http_arguments(params): if "auth" in settings: user, password = settings["auth"] if password.startswith("store:"): - group, password = password[6:].split(":", 1) - args += ' -a %s:%s --password-store %s' %\ - (quote_shell_string(user), quote_shell_string(password), - quote_shell_string(group)) + args += ' -a %s --password-store' % (quote_shell_string(user + ":" + password[6:])) else: if password.startswith("imm:"): password = password[4:] # else: assume that a password that starts with neither store nor imm is from an old # configuration and has no prefix - args += ' -a %s:%s' % (quote_shell_string(user), quote_shell_string(password)) + args += ' -a %s' % quote_shell_string(user + ":" + password) if "proxy_auth" in settings: auth = settings["proxy_auth"] diff --git a/lib/passwordstore.py b/lib/passwordstore.py index a1b27c8..e09e6e4 100644 --- a/lib/passwordstore.py +++ b/lib/passwordstore.py @@ -564,7 +564,7 @@ def do_action(store, args): logging.info("key \"%s\" set with owner \"%s\"", args.set[0], args.user) elif args.get is not None: try: - print(store.get(args.get, args.user)) + sys.stdout.write(store.get(args.get, args.user)) except NotAuthorizedException: logging.warn("User \"%s\" isn't authorized to retrive \"%s\"", args.user, args.get) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index cb912e7..fce02f1 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3373,6 +3373,8 @@ class PasswordSpec(TextAscii): html.icon_button("#", _(u"Show/Hide password"), "showhide", onclick="vs_toggle_hidden(this);") + + class PasswordFromStore(Alternative): def __init__(self, **kwargs): kwargs["elements"] = [ @@ -3391,6 +3393,7 @@ class PasswordFromStore(Alternative): ) Alternative.__init__(self, **kwargs) + def __stored_passwords(self): from cmk.passwordstore import CryptoBackend, PasswordStore, NonePasswordProvider backend = CryptoBackend(defaults.var_dir + "/private_keys", NonePasswordProvider()) @@ -3400,48 +3403,64 @@ class PasswordFromStore(Alternative): with PasswordStore(defaults.var_dir + "/passwords.json", backend) as store: return store.list(with_details=True) + def matching_alternative(self, value): if value.startswith("store:") and len(self._elements) > 1: - return self._elements[1], value.split(':', 2)[2] + return self._elements[1], value.split(':', 1)[1] elif value.startswith("imm:"): return self._elements[0], value.split(':', 1)[1] else: return self._elements[0], value + def value_to_text(self, value): return value.split(':', 1)[1] + def validate_datatype(self, value, varprefix): - return Alternative.validate_datatype(self, value.split(':', 2)[2], varprefix) + mvs, value = self.matching_alternative(value) + return Alternative.validate_datatype(self, value, varprefix) + - def __find_contactgroup(self, value, varprefix): + def __get_password_by_key(self, value, varprefix): for pw in self.__passwords: if pw['key'] == value: - import config, userdb - for group in userdb.contactgroups_of_user(config.user_id): - if "group:" + group in pw['shared']: - return group - raise MKUserError(varprefix, - _("You don't belong to a contact group with access to " - "password key %s") % value) - raise MKUserError(varprefix, _("Unknown password key %s") % value) + return pw + raise MKUserError(varprefix, _("Unknown password key: %s") % value) + + + def __may_use_password(self, key, varprefix): + import config, userdb + pw = self.__get_password_by_key(key, varprefix) + + if pw["owner"] == "user:" + config.user_id: + return # the users password + + for group in userdb.contactgroups_of_user(config.user_id): + if "group:" + group in pw['shared']: + return group # is shared with a users group + + raise MKUserError(varprefix, _("You don't have permission to use the password with " + "the key \"%s\", shared by user %s.") % (key, pw["owner"][5:])) + def validate_value(self, value, varprefix): - prefix, group, val = value.split(':', 2) + prefix, val = value.split(':', 1) if prefix == "store": # couldn't check user permission before, but now I can - self.__find_contactgroup(val, varprefix) + self.__may_use_password(val, varprefix) else: return Alternative.validate_value(self, val, varprefix) + def from_html_vars(self, varprefix): nr = int(html.var(varprefix + "_use")) if nr == 0: return "imm:" + Alternative.from_html_vars(self, varprefix) else: key = Alternative.from_html_vars(self, varprefix) - group = self.__find_contactgroup(key, varprefix) - return ":".join(["store", group, key]) + return ":".join(["store", key]) + class FileUpload(ValueSpec): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 047eca3..f44ae87 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10917,6 +10917,9 @@ def mode_edit_user(phase): select_language(user) custom_user_attributes('personal') + forms.header(_("Password Store"), isopen = False) + custom_user_attributes("password_store") + # Later we could add custom macros here, which then could be used # for notifications. On the other hand, if we implement some check_mk # --notify, we could directly access the data in the account with the need diff --git a/web/plugins/userdb/user_attributes.py b/web/plugins/userdb/user_attributes.py index 805613a..a1a1694 100644 --- a/web/plugins/userdb/user_attributes.py +++ b/web/plugins/userdb/user_attributes.py @@ -87,22 +87,29 @@ declare_user_attribute( "passwords", ListOf( Dictionary( - title = _("Password Store"), elements = [ ("key", TextAscii(title=_("Key"))), ("secret", PasswordSpec(title=_("Password"), allow_empty=True, hidden=True)), - ('contactgroups', ListChoice( - title = _('Share with Contact groups'), - help = _('Specify the contact groups that may access the password.'), + ("contactgroups", ListChoice( + title = _("Share with contact groups"), + help = _("By default you are the only user that can configure checks to use " + "your configured passwords. It is possible to share a password with " + "a group of users to make them able to use a password in checks."), default_value = [], choices = list_contactgroups, )) ], optional_keys=[] ), - title = _("Password"), - add_label = _("Add Password") + title = _("Password Store"), + add_label = _("Add Password"), + help = _("The password store is used to store multiple passwords per user which can then " + "be used by Check_MK during checking. The passwords are stored in encrypted form, " + "so that they can not be read by other users in clear text. They can be decrypted " + "by Check_MK during monitoring to hand over them to checks for authentification " + "with the monitoringed systems."), ), - domain = "passwords" + domain = "multisite", + topic = "password_store", )

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 79e01dadee4f67f2bb8b29e4f7cfdec9aa94dbf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79e01dadee4f67… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 19 16:41:38 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/Query.cc | 26 ++++++------ livestatus/src/Query.h | 3 -- livestatus/src/Renderer.cc | 10 ++--- livestatus/src/Renderer.h | 96 +++++++++++++++++++++++--------------------- 4 files changed, 69 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=79e01dadee…

8 years, 2 months

Fixed typo

by Lars Michelsen

Module: check_mk Branch: master Commit: 8dccfef293d94b7d8576d67034c585cb531aa79b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dccfef293d94b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 19 16:01:37 2016 +0200 Fixed typo --- web/htdocs/key_mgmt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/key_mgmt.py b/web/htdocs/key_mgmt.py index 4474549..e35023d 100644 --- a/web/htdocs/key_mgmt.py +++ b/web/htdocs/key_mgmt.py @@ -448,9 +448,9 @@ class PageDownloadKey(object): def page(self): html.write("<p>%s</p>" % - _("To be able to download the passphrase, you need to unlock the key by entering the " + _("To be able to download the key, you need to unlock the key by entering the " "passphrase. This is only done to verify that you are allowed to download the key. " - "The key will be downloaded encrypted form.")) + "The key will be downloaded in encrypted form.")) html.begin_form("key", method="POST") html.prevent_password_auto_completion() self._vs_key().render_input("key", {})

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: f02d796f750e2ccdfac496ea641167d845924c72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f02d796f750e2c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 19 15:51:58 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/Aggregator.h | 4 +- livestatus/src/AttributelistColumn.cc | 1 - livestatus/src/ContactgroupsColumn.cc | 1 - livestatus/src/ContactsColumn.cc | 1 - livestatus/src/CountAggregator.cc | 4 +- livestatus/src/CountAggregator.h | 4 +- livestatus/src/DoubleAggregator.cc | 12 ++-- livestatus/src/DoubleAggregator.h | 4 +- livestatus/src/DownCommColumn.cc | 6 -- livestatus/src/HostgroupsColumn.cc | 1 - livestatus/src/HostlistColumn.cc | 4 -- livestatus/src/IntAggregator.cc | 14 ++--- livestatus/src/IntAggregator.h | 4 +- livestatus/src/LogwatchListColumn.cc | 1 - livestatus/src/PerfdataAggregator.cc | 4 +- livestatus/src/PerfdataAggregator.h | 4 +- livestatus/src/Query.cc | 16 ++--- livestatus/src/Renderer.h | 104 ++++++++++++++++++++++----------- livestatus/src/ServicegroupsColumn.cc | 1 - livestatus/src/ServicelistColumn.cc | 13 ----- livestatus/src/TableEventConsole.h | 1 - 21 files changed, 102 insertions(+), 102 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f02d796f75…

8 years, 2 months

New commits on branch master

by git version control

URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e748d9d699a66… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 19 14:15:49 2016 +0200 Fixed pylint validation issues URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=306b714d56966c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 19 13:01:44 2016 +0200 mkbackup: restore can not be configured as backup id URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3efde72cc5bc8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 19 12:59:53 2016 +0200 mkbackup: New check for monitoring Check_MK backup jobs URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=972650ffc36036… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 19 09:52:19 2016 +0200 moved schedule calculation function to generic lib code URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2eddadf759ae7a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 19 09:39:05 2016 +0200 mkbackup: Files transfered with external systems are now in json format URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3180106a600a3d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 19 09:21:43 2016 +0200 Next execution time of backup schedules is now shown in GUI URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e94ab1244bc733… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 19 08:42:09 2016 +0200 mkbackup: Logging to syslog too on CMA URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7899611d7fa864… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 19 08:35:13 2016 +0200 mkbackup: Sites not supporting online backup are stopped/started during backups URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30b6ed1079d0e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 18 14:11:33 2016 +0200 cleaned up snapshot code and usage a bit URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=302219039a7178… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 18 13:59:21 2016 +0200 Stripped down WATO snapshots to really only care about WATO config URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee6a0cc15e6ab0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 18 10:54:28 2016 +0200 mkbackup: Show more details on backup list page URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d8db118b7d1d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 18 08:58:25 2016 +0200 mkbackup: Fixed site backup in case of restoring backups of sites using 1.2.8p5 or older URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d36578f3bc538e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 15 15:56:49 2016 +0200 mkbackup: config edit actions can now be disabled; minor cleanups URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=977a5c501a79b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 15 09:01:45 2016 +0200 mkbackup: Restore of cluster nodes is now possible URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef501bd2672efb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 14 11:42:08 2016 +0200 Moved some CMA specific code away URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=646bcfd5216373… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 14 10:32:33 2016 +0200 Fixed recently introduced bug in Alternative() valuespec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57ff943430818b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 14 10:19:09 2016 +0200 Fixed some validation errors URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f72f65fe5c9ed9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 14 09:05:13 2016 +0200 mkbackup: Add warning message for restoring inactive cluster nodes URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c667abb74b0a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 13 17:49:24 2016 +0200 mkbackup: key load - do not fail when no backup keys file exists URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf0918d1be0a4c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 13 16:08:11 2016 +0200 mkbackup: Do not show CMA backups on in site restore dialog anymore URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4501236d747b63… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 13 15:47:44 2016 +0200 mkbackup: Added reboot after CMA system restore URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bada5361d36419… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 13 13:56:11 2016 +0200 mkbackup: Startet whole implementing system restore for CMA URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=717d900bb71e56… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 11 09:58:35 2016 +0200 mkbackup: Fixed backup of CMA, slightly improved logging URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11b6b3d3858804… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 8 17:55:27 2016 +0200 mkbackup: Improved error handling in different situations URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce25f6835ff728… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 8 16:55:35 2016 +0200 mkbackup: Fixed system backup cronjobs URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01fe70ff15305f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 8 16:22:51 2016 +0200 mkbackup: Additional fixes for CMA integration URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c25332bbf441b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 8 14:08:36 2016 +0200 mkbackup: Cleaned up some problems URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4f024536989da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 8 13:30:20 2016 +0200 mkbackup: Added key store for CMA URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f599113b39741… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 6 11:11:23 2016 +0200 mkbackup: Encrypted backups can now be restored URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=413b5ae0ed4f3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 5 17:45:23 2016 +0200 mkbackup: Fixed restores from system targets URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=add43bdc6a4038… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 5 17:37:21 2016 +0200 mkbackup: Its now possible to restore site backups made with other sites URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c87cafc99f13b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 5 15:02:24 2016 +0200 mkbackup: Started implementation of restore via GUI URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a7d4db27645f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 4 09:32:30 2016 +0200 mkbackup: Open status file locked and with tempfile now URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68244feda9411e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jul 3 20:54:30 2016 +0200 mkbackup: Updated restore help text URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1ca8dcc1b5338… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jul 3 20:45:59 2016 +0200 mkbackup: Referencing backup keys by their cert fingerprint URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40f746ad3329aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jul 3 20:14:38 2016 +0200 Preventing system/site target conflicts URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ac834f800fa22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jul 3 11:39:03 2016 +0200 mkbackup: Improved styling of job states in GUI URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=283270fc8b47a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jul 3 11:34:53 2016 +0200 mkbackup: Schedules can now be disabled temporarily URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf29154482cdec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jul 2 19:44:56 2016 +0200 Fixed formating of backup/restore results URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=886cd7a3d0cc8d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jul 2 19:33:17 2016 +0200 mkbackup: Restoring of encrypted backups is now possible URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5845569a68309c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 1 21:33:55 2016 +0200 mkbackup: Backup keys can now be up- and downloaded URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=994ba815d80a70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 30 16:11:47 2016 +0200 mkbackup: Site restore is now working (from console) URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f4a24e695387d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 29 16:35:00 2016 +0200 Moved job state files to site/system specific directories URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60ad6a0691d0e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 29 16:15:18 2016 +0200 mkbackup: Implemented encryption of backed up files URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=224349e988dedf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 29 09:16:02 2016 +0200 mkbackup: Check for key usage during deletion URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52987885800a20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 27 17:00:12 2016 +0200 mkbackup: Showing idents in dialogs when editing jobs/targets URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cff734c731c93… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 27 16:50:29 2016 +0200 mkbackup: Fixed job creation when no target exists URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff043c3ef640e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jun 26 21:41:50 2016 +0200 mkbackup: Compression can now be configured URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bbfe12c382693… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jun 26 17:56:13 2016 +0200 Started to add backup key management URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76526a6b004e5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jun 26 14:44:31 2016 +0200 Generalized key management code and moved generic parts to Check_MK URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58757d4505512d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 22 15:49:42 2016 +0200 mkbackup: Cronjob config for schedules is now written URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25278707327ab0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 22 01:28:18 2016 +0200 mkbackup: Added validation for sites jobs using system targets during target deletion URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cb772b6e4f034… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 22 00:48:43 2016 +0200 mkbackup: Added optional check for active mount point URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27be11b20aa65b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 21 15:15:57 2016 +0200 mkbackup: Backups are now streamed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c36831b3b3a7ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 21 10:48:06 2016 +0200 mkbackup: Formated help output URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f026b2642b9da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 21 10:36:12 2016 +0200 Moved byte human readable formating to cmk lib URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d26ae85a765690… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 21 10:29:39 2016 +0200 mkbackup: Site backup can now be disabled by configuration URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a884be6e75a473… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 21 09:13:57 2016 +0200 mkbackup: Fixed backup of CMA files URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce9b11431e001b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 20 14:26:47 2016 +0200 Added system backup job class URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=769a900bfd115c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 20 13:31:23 2016 +0200 Fixed table row limit when default config not available (cma) URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bc791ea43da37… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 20 13:30:21 2016 +0200 mkbackup: Added target and job list modes URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78bec0d6f9012c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jun 19 23:27:48 2016 +0200 Cleaned up date time rendering URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64279264ef4995… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jun 19 22:55:26 2016 +0200 Backup: Several cleanups (fixes after restructuring, validations) URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baf147f92530b4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jun 18 13:43:05 2016 +0200 Moved cma/cmk common GUI code to backup.py URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2a2fcb2f201e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jun 18 12:14:19 2016 +0200 Listing of backups in target works now URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66004739aaf0c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 17 23:01:58 2016 +0200 mkbackup: Cleaned up localized strings; Improved logging; data backup now working basically URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56f6efc091e429… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 17 14:40:54 2016 +0200 System hostname is also used in WATO code URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99e624e98b7149… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 16 15:08:07 2016 +0200 Basic system (/rw) backup working; hostname set correctly URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a33b3560776804… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 16 14:42:18 2016 +0200 Cleaned up code and handling edge cases URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f4af2b3fcc62c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 14 18:06:51 2016 +0200 Sitebackup is now working in tests URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4844642b87c3f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 14 16:13:14 2016 +0200 Further progress in backup implementation URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f8aa245307f56… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 10 08:23:05 2016 +0200 Added global backup lock URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ff0d62fe6dab9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 9 16:03:01 2016 +0200 Started with mkbackup command line tool URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae1d261d7da456… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 9 10:49:58 2016 +0200 Added comments to structure the backup module URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=191f51eb59e38c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 9 10:42:39 2016 +0200 Backup schedules can be configured; Added planned backup target types URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=186610884578c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 9 09:20:25 2016 +0200 Moved WATO snapshot module to activate changes page URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37084929ee56b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 8 16:03:33 2016 +0200 Backup targets can be edited and deleted URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4eb95285854c1b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 8 14:53:15 2016 +0200 Started to implement site backup module

8 years, 2 months

2241 check_mk_agent.openwrt: Added section for local scripts and plugins

by Sven Rueß

Module: check_mk Branch: master Commit: 77530e677e33b12b165df7982615484467335ce9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77530e677e33b1… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Jul 19 14:14:37 2016 +0200 2241 check_mk_agent.openwrt: Added section for local scripts and plugins Added missing sections for local script and plugins. The agent supports the same information, except the following sections: <ul> <li>VirtualBox Guests</li> <li>MK's Remote Plugin Executor</li> <li>MK's runas Executor</li> </ul> Addional the Agent is missing following features: <ul> <li>Agent based encryption</li> </ul> --- .werks/2241 | 21 +++++++++ ChangeLog | 1 + agents/check_mk_agent.openwrt | 98 +++++++++++++++++++++++++++++++++++------ 3 files changed, 107 insertions(+), 13 deletions(-) diff --git a/.werks/2241 b/.werks/2241 new file mode 100644 index 0000000..8e66644 --- /dev/null +++ b/.werks/2241 @@ -0,0 +1,21 @@ +Title: check_mk_agent.openwrt: Added section for local scripts and plugins +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1468929868 +Class: feature + +Added missing sections for local script and plugins. + +The agent supports the same information, except the following sections: +<ul> + <li>VirtualBox Guests</li> + <li>MK's Remote Plugin Executor</li> + <li>MK's runas Executor</li> +</ul> + +Addional the Agent is missing following features: +<ul> + <li>Agent based encryption</li> +</ul> diff --git a/ChangeLog b/ChangeLog index cea99fd..d948592 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ * 3558 check_mail: now able to process mail body with Content-Transfer-Encoding base64... * 3695 f5_bigip_cluster_v11: Now WATO configurable... NOTE: Please refer to the migration notes! + * 2241 check_mk_agent.openwrt: Added section for local scripts and plugins... * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 8c9acd9..7de8a06 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -1,5 +1,5 @@ #!/bin/ash -# Check_MK Agent for Linux +# Check_MK Agent for OpenWRT # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | # | / ___| |__ ___ ___| | __ | \/ | |/ / | @@ -119,8 +119,10 @@ run_cached () { local NOW=$(date +%s) local section= local mrpe=0 + local append_age=0 if [ "$1" = -s ] ; then local section="echo '<<<$2:cached($NOW,$3)>>>' ; " ; shift ; fi if [ "$1" = -m ] ; then local mrpe=1 ; shift ; fi + if [ "$1" = -a ] ; then local append_age=1 ; shift ; fi local NAME=$1 local MAXAGE=$2 shift 2 @@ -145,14 +147,23 @@ run_cached () { # Check if cache file exists and is recent enough if [ -s "$CACHEFILE" ] ; then local MTIME=$(stat -c %Y "$CACHEFILE") - if [ $((NOW - MTIME)) -le $MAXAGE ] ; then local USE_CACHEFILE=1 ; fi + local AGE=$((NOW - MTIME)) + if [ $AGE -le $MAXAGE ] ; then local USE_CACHEFILE=1 ; fi # Output the file in any case, even if it is # outdated. The new file will not yet be available - cat "$CACHEFILE" + if [ $append_age -eq 1 ] ; then + # insert the cached-string before the pipe (first -e) + # or, if no pipe found (-e t) append it (third -e), + # but only once and on the second line (2!b) (first line is section header, + # all further lines are long output) + cat "$CACHEFILE" | sed -e "2s/|/ (Cached: ${AGE}\/${MAXAGE}s)|/" -e t -e "2s/$/ (Cached: ${AGE}\/${MAXAGE}s)/" + else + cat "$CACHEFILE" + fi fi # Cache file outdated and new job not yet running? Start it - if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then + if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then # When the command fails, the output is throws away ignored if [ $mrpe -eq 1 ] ; then echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & @@ -172,6 +183,11 @@ run_real_time_checks() . $MK_CONFDIR/real_time_checks.cfg + if [ "$PASSPHRASE" != "" ] ; then + # new mechanism to set the passphrase has priority + RTC_SECRET=$PASSPHRASE + fi + while true; do # terminate when pidfile is gone or other Real-Time Check process started or configured timeout if [ ! -e $PIDFILE ] || [ $(<$PIDFILE) -ne $$ ] || [ $RTC_TIMEOUT -eq 0 ]; then @@ -179,13 +195,22 @@ run_real_time_checks() fi for SECTION in $RTC_SECTIONS; do + if [ "$ENCRYPTED_RT" != "no" ] ; then + PROTOCOL=00 + else + PROTOCOL=99 + fi # Be aware of maximum packet size. Maybe we need to check the size of the section # output and do some kind of nicer error handling. # 2 bytes: protocol version, 10 bytes: timestamp, rest: encrypted data # dd is used to concatenate the output of all commands to a single write/block => udp packet - { echo -n 00 ; + { echo -n $PROTOCOL ; date +%s | tr -d '\n' ; - export RTC_SECRET=$RTC_SECRET ; section_$SECTION | openssl enc -aes-256-cbc -pass env:RTC_SECRET -nosalt ; + if [ "$ENCRYPTED_RT" != "no" ] ; then + export RTC_SECRET=$RTC_SECRET ; section_$SECTION | openssl enc -aes-256-cbc -pass env:RTC_SECRET -nosalt ; + else + section_$SECTION ; + fi } | dd bs=9999 iflag=fullblock 2>/dev/null >/dev/udp/$REMOTE/$RTC_PORT done @@ -195,8 +220,8 @@ run_real_time_checks() } echo '<<<check_mk>>>' -echo Version: 1.2.8b7 -echo AgentOS: linux +echo Version: 1.4.0i1 +echo AgentOS: openwrt echo Hostname: $HOSTNAME echo AgentDirectory: $MK_CONFDIR echo DataDirectory: $MK_VARDIR @@ -295,7 +320,6 @@ section_cpu echo '<<<uptime>>>' cat /proc/uptime - # New variant: Information about speed and state in one section if type ip > /dev/null then @@ -334,7 +358,6 @@ if type ovs-appctl > /dev/null ; then done fi - # Number of TCP connections in the various states echo '<<<tcp_conn_stats>>>' cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }' @@ -368,7 +391,9 @@ cat /proc/vmstat /proc/stat # Hardware sensors via IPMI (need ipmitool) if type ipmitool > /dev/null then - run_cached -s ipmi 300 "waitmax 300 ipmitool sensor list | grep -v 'command failed' | sed -e 's/ *| */|/g' -e 's/ /_/g' -e 's/_*"'$'"//' -e 's/|/ /g' | egrep -v '^[^ ]+ na ' | grep -v ' discrete '" + run_cached -s "ipmi:sep(124)" 300 "waitmax 300 ipmitool sensor list | grep -v 'command failed' | egrep -v '^[^ ]+ na ' | grep -v ' discrete '" + # readable discrete sensor states + run_cached -s "ipmi_discrete:sep(124)" 300 "waitmax 300 ipmitool sdr elist compact" fi # IPMI data via ipmi-sensors (of freeipmi). Please make sure, that if you @@ -628,7 +653,6 @@ if type zpool >/dev/null; then zpool status -x fi - # Veritas Cluster Server # Software is always installed in /opt/VRTSvcs. # Secure mode must be off to allow root to execute commands @@ -642,7 +666,6 @@ then hares -display -sys $vcshost -attribute State -localclus fi - # Fileinfo-Check: put patterns for files into /etc/check_mk/fileinfo.cfg if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then echo '<<<fileinfo:sep(124)>>>' @@ -710,6 +733,20 @@ if type trd >/dev/null; then trd -s fi +# HTTP Accelerator Statistics +if type varnishstat >/dev/null; then + echo "<<<varnish>>>" + varnishstat -1 +fi + +# Proxmox Cluster +if type pvecm > /dev/null 2>&1 ; then + echo "<<<pvecm_status:sep(58)>>>" + pvecm status + echo "<<<pvecm_nodes>>>" + pvecm nodes +fi + # Start new liveupdate process in background on each agent execution. Starting # a new live update process will terminate the old one automatically after # max. 1 sec. @@ -723,6 +760,41 @@ if [ -e $MK_CONFDIR/real_time_checks.cfg ]; then fi fi +is_valid_plugin () { + [[ -f "$1" && -x "$1" ]] && true || false +} + +# Local checks +echo '<<<local>>>' +if cd $LOCALDIR ; then + for skript in $(ls) ; do + if is_valid_plugin "$skript" ; then + ./$skript + fi + done + # Call some plugins only every X'th second + for skript in [1-9]*/* ; do + if is_valid_plugin "$skript" ; then + run_cached local_${skript//\//\\} ${skript%/*} "$skript" + fi + done +fi + +# Plugins +if cd $PLUGINSDIR ; then + for skript in $(ls) ; do + if is_valid_plugin "$skript" ; then + ./$skript + fi + done + # Call some plugins only every Xth second + for skript in [1-9]*/* ; do + if is_valid_plugin "$skript" ; then + run_cached plugins_${skript//\//\\} ${skript%/*} "$skript" + fi + done +fi + # Agent output snippets created by cronjobs, etc. if [ -d "$SPOOLDIR" ] then

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 4a84b5aef6e3ec40de024edfe1f5ef75d8c8079c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a84b5aef6e3ec… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 19 12:18:02 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/Aggregator.h | 3 +- livestatus/src/AttributelistColumn.cc | 16 +- livestatus/src/AttributelistColumn.h | 4 +- livestatus/src/AttributelistFilter.cc | 3 +- livestatus/src/BlobColumn.cc | 4 +- livestatus/src/BlobColumn.h | 4 +- livestatus/src/Column.h | 4 +- livestatus/src/ContactgroupsColumn.cc | 15 +- livestatus/src/ContactgroupsColumn.h | 4 +- livestatus/src/ContactsColumn.cc | 14 +- livestatus/src/ContactsColumn.h | 4 +- livestatus/src/CountAggregator.cc | 3 +- livestatus/src/CustomVarsDictColumn.cc | 10 +- livestatus/src/CustomVarsDictColumn.h | 2 +- livestatus/src/CustomVarsNamesColumn.cc | 12 +- livestatus/src/CustomVarsNamesColumn.h | 2 +- livestatus/src/CustomVarsValuesColumn.cc | 12 +- livestatus/src/CustomVarsValuesColumn.h | 2 +- livestatus/src/DoubleAggregator.cc | 3 +- livestatus/src/DoubleColumn.cc | 4 +- livestatus/src/DoubleColumn.h | 4 +- livestatus/src/DoubleFilter.cc | 3 +- livestatus/src/DownCommColumn.cc | 36 ++--- livestatus/src/DownCommColumn.h | 4 +- livestatus/src/EmptyColumn.cc | 4 +- livestatus/src/EmptyColumn.h | 4 +- livestatus/src/GlobalCountersColumn.cc | 6 +- livestatus/src/GlobalCountersColumn.h | 4 +- livestatus/src/HostgroupsColumn.cc | 14 +- livestatus/src/HostgroupsColumn.h | 4 +- livestatus/src/HostlistColumn.cc | 28 ++-- livestatus/src/HostlistColumn.h | 4 +- livestatus/src/IntAggregator.cc | 3 +- livestatus/src/IntColumn.cc | 4 +- livestatus/src/IntColumn.h | 4 +- livestatus/src/ListFilter.cc | 3 +- livestatus/src/LogwatchListColumn.cc | 14 +- livestatus/src/LogwatchListColumn.h | 5 +- livestatus/src/MetricsColumn.cc | 5 +- livestatus/src/MetricsColumn.h | 4 +- livestatus/src/NullColumn.cc | 4 +- livestatus/src/NullColumn.h | 4 +- livestatus/src/OffsetStringMacroColumn.cc | 4 +- livestatus/src/OffsetStringMacroColumn.h | 4 +- livestatus/src/OffsetTimeColumn.cc | 5 +- livestatus/src/OffsetTimeColumn.h | 4 +- livestatus/src/PerfdataAggregator.cc | 3 +- livestatus/src/Query.cc | 90 +++--------- livestatus/src/Query.h | 5 +- livestatus/src/Renderer.h | 228 +++++++++++++++++++++++++---- livestatus/src/RendererCSV.cc | 32 ++-- livestatus/src/RendererCSV.h | 50 +++---- livestatus/src/RendererJSON.cc | 32 ++-- livestatus/src/RendererJSON.h | 39 ++--- livestatus/src/RendererPython.cc | 32 ++-- livestatus/src/RendererPython.h | 39 ++--- livestatus/src/ServicegroupsColumn.cc | 14 +- livestatus/src/ServicegroupsColumn.h | 4 +- livestatus/src/ServicelistColumn.cc | 62 ++++---- livestatus/src/ServicelistColumn.h | 4 +- livestatus/src/StringColumn.cc | 6 +- livestatus/src/StringColumn.h | 4 +- livestatus/src/StringFilter.cc | 3 +- livestatus/src/TableEventConsole.h | 14 +- livestatus/src/TableStateHistory.cc | 3 +- livestatus/src/TimePointerColumn.cc | 4 +- livestatus/src/TimePointerColumn.h | 4 +- livestatus/src/VariadicFilter.h | 4 +- 68 files changed, 523 insertions(+), 460 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4a84b5aef6…

8 years, 2 months

Updated bug entries #2499

by Mathias Kettner

Module: check_mk Branch: master Commit: 87bb5cba91804e486d6b55754296e5c76fe0e7d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87bb5cba91804e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 19 11:58:51 2016 +0200 Updated bug entries #2499 --- .bugs/2499 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.bugs/2499 b/.bugs/2499 new file mode 100644 index 0000000..1ffc8e1 --- /dev/null +++ b/.bugs/2499 @@ -0,0 +1,19 @@ +Title: Error in check plugins breaks automation for package info +Component: core +State: open +Date: 2016-07-19 11:56:45 +Targetversion: future +Class: nastiness + +I did: + +1. Installed an MKP via WATO +2. Dissolved the files +3. Manually began to delete one after the other + +As soon as I've deleted some foo.include - the automation for the package +information would stop working sind load_checks() in check_mk.py unconditionally +exists (sys.exit(5)) when a check plugin cannot be loaded. + +Better output just a warning and suppress this warning when in +automation mode.

8 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016