Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

#3075 FIX windows agent: fixed data encryption of realtime updates were incompatible

by Sebastian Herbord

Module: check_mk Branch: master Commit: 1ebd0270923d06e923d59398d94e57c7fc3b51cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ebd0270923d06… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 15 15:29:05 2016 +0100 #3075 FIX windows agent: fixed data encryption of realtime updates were incompatible The windows agent used sha-1 hashes to derive the key/iv-pair from the pass phrase while check_mk and the linux agent use md5 --- .werks/3075 | 11 +++++++++++ ChangeLog | 1 + agents/windows/Crypto.h | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3075 b/.werks/3075 new file mode 100644 index 0000000..fcc0db9 --- /dev/null +++ b/.werks/3075 @@ -0,0 +1,11 @@ +Title: windows agent: fixed data encryption of realtime updates were incompatible +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455546420 + +The windows agent used sha-1 hashes to derive the key/iv-pair from the pass phrase while check_mk +and the linux agent use md5 diff --git a/ChangeLog b/ChangeLog index b3243d5..39197c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 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 + * 3075 FIX: windows agent: fixed data encryption of realtime updates were incompatible... Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/agents/windows/Crypto.h b/agents/windows/Crypto.h index c202b74..6400fd8 100644 --- a/agents/windows/Crypto.h +++ b/agents/windows/Crypto.h @@ -14,7 +14,7 @@ private: // algorithm can't currently be changed static const ALG_ID DEFAULT_ALGORITHM = CALG_AES_256; - static const ALG_ID HASH_ALGORITHM = CALG_SHA1; + static const ALG_ID HASH_ALGORITHM = CALG_MD5; enum KeyLength { KEY_LEN_DEFAULT = 0,

8 years, 4 months

Fixed wrong identation

by Lars Michelsen

Module: check_mk Branch: master Commit: 9461f1af3c58040ff79f8a6d9dd682bf2b2a693d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9461f1af3c5804… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 15:07:32 2016 +0100 Fixed wrong identation --- modules/discovery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/discovery.py b/modules/discovery.py index f498930..4fc1c57 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -864,7 +864,7 @@ def get_discovered_services(hostname, ipaddress, use_caches, do_snmp_scan, on_er # Handle discovered services -> "new" new_items = discover_services(hostname, None, use_caches, do_snmp_scan, on_error, ipaddress) for check_type, item, paramstring in new_items: - services[(check_type, item)] = ("new", paramstring) + services[(check_type, item)] = ("new", paramstring) # Match with existing items -> "old" and "vanished" old_items = parse_autochecks_file(hostname)

8 years, 4 months

#3074 FIX windows agent: fixed incorrect values for 32-bit performance counters

by Sebastian Herbord

Module: check_mk Branch: master Commit: b92bf59c756a9d6e139b88fbd124e340c2e45b50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b92bf59c756a9d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 15 14:32:23 2016 +0100 #3074 FIX windows agent: fixed incorrect values for 32-bit performance counters --- .werks/3074 | 10 ++++++++++ ChangeLog | 1 + agents/windows/PerfCounter.cc | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 909824 -> 909824 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 909824 -> 909824 bytes agents/windows/check_mk_agent.exe | Bin 835584 -> 835584 bytes agents/windows/check_mk_agent.msi | Bin 2006016 -> 2006016 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 835584 -> 835584 bytes agents/windows/install_agent-64.exe | Bin 418338 -> 418320 bytes agents/windows/install_agent.exe | Bin 408688 -> 408684 bytes 11 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3074 b/.werks/3074 new file mode 100644 index 0000000..7758c1f --- /dev/null +++ b/.werks/3074 @@ -0,0 +1,10 @@ +Title: windows agent: fixed incorrect values for 32-bit performance counters +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455543009 + + diff --git a/ChangeLog b/ChangeLog index 4caf501..b3243d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 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 Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/agents/windows/PerfCounter.cc b/agents/windows/PerfCounter.cc index ddd3620..9e38471 100644 --- a/agents/windows/PerfCounter.cc +++ b/agents/windows/PerfCounter.cc @@ -117,7 +117,7 @@ ULONGLONG PerfCounter::extractValue(PERF_COUNTER_BLOCK *block) const { switch (_counter->CounterType & PERF_SIZE_MASK) { case PERF_SIZE_DWORD: - return static_cast<ULONGLONG>(*(DWORD *)block); + return static_cast<ULONGLONG>(*(DWORD *)pData); case PERF_SIZE_LARGE: return *(UNALIGNED ULONGLONG *)pData; case PERF_SIZE_ZERO: diff --git a/agents/windows/build_version b/agents/windows/build_version index 0718dd8..6f2c618 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1320 +1335 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index c6190d3..4a7a922 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index af37d1f..cab6ca2 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index eb737d0..ff5ab48 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 179d2c9..b152115 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 3f7c0fc..bf7c2e2 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 4692be4..a30ce28 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 05a99e1..b86b2c7 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 4 months

#3203 FIX Distributed WATO: Fixed exception in remote host service discovery

by Lars Michelsen

Module: check_mk Branch: master Commit: 80f9afc8afeaca34609217e347b662e1c7d0ee74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80f9afc8afeaca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 13:53:33 2016 +0100 #3203 FIX Distributed WATO: Fixed exception in remote host service discovery Fixed an exception which could occur during automation calls between distributed sites: 2016-02-15 13:49:14 [3] [13761] /heute/check_mk/wato.py Internal error: Traceback (most recent call last): File "/omd/sites/heute/share/check_mk/web/htdocs/index.py", line 131, in handler handler() File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 188, in page_handler result = modefunc("action") File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 15850, in <lambda> "inventory" : (["hosts"], lambda phase: mode_inventory(phase, False)), File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 2669, in mode_inventory check_mk_automation(host.site_id(), "set-autochecks", [hostname], active_checks) File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3878, in check_mk_automation return check_mk_remote_automation(siteid, command, args, indata, stdin_data, timeout) File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3072, in check_mk_remote_automation ("timeout", mk_repr(indata)), # The timeout File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3099, in do_remote_automation raise MKAutomationException("<pre>%s</pre>" % response) MKAutomationException: <pre>%d format: a number is required, not dictTraceback (most recent call last): File "/omd/sites/slave/share/check_mk/web/htdocs/index.py", line 63, in handler handler() File "/omd/sites/slave/share/check_mk/web/htdocs/wato.py", line 9515, in page_automation result = check_mk_local_automation(cmk_command, args, indata, stdin_data, timeout) File "/omd/sites/slave/share/check_mk/web/htdocs/watolib.py", line 3883, in check_mk_local_automation args = [ "--timeout", "%d" % timeout ] + args TypeError: %d format: a number is required, not dic --- .werks/3203 | 35 +++++++++++++++++++++++++++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 2 +- 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/.werks/3203 b/.werks/3203 new file mode 100644 index 0000000..f5724ed --- /dev/null +++ b/.werks/3203 @@ -0,0 +1,35 @@ +Title: Distributed WATO: Fixed exception in remote host service discovery +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455540745 + +Fixed an exception which could occur during automation calls between distributed +sites: + +2016-02-15 13:49:14 [3] [13761] /heute/check_mk/wato.py Internal error: Traceback (most recent call last): + File "/omd/sites/heute/share/check_mk/web/htdocs/index.py", line 131, in handler + handler() + File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 188, in page_handler + result = modefunc("action") + File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 15850, in <lambda> + "inventory" : (["hosts"], lambda phase: mode_inventory(phase, False)), + File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 2669, in mode_inventory + check_mk_automation(host.site_id(), "set-autochecks", [hostname], active_checks) + File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3878, in check_mk_automation + return check_mk_remote_automation(siteid, command, args, indata, stdin_data, timeout) + File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3072, in check_mk_remote_automation + ("timeout", mk_repr(indata)), # The timeout + File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3099, in do_remote_automation + raise MKAutomationException("<pre>%s</pre>" % response) +MKAutomationException: <pre>%d format: a number is required, not dictTraceback (most recent call last): + File "/omd/sites/slave/share/check_mk/web/htdocs/index.py", line 63, in handler + handler() + File "/omd/sites/slave/share/check_mk/web/htdocs/wato.py", line 9515, in page_automation + result = check_mk_local_automation(cmk_command, args, indata, stdin_data, timeout) + File "/omd/sites/slave/share/check_mk/web/htdocs/watolib.py", line 3883, in check_mk_local_automation + args = [ "--timeout", "%d" % timeout ] + args +TypeError: %d format: a number is required, not dic diff --git a/ChangeLog b/ChangeLog index 9330266..4caf501 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ WATO: * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control + * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index da601a7..d457d80 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3070,7 +3070,7 @@ def check_mk_remote_automation(siteid, command, args, indata, stdin_data=None, t ("arguments", mk_repr(args)), # The arguments for the command ("indata", mk_repr(indata)), # The input data ("stdin_data", mk_repr(stdin_data)), # The input data for stdin - ("timeout", mk_repr(indata)), # The timeout + ("timeout", mk_repr(timeout)), # The timeout ]) return response

8 years, 4 months

Reserved 30 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: bfbef848439e1f845d0ec751b8b7a7abb185eab5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfbef848439e1f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 13:52:09 2016 +0100 Reserved 30 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e4d7a32..3c964c4 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3203 +3233

8 years, 4 months

#3062 FIX Git integration: Fixed not adding files in WATO folders to git control

by Lars Michelsen

Module: check_mk Branch: master Commit: 0da2a6f721da8496a2132ec45f9f154f1479f89e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0da2a6f721da84… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 13:28:09 2016 +0100 #3062 FIX Git integration: Fixed not adding files in WATO folders to git control --- .werks/3062 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 38 ++++++++++++++++++++++++-------------- 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/.werks/3062 b/.werks/3062 new file mode 100644 index 0000000..faf5e02 --- /dev/null +++ b/.werks/3062 @@ -0,0 +1,10 @@ +Title: Git integration: Fixed not adding files in WATO folders to git control +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455539260 + + diff --git a/ChangeLog b/ChangeLog index 567caee..9330266 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ WATO: * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... + * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 7753c29..da601a7 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4247,25 +4247,13 @@ def do_git_commit(): git_command(["config", "user.email", "check_mk"]) git_command(["config", "user.name", "check_mk"]) - # Make sure that .gitignore-files are present and uptodate - file(defaults.default_config_dir + "/.gitignore", "w").write( - "*\n" - "!*.d\n" - "!.gitignore\n" - "*swp\n" - "*.mk.new\n") - for subdir in os.listdir(defaults.default_config_dir): - if subdir.endswith(".d"): - file(defaults.default_config_dir + "/" + subdir + "/.gitignore", "w").write( - "*\n" - "!wato\n" - "!wato/*\n") + write_gitignore_files() git_command(["add", ".gitignore", "*.d/wato"]) git_command(["commit", "--untracked-files=no", "--author", author, "-m", shell_quote(_("Initialized GIT for Check_MK"))]) # Only commit, if something is changed - if os.popen("cd '%s' && git status --untracked-files=no --porcelain" % defaults.default_config_dir).read().strip(): + if os.popen("cd '%s' && git status --porcelain" % defaults.default_config_dir).read().strip(): git_command(["add", "*.d/wato"]) message = ", ".join(g_git_messages) if not message: @@ -4273,6 +4261,28 @@ def do_git_commit(): git_command(["commit", "--author", author, "-m", shell_quote(message)]) +# Make sure that .gitignore-files are present and uptodate. Only files below the "wato" directories +# should be under git control. The files in etc/check_mk/*.mk should not be put under control. +# +# FIXME TODO: Should also be written on regular commits to make it possible to update the files +def write_gitignore_files(): + file(defaults.default_config_dir + "/.gitignore", "w").write( + "*\n" + "!*.d\n" + "!.gitignore\n" + "*swp\n" + "*.mk.new\n") + + for subdir in os.listdir(defaults.default_config_dir): + if subdir.endswith(".d"): + file(defaults.default_config_dir + "/" + subdir + "/.gitignore", "w").write( + "*\n" + "!wato\n") + + if os.path.exists(defaults.default_config_dir + "/" + subdir + "/wato"): + file(defaults.default_config_dir + "/" + subdir + "/wato/.gitignore", "w").write("!*\n") + + # Make sure that the user is in all of cgs contact groups. # This is needed when the user assigns contact groups to # objects. He may only assign such groups he is member himself.

8 years, 4 months

#3175 FIX Fix timeranges of graphs that are embedded in a dashboard

by Mathias Kettner

Module: check_mk Branch: master Commit: 68dda8ed301c4ffe3e48a881125596c7c0fbc11e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68dda8ed301c4f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 15 12:35:16 2016 +0100 #3175 FIX Fix timeranges of graphs that are embedded in a dashboard That was hard coded to 8 hours and ignored the settings in the dashlet. This has been fixed. --- .werks/3175 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/metrics.py | 14 ++++++++++++-- web/plugins/dashboard/dashlets.py | 3 ++- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.werks/3175 b/.werks/3175 new file mode 100644 index 0000000..856d640 --- /dev/null +++ b/.werks/3175 @@ -0,0 +1,11 @@ +Title: Fix timeranges of graphs that are embedded in a dashboard +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455536077 + +That was hard coded to 8 hours and ignored the settings in the dashlet. +This has been fixed. diff --git a/ChangeLog b/ChangeLog index 2d024e4..567caee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices + * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... WATO: * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index d493782..62c9df8 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1407,9 +1407,19 @@ def host_service_graph_dashlet_cmk(graph_specification): "resizable" : False, } - # FIXME: html.var("timerange") ??? + + # The timerange is specified in PNP like manner. + range_secs = { + "0" : 4 * 3600, + "1" : 25 * 3600, + "2" : 7 * 86400, + "3" : 31 * 86400, + "4" : 366 * 86400, + } + + secs = range_secs.get(html.var("timerange"), 4 * 3600) end_time = time.time() - start_time = end_time - 8 * 3600 + start_time = end_time - secs graph_data_range = { "time_range" : (start_time, end_time), } diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 9bfac70..d57f95b 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -390,6 +390,7 @@ dashlet_types["pnpgraph"] = { "infos" : ["service", "host"], "single_infos" : ["service", "host"], "parameters" : [ + # Cleanup: switch to generic Timerange() valuespec! ("timerange", DropdownChoice( title = _('Timerange'), default_value = '1', @@ -407,7 +408,7 @@ dashlet_types["pnpgraph"] = { ], "styles": """ .dashlet.pnpgraph .dashlet_inner { - background-color: #fff; + background-color: #f8f4f0; color: #000; text-align: center; }

8 years, 4 months

#3061 FIX mk_jolokia: Fixed debugging of the agent plugin

by Lars Michelsen

Module: check_mk Branch: master Commit: db8aa12977f7289aea41279a865bff16fa315654 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db8aa12977f728… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 11:55:52 2016 +0100 #3061 FIX mk_jolokia: Fixed debugging of the agent plugin --- .werks/3061 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/mk_jolokia | 11 +++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/3061 b/.werks/3061 new file mode 100644 index 0000000..ad022bc --- /dev/null +++ b/.werks/3061 @@ -0,0 +1,10 @@ +Title: mk_jolokia: Fixed debugging of the agent plugin +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455533734 + + diff --git a/ChangeLog b/ChangeLog index c2ca75d..2d024e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 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 Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 5295801..d90a7f0 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -26,7 +26,8 @@ import urllib2, sys, os, socket, pprint, base64 -opt_debug = '--debug' in sys.argv +opt_verbose = '--verbose' in sys.argv +opt_debug = '--debug' in sys.argv class PreemptiveBasicAuthHandler(urllib2.HTTPBasicAuthHandler): """ @@ -49,13 +50,15 @@ class PreemptiveBasicAuthHandler(urllib2.HTTPBasicAuthHandler): def fetch_var(protocol, server, port, path, suburi, itemspec): url = "%s://%s:%d/%s/%s" % (protocol, server, port, suburi, path) - if opt_debug: + if opt_verbose: sys.stderr.write("DEBUG: Fetching: %s\n" % url) try: json = urllib2.urlopen(url).read() - if opt_debug: + if opt_verbose: sys.stderr.write("DEBUG: Result: %s\n\n" % json) except Exception, e: + if opt_debug: + raise sys.stderr.write("ERROR: %s\n" % e) return [] @@ -79,7 +82,7 @@ def fetch_var(protocol, server, port, path, suburi, itemspec): # take the first items first value. # {'Catalina:host=localhost,path=\\/test,type=Manager': {'activeSessions': 0}} if 'value' not in obj: - if opt_debug: + if opt_verbose: sys.stderr.write("ERROR: not found: %s\n" % path) return [] val = obj.get('value', None)

8 years, 4 months

Updated bug entries #2360

by Sven Panne

Module: check_mk Branch: master Commit: 74af26f478997fcfbab887e1aa8ca4424b2b6dd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74af26f478997f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 15 11:42:13 2016 +0100 Updated bug entries #2360 --- .bugs/2360 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2360 b/.bugs/2360 index 7ab250a..bf19902 100644 --- a/.bugs/2360 +++ b/.bugs/2360 @@ -1,11 +1,14 @@ Title: "Fake check results" on hosts doesn't work Component: multisite -Class: bug -State: works4me +State: done Date: 2015-08-31 16:26:06 Targetversion: 1.2.7 +Class: bug The "Fake check results" feature on hosts allows to set the status of the host to "up", "down" or "unreachable" but this has no effect, the host status stays as it was. 2016-01-19 12:39:14: changed state open -> works4me Works for me. Could be be cause of Smart PING that updates the state *really* fast. + +2016-02-15 11:41:24: changed state works4me -> done +The core handled check results in a slightly inconsisten way, this has been fixed. Furthermore, the "Fake check results" on hosts GUI has been adapted to reflect the fact that you can't force a host to the "down" state.

8 years, 4 months

Claned up duplicated code with events.py

by Lars Michelsen

Module: check_mk Branch: master Commit: fc31b7b8f157cd86e6bae87cf6f1b3fca2679f0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc31b7b8f157cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 11:38:59 2016 +0100 Claned up duplicated code with events.py --- modules/notify.py | 91 ----------------------------------------------------- 1 file changed, 91 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 03b4456..995423c 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1501,97 +1501,6 @@ def call_bulk_notification_script(plugin, context_text): # | Functions dealing with loading, storing and converting contexts. | # '----------------------------------------------------------------------' -# Add a few further helper variables that are usefull in notification plugins -def complete_raw_context(raw_context): - raw_context["WHAT"] = raw_context.get("SERVICEDESC") and "SERVICE" or "HOST" - raw_context["MONITORING_HOST"] = socket.gethostname() - raw_context["LOGDIR"] = notification_logdir - if omd_root: - raw_context["OMD_ROOT"] = omd_root - raw_context["OMD_SITE"] = os.getenv("OMD_SITE", "") - raw_context["MAIL_COMMAND"] = notification_mail_command - - # The Check_MK Micro Core sends the MICROTIME and no other time stamps. We add - # a few Nagios-like variants in order to be compatible - if "MICROTIME" in raw_context: - microtime = int(raw_context["MICROTIME"]) - timestamp = float(microtime) / 1000000.0 - broken = time.localtime(timestamp) - raw_context["DATE"] = time.strftime("%Y-%m-%d", broken) - raw_context["SHORTDATETIME"] = time.strftime("%Y-%m-%d %H:%M:%S", broken) - raw_context["LONGDATETIME"] = time.strftime("%a %b %d %H:%M:%S %Z %Y", broken) - - raw_context['HOSTURL'] = '/check_mk/index.py?start_url=%s' % \ - urlencode('view.py?view_name=hoststatus&host=%s' % raw_context['HOSTNAME']) - if raw_context['WHAT'] == 'SERVICE': - raw_context['SERVICEURL'] = '/check_mk/index.py?start_url=%s' % \ - urlencode('view.py?view_name=service&host=%s&service=%s' % - (raw_context['HOSTNAME'], raw_context['SERVICEDESC'])) - - # Relative Timestamps for several macros - for macro in [ 'LASTHOSTSTATECHANGE', 'LASTSERVICESTATECHANGE', 'LASTHOSTUP', 'LASTSERVICEOK' ]: - if macro in raw_context: - raw_context[macro + '_REL'] = get_readable_rel_date(raw_context[macro]) - - - # Rule based notifications enabled? We might need to complete a few macros - contact = raw_context.get("CONTACTNAME") - if not contact or contact == "check-mk-notify": - add_rulebased_macros(raw_context) - - # For custom notifications the number is set to 0 by the core (Nagios and CMC). We force at least - # number 1 here, so that rules with conditions on numbers do not fail (the minimum is 1 here) - for what in [ "HOST", "SERVICE" ]: - key = what + "NOTIFICATIONNUMBER" - if key in raw_context and raw_context[key] == "0": - raw_context[key] = "1" - - # Add the previous hard state. This is neccessary for notification rules that depend on certain transitions, - # like OK -> WARN (but not CRIT -> WARN). The CMC sends PREVIOUSHOSTHARDSTATE and PREVIOUSSERVICEHARDSTATE. - # Nagios does not have this information and we try to deduct this. - if "PREVIOUSHOSTHARDSTATE" not in raw_context and "LASTHOSTSTATE" in raw_context: - prev_state = raw_context["LASTHOSTSTATE"] - # When the attempts are > 1 then the last state could be identical with - # the current one, e.g. both critical. In that case we assume the - # previous hard state to be OK. - if prev_state == raw_context["HOSTSTATE"]: - prev_state = "UP" - elif "HOSTATTEMPT" not in raw_context or \ - ("HOSTATTEMPT" in raw_context and raw_context["HOSTATTEMPT"] != "1"): - # Here We do not know. The transition might be OK -> WARN -> CRIT and - # the initial OK is completely lost. We use the artificial state "?" - # here, which matches all states and makes sure that when in doubt a - # notification is being sent out. But when the new state is UP, then - # we know that the previous state was a hard state (otherwise there - # would not have been any notification) - if raw_context["HOSTSTATE"] != "UP": - prev_state = "?" - notify_log("Previous host hard state not known. Allowing all states.") - raw_context["PREVIOUSHOSTHARDSTATE"] = prev_state - - # Same for services - if raw_context["WHAT"] == "SERVICE" and "PREVIOUSSERVICEHARDSTATE" not in raw_context: - prev_state = raw_context["LASTSERVICESTATE"] - if prev_state == raw_context["SERVICESTATE"]: - prev_state = "OK" - elif "SERVICEATTEMPT" not in raw_context or \ - ("SERVICEATTEMPT" in raw_context and raw_context["SERVICEATTEMPT"] != "1"): - if raw_context["SERVICESTATE"] != "OK": - prev_state = "?" - notify_log("Previous service hard state not known. Allowing all states.") - raw_context["PREVIOUSSERVICEHARDSTATE"] = prev_state - - # Add short variants for state names (at most 4 characters) - for key, value in raw_context.items(): - if key.endswith("STATE"): - raw_context[key[:-5] + "SHORTSTATE"] = value[:4] - - if raw_context["WHAT"] == "SERVICE": - raw_context['SERVICEFORURL'] = urllib.quote(raw_context['SERVICEDESC']) - raw_context['HOSTFORURL'] = urllib.quote(raw_context['HOSTNAME']) - - convert_context_to_unicode(raw_context) - # Be aware: The backlog.mk contains the raw context which has not been decoded # to unicode yet. It contains raw encoded strings e.g. the plugin output provided # by third party plugins which might be UTF-8 encoded but can also be encoded in

8 years, 4 months

← Newer
1
...
11
12
13
14
15
16
17
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016