Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

7090 SEC Automatically lock users after 10 subsequent logon failures

by Lars Michelsen

Module: check_mk Branch: master Commit: cbe4bcbf81f607733adb54420af062372ec937dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbe4bcbf81f607… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 18 22:02:59 2019 +0100 7090 SEC Automatically lock users after 10 subsequent logon failures Sites created with Check_MK 1.6 will be configured to automatically lock user accounts that fail to log in 10 times in a row. Existing sites will not be affected by this change. Check_MK already had the option to configure this feature for a long time. It can be customized using the global setting "Lock user accounts after N logon failures". If you have configured this in your setup, your setting is left untouched. To unlock automatically locked users, you need to login as administrative user and disable the option "Disable password" for this user. In case your administrative account was locked out, you will have to reset the password of your account (using <tt>htpasswd -m ~/etc/htpasswd [user-id]</tt>). CMK-1083 Change-Id: I2c1f6a5560b0d537acbf3be735ef9d9b2e3a4f0b --- .werks/7090 | 22 ++++++++++++++++++++++ cmk/gui/watolib/__init__.py | 1 + 2 files changed, 23 insertions(+) diff --git a/.werks/7090 b/.werks/7090 new file mode 100644 index 0000000..ed13924 --- /dev/null +++ b/.werks/7090 @@ -0,0 +1,22 @@ +Title: Automatically lock users after 10 subsequent logon failures +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1550523202 +Class: security + +Sites created with Check_MK 1.6 will be configured to automatically lock user +accounts that fail to log in 10 times in a row. Existing sites will not be +affected by this change. + +Check_MK already had the option to configure this feature for a long time. It +can be customized using the global setting "Lock user accounts after N logon +failures". If you have configured this in your setup, your setting is left +untouched. + +To unlock automatically locked users, you need to login as administrative user +and disable the option "Disable password" for this user. In case your +administrative account was locked out, you will have to reset the password +of your account (using <tt>htpasswd -m ~/etc/htpasswd [user-id]</tt>). diff --git a/cmk/gui/watolib/__init__.py b/cmk/gui/watolib/__init__.py index 399d214..096d96a 100644 --- a/cmk/gui/watolib/__init__.py +++ b/cmk/gui/watolib/__init__.py @@ -422,6 +422,7 @@ def _create_sample_config(): ], "enable_rulebased_notifications": True, "ui_theme": "facelift", + "lock_on_logon_failures": 10, }) # A contact group for all hosts and services

5 years, 7 months

Fix wrong version in faked .version_meta

by Lars Michelsen

Module: check_mk Branch: master Commit: 1579a3fd9f3cc08f5ec6e3cf4adb8b0d8485bd14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1579a3fd9f3cc0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 07:59:14 2019 +0100 Fix wrong version in faked .version_meta Change-Id: I49d7f80a4776e8c71d9a8ee0ffd745b070412b2c --- tests/docker/test_docker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index d42137a..a3163b7 100644 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -337,7 +337,8 @@ def test_update(request, client, version): user="cmk", workdir="/omd/sites/cmk")[0] == 0 assert c_orig.exec_run( - ["bash", "-c", "echo '%s' > .version_meta/version" % old_version.version], + ["bash", "-c", + "echo '%s' > .version_meta/version" % old_version.omd_version()], user="cmk", workdir="/omd/sites/cmk")[0] == 0

5 years, 7 months

Extracted helper function to untie variable scopes

by Lars Michelsen

Module: check_mk Branch: master Commit: 15cb695948ba3f3285b537533f312c835aa9fec0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15cb695948ba3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 18 22:18:50 2019 +0100 Extracted helper function to untie variable scopes Change-Id: I4ace65cb898bb17857db71a0c66e0cff2afcb050 --- omd/packages/omd/omdlib/main.py | 90 +++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index 1bec114..585362b 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -1074,52 +1074,10 @@ def patch_template_file(src, dst, old_site, new_site): def merge_update_file(site, relpath, old_version, new_version): fn = tty_bold + relpath + tty_normal - replacements = site.replacements user_path = site.dir + "/" + relpath permissions = os.stat(user_path).st_mode - def try_merge(): - for version, skelroot in [(old_version, site.version_skel_dir), - (new_version, "/omd/versions/%s/skel" % version)]: - p = "%s/%s" % (skelroot, relpath) - while True: - try: - skel_content = file(p).read() - break - except: - # Do not ask the user in non-interactive mode. - if opt_conflict in ["abort", "install"]: - bail_out("Skeleton file '%s' of version %s not readable." % (p, version)) - elif opt_conflict == "keepold" or not user_confirms( - site, "Skeleton file of version %s not readable" % version, - "The file '%s' is not readable for the site user. " - "This is most probably due a bug in release 0.42. " - "You can either fix that problem by making the file " - "readable with doing as root: chmod +r '%s' " - "or assume the file as empty. In that case you might " - "damage your configuration file " - "in case you have made changes to it in your site. What shall we do?" % - (p, p), relpath, "retry", "Retry reading the file (after you've fixed it)", - "ignore", "Assume the file to be empty"): - skel_content = "" - break - file("%s-%s" % (user_path, version), "w").write( - replace_tags(skel_content, replacements)) - version_patch = os.popen( # nosec - "diff -u %s-%s %s-%s" % (user_path, old_version, user_path, new_version)).read() - - # First try to merge the changes in the version into the users' file - merge = '--merge' if patch_has_merge() else '' - f = os.popen( # nosec - "PATH=/omd/versions/default/bin:$PATH patch --force --backup --forward --silent %s %s >/dev/null" - % (merge, user_path), "w") - f.write(version_patch) - status = f.close() - if status: - return status / 256 - return 0 - - if try_merge() == 0: + if _try_merge(site, relpath, old_version, new_version) == 0: # ACHTUNG: Hier müssen die Dateien $DATEI-alt, $DATEI-neu und $DATEI.orig # gelöscht werden sys.stdout.write(StateMarkers.good + " Merged %s\n" % fn) @@ -1202,7 +1160,7 @@ def merge_update_file(site, relpath, old_version, new_version): elif choice == "try again": os.rename(user_path + ".orig", user_path) os.system("%s '%s'" % (editor, user_path)) # nosec - if try_merge() == 0: + if _try_merge(site, relpath, old_version, new_version) == 0: sys.stdout.write("Successfully merged changes from %s -> %s into %s\n" % (old_version, new_version, fn)) return @@ -1228,6 +1186,50 @@ def merge_update_file(site, relpath, old_version, new_version): pass +def _try_merge(site, relpath, old_version, new_version): + user_path = site.dir + "/" + relpath + + for version, skelroot in [(old_version, site.version_skel_dir), + (new_version, "/omd/versions/%s/skel" % new_version)]: + p = "%s/%s" % (skelroot, relpath) + while True: + try: + skel_content = file(p).read() + break + except: + # Do not ask the user in non-interactive mode. + if opt_conflict in ["abort", "install"]: + bail_out("Skeleton file '%s' of version %s not readable." % (p, version)) + elif opt_conflict == "keepold" or not user_confirms( + site, "Skeleton file of version %s not readable" % version, + "The file '%s' is not readable for the site user. " + "This is most probably due a bug in release 0.42. " + "You can either fix that problem by making the file " + "readable with doing as root: chmod +r '%s' " + "or assume the file as empty. In that case you might " + "damage your configuration file " + "in case you have made changes to it in your site. What shall we do?" % + (p, p), relpath, "retry", "Retry reading the file (after you've fixed it)", + "ignore", "Assume the file to be empty"): + skel_content = "" + break + file("%s-%s" % (user_path, version), "w").write( + replace_tags(skel_content, site.replacements)) + version_patch = os.popen( # nosec + "diff -u %s-%s %s-%s" % (user_path, old_version, user_path, new_version)).read() + + # First try to merge the changes in the version into the users' file + merge = '--merge' if patch_has_merge() else '' + f = os.popen( # nosec + "PATH=/omd/versions/default/bin:$PATH patch --force --backup --forward --silent %s %s >/dev/null" + % (merge, user_path), "w") + f.write(version_patch) + status = f.close() + if status: + return status / 256 + return 0 + + # Compares two files and returns infos wether the file type or contants have changed """ def file_status(site, source_path, target_path): source_type = filetype(source_path)

5 years, 7 months

CMK-1544: Fix typos in Werk

by Andreas Umbreit

Module: check_mk Branch: master Commit: 6a0795f352e826430acb2d83eb1701b6ca678dc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a0795f352e826… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Feb 18 17:04:53 2019 +0100 CMK-1544: Fix typos in Werk Change-Id: Ic33424b828fa1d162b53bf4cf2a0c2dee13bec1d --- .werks/7164 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.werks/7164 b/.werks/7164 index 4f950ed..c0c885d 100644 --- a/.werks/7164 +++ b/.werks/7164 @@ -15,9 +15,8 @@ This was particularly noticeable when running the agent updater under Windows, because the agent updater would fail to start over again, showing an error like <code>copying plugins\cmk-update-agent.exe to temp\cmk-update-agent.exe failed</code>. -The agent updater now will cancel the connection if it freezes. -or if the connection freezes. The timeout limit is set to 120 seconds. -This timeout handling does not limit the overall connection time. +The agent updater now will cancel the connection if it freezes. The timeout +limit is set to 120 seconds. This handling does not limit the overall connection time. For a detailled explenation have a look at the Timeouts paragraph at the <a href="http://docs.python-requests.org">requests documentation</a>!

5 years, 7 months

Comments only.

by Sven Panne

Module: check_mk Branch: master Commit: 62e20c5f73bd7f7de06f990319ff7d240a0c3988 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62e20c5f73bd7f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 18 16:32:22 2019 +0100 Comments only. Change-Id: I9f41b76380c3bf1e5bfd4bf109ba63c8ada1054e --- livestatus/src/LogEntry.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 204882e..13999f2 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -181,17 +181,20 @@ std::vector<LogEntry::LogDef> LogEntry::log_definitions{ {Param::HostName, Param::ServiceDescription, Param::StateType, Param::Comment}}, //////////////// + // NOTE: We ignore the trailing name/from/to fields. LogDef{"TIMEPERIOD TRANSITION", Class::state, LogEntryKind::timeperiod_transition, {}}, //////////////// + // NOTE: We ignore the trailing author/comment fields. LogDef{"HOST NOTIFICATION", Class::hs_notification, LogEntryKind::none, {Param::ContactName, Param::HostName, Param::StateType, Param::CommandName, Param::PluginOutput}}, //////////////// + // NOTE: We ignore the trailing author/comment fields. LogDef{"SERVICE NOTIFICATION", Class::hs_notification, LogEntryKind::none, @@ -245,17 +248,20 @@ std::vector<LogEntry::LogDef> LogEntry::log_definitions{ {Param::HostName, Param::ServiceDescription, Param::CommandName, Param::ServiceState, Param::PluginOutput}}, //////////////// + // NOTE: Nobody seems to write such lines?! LogDef{"PASSIVE SERVICE CHECK", Class::passivecheck, LogEntryKind::none, {Param::HostName, Param::ServiceDescription, Param::State, Param::PluginOutput}}, //////////////// + // NOTE: Nobody seems to write such lines?! LogDef{"PASSIVE HOST CHECK", Class::passivecheck, LogEntryKind::none, {Param::HostName, Param::State, Param::PluginOutput}}, //////////////// + // NOTE: We ignore the trailing command field. LogDef{"EXTERNAL COMMAND", Class::ext_command, LogEntryKind::none, {}}}; // A bit verbose, but we avoid unnecessary string copies below.

5 years, 7 months

CMK-1544: Make the meaning of the timeout constant clearer

by Andreas Umbreit

Module: check_mk Branch: master Commit: da48b17bc764af50c2e50bcadd0653591515e7d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da48b17bc764af… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Feb 18 16:33:06 2019 +0100 CMK-1544: Make the meaning of the timeout constant clearer Change-Id: I03ba5b0e5623596deec428b9b697c1de1573082d --- .werks/7164 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.werks/7164 b/.werks/7164 index be88e4c..4f950ed 100644 --- a/.werks/7164 +++ b/.werks/7164 @@ -15,9 +15,11 @@ This was particularly noticeable when running the agent updater under Windows, because the agent updater would fail to start over again, showing an error like <code>copying plugins\cmk-update-agent.exe to temp\cmk-update-agent.exe failed</code>. -The agent updater now will cancel the connection if there is a connection timeout detected +The agent updater now will cancel the connection if it freezes. or if the connection freezes. The timeout limit is set to 120 seconds. -This timeout handling does not limit the overall connection time. +This timeout handling does not limit the overall connection time. +For a detailled explenation have a look at the Timeouts paragraph at the +<a href="http://docs.python-requests.org">requests documentation</a>! Please note: This timeout is only active for connections handled by python-requests. This fix won't apply if you are running the agent updater using cURL.

5 years, 7 months

mk_jolokia.py: prepare for additional sections

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7b8376c39be5ec4b868a55ded1767180eb3bfae9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b8376c39be5ec… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Feb 18 07:57:29 2019 +0100 mk_jolokia.py: prepare for additional sections Change-Id: Iaef34b28432fc6cbcd08e5f4347afb865b40b950 --- agents/plugins/mk_jolokia.py | 121 +++++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 57 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index af6abfd..251ebdf 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -55,61 +55,65 @@ except ImportError as import_error: VERBOSE = '--verbose' in sys.argv DEBUG = '--debug' in sys.argv -QUERY_SPECS_GENERIC = [ - ("java.lang:type=Memory", "NonHeapMemoryUsage/used", "NonHeapMemoryUsage", [], False), - ("java.lang:type=Memory", "NonHeapMemoryUsage/max", "NonHeapMemoryMax", [], False), - ("java.lang:type=Memory", "HeapMemoryUsage/used", "HeapMemoryUsage", [], False), - ("java.lang:type=Memory", "HeapMemoryUsage/max", "HeapMemoryMax", [], False), - ("java.lang:type=Threading", "ThreadCount", "ThreadCount", [], False), - ("java.lang:type=Threading", "DaemonThreadCount", "DeamonThreadCount", [], False), - ("java.lang:type=Threading", "PeakThreadCount", "PeakThreadCount", [], False), - ("java.lang:type=Threading", "TotalStartedThreadCount", "TotalStartedThreadCount", [], False), - ("java.lang:type=Runtime", "Uptime", "Uptime", [], False), - ("java.lang:type=GarbageCollector,name=*", "CollectionCount", "", [], False), - ("java.lang:type=GarbageCollector,name=*", "CollectionTime", "", [], False), - ("java.lang:name=CMS%20Perm%20Gen,type=MemoryPool", "Usage/used", "PermGenUsage", [], False), - ("java.lang:name=CMS%20Perm%20Gen,type=MemoryPool", "Usage/max", "PermGenMax", [], False), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", "OffHeapHits", - "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", "OnDiskHits", - "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "InMemoryHitPercentage", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", "CacheMisses", - "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "OnDiskHitPercentage", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "MemoryStoreObjectCount", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "DiskStoreObjectCount", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "CacheMissPercentage", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "CacheHitPercentage", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "OffHeapHitPercentage", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "InMemoryMisses", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "OffHeapStoreObjectCount", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "WriterQueueLength", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "WriterMaxQueueSize", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", "OffHeapMisses", - "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", "InMemoryHits", - "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", - "AssociatedCacheName", "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", "ObjectCount", - "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", "OnDiskMisses", - "", [], True), - ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", "CacheHits", "", - [], True), -] +QUERY_SPECS_GENERIC = { + 'metrics': [ + ("java.lang:type=Memory", "NonHeapMemoryUsage/used", "NonHeapMemoryUsage", [], False), + ("java.lang:type=Memory", "NonHeapMemoryUsage/max", "NonHeapMemoryMax", [], False), + ("java.lang:type=Memory", "HeapMemoryUsage/used", "HeapMemoryUsage", [], False), + ("java.lang:type=Memory", "HeapMemoryUsage/max", "HeapMemoryMax", [], False), + ("java.lang:type=Threading", "ThreadCount", "ThreadCount", [], False), + ("java.lang:type=Threading", "DaemonThreadCount", "DeamonThreadCount", [], False), + ("java.lang:type=Threading", "PeakThreadCount", "PeakThreadCount", [], False), + ("java.lang:type=Threading", "TotalStartedThreadCount", "TotalStartedThreadCount", [], + False), + ("java.lang:type=Runtime", "Uptime", "Uptime", [], False), + ("java.lang:type=GarbageCollector,name=*", "CollectionCount", "", [], False), + ("java.lang:type=GarbageCollector,name=*", "CollectionTime", "", [], False), + ("java.lang:name=CMS%20Perm%20Gen,type=MemoryPool", "Usage/used", "PermGenUsage", [], + False), + ("java.lang:name=CMS%20Perm%20Gen,type=MemoryPool", "Usage/max", "PermGenMax", [], False), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "OffHeapHits", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "OnDiskHits", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "InMemoryHitPercentage", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "CacheMisses", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "OnDiskHitPercentage", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "MemoryStoreObjectCount", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "DiskStoreObjectCount", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "CacheMissPercentage", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "CacheHitPercentage", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "OffHeapHitPercentage", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "InMemoryMisses", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "OffHeapStoreObjectCount", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "WriterQueueLength", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "WriterMaxQueueSize", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "OffHeapMisses", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "InMemoryHits", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "AssociatedCacheName", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "ObjectCount", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", + "OnDiskMisses", "", [], True), + ("net.sf.ehcache:CacheManager=CacheManagerApplication*,*,type=CacheStatistics", "CacheHits", + "", [], True), + ], +} QUERY_SPECS_SPECIFIC = { "weblogic": [ @@ -463,8 +467,11 @@ def _process_queries(inst, queries): def query_instance(inst): write_section('jolokia_info', generate_jolokia_info(inst)) - shipped_vars = QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst.product, []) - write_section('jolokia_metrics', generate_values(inst, shipped_vars)) + # now (after jolokia_info) we're sure about the product + specs_specific = QUERY_SPECS_SPECIFIC.get(inst.product, []) + write_section('jolokia_metrics', generate_values(inst, specs_specific)) + for section_name, specs_shipped in QUERY_SPECS_GENERIC.iteritems(): + write_section('jolokia_%s' % section_name, generate_values(inst, specs_shipped)) write_section('jolokia_generic', generate_values(inst, inst.custom_vars))

5 years, 7 months

[CMK-1647] - integration tests should work nice now

by Sergey Kipnis

Module: check_mk Branch: master Commit: 840363b569e123166e2924bfb529c36250b8194a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=840363b569e123… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Mon Feb 18 11:53:46 2019 +0100 [CMK-1647] - integration tests should work nice now - almost all values from WMI now are positive Change-Id: Iccf1faa762d74cbd4045c61aa78a2c6a135dfddf --- agents/windows/wmiHelper.cc | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index fbfc52b..482f8b2 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -291,6 +291,28 @@ bool Variant::get() const { } } +// this is original and weird function from the Agent. +// Used to avoid negative numbers in output. Sometimes. +// And satisfy integration tests. +// Microsoft is stupid, because VT_I4 must be interpreted as UNSIGNED sometimes. +// ****************************************************************** +// We will use this function in LA just to satisfy integration tests. +// #TODO rename this function to something more clear +template <> +int64_t Variant::get() const { + switch (_value.vt) { + case VT_I1: // has a char + return _value.iVal; // load short + case VT_I2: // has a short + return _value.intVal; // load int32 + case VT_I4: // has a int32 + return _value.llVal; // load in64 + default: + throw ComTypeException(string("wrong value type requested: ") + + to_string(_value.vt)); + } +} + template <> int32_t Variant::get() const { switch (_value.vt) { @@ -385,7 +407,11 @@ wstring Variant::get() const { case VT_I1: case VT_I2: case VT_I4: - return std::to_wstring(get<int32_t>()); + // call of *weird* function: + // in fact it is abs(_value) with extremely high probability + // We have to use by default uint64_t, because almost all WMI are + // defined as unsigned. + return std::to_wstring(get<int64_t>()); case VT_UI1: case VT_UI2: case VT_UI4:

5 years, 7 months

Cleanup module global state cmk.gui.plugins.views.utils.painter_options

by Lars Michelsen

Module: check_mk Branch: master Commit: cffd55a2bb72b2e5159ba7f3fe1e13ed9145a55e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cffd55a2bb72b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 18 14:35:39 2019 +0100 Cleanup module global state cmk.gui.plugins.views.utils.painter_options The PainterOptions object deals with view (request) specific information which should never be stored in module scope. As intermediate solution we store the object in current_app.g["painter_options"]. A better solution would be to create a "view instance" object that holds the painter options object as helper. This would need a bigger restructuring of the views code, which we can not focus on at the moment. CMK-1626 Change-Id: I6edd86d7c798417c468b0bca5a5b883249ff9667 --- cmk/gui/mobile.py | 13 +++++++++---- cmk/gui/plugins/dashboard/view.py | 4 +++- cmk/gui/plugins/views/__init__.py | 2 +- cmk/gui/plugins/views/bi.py | 3 ++- cmk/gui/plugins/views/inventory.py | 3 ++- cmk/gui/plugins/views/layouts.py | 4 +++- cmk/gui/plugins/views/mobile.py | 5 ++++- cmk/gui/plugins/views/painters.py | 3 ++- cmk/gui/plugins/views/utils.py | 21 ++++++++++++--------- cmk/gui/views.py | 22 ++++++++++++++-------- 10 files changed, 52 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cffd55a2bb…

5 years, 7 months

notify.py: remove redudant log entry and use event_log in all log functions

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 6210e9c44172da4da4a295366caaf780325f723b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6210e9c44172da… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Feb 8 10:48:02 2019 +0100 notify.py: remove redudant log entry and use event_log in all log functions Change-Id: I0601f4b8a0a344872915e04fad16abd5db4c908f --- cmk_base/notify.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmk_base/notify.py b/cmk_base/notify.py index 46396cd..8c38be3 100755 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -802,8 +802,6 @@ def rbn_match_event(context, state, last_state, event_map, allowed_events): else: event = event_map.get(last_state, '?') + event_map.get(state, '?') - notify_log("Event type is %s" % event) - # Now go through the allowed events. Handle '?' has matching all types! for allowed in allowed_events: if event == allowed or \ @@ -1916,7 +1914,7 @@ def notify_log(message): def notify_log_debug(message): if config.notification_logging >= 2: - notify_log(message) + events.event_log(notification_log, message) def fresh_uuid():

5 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019