Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

agent_aws: Be stricter in the processing chain of AWS sections

by Simon Betz

Module: check_mk Branch: master Commit: bd6b60c500a999076152af3c655ef118cb01145d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd6b60c500a999… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 31 15:41:23 2019 +0100 agent_aws: Be stricter in the processing chain of AWS sections Change-Id: I4388baff2de2310c2c69fb90a37d77d96617776b --- agents/special/agent_aws | 88 +++++++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bd6b60c500…

5 years, 10 months

Prepare for visual info registry refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 133ab3726d810ea0b3d5513a6597253ed092cfa0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=133ab3726d810e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 30 22:06:11 2019 +0100 Prepare for visual info registry refactoring CMK-1593 Change-Id: Ifba176425488e20346b7bde23fb927af2d2d2589 --- cmk/gui/plugins/visuals/utils.py | 55 +++++++++- tests/unit/cmk/gui/test_visuals.py | 200 +++++++++++++++++++++++++++++++++++++ 2 files changed, 254 insertions(+), 1 deletion(-) diff --git a/cmk/gui/plugins/visuals/utils.py b/cmk/gui/plugins/visuals/utils.py index 20f8729..187fe8c 100644 --- a/cmk/gui/plugins/visuals/utils.py +++ b/cmk/gui/plugins/visuals/utils.py @@ -30,6 +30,7 @@ import abc import time from typing import Dict, List, Tuple, Text, Optional # pylint: disable=unused-import +from cmk.gui.valuespec import ValueSpec # pylint: disable=unused-import import cmk.utils.plugin_registry @@ -42,6 +43,58 @@ from cmk.gui.globals import html _infos = {} +class VisualInfo(object): + """Base class for all visual info classes""" + __metaclass__ = abc.ABCMeta + + @abc.abstractproperty + def ident(self): + # type: () -> str + """The identity of a visual type. One word, may contain alpha numeric characters""" + raise NotImplementedError() + + @abc.abstractproperty + def title(self): + # type: () -> Text + """The human readable GUI title""" + raise NotImplementedError() + + @abc.abstractproperty + def title_plural(self): + # type: () -> Text + """The human readable GUI title for multiple items""" + raise NotImplementedError() + + @abc.abstractproperty + def single_spec(self): + # type: () -> Optional[Tuple[str, ValueSpec]] + """The key / valuespec pairs (choices) to identify a single row""" + raise NotImplementedError() + + def multiple_site_filters(self): + # type: () -> List[str] + """Returns a list of filter identifiers. When one of these filters is + used by a visual, the "site hint" may not be used""" + return [] + + def single_site(self): + # type: () -> bool + """When there is one non single site info used by a visual + don't add the site hint""" + return True + + +class VisualInfoRegistry(cmk.utils.plugin_registry.ClassRegistry): + def plugin_base_class(self): + return VisualInfo + + def plugin_name(self, plugin_class): + return plugin_class().ident + + +visual_info_registry = VisualInfoRegistry() + + def declare_info(infoname, info): _infos[infoname] = info @@ -199,7 +252,7 @@ class Filter(object): @abc.abstractmethod def display(self): - # type: (None) -> None + # type: () -> None raise NotImplementedError() def filter(self, infoname): diff --git a/tests/unit/cmk/gui/test_visuals.py b/tests/unit/cmk/gui/test_visuals.py index 4d198de..c43d252 100644 --- a/tests/unit/cmk/gui/test_visuals.py +++ b/tests/unit/cmk/gui/test_visuals.py @@ -3471,3 +3471,203 @@ def test_registered_filters(load_plugins): bases = [c.__name__ for c in filt.__class__.__bases__] + [filt.__class__.__name__] assert spec["filter_class"] in bases + + +expected_infos = { + 'aggr': { + 'single_spec': [('aggr_name', 'TextUnicode')], + 'title': u'BI Aggregation', + 'title_plural': u'BI Aggregations' + }, + 'aggr_group': { + 'single_spec': [('aggr_group', 'TextUnicode')], + 'title': u'BI Aggregation Group', + 'title_plural': u'BI Aggregation Groups' + }, + 'command': { + 'single_spec': [('command_name', 'TextUnicode')], + 'title': u'Command', + 'title_plural': u'Commands' + }, + 'comment': { + 'single_spec': [('comment_id', 'Integer')], + 'title': u'Comment', + 'title_plural': u'Comments' + }, + 'contact': { + 'single_spec': [('log_contact_name', 'TextUnicode')], + 'title': u'Contact', + 'title_plural': u'Contacts' + }, + 'discovery': { + 'single_spec': None, + 'title': u'Discovery Output', + 'title_plural': u'Discovery Outputs' + }, + 'downtime': { + 'single_spec': [('downtime_id', 'Integer')], + 'title': u'Downtime', + 'title_plural': u'Downtimes' + }, + 'event': { + 'single_spec': [('event_id', 'Integer')], + 'title': u'Event Console Event', + 'title_plural': u'Event Console Events' + }, + 'history': { + 'single_spec': [('event_id', 'Integer'), ('history_line', 'Integer')], + 'title': u'Historic Event Console Event', + 'title_plural': u'Historic Event Console Events' + }, + 'host': { + 'multiple_site_filters': ['hostgroup'], + 'single_spec': [('host', 'TextUnicode')], + 'title': u'Host', + 'title_plural': u'Hosts' + }, + 'hostgroup': { + 'single_site': False, + 'single_spec': [('hostgroup', 'TextUnicode')], + 'title': u'Host Group', + 'title_plural': u'Host Groups' + }, + 'invbackplane': { + 'single_spec': None, + 'title': u'Backplane', + 'title_plural': u'Backplanes' + }, + 'invchassis': { + 'single_spec': None, + 'title': u'Chassis', + 'title_plural': u'Chassis' + }, + 'invcontainer': { + 'single_spec': None, + 'title': u'HW container', + 'title_plural': u'HW containers' + }, + 'invdockercontainers': { + 'single_spec': None, + 'title': u'Docker containers', + 'title_plural': u'Docker containers' + }, + 'invdockerimages': { + 'single_spec': None, + 'title': u'Docker images', + 'title_plural': u'Docker images' + }, + 'invfan': { + 'single_spec': None, + 'title': u'Fan', + 'title_plural': u'Fans' + }, + 'invhist': { + 'single_spec': None, + 'title': u'Inventory History', + 'title_plural': u'Inventory Historys' + }, + 'invinterface': { + 'single_spec': None, + 'title': u'Network interface', + 'title_plural': u'Network interfaces' + }, + 'invmodule': { + 'single_spec': None, + 'title': u'Module', + 'title_plural': u'Modules' + }, + 'invoradataguardstats': { + 'single_spec': None, + 'title': u'Oracle dataguard statistic', + 'title_plural': u'Oracle dataguard statistics' + }, + 'invorainstance': { + 'single_spec': None, + 'title': u'Oracle instance', + 'title_plural': u'Oracle instances' + }, + 'invorarecoveryarea': { + 'single_spec': None, + 'title': u'Oracle recovery area', + 'title_plural': u'Oracle recovery areas' + }, + 'invorasga': { + 'single_spec': None, + 'title': u'Oracle performance', + 'title_plural': u'Oracle performance' + }, + 'invoratablespace': { + 'single_spec': None, + 'title': u'Oracle tablespace', + 'title_plural': u'Oracle tablespaces' + }, + 'invother': { + 'single_spec': None, + 'title': u'Other entity', + 'title_plural': u'Other entities' + }, + 'invpsu': { + 'single_spec': None, + 'title': u'Power supply', + 'title_plural': u'Power supplies' + }, + 'invsensor': { + 'single_spec': None, + 'title': u'Sensor', + 'title_plural': u'Sensors' + }, + 'invstack': { + 'single_spec': None, + 'title': u'Stack', + 'title_plural': u'Stacks' + }, + 'invswpac': { + 'single_spec': None, + 'title': u'Software package', + 'title_plural': u'Software packages' + }, + 'invunknown': { + 'single_spec': None, + 'title': u'Unknown entity', + 'title_plural': u'Unknown entities' + }, + 'log': { + 'single_spec': None, + 'title': u'Log Entry', + 'title_plural': u'Log Entries' + }, + 'service': { + 'multiple_site_filters': ['servicegroup'], + 'single_spec': [('service', 'TextUnicode')], + 'title': u'Service', + 'title_plural': u'Services' + }, + 'servicegroup': { + 'single_site': False, + 'single_spec': [('servicegroup', 'TextUnicode')], + 'title': u'Service Group', + 'title_plural': u'Service Groups' + }, +} + + +def test_registered_infos(load_plugins): + assert sorted(utils._infos.keys()) == sorted(expected_infos.keys()) + + +def test_registered_info_attributes(load_plugins): + for ident, info in utils._infos.items(): + #info = cls() + spec = expected_infos[ident] + + assert info["title"] == spec["title"] + assert info["title_plural"] == spec["title_plural"] + + if spec["single_spec"] is None: + assert info["single_spec"] is None + else: + assert [(e[0], e[1].__class__.__name__) for e in info["single_spec"] + ] == spec["single_spec"] + + assert info.get("multiple_site_filters", []) == spec.get("multiple_site_filters", []) + assert info.get("single_site", True) == spec.get("single_site", True)

5 years, 10 months

Refactored visual infos to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 35010402d56aef3cb50086f47e803c448f72e024 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35010402d56aef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 30 22:52:39 2019 +0100 Refactored visual infos to plugin registry CMK-1593 Change-Id: I9826943ea61d79e417cb3c346e6869d1b7f98717 --- cmk/gui/dashboard.py | 5 +- cmk/gui/plugins/views/inventory.py | 23 +- cmk/gui/plugins/visuals/__init__.py | 5 +- cmk/gui/plugins/visuals/infos.py | 428 +++++++++++++++++++++++++---------- cmk/gui/plugins/visuals/inventory.py | 25 +- cmk/gui/plugins/visuals/utils.py | 16 +- cmk/gui/views.py | 5 +- cmk/gui/visuals.py | 37 ++- tests/unit/cmk/gui/test_visuals.py | 18 +- 9 files changed, 388 insertions(+), 174 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=35010402d5…

5 years, 10 months

Fix for d484df86d

by Lars Michelsen

Module: check_mk Branch: master Commit: e9e466fb1eee467ae9d866b762dac64b54861840 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9e466fb1eee46… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 31 15:55:17 2019 +0100 Fix for d484df86d Change-Id: I59e2c78980f57c02d96c3b57d16b5ed1d017891f --- omd/packages/omd/omdlib/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index 42e9447..84bc87d 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -1634,7 +1634,7 @@ def tmpfs_is_managed_by_node(site): return subprocess.call(["umount", site.tmp_dir], stdout=open(os.devnull, "w"), - stderr=subprocess.STDOUT) == 32 + stderr=subprocess.STDOUT) in [1, 32] def unmount_tmpfs(site, output=True, kill=False):

5 years, 10 months

agent_aws: Take colleague data age into account

by Simon Betz

Module: check_mk Branch: master Commit: 8072651cfec02f322bf8f59df9b3f91db410e6ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8072651cfec02f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 31 10:32:04 2019 +0100 agent_aws: Take colleague data age into account Change-Id: I327a248edf5e9176f6bc515df2197d8cc94525c3 --- agents/special/agent_aws | 184 +++++++++++++++++++++++++++-------------------- 1 file changed, 106 insertions(+), 78 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8072651cfe…

5 years, 10 months

7137 FIX mem.win: Titles of rule are more consistent

by Moritz Kiemer

Module: check_mk Branch: master Commit: 1dd5cdf43ef20485210230ed76a70f99d232825e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dd5cdf43ef204… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 31 10:14:32 2019 +0100 7137 FIX mem.win: Titles of rule are more consistent Some of the titles and rules still referred to the commit charge as 'page file'. CMK-1543 Change-Id: I8acbccfb7f639b8888240dd02935f697a1ffa803 --- .werks/7137 | 10 ++++++++++ checkman/mem.win | 18 +++++++++++------- checks/mem | 2 +- .../wato/check_parameters/memory_pagefile_win.py | 6 +++--- .../checks/generictests/datasets/mem_win_regression.py | 4 ++-- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.werks/7137 b/.werks/7137 new file mode 100644 index 0000000..54aae5e --- /dev/null +++ b/.werks/7137 @@ -0,0 +1,10 @@ +Title: mem.win: Titles of rule are more consistent +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1548925887 +Class: fix + +Some of the titles and rules still referred to the commit charge as 'page file'. diff --git a/checkman/mem.win b/checkman/mem.win index 79c86cf..a4338cc 100644 --- a/checkman/mem.win +++ b/checkman/mem.win @@ -1,4 +1,4 @@ -title: Usage of main memory and page file +title: Memory Usage agents: windows catalog: os/kernel license: GPL @@ -6,29 +6,33 @@ distribution: check_mk description: This check measures the current usage of physical RAM and of the commit charge. + The "commit charge" was previously confusingly named "pagefile". Please note that Microsoft themselves use this naming in some applications. - Due to how Windows optimizes memory management, physical memory is in practice almost always fully utilized. The Memory usage this check displays says how much memory is actually required by processes, in contrast to caches that could be freed if the need arises. In the same vein Windows may hold data in RAM and pagefile at the same - time or it may hold data in the pagefile even when there is RAM available, + time or it may hold data in the pagefile even if there is RAM available, when it determines this may improve performance. As a result, the real pagefile usage is not only hard to determine, it's also utterly useless when we want to determine resource usage on the system. The commit charge instead tells us how much of the memory used in - total (RAM + swap) is really required, ignoring overlap and caches. - Commit Charge minus Memory Usage is approximately the amount + total (RAM + page file) is really required, ignoring overlap and caches. + Commit Charge minus used RAM is approximately the amount of the pagefile used for "relevant" data, but further optimizations - may lead to offsets (to the point where Commit Charge - Memory Usage - can be negative). + may lead to offsets (to the point where Commit Charge - RAM can be negative). + The page file metric is determined using the fields 'ullTotalPageFile' + (current committed memory limit for the system or the current + process, whichever is smaller) and 'ullAvailPageFile' (maximum + amount of memory the current process can commit) of the MEMORYSTATUSEX + structure as returned by the windows API function 'GlobalMemoryStatusEx'. item: {None} diff --git a/checks/mem b/checks/mem index 62b9032..df0a9db 100644 --- a/checks/mem +++ b/checks/mem @@ -551,7 +551,7 @@ def check_mem_windows(_no_item, params, info): return warn, crit for title, prefix, paramname in [("Memory usage", "Mem", "memory"), - ("Commit Charge", "Page", "pagefile")]: + ("Commit charge", "Page", "pagefile")]: total_kb = meminfo.get("%sTotal" % prefix) free_kb = meminfo.get("%sFree" % prefix) diff --git a/cmk/gui/plugins/wato/check_parameters/memory_pagefile_win.py b/cmk/gui/plugins/wato/check_parameters/memory_pagefile_win.py index 5b5d042..87731f0 100644 --- a/cmk/gui/plugins/wato/check_parameters/memory_pagefile_win.py +++ b/cmk/gui/plugins/wato/check_parameters/memory_pagefile_win.py @@ -75,18 +75,18 @@ register_check_parameters( ( "pagefile", Alternative( - title=_("Pagefile Levels"), + title=_("Commit charge Levels"), style="dropdown", elements=[ Tuple( - title=_("Pagefile usage in percent"), + title=_("Commit charge in percent (relative to commit limit)"), elements=[ Percentage(title=_("Warning at")), Percentage(title=_("Critical at")), ]), Transform( Tuple( - title=_("Absolute free pagefile"), + title=_("Absolute commitable memory"), elements=[ Filesize(title=_("Warning if less than")), Filesize(title=_("Critical if less than")), diff --git a/tests/unit/checks/generictests/datasets/mem_win_regression.py b/tests/unit/checks/generictests/datasets/mem_win_regression.py index 86d1460..c29e002 100644 --- a/tests/unit/checks/generictests/datasets/mem_win_regression.py +++ b/tests/unit/checks/generictests/datasets/mem_win_regression.py @@ -25,7 +25,7 @@ checks = { ('memory', 16369.96875, 26213.990625, 29490.739453125, 0, 32767.48828125), ('mem_total', 32767.48828125, None, None, None, None), ]), - (0, 'Commit Charge: 20.1% (19.04 GB/94.50 GB)', [ + (0, 'Commit charge: 20.1% (19.04 GB/94.50 GB)', [ ('pagefile', 19491.90625, 77413.990625, 87090.739453125, 0, 96767.48828125), ('pagefile_total', 96767.48828125, None, None, None, None), ]), @@ -35,7 +35,7 @@ checks = { ('memory', 16369.96875, 26214.48828125, 29490.48828125, 0, 32767.48828125), ('mem_total', 32767.48828125, None, None, None, None), ]), - (2, 'Commit Charge: 20.1% (19.04 GB/94.50 GB)', [ + (2, 'Commit charge: 20.1% (19.04 GB/94.50 GB)', [ ('pagefile', 19491.90625, 77275.48828125, 19353.48828125, 0, 96767.48828125), ('pagefile_total', 96767.48828125, None, None, None, None), ]),

5 years, 10 months

Performance fix for view rendering in 1.6

by Lars Michelsen

Module: check_mk Branch: master Commit: b5edd48f6b1932a7e46ca23c95ad537bd4225f96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5edd48f6b1932… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 31 08:26:07 2019 +0100 Performance fix for view rendering in 1.6 Because of some restructuring the views of all users were loaded multiple times during a single page request. When having a larger number of users this lead to a very slow view rendering time. Several cleanups on the way: * Cleaned up view module globals (available_views and permitted_views) * Removed the need to call views.load_views() in advance when working with view definitions. * Wrapped view loading into ViewStore object Change-Id: I88a15926790d6f7a8fc3a123b684824cf09471e0 --- cmk/gui/dashboard.py | 14 +++---- cmk/gui/mobile.py | 6 +-- cmk/gui/plugins/dashboard/view.py | 3 -- cmk/gui/plugins/sidebar/hosts.py | 1 - cmk/gui/plugins/sidebar/views.py | 3 +- cmk/gui/plugins/sidebar/wato.py | 3 +- cmk/gui/plugins/views/__init__.py | 1 + cmk/gui/plugins/views/mkeventd.py | 5 +-- cmk/gui/plugins/views/utils.py | 45 ++++++++++++++++------ cmk/gui/sidebar.py | 3 -- cmk/gui/views.py | 79 +++++++++++---------------------------- 11 files changed, 69 insertions(+), 94 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b5edd48f6b…

5 years, 10 months

Remove information of the basic kubernetes setup from treasures

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 306b5a0b65a15e93dd58fce3897412278227dafa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=306b5a0b65a15e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jan 31 13:13:51 2019 +0100 Remove information of the basic kubernetes setup from treasures Change-Id: I87b2a3c24bdb64463d38a4703aaf9b474f5fbc65 --- doc/treasures/kubernetes/readme.md | 144 ++----------------------------------- 1 file changed, 5 insertions(+), 139 deletions(-) diff --git a/doc/treasures/kubernetes/readme.md b/doc/treasures/kubernetes/readme.md index 78f6d43..0524cf8 100644 --- a/doc/treasures/kubernetes/readme.md +++ b/doc/treasures/kubernetes/readme.md @@ -55,146 +55,12 @@ nuances of encryption and authentication. ## Configuring Monitoring architecture -For the Check\_MK special agent to be able to query the Kubelet API for -metrics as the prometheus adapter we create a specific user for that goal. -Apply the rbac for check\_mk to get a service account with enough read -permissions. +The data delivered by the kubelet API and the Prometheus adapter augments +the basic monitoring of Kubernetes via Check_MK. Therefore, as a first step +the setup of the basic monitoring is necessary. A detailled description of +the setup can be found here +<https://mathias-kettner.de/cms_monitoring_kubernetes.html> - kubectl apply -f ~/git/check_mk/doc/treasures/kubernetes/check_mk_rbac.yaml - - -This should have created a Service Account, we can have a look at with: - - kubectl get serviceaccount check-mk -o yaml -n check-mk - - apiVersion: v1 - kind: ServiceAccount - metadata: - annotations: - kubectl.kubernetes.io/last-applied-configuration: | - {"apiVersion":"v1","kind":"ServiceAccount","metadata":{"annotations":{},"name":"check-mk","namespace":"check-mk"}} - creationTimestamp: "2019-01-07T11:31:33Z" - name: check-mk - namespace: check-mk - resourceVersion: "111238" - selfLink: /api/v1/namespaces/check-mk/serviceaccounts/check-mk - uid: c8cc6e72-126f-11e9-94b0-080027e0313a - secrets: - - name: check-mk-token-bc44j - - - - -### Get token - -For Check\_MK to communicate to kubernetes we need to get the authentication -token. To first obtain the name of the token we use: - - kubectl get serviceaccount check-mk -o yaml -n check-mk | grep "\- name:" | awk {'print $3'} - -Which during this guide is: - - check-mk-token-bc44j - -Replace it under `${token_name}` in the next command, which returns the token - - kubectl get secret ${token_name} -o yaml -n check-mk | grep "token:" | awk {'print $2'} | base64 --decode - - eyJhbGciOiJSUzI1NiIsImtpZCI6IiJ9.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJjaGVjay1tayIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJjaGVjay1tay10b2tlbi1iYzQ0aiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJjaGVjay1tayIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6ImM4Y2M2ZTcyLTEyNmYtMTFlOS05NGIwLTA4MDAyN2UwMzEzYSIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDpjaGVjay1tazpjaGVjay1tayJ9.w1xNU0JoyQK8NMlpK2X7-ep4yjhOrjTXhwFmuHhvRX6MWSw4Gr72kQ2EFg8eDcZKPvAr7OYljducAcXvBTmvlhV9nWRsaZNBlWDsu3Jmw0YswQJlHs5VCLWk8_VbiLHKiRt8PX8zNoZBhUF1XzWYRJjKapPpcL4IAuQ57LsE_OgLf1Bfj9MbqfhSuIgoJ4AAn0UEslo5giQdLBRL1m6JMxeE1Xlv5Sl-Uc98DlwZFTwIdXj_X1iOqRkepA8DPFr4wjN3xPkKPiqP6l84x4Nwg6Z79Msq7FYG__XhlgVsRnCwUwfZwPKw0XqfncEtVYrUQPmP8EsrQ179Z_5bkPatmw - -Copy this in your Check\_MK passwordstore. Then setup kubernetes as a data -source to use the special agent. - - - - -### Get certificate - -This is the certificate to communicate from the exterior of kubernetes into -it. We need to give this certificate to Check\_MK for the special agent not -to complain about the communication. - - kubectl get secret ${token_name} -o yaml -n check-mk | grep "ca.crt:" | awk {'print $2'} | base64 --decode - - -----BEGIN CERTIFICATE----- - MIIC5zCCAc+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAVMRMwEQYDVQQDEwptaW5p - a3ViZUNBMB4XDTE4MTIxNjEzNDYzOFoXDTI4MTIxNDEzNDYzOFowFTETMBEGA1UE - AxMKbWluaWt1YmVDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALT5 - 7EvR3ehKXx3LdztLTZllNXihDqeM2Px27FemBZ/LzVl0UQBqMAsNYHPHTs9KfrTw - I0HGR5sp8dM+yOeg6EW8pFLjDpMyxf7Vxlfga2FHgW443fsQ+t6j6Vu780xMEvM5 - Kx/NNZSc7dVEyxD4jCZ+8iL0Rhd9sgiEvu8RjUlazIlltPUACAhNUwE1+oN5iBFo - 6wtDzkGkN6Yl2hEdGS/nUvEokiYV7as2WI++qepCmdmntzqK72+FW45rRLY4wsYT - qCWRkZEzdnna6BKbeMigQ/vTF1LlbHj4XxsbM9SJiP8EKduN+TBz0ZWo7k618BK0 - 030/bGtD5WWL5m2nocMCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgKkMB0GA1UdJQQW - MBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 - DQEBCwUAA4IBAQCzWfneGoCou4jnCoB2bWzHC7rB3OVKFOAku+CjY/zYqFoiY9mI - XX2ufCn6RSlsbWFZz1LR7hYzS07pi+pWddHOz66dXo3DlKEq0HpKF0u0d/P9C3uA - JPJsxmunwYWhlVrbxfSpWaaiPZMAQD/Mc03CZrVl6FcNGcdxvHO/O0MoFMBZ1n74 - 0jdh5jvVeQyxr1WWbIWqI6mj/OguyZMQkq3xGPrgwf4S1jKPWgOiESpdPPkruLUO - H3/URbaENRRDpVQy1wh4DAjOg7Ex7tKujeXxuO/ihgzfL3f4+NX7tkSiQaudll3T - Ik+23cGz8QC5aQ7HEjiuXzEW1a/lCS95WDsM - -----END CERTIFICATE----- - -For our Minikube node it looks like this. - - echo "${certificate}" | openssl x509 -text -noout - - Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: sha256WithRSAEncryption - Issuer: CN = minikubeCA - Validity - Not Before: Dec 16 13:46:38 2018 GMT - Not After : Dec 14 13:46:38 2028 GMT - Subject: CN = minikubeCA - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:b4:f9:ec:4b:d1:dd:e8:4a:5f:1d:cb:77:3b:4b: - 4d:99:65:35:78:a1:0e:a7:8c:d8:fc:76:ec:57:a6: - 05:9f:cb:cd:59:74:51:00:6a:30:0b:0d:60:73:c7: - 4e:cf:4a:7e:b4:f0:23:41:c6:47:9b:29:f1:d3:3e: - c8:e7:a0:e8:45:bc:a4:52:e3:0e:93:32:c5:fe:d5: - c6:57:e0:6b:61:47:81:6e:38:dd:fb:10:fa:de:a3: - e9:5b:bb:f3:4c:4c:12:f3:39:2b:1f:cd:35:94:9c: - ed:d5:44:cb:10:f8:8c:26:7e:f2:22:f4:46:17:7d: - b2:08:84:be:ef:11:8d:49:5a:cc:89:65:b4:f5:00: - 08:08:4d:53:01:35:fa:83:79:88:11:68:eb:0b:43: - ce:41:a4:37:a6:25:da:11:1d:19:2f:e7:52:f1:28: - 92:26:15:ed:ab:36:58:8f:be:a9:ea:42:99:d9:a7: - b7:3a:8a:ef:6f:85:5b:8e:6b:44:b6:38:c2:c6:13: - a8:25:91:91:91:33:76:79:da:e8:12:9b:78:c8:a0: - 43:fb:d3:17:52:e5:6c:78:f8:5f:1b:1b:33:d4:89: - 88:ff:04:29:db:8d:f9:30:73:d1:95:a8:ee:4e:b5: - f0:12:b4:d3:7d:3f:6c:6b:43:e5:65:8b:e6:6d:a7: - a1:c3 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Key Usage: critical - Digital Signature, Key Encipherment, Certificate Sign - X509v3 Extended Key Usage: - TLS Web Client Authentication, TLS Web Server Authentication - X509v3 Basic Constraints: critical - CA:TRUE - Signature Algorithm: sha256WithRSAEncryption - b3:59:f9:de:1a:80:a8:bb:88:e7:0a:80:76:6d:6c:c7:0b:ba: - c1:dc:e5:4a:14:e0:24:bb:e0:a3:63:fc:d8:a8:5a:22:63:d9: - 88:5d:7d:ae:7c:29:fa:45:29:6c:6d:61:59:cf:52:d1:ee:16: - 33:4b:4e:e9:8b:ea:56:75:d1:ce:cf:ae:9d:5e:8d:c3:94:a1: - 2a:d0:7a:4a:17:4b:b4:77:f3:fd:0b:7b:80:24:f2:6c:c6:6b: - a7:c1:85:a1:95:5a:db:c5:f4:a9:59:a6:a2:3d:93:00:40:3f: - cc:73:4d:c2:66:b5:65:e8:57:0d:19:c7:71:bc:73:bf:3b:43: - 28:14:c0:59:d6:7e:f8:d2:37:61:e6:3b:d5:79:0c:b1:af:55: - 96:6c:85:aa:23:a9:a3:fc:e8:2e:c9:93:10:92:ad:f1:18:fa: - e0:c1:fe:12:d6:32:8f:5a:03:a2:11:2a:5d:3c:f9:2b:b8:b5: - 0e:1f:7f:d4:45:b6:84:35:14:43:a5:54:32:d7:08:78:0c:08: - ce:83:b1:31:ee:d2:ae:8d:e5:f1:b8:ef:e2:86:0c:df:2f:77: - f8:f8:d5:fb:b6:44:a2:41:ab:9d:96:5d:d3:22:4f:b6:dd:c1: - b3:f1:00:b9:69:0e:c7:12:38:ae:5f:31:16:d5:af:e5:09:2f: - 79:58:3b:0c

5 years, 10 months

k8s_roles: don't show age in HW/SW inventory

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 0f80c694fe78804de327ed3345a2b04a372b0967 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f80c694fe7880… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jan 31 11:16:42 2019 +0100 k8s_roles: don't show age in HW/SW inventory Change-Id: I9b74742ae4dd7b6fca1742fccf65233de23c9fda --- cmk/gui/plugins/views/inventory.py | 3 +-- inventory/k8s_roles | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 98f02e4..1f511bb 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -1076,11 +1076,10 @@ inventory_displayhints.update({ }, ".software.applications.kubernetes.roles:": { "title": _("Roles"), - "keyorder": ["role", "namespace", "age"], + "keyorder": ["role", "namespace"], }, ".software.applications.k8s.roles:*.role": {"title": _("Name")}, ".software.applications.k8s.roles:*.namespace": {"title": _("Namespace")}, - ".software.applications.k8s.roles:*.age": {"title": _("Age")}, ".software.applications.citrix.": {"title": _("Citrix")}, ".software.applications.citrix.controller.": {"title": _("Controller")}, ".software.applications.citrix.controller.controller_version": { diff --git a/inventory/k8s_roles b/inventory/k8s_roles index 318dd1b..43f9508 100644 --- a/inventory/k8s_roles +++ b/inventory/k8s_roles @@ -27,8 +27,6 @@ def inv_k8s_roles(parsed): import itertools - - now = time.time() node = inv_tree_list("software.applications.kubernetes.roles:") for role in sorted( @@ -38,7 +36,6 @@ def inv_k8s_roles(parsed): node.append({ 'role': role['name'], 'namespace': role['namespace'], - 'age': get_age_human_readable(now - role['creation_timestamp']), })

5 years, 10 months

Cleanup application global per request "caching"

by Lars Michelsen

Module: check_mk Branch: master Commit: 03f47269c43932e0d409f3182dc0de3f87114df9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03f47269c43932… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 30 23:54:33 2019 +0100 Cleanup application global per request "caching" * Removed "cache" functionality from htmllib * Make the WSGI application object of the current request available through cmk.gui.globals.current_app * Provide a simple dictionary structure at current_app.g for storing information during request processing * The API is similar to the way flask realizes this Change-Id: I466174cac1b9dc2920f0f8a8cdc7cff6e74cd4ef --- cmk/gui/bi.py | 6 +++--- cmk/gui/globals.py | 28 +++++++++++++++------------- cmk/gui/gui_background_job.py | 2 +- cmk/gui/htmllib.py | 26 -------------------------- cmk/gui/inventory.py | 22 +++++++++------------- cmk/gui/log.py | 2 +- cmk/gui/modules.py | 8 ++++---- cmk/gui/plugins/metrics/utils.py | 8 ++++---- cmk/gui/plugins/views/icons/builtin.py | 6 +++--- cmk/gui/userdb.py | 11 +++++------ cmk/gui/watolib/hosts_and_folders.py | 21 ++++++++++++--------- tests/unit/cmk/gui/conftest.py | 11 ++++++++++- web/app/index.wsgi | 7 +++++++ 13 files changed, 74 insertions(+), 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=03f47269c4…

5 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019