Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

6672 FIX Fixed possible file handle leak on ipaddress lookup

by Andreas Boesl

Module: check_mk Branch: master Commit: c9f4fe781e5e8c7e742f943b6ca04d1ffda37850 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9f4fe781e5e8c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 29 15:01:16 2018 +0100 6672 FIX Fixed possible file handle leak on ipaddress lookup Change-Id: I0a4e20388b88eae0a7040169610a8ff035abf9d1 --- .werks/6672 | 10 ++++++++++ cmk_base/ip_lookup.py | 22 +++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.werks/6672 b/.werks/6672 new file mode 100644 index 0000000..dfe48c5 --- /dev/null +++ b/.werks/6672 @@ -0,0 +1,10 @@ +Title: Fixed possible file handle leak on ipaddress lookup +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1540821637 +Class: fix + + diff --git a/cmk_base/ip_lookup.py b/cmk_base/ip_lookup.py index 0052488..4b33349 100644 --- a/cmk_base/ip_lookup.py +++ b/cmk_base/ip_lookup.py @@ -188,19 +188,23 @@ def _update_ip_lookup_cache(cache_id, ipa): # Read already known data cache_path = cmk.paths.var_dir + '/ipaddresses.cache' - data_from_file = cmk.store.load_data_from_file(cache_path, default={}, lock=True) + try: + data_from_file = cmk.store.load_data_from_file(cache_path, default={}, lock=True) - _convert_legacy_ip_lookup_cache(data_from_file) - ip_lookup_cache.update(data_from_file) - ip_lookup_cache[cache_id] = ipa + _convert_legacy_ip_lookup_cache(data_from_file) + ip_lookup_cache.update(data_from_file) + ip_lookup_cache[cache_id] = ipa - # (I don't like this) - # TODO: this file always grows... there should be a cleanup mechanism - # maybe on "cmk --update-dns-cache" - # The cache_path is already locked from a previous function call.. - cmk.store.save_data_to_file(cache_path, ip_lookup_cache) + # (I don't like this) + # TODO: this file always grows... there should be a cleanup mechanism + # maybe on "cmk --update-dns-cache" + # The cache_path is already locked from a previous function call.. + cmk.store.save_data_to_file(cache_path, ip_lookup_cache) + finally: + cmk.store.release_lock(cache_path) +# TODO: remove unused code? def _write_ip_lookup_cache(): ip_lookup_cache = cmk_base.config_cache.get_dict("ip_lookup")

5 years, 7 months

6647 Enable use of Passwordstore for Slack's Webhook-URL

by Óscar Nájera

Module: check_mk Branch: master Commit: 0c23bb363179c789ca21d6073eaad8fa29e2b190 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c23bb363179c7… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Oct 30 09:51:03 2018 +0100 6647 Enable use of Passwordstore for Slack's Webhook-URL It is now possible to configure Slack's notification plugin using values stored in Check_MK Password store. In this way the Webhook URL is not shown in the Notifications Parameters but is just recovered from the password store vault. CMK-989 Change-Id: I3fc443a6f28a21227bd75056a0640f7b2a924a1d --- .werks/6647 | 13 ++++++ cmk/gui/plugins/wato/__init__.py | 1 + cmk/gui/plugins/wato/notifications.py | 76 ++++++++++++++++++++-------------- cmk/gui/plugins/wato/utils/__init__.py | 15 ++++--- cmk/notification_plugins/slack.py | 8 +++- cmk/password_store.py | 4 ++ 6 files changed, 76 insertions(+), 41 deletions(-) diff --git a/.werks/6647 b/.werks/6647 new file mode 100644 index 0000000..7a4a66e --- /dev/null +++ b/.werks/6647 @@ -0,0 +1,13 @@ +Title: Enable use of Passwordstore for Slack's Webhook-URL +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1540910427 +Class: feature + +It is now possible to configure Slack's notification plugin using values +stored in Check_MK Password store. In this way the Webhook URL is not shown +in the Notifications Parameters but is just recovered from the password +store vault. diff --git a/cmk/gui/plugins/wato/__init__.py b/cmk/gui/plugins/wato/__init__.py index 054bf6b..6d3a469 100644 --- a/cmk/gui/plugins/wato/__init__.py +++ b/cmk/gui/plugins/wato/__init__.py @@ -64,6 +64,7 @@ from cmk.gui.plugins.wato.utils import ( home_button, HostnameTranslation, IndividualOrStoredPassword, + passwordstore_choices, IPMIParameters, is_wato_slave_site, Levels, diff --git a/cmk/gui/plugins/wato/notifications.py b/cmk/gui/plugins/wato/notifications.py old mode 100755 new mode 100644 index 6df8133..7da9207 --- a/cmk/gui/plugins/wato/notifications.py +++ b/cmk/gui/plugins/wato/notifications.py @@ -33,23 +33,25 @@ from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.valuespec import ( - DropdownChoice, - FixedValue, - Tuple, Age, - TextAscii, CascadingDropdown, - Transform, - TextAreaUnicode, - TextUnicode, - ListChoice, Dictionary, - Password, - IPv4Address, + DropdownChoice, EmailAddress, + FixedValue, + HTTPUrl, + IPv4Address, + ListChoice, + Password, + TextAreaUnicode, + TextAscii, + TextUnicode, + Transform, + Tuple, ) -from cmk.gui.plugins.wato import register_notification_parameters +from cmk.gui.plugins.wato import (register_notification_parameters, passwordstore_choices) + # We have to transform because 'add_to_event_context' # in modules/events.py can't handle complex data structures @@ -208,9 +210,9 @@ def html_email_parameter_elements(): register_notification_parameters( "mail", Dictionary( - elements = html_email_parameter_elements, # must be called at run time!! - ) -) + elements=html_email_parameter_elements, # must be called at run time!! + )) + register_notification_parameters( "slack", @@ -218,20 +220,26 @@ register_notification_parameters( optional_keys=["url_prefix"], elements=[ ("webhook_url", - TextAscii( + CascadingDropdown( title=_("Slack Webhook-URL"), - size=80, - allow_empty=False, - help=_( - "URL from Slack Webhook. Setup one <a href=\"https://my.slack.com/services/new/incoming-webhook/\" target=\"_blank\"> here </a>"), - regex="^https://hooks.slack.com/services/.+", - regex_error=_("The Webhook-URL must begin with " - "<tt>https://hooks.slack.com/services/</tt>"), - ) - ), + help=_("URL from Slack Webhook. Setup one "+ + "<a href=\"https://my.slack.com/services/new/incoming-webhook/\" target=\"_blank\"> here </a>" + "<br />This URL can also be collected from the Password Store from Check_MK."), + choices=[ + ("webhook_url", _("Webhook URL"), HTTPUrl( + size=80, + allow_empty=False, + regex="^https://hooks.slack.com/services/.+", + regex_error=_("The Webhook-URL must begin with " + "<tt>https://hooks.slack.com/services/</tt>")),), + ("store", _("URL from password store"), DropdownChoice( + sorted = True, + choices=passwordstore_choices, + )) + ] + )), ("url_prefix", Transform(CascadingDropdown( - style="dropdown", title=_("URL prefix for links to Check_MK"), help=_("If you use <b>Automatic HTTP/s</b> the URL prefix for " "host and service links within the notification mail " @@ -303,7 +311,7 @@ register_notification_parameters( cols = 58, monospaced = True, default_value = -"""Host: $HOSTNAME$ + """Host: $HOSTNAME$ Alias: $HOSTALIAS$ Address: $HOSTADDRESS$ """, @@ -316,7 +324,7 @@ Address: $HOSTADDRESS$ cols = 58, monospaced = True, default_value = -"""Event: $EVENT_TXT$ + """Event: $EVENT_TXT$ Output: $HOSTOUTPUT$ Perfdata: $HOSTPERFDATA$ $LONGHOSTOUTPUT$ @@ -330,7 +338,7 @@ $LONGHOSTOUTPUT$ cols = 58, monospaced = True, default_value = -"""Service: $SERVICEDESC$ + """Service: $SERVICEDESC$ Event: $EVENT_TXT$ Output: $SERVICEOUTPUT$ Perfdata: $SERVICEPERFDATA$ @@ -417,16 +425,20 @@ register_notification_parameters( ) ) + # We have to transform because 'add_to_event_context' # in modules/events.py can't handle complex data structures def transform_back_pushover_priority(params): if type(params) == tuple: - return {"priority" : "2", - "retry" : params[1][0], - "expire" : params[1][1], - "receipts" : params[1][2]} + return { + "priority": "2", + "retry": params[1][0], + "expire": params[1][1], + "receipts": params[1][2] + } return params + def transform_forth_pushover_priority(params): if type(params) == dict: return (params['priority'], (params["retry"], params["expire"], params["receipts"])) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 5736d99..9fe4777 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -544,6 +544,11 @@ class GroupSelection(ElementSelection): return dict(elements) +def passwordstore_choices(): + return [ + (ident, pw["title"]) for ident, pw in watolib.PasswordStore().usable_passwords().items() + ] + class PasswordFromStore(CascadingDropdown): def __init__(self, *args, **kwargs): @@ -552,7 +557,7 @@ class PasswordFromStore(CascadingDropdown): allow_empty = kwargs.get("allow_empty", True), )), ("store", _("Stored password"), DropdownChoice( - choices = self._password_choices, + choices = passwordstore_choices, sorted = True, invalid_choice = "complain", invalid_choice_title = _("Password does not exist or using not permitted"), @@ -566,16 +571,10 @@ class PasswordFromStore(CascadingDropdown): CascadingDropdown.__init__(self, *args, **kwargs) - def _password_choices(self): - return [ (ident, pw["title"]) for ident, pw - in watolib.PasswordStore().usable_passwords().items() ] - - - def IndividualOrStoredPassword(*args, **kwargs): return Transform( PasswordFromStore(*args, **kwargs), - forth = lambda v: ("password", v) if type(v) != tuple else v, + forth=lambda v: ("password", v) if type(v) != tuple else v, ) diff --git a/cmk/notification_plugins/slack.py b/cmk/notification_plugins/slack.py index 5f82560..de6098b 100644 --- a/cmk/notification_plugins/slack.py +++ b/cmk/notification_plugins/slack.py @@ -34,6 +34,7 @@ import sys import requests from cmk.notification_plugins import utils +import cmk.password_store COLORS = { "CRITICAL": "#EE0000", @@ -89,7 +90,12 @@ def construct_message(context): def main(): context = utils.collect_context() - url = context.get("PARAMETER_WEBHOOK_URL") + url = context.get("PARAMETER_WEBHOOK_URL").split() + + if url[0] == 'store': + url = cmk.password_store.extract(url[1]) + else: + url = url[1] r = requests.post(url=url, json=construct_message(context)) diff --git a/cmk/password_store.py b/cmk/password_store.py index 408557c..4adc92b 100644 --- a/cmk/password_store.py +++ b/cmk/password_store.py @@ -106,3 +106,7 @@ def load(): ident, password = line.strip().split(":", 1) passwords[ident] = password return passwords + + +def extract(password_id): + return load().get(password_id)

5 years, 7 months

Semi-automatic yapf for cmk/gui/plugins/webapi

by Óscar Nájera

Module: check_mk Branch: master Commit: c2c2c8f20531b72ed8666dad928bdbdbd0c50c9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2c2c8f20531b7… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 5 17:07:35 2018 +0100 Semi-automatic yapf for cmk/gui/plugins/webapi CMK-1180 Change-Id: I35bd3a41220c9033d66a6e3bcc5ef2492249ebea --- cmk/gui/plugins/webapi/utils.py | 20 +-- cmk/gui/plugins/webapi/webapi.py | 369 ++++++++++++++++++++------------------- 2 files changed, 202 insertions(+), 187 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c2c2c8f205…

5 years, 7 months

6648 VictorOPS: Notification plugin for VictorOPS

by Óscar Nájera

Module: check_mk Branch: master Commit: 4cc14c2c077a6e2030f5c3b52ce48f73302b60db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cc14c2c077a6e… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Wed Oct 31 17:10:40 2018 +0100 6648 VictorOPS: Notification plugin for VictorOPS It is now possible to configure Check_MK notifications to be sent to VictorOPS by using their REST API integration. In VictorOPS the REST integration for alerts needs to be enabled and the routing keys defined. Then in Check_MK for every routing key a notification can be set up under WATO->Notifications. Copy your VictorOPS REST API URL with the corresponding routing key in the URL. Optionaly to include the URL of Check_MK's enable the URL prefix field. (VictorOPS does not support links in their timeline at the time of this writing, thus the full URL is displayed in the message) CMK-1187 Change-Id: If002982cde6fe4ecab6235fcde6468e53b7eb8af --- .werks/6648 | 19 +++++++ cmk/gui/plugins/wato/notifications.py | 55 +++++++++++++++++++ cmk/notification_plugins/slack.py | 32 ++--------- cmk/notification_plugins/utils.py | 30 +++++++++-- cmk/notification_plugins/victorops.py | 73 ++++++++++++++++++++++++++ notifications/slack | 5 +- notifications/victorops | 7 +++ tests/unit/cmk/notifications/test_slack.py | 9 ++-- tests/unit/cmk/notifications/test_utils.py | 6 +-- tests/unit/cmk/notifications/test_victorops.py | 70 ++++++++++++++++++++++++ 10 files changed, 268 insertions(+), 38 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4cc14c2c07…

5 years, 7 months

Work around for delete failed notifications bug

by Óscar Nájera

Module: check_mk Branch: master Commit: 4128badc3a3b72b24b02120fac17ad1c7773ee6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4128badc3a3b72… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 5 10:52:46 2018 +0100 Work around for delete failed notifications bug The delete failed notifications link sits on the sidebar and has no access to the content in the main frame, thus can't know about the previous page. As such it fail looking for it. An empty string bypasses the issue. Change-Id: Iee280b33379b88a2abe9bc941e23f88de9da98e1 --- cmk/gui/notifications.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/notifications.py b/cmk/gui/notifications.py index 5476b98..5953353 100644 --- a/cmk/gui/notifications.py +++ b/cmk/gui/notifications.py @@ -196,7 +196,7 @@ def page_clear(): else: acktime = float(acktime) - prev_url = html.get_url_input('prev_url') + prev_url = html.get_url_input('prev_url', '') if html.var('_confirm'): acknowledge_failed_notifications(acktime) html.reload_sidebar()

5 years, 7 months

6836 FIX Fix Docker crashes

by Moritz Kiemer

Module: check_mk Branch: master Commit: af6eebd81d93c27231f09124b52c1c1ecd8b8987 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af6eebd81d93c2… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Nov 5 09:17:09 2018 +0100 6836 FIX Fix Docker crashes Work around missing 'Repository' key if Repository Tags are not defined in image inspect output. Work around missing values if values are zero in 'docker system df'. Change-Id: Ie2560d04edfd15e3c7c52c3801ce6aea94a57da4 --- .werks/6836 | 12 +++++++++ checks/docker.include | 28 +++++++++++++------ inventory/docker_node_info | 2 +- tests/unit/checks/test_docker_parse_node_images.py | 8 +++--- tests/unit/checks/test_docker_parse_node_info.py | 9 ++++++- tests/unit/checks/test_docker_parse_system_df.py | 31 ++++++++++++++++++++++ 6 files changed, 76 insertions(+), 14 deletions(-) diff --git a/.werks/6836 b/.werks/6836 new file mode 100644 index 0000000..c6ebbe2 --- /dev/null +++ b/.werks/6836 @@ -0,0 +1,12 @@ +Title: Fix Docker crashes +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1541405122 +Class: fix + +Work around missing 'Repository' key if Repository Tags are not defined in image inspect output. +Work around missing values if values are zero in 'docker system df'. +Do not crash upon empty section in case of missing permissions. diff --git a/checks/docker.include b/checks/docker.include index 3b23b69..01b6bf8 100644 --- a/checks/docker.include +++ b/checks/docker.include @@ -71,15 +71,21 @@ def _docker_trunc_id(hash_string): def _get_repo_tag(string): if ":" in string: - return tuple(string.split(":", 1)) + return tuple(string.rsplit(":", 1)) return string, "latest" def parse_docker_node_info(info): '''parse output of "docker info"''' + if not info: + return {} + + # parse legacy json output (verisons 1.5.0 - 1.5.0p6) + joined = " ".join(info[0]) + if joined.endswith("permission denied"): + return {} try: - # parse legacy json output (verisons 1.5.0 - 1.5.0p6) - return json.loads(" ".join(info[0])) + return json.loads(joined) except ValueError: pass @@ -169,10 +175,13 @@ def _docker_parse_table(rows, fields, keys): def parse_docker_system_df(info): + def int_or_zero(s): + return int(s.strip() or 0) + field_map = ( ('TYPE', 'TOTAL', 'ACTIVE', 'SIZE', 'RECLAIMABLE'), ('Type', 'TotalCount', 'Active', 'Size', 'Reclaimable'), - (str, int, int, _docker_get_bytes, _docker_get_bytes), + (str, int_or_zero, int_or_zero, _docker_get_bytes, _docker_get_bytes), ) try: # parse legacy json output: from 1.5.0 - 1.5.0p6 @@ -292,6 +301,9 @@ def parse_docker_node_images(info): repotags = pref_info.get("RepoTags") if repotags: image["Repository"], image["Tag"] = _get_repo_tag(repotags[-1]) + else: + repo = pref_info.get("RepoDigest", "").split('@', 1)[0] + image["Repository"], image["Tag"] = _get_repo_tag(repo) for image in images.itervalues(): image["amount_containers"] = 0 @@ -305,15 +317,15 @@ def parse_docker_node_images(info): mapping = {(i['Repository'], i['Tag']): i['ID'] for i in images.itervalues()} - for c in containers.itervalues(): - image_id = mapping.get((c["Repository"], c["Tag"])) + for cont in containers.itervalues(): + image_id = mapping.get((cont["Repository"], cont["Tag"])) image = images.get(image_id) if image is not None: image["amount_containers"] += 1 - labels = c.get("Labels") + labels = cont.get("Labels") if isinstance(labels, (str, unicode)): - c["Labels"] = parse_docker_messed_up_labels(labels) + cont["Labels"] = parse_docker_messed_up_labels(labels) return {"images": images, "containers": containers} diff --git a/inventory/docker_node_info b/inventory/docker_node_info index a7da959..b95dfef 100644 --- a/inventory/docker_node_info +++ b/inventory/docker_node_info @@ -27,7 +27,7 @@ def inv_docker_node_info(parsed, inventory_tree, status_data_tree): - if not isinstance(parsed, dict): + if not parsed or not isinstance(parsed, dict): # String with error message in case the daemon is not running return diff --git a/tests/unit/checks/test_docker_parse_node_images.py b/tests/unit/checks/test_docker_parse_node_images.py index 4cd1318..6588b56 100644 --- a/tests/unit/checks/test_docker_parse_node_images.py +++ b/tests/unit/checks/test_docker_parse_node_images.py @@ -6539,10 +6539,10 @@ EXPECTED_IMAGES3 = { u'CreatedSince': u'3 days ago', u'Digest': u'<none>', u'ID': u'0983f5184ce7', - u'Repository': u'<none>', + u'Repository': u'', u'SharedSize': u'N/A', u'Size': u'312MB', - u'Tag': u'<none>', + u'Tag': u'latest', u'UniqueSize': u'N/A', u'VirtualSize': 312404556, '__labels__': { @@ -6896,10 +6896,10 @@ EXPECTED_IMAGES3 = { u'CreatedSince': u'6 days ago', u'Digest': u'<none>', u'ID': u'df118e583614', - u'Repository': u'<none>', + u'Repository': u'', u'SharedSize': u'N/A', u'Size': u'818MB', - u'Tag': u'<none>', + u'Tag': u'latest', u'UniqueSize': u'N/A', u'VirtualSize': 817561911, '__labels__': { diff --git a/tests/unit/checks/test_docker_parse_node_info.py b/tests/unit/checks/test_docker_parse_node_info.py index 7ba3e8c..a8c3432 100644 --- a/tests/unit/checks/test_docker_parse_node_info.py +++ b/tests/unit/checks/test_docker_parse_node_info.py @@ -312,7 +312,14 @@ execfile(os.path.join(os.path.dirname(__file__), '../../../checks/docker.include "ContainersRunning": 1, "ContainersStopped": 1, "ContainersPaused": 0, - }) + }), + ([[u'Got', u'permission', u'denied', u'while', u'trying', u'to', u'connect', + u'to', u'the', u'Docker', u'daemon', u'socket', u'at', + u'unix:///var/run/docker.sock:', u'Get', + u'http://%2Fvar%2Frun%2Fdocker.sock/v1.26/info:', u'dial', u'unix', + u'/var/run/docker.sock:', u'connect:', u'permission', u'denied'] + ], {}), + ([], {}), ]) def test_parse_docker_node_info(indata, outdata_subset): diff --git a/tests/unit/checks/test_docker_parse_system_df.py b/tests/unit/checks/test_docker_parse_system_df.py index 80d76a4..a9dd43f 100644 --- a/tests/unit/checks/test_docker_parse_system_df.py +++ b/tests/unit/checks/test_docker_parse_system_df.py @@ -39,6 +39,37 @@ regex = re.compile ['Images 15 2 9.57GB 8.674GB (90%)'], ['Containers 2 1 1.226GB 1.224GB (99%)'], ['Local Volumes 1 1 9.323MB 0B (0%)'], + ['Build Cache 0B 0B'], + ], {"images": { + "Type": "Images", + "TotalCount": 15, + "Active": 2, + "Size": 9570000000, + "Reclaimable": 8674000000}, + "containers": { + "Type": "Containers", + "TotalCount": 2, + "Active": 1, + "Size": 1226000000, + "Reclaimable": 1224000000}, + "local volumes": { + "Type": "Local Volumes", + "TotalCount": 1, + "Active": 1, + "Size": 9323000, + "Reclaimable": 0}, + "build cache": { + "Type": "Build Cache", + "TotalCount": 0, + "Active": 0, + "Size": 0, + "Reclaimable": 0}, + }), + ([ + ['TYPE TOTAL ACTIVE SIZE RECLAIMABLE'], + ['Images 15 2 9.57GB 8.674GB (90%)'], + ['Containers 2 1 1.226GB 1.224GB (99%)'], + ['Local Volumes 1 1 9.323MB 0B (0%)'], ['Build Cache 0 0 0B 0B'], ], {"images": { "Type": "Images",

5 years, 7 months

mk_logwatch: extract function status_filename and simplify logic

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 92894c9fcf805bb6f016bc466d8987124469e4fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92894c9fcf805b… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Oct 31 08:53:16 2018 +0100 mk_logwatch: extract function status_filename and simplify logic Change-Id: I5c593206267f53b15853c500d9b01dd85e8464d1 --- agents/plugins/mk_logwatch | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 299f5be..b6179b4 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -148,25 +148,23 @@ sys.stdout.write("<<<logwatch>>>\n") config_filename = mk_confdir + "/logwatch.cfg" config_dir = mk_confdir + "/logwatch.d/*.cfg" - -# Determine the name of the state file -# $REMOTE set -> logwatch.state.$REMOTE -# $REMOTE not set and a tty -> logwatch.state.local -# $REMOTE not set and not a tty -> logwatch.state -remote_hostname = os.getenv("REMOTE", "") -remote_hostname = remote_hostname.replace(":", "_") -if remote_hostname != "": - status_filename = "%s/logwatch.state.%s" % (mk_vardir, remote_hostname) -else: - if sys.stdout.isatty(): - status_filename = "%s/logwatch.state.local" % mk_vardir - else: - status_filename = "%s/logwatch.state" % mk_vardir - # Copy the last known state from the logwatch.state when there is no status_filename yet. -if not os.path.exists(status_filename) and os.path.exists("%s/logwatch.state" % mk_vardir): +if not os.path.exists(status_filename()) and os.path.exists("%s/logwatch.state" % mk_vardir): import shutil - shutil.copy("%s/logwatch.state" % mk_vardir, status_filename) + shutil.copy("%s/logwatch.state" % mk_vardir, status_filename()) + + +def status_filename(): + # Determine the name of the state file + # $REMOTE set -> logwatch.state.$REMOTE + # $REMOTE not set and a tty -> logwatch.state.local + # $REMOTE not set and not a tty -> logwatch.state + remote_hostname = os.getenv("REMOTE", "").replace(":", "_") + if remote_hostname != "": + return "%s/logwatch.state.%s" % (mk_vardir, remote_hostname) + if sys.stdout.isatty(): + return "%s/logwatch.state.local" % mk_vardir + return "%s/logwatch.state" % mk_vardir def is_not_comment(line): if line.lstrip().startswith('#') or \ @@ -251,7 +249,7 @@ def read_status(): return {} status = {} - for line in file(status_filename): + for line in file(status_filename()): # TODO: Remove variants with spaces. rsplit is # not portable. split fails if logfilename contains # spaces @@ -272,7 +270,7 @@ def read_status(): return status def save_status(status): - f = file(status_filename, "w") + f = file(status_filename(), "w") for filename, (offset, inode) in status.items(): f.write("%s|%d|%d\n" % (filename, offset, inode))

5 years, 7 months

YAPFed mk_logwatch

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 442a7e9b9e8b707f1d3b5d3631da791a010f9f74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=442a7e9b9e8b70… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Oct 31 09:40:48 2018 +0100 YAPFed mk_logwatch CMK-1180 Change-Id: Iedb098ce487925820440a79e261f02d05639ce14 --- agents/plugins/mk_logwatch | 141 ++++++++++++++++++++++++++++----------------- 1 file changed, 89 insertions(+), 52 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=442a7e9b9e…

5 years, 7 months

mk_logwatch: extract function os_type

by Tom Baerwinkel

Module: check_mk Branch: master Commit: bb71d132a1644ee124815b6e89e5ee47b15d4ece URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb71d132a1644e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Oct 31 10:06:29 2018 +0100 mk_logwatch: extract function os_type Change-Id: I394a7627089b127305df3fd3d52129183033b136 --- agents/plugins/mk_logwatch | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 33d6e9e..98ac5f0 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -107,13 +107,6 @@ class MEIFolderCleaner(object): pass #. -os_type = "linux" -try: - import platform - os_type = platform.system().lower() -except: - pass - if '-d' in sys.argv[1:] or '--debug' in sys.argv[1:]: tty_red = '\033[1;31m' tty_green = '\033[1;32m' @@ -166,9 +159,16 @@ def status_filename(): return "%s/logwatch.state" % mk_vardir +def os_type(): + try: + import platform # added in Python 2.3 + return platform.system().lower() + except ImportError: + return "linux" + + def is_not_comment(line): - if line.lstrip().startswith('#') or \ - line.strip() == '': + if line.lstrip().startswith('#') or line.strip() == '': return False return True @@ -312,9 +312,9 @@ def next_line(file_handle): def is_inode_cabable(path): - if "linux" in os_type: + if "linux" in os_type(): return True - elif "windows" in os_type: + elif "windows" in os_type(): volume_name = "%s:\\\\" % path.split(":", 1)[0] import win32api # pylint: disable=import-error volume_info = win32api.GetVolumeInformation(volume_name) @@ -378,7 +378,7 @@ def process_logfile(logfile, patterns, opt, status): # now seek to offset where interesting data begins os.lseek(file_desc, offset, 0) # os.SEEK_SET not available in Python 2.4 - if os_type == "windows": + if "windows" in os_type(): import io # Available with python 2.6 # Some windows files are encoded in utf_16 # Peak the first two bytes to determine the encoding...

5 years, 7 months

mk_logwatch: extract functions mk_vardir and mk_confdir

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 07d996490798bcf8f2440a5ab18d0b0956e0d62a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07d996490798bc… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Oct 31 10:49:55 2018 +0100 mk_logwatch: extract functions mk_vardir and mk_confdir Change-Id: Ibb2166379d5ed3236a1b2a081c41a7694c19b20e --- agents/plugins/mk_logwatch | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 98ac5f0..eb27781 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -29,6 +29,7 @@ import glob import os import re +import shutil import sys import time @@ -122,28 +123,28 @@ else: tty_normal = '' debug = False + # The configuration file and status file are searched # in the directory named by the environment variable # LOGWATCH_DIR. If that is not set, MK_CONFDIR is used. # If that is not set either, the current directory ist # used. -logwatch_dir = os.getenv("LOGWATCH_DIR") -if logwatch_dir: - mk_confdir = logwatch_dir - mk_vardir = logwatch_dir -else: - mk_confdir = os.getenv("MK_CONFDIR") or "." - mk_vardir = os.getenv("MK_VARDIR") or os.getenv("MK_STATEDIR") or "." +def mk_vardir(): + return os.getenv("LOGWATCH_DIR") or os.getenv("MK_VARDIR") or os.getenv("MK_STATEDIR") or "." -sys.stdout.write("<<<logwatch>>>\n") -config_filename = mk_confdir + "/logwatch.cfg" -config_dir = mk_confdir + "/logwatch.d/*.cfg" +def mk_confdir(): + return os.getenv("LOGWATCH_DIR") or os.getenv("MK_CONFDIR") or "." + + +config_filename = mk_confdir() + "/logwatch.cfg" +config_dir = mk_confdir() + "/logwatch.d/*.cfg" + +sys.stdout.write("<<<logwatch>>>\n") # Copy the last known state from the logwatch.state when there is no status_filename yet. -if not os.path.exists(status_filename()) and os.path.exists("%s/logwatch.state" % mk_vardir): - import shutil - shutil.copy("%s/logwatch.state" % mk_vardir, status_filename()) +if not os.path.exists(status_filename()) and os.path.exists("%s/logwatch.state" % mk_vardir()): + shutil.copy("%s/logwatch.state" % mk_vardir(), status_filename()) def status_filename(): @@ -153,10 +154,10 @@ def status_filename(): # $REMOTE not set and not a tty -> logwatch.state remote_hostname = os.getenv("REMOTE", "").replace(":", "_") if remote_hostname != "": - return "%s/logwatch.state.%s" % (mk_vardir, remote_hostname) + return "%s/logwatch.state.%s" % (mk_vardir(), remote_hostname) if sys.stdout.isatty(): - return "%s/logwatch.state.local" % mk_vardir - return "%s/logwatch.state" % mk_vardir + return "%s/logwatch.state.local" % mk_vardir() + return "%s/logwatch.state" % mk_vardir() def os_type():

5 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018