Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

Added preliminary clang-format configuration. Tweaked Makefile a bit.

by Sven Panne

Module: check_mk Branch: master Commit: becdae86bad9f4295b62c3d114d31582e03be0c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=becdae86bad9f4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 13:05:34 2015 +0100 Added preliminary clang-format configuration. Tweaked Makefile a bit. --- .clang-format | 65 +++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 79 +++++++++++++++++++++++++++++++++------------------------ 2 files changed, 111 insertions(+), 33 deletions(-) diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..c7b0389 --- /dev/null +++ b/.clang-format @@ -0,0 +1,65 @@ +--- +Language: Cpp +AccessModifierOffset: -4 +AlignAfterOpenBracket: true +AlignConsecutiveAssignments: false +AlignEscapedNewlinesLeft: true +AlignOperands: true +AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: true +AllowShortFunctionsOnASingleLine: Inline +AllowShortIfStatementsOnASingleLine: true +AllowShortLoopsOnASingleLine: true +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakBeforeMultilineStrings: true +AlwaysBreakTemplateDeclarations: true +BinPackArguments: true +BinPackParameters: true +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Stroustrup +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: true +ColumnLimit: 80 +CommentPragmas: '^ IWYU pragma:' +ConstructorInitializerAllOnOneLineOrOnePerLine: true +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: true +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +IndentCaseLabels: true +IndentWidth: 4 +IndentWrappedFunctionNames: false +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 2 +NamespaceIndentation: None +ObjCBlockIndentWidth: 2 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: false +PenaltyBreakBeforeFirstCallParameter: 1 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 200 +PointerAlignment: Right +SpaceAfterCStyleCast: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp03 +TabWidth: 8 +UseTab: Never +... diff --git a/Makefile b/Makefile index 99647e0..56786f3 100644 --- a/Makefile +++ b/Makefile @@ -22,45 +22,52 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -SHELL = /bin/bash -VERSION = 1.2.7i4 -NAME = check_mk -PREFIX = /usr -BINDIR = $(PREFIX)/bin -CONFDIR = /etc/$(NAME) -LIBDIR = $(PREFIX)/lib/$(NAME) -DISTNAME = $(NAME)-$(VERSION) -TAROPTS = --owner=root --group=root --exclude=.svn --exclude=*~ \ - --exclude=.gitignore --exclude=*.swp --exclude=.f12 - -CPPCHECK = cppcheck -DOXYGEN = doxygen -IWYU = include-what-you-use +SHELL := /bin/bash +VERSION := 1.2.7i4 +NAME := check_mk +PREFIX := /usr +BINDIR := $(PREFIX)/bin +CONFDIR := /etc/$(NAME) +LIBDIR := $(PREFIX)/lib/$(NAME) +DISTNAME := $(NAME)-$(VERSION) +TAROPTS := --owner=root --group=root --exclude=.svn --exclude=*~ \ + --exclude=.gitignore --exclude=*.swp --exclude=.f12 + +CLANG_FORMAT := clang-format-3.7 +CPPCHECK := cppcheck +DOXYGEN := doxygen +IWYU := include-what-you-use # File to pack into livestatus-$(VERSION).tar.gz -LIVESTATUS_SOURCES = configure aclocal.m4 config.guess config.h.in config.sub \ - configure.ac ltmain.sh Makefile.am Makefile.in missing \ - nagios/README nagios/*.h nagios4/README nagios4/*.h \ - src/*.{h,c,cc} src/Makefile.{in,am} \ - depcomp install-sh api/python/{*.py,README} api/perl/* +LIVESTATUS_SOURCES := configure aclocal.m4 config.guess config.h.in config.sub \ + configure.ac ltmain.sh Makefile.am Makefile.in missing \ + nagios/README nagios/*.h nagios4/README nagios4/*.h \ + src/*.{h,c,cc} src/Makefile.{in,am} \ + depcomp install-sh api/python/{*.py,README} api/perl/* # Files that are checked for trailing spaces -HEAL_SPACES_IN = checkman/* modules/* checks/* notifications/* inventory/* \ - $$(find -name Makefile) livestatus/src/*{cc,c,h} agents/windows/*.cc \ - web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ - doc/helpers/* scripts/setup.sh scripts/autodetect.py \ - $$(find pnp-templates -type f -name "*.php") \ - mkeventd/bin/mkeventd mkeventd/web/htdocs/*.py mkeventd/web/plugins/*/*.py \ - mkeventd/src/*.c mkeventd/checks/* check_mk_templates.cfg \ - agents/check_mk_*agent* agents/*.c \ - $$(find agents/cfg_examples -type f) \ - agents/special/* \ - $$(find agents/plugins -type f) +HEAL_SPACES_IN := checkman/* modules/* checks/* notifications/* inventory/* \ + $$(find -name Makefile) livestatus/src/*{cc,c,h} agents/windows/*.cc \ + web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ + doc/helpers/* scripts/setup.sh scripts/autodetect.py \ + $$(find pnp-templates -type f -name "*.php") \ + mkeventd/bin/mkeventd mkeventd/web/htdocs/*.py mkeventd/web/plugins/*/*.py \ + mkeventd/src/*.c mkeventd/checks/* check_mk_templates.cfg \ + agents/check_mk_*agent* agents/*.c \ + $$(find agents/cfg_examples -type f) \ + agents/special/* \ + $$(find agents/plugins -type f) + +FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ + $(wildcard $(addprefix agents/windows/,*.cc *.c *.h)) \ + $(wildcard $(addprefix livestatus/api/c++/,*.cc *.c *.h)) \ + $(wildcard $(addprefix livestatus/src/,*.cc *.c *.h)) \ + $(wildcard $(addprefix mkeventd/src/,*.cc *.c *.h)) .PHONY: all check-binaries check check-permissions check-spaces check-version \ - clean cppcheck dist doxygen headers healspaces help iwyu minify-js \ - mk-eventd mk-livestatus mrproper optimize-images packages setup \ - setversion version + clean cppcheck dist documentation format headers healspaces help iwyu \ + minify-js mk-eventd mk-livestatus mrproper optimize-images packages \ + setup setversion version all: dist packages @@ -254,6 +261,12 @@ iwyu: cppcheck: $(CPPCHECK) --quiet --enable=all --max-configs=20 --inline-suppr --template=gcc -I livestatus/src -I livestatus livestatus +# TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in +# src/configure.ac, but this needs at least automake-1.13, which in turn is only +# available from e.g. Ubuntu Saucy (13) onwards, so some magic is needed. +format: + $(CLANG_FORMAT) -style=file -i $(FILES_TO_FORMAT) + # Note: You need the doxygen and graphviz packages. documentation: $(DOXYGEN) doc/Doxyfile

8 years, 7 months

#2801 snmp text encoding: now able to decode cp437 encoded snmp strings

by Andreas Boesl

Module: check_mk Branch: master Commit: 8af39c0824755eb8c77f325e31a98d427dd43fd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8af39c0824755e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 24 12:51:25 2015 +0100 #2801 snmp text encoding: now able to decode cp437 encoded snmp strings Furthermore the explicit decoding with the decode_snmp_string function in the checks if, hr_fs and printer_supply has been removed. Decoding of strings is now done before the data hits the check. --- .werks/2801 | 12 ++++++++++++ ChangeLog | 1 + checks/hr_fs | 2 +- checks/if | 2 -- checks/printer_supply | 2 +- modules/snmp.py | 16 +++++----------- web/plugins/wato/check_mk_configuration.py | 1 + 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.werks/2801 b/.werks/2801 new file mode 100644 index 0000000..63a119c --- /dev/null +++ b/.werks/2801 @@ -0,0 +1,12 @@ +Title: snmp text encoding: now able to decode cp437 encoded snmp strings +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1448365635 +Class: feature + +Furthermore the explicit decoding with the decode_snmp_string function in +the checks if, hr_fs and printer_supply has been removed. + +Decoding of strings is now done before the data hits the check. diff --git a/ChangeLog b/ChangeLog index 9dace45..f6fd98a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 1304 mk_mysql: Agent plugin can now detect multiple instances running unter the same user... * 2797 netscaler_vserver: now also shows tftp servers and health state of loadbalacing entities * 2863 wagner_titanus_topsens: added support for more devices... + * 2801 snmp text encoding: now able to decode cp437 encoded snmp strings... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/hr_fs b/checks/hr_fs index 2e9bb33..6489d84 100644 --- a/checks/hr_fs +++ b/checks/hr_fs @@ -27,7 +27,7 @@ # Juniper devices put information about the device into the # field where we expect the mount point. Ugly. Remove that crap. def fix_hr_fs_mountpoint(mp): - mp = snmp_decode_string(mp).replace("\\", "/") + mp = mp.replace("\\", "/") if "mounted on:" in mp: return mp.rsplit(":",1)[-1].strip() elif "Label:" in mp: diff --git a/checks/if b/checks/if index 5514c62..a3849ae 100644 --- a/checks/if +++ b/checks/if @@ -35,8 +35,6 @@ def if_convert_to_if64(info): for line in info: if saveint(line[0]) > 0: #Fix for switches with empty indexes newinfo.append(line[0:8] + ['0'] + line[8:12] + ['0'] + line[12:16] + line[1:2] + line[16:17]) - # Fix encoding of interface description - newinfo[-1][1] = snmp_decode_string(newinfo[-1][1]) return newinfo check_includes['if'] = [ "if.include" ] diff --git a/checks/printer_supply b/checks/printer_supply index 6c4ed20..e3788ae 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -68,7 +68,7 @@ def printer_supply_fix_infos(info): colors = [] new_info = [] for index, line in enumerate(info): - line_0 = snmp_decode_string(line[0]) # give chance for latin1->utf8 decoding + line_0 = line[0] # give chance for latin1->utf8 decoding # For toners or drum units add the color (if available) if line_0.startswith('Toner Cartridge') \ diff --git a/modules/snmp.py b/modules/snmp.py index 81660a9..f14b91f 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -276,7 +276,7 @@ def compute_fetch_oid(oid, suboid, column): def sanitize_snmp_encoding(columns): for index, column in enumerate(columns): - columns[index] = map(decode_incoming_string, column) + columns[index] = map(snmp_decode_string, column) return columns @@ -529,22 +529,16 @@ def get_stored_snmpwalk(hostname, oid): else: return rowinfo -# Helper function to be used in checks. It applies a user-specified -# character encoding in order to tranlate e.g. latin1 to utf8 def snmp_decode_string(text): encoding = get_snmp_character_encoding(g_hostname) if encoding: - return text.decode(encoding).encode("utf-8") + return text.decode(encoding) else: - # Try to determine the current string encoding. In case a UTF-8 - # decoding fails, we decode latin1 and encode it as UTF-8 again. - # When UTF-8 decoding works, we assume the string is already - # encoded in UTF-8 as we expect it to be. + # Try to determine the current string encoding. In case a UTF-8 decoding fails, we decode latin1. try: - text.decode('utf-8') - return text + return text.decode('utf-8') except: - return text.decode('latin1').encode('utf-8') + return text.decode('latin1') # .--Classic SNMP--------------------------------------------------------. # | ____ _ _ ____ _ _ __ __ ____ | diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 71efa24..e2cdd83 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1979,6 +1979,7 @@ register_rule(group, choices = [ ("utf-8", _("UTF-8") ), ("latin1" ,_("latin1")), + ("cp437" ,_("cp437")), ] )),

8 years, 7 months

#2800 FIX mk_mysql: fixed some issues with incorrect assembled command line

by Andreas Boesl

Module: check_mk Branch: master Commit: 39db43cf8adb97d0629f8b769e1190c063624f04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39db43cf8adb97… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 24 11:56:33 2015 +0100 #2800 FIX mk_mysql: fixed some issues with incorrect assembled command line This plugin tries to detect the correct command line out of the command line for the mysqld.exe. There were some instances where this mechanism failed. --- .werks/2800 | 11 +++++++++++ ChangeLog | 1 + agents/windows/plugins/mk_mysql.vbs | 12 +++++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.werks/2800 b/.werks/2800 new file mode 100644 index 0000000..d13f6ff --- /dev/null +++ b/.werks/2800 @@ -0,0 +1,11 @@ +Title: mk_mysql: fixed some issues with incorrect assembled command line +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1448362357 +Class: fix + +This plugin tries to detect the correct command line out of the command line for the mysqld.exe. +There were some instances where this mechanism failed. + diff --git a/ChangeLog b/ChangeLog index e331831..9dace45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ * 2798 FIX: netapp_api_cpu: fixed incorrect scaling of CPU data in NetApp Clustermode... * 2799 FIX: check_mail_loop: "Use TLS over SMTP" option did not work * 2777 FIX: check_mk_agent.linux: avoid execution of .deb temporary files as plugins + * 2800 FIX: mk_mysql: fixed some issues with incorrect assembled command line... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/windows/plugins/mk_mysql.vbs b/agents/windows/plugins/mk_mysql.vbs index 8c26dab..7999b41 100644 --- a/agents/windows/plugins/mk_mysql.vbs +++ b/agents/windows/plugins/mk_mysql.vbs @@ -94,6 +94,15 @@ For Each instance In instances.Keys pos = InStrRev(output, vbCrLf, Len(output)-1) conn_args = Mid(output, pos+2, Len(output)-pos-4) + Dim RegEx : Set RegEx = New RegExp + RegEx.Pattern = "(--port=.*?) " + + If RegEx.Test(conn_args) Then + conn_args = RegEx.Execute(conn_args)(0).SubMatches(0) + Else + conn_args = "" + End If + ' Now we try to construct a mysql.exe client command which is able to connect to this database ' based on the command uses by the database service. ' In our development setup, where MySQL 5.6 has been used, the server command is: @@ -101,7 +110,8 @@ For Each instance In instances.Keys ' To get the client command we simply need to replace mysqld.exe with mysql.exe, remove the ' my.ini and instance name from the end of the command and add our config as --defaults-extra-file. cmd = instances.Item(instance) - cmd = Replace(cmd, "mysqld.exe", "mysql.exe") + cmd = Replace(cmd, "mysqld""", "mysql""") + cmd = Replace(cmd, "mysql""", "mysql.exe""") cmd = Left(cmd, InStr(cmd, "mysql.exe""")+9) If cfg_file <> "" Then cmd = cmd & " --defaults-extra-file=""" & cfg_file & """"

8 years, 7 months

Reserved 10 Werk IDS

by Sebastian Herbord

Module: check_mk Branch: master Commit: a4cef95f19f5ee4145d7dae37ccc8e1c6f797d18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4cef95f19f5ee… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Nov 24 09:21:40 2015 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 42b029a..598ac53 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2863 +2873

8 years, 7 months

#2863 wagner_titanus_topsens: added support for more devices

by Sebastian Herbord

Module: check_mk Branch: master Commit: 3aec63e83fcad3b5e7401c2057521774f16f5efd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3aec63e83fcad3… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Nov 24 09:26:52 2015 +0100 #2863 wagner_titanus_topsens: added support for more devices The supported devices are both topsens-es, but different variants. The main difference seems to be that one has a LSN (Local Security Network) interface and one doesn't. --- .werks/2863 | 10 ++++ ChangeLog | 1 + checks/wagner_titanus_topsense | 116 +++++++++++++++++++++++++++------------- 3 files changed, 90 insertions(+), 37 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3aec63e83f…

8 years, 7 months

check_mk.agent_update: better output of timestamps

by Mathias Kettner

Module: check_mk Branch: master Commit: 3f310555d9f677bf4cf13e3eabcac2e77a237b9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f310555d9f677… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 23 21:28:41 2015 +0100 check_mk.agent_update: better output of timestamps --- checks/check_mk | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/checks/check_mk b/checks/check_mk index 03a466b..ffe938f 100644 --- a/checks/check_mk +++ b/checks/check_mk @@ -128,12 +128,6 @@ def inventory_cmk_agent_update(info): return [ (None, {}) ] def check_cmk_agent_update(_no_item, _no_params, info): - def output_age(text): - if text == "None": - return "never" - else: - return "%s ago" % (get_age_human_readable(time.time() - float(text))) - for line in info: if line[0] == "AgentUpdate:": parsed = {} @@ -150,6 +144,11 @@ def check_cmk_agent_update(_no_item, _no_params, info): now = time.time() + if parsed["error"] != "None": + yield 2, "error: %s" % parsed["error"] + else: + yield 0, "no errors" + try: last_check = float(parsed["last_check"]) age = now - last_check @@ -164,17 +163,14 @@ def check_cmk_agent_update(_no_item, _no_params, info): levels_text = " (warn/crit at %s/%s)" % (get_age_human_readable(warn), get_age_human_readable(crit)) else: levels_text = "" - yield state, "previous update check: " + output_age(parsed["last_check"]) + levels_text + yield state, "last update check: " + get_timestamp_human_readable(parsed["last_check"]) + levels_text except: yield 1, "no successful connect to server yet" - yield 0, "last agent update: %s" % output_age(parsed["last_update"]) + yield 0, "last agent update: %s" % get_timestamp_human_readable(parsed["last_update"]) + if parsed["aghash"] != "None": yield 0, "agent configuration: %s" % parsed["aghash"][:8] - if parsed["error"] != "None": - yield 2, "error: %s" % parsed["error"] - else: - yield 0, "no errors" return

8 years, 7 months

New check API function get_timestamp_human_readable

by Mathias Kettner

Module: check_mk Branch: master Commit: b1771187721c0c9ffeed7305925a86cf91fbc295 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1771187721c0c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 23 21:28:28 2015 +0100 New check API function get_timestamp_human_readable --- modules/check_mk_base.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 1a5286e..c24c5c6 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2203,6 +2203,13 @@ def get_nic_speed_human_readable(speed): return speed +def get_timestamp_human_readable(timestamp): + if timestamp: + return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(float(timestamp))) + else: + return "never" + + # Format time difference seconds into approximated # human readable value def get_age_human_readable(secs):

8 years, 7 months

check_mk.agent_update: fixed in case of duplicate output

by Mathias Kettner

Module: check_mk Branch: master Commit: b749b36d4648bc297fa69762ac7569a8b785b372 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b749b36d4648bc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 23 21:16:10 2015 +0100 check_mk.agent_update: fixed in case of duplicate output --- checks/check_mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/checks/check_mk b/checks/check_mk index 2937c0a..03a466b 100644 --- a/checks/check_mk +++ b/checks/check_mk @@ -164,18 +164,20 @@ def check_cmk_agent_update(_no_item, _no_params, info): levels_text = " (warn/crit at %s/%s)" % (get_age_human_readable(warn), get_age_human_readable(crit)) else: levels_text = "" - yield state, "last update check: " + output_age(parsed["last_check"]) + levels_text + yield state, "previous update check: " + output_age(parsed["last_check"]) + levels_text except: yield 1, "no successful connect to server yet" yield 0, "last agent update: %s" % output_age(parsed["last_update"]) if parsed["aghash"] != "None": - yield 0, "agent configuration: %s" % parsed["aghash"] + yield 0, "agent configuration: %s" % parsed["aghash"][:8] if parsed["error"] != "None": yield 2, "error: %s" % parsed["error"] else: yield 0, "no errors" + return + check_info["check_mk.agent_update"] = { 'check_function' : check_cmk_agent_update,

8 years, 7 months

#2777 FIX check_mk_agent.linux: avoid execution of .deb temporary files as plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: 86cf5a8227fe1b230dcff5fed07dff4dfadea1b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86cf5a8227fe1b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 23 21:16:45 2015 +0100 #2777 FIX check_mk_agent.linux: avoid execution of .deb temporary files as plugins --- .werks/2777 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 13 +++++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.werks/2777 b/.werks/2777 new file mode 100644 index 0000000..06aa6a2 --- /dev/null +++ b/.werks/2777 @@ -0,0 +1,9 @@ +Title: check_mk_agent.linux: avoid execution of .deb temporary files as plugins +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1448309782 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 44c8f85..64a0988 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * 2844 FIX: heartbeat_crm: Fixed problem processing the state of clone set resources * 2798 FIX: netapp_api_cpu: fixed incorrect scaling of CPU data in NetApp Clustermode... * 2799 FIX: check_mail_loop: "Use TLS over SMTP" option did not work + * 2777 FIX: check_mk_agent.linux: avoid execution of .deb temporary files as plugins Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index d32045d..949bc51 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -723,17 +723,22 @@ then done fi +function is_valid_plugin () { + [[ -f "$1" && -x "$1" && ! "$1" =~ \.dpkg-(new|old|temp)$ ]] && true || false +} + + # Local checks echo '<<<local>>>' if cd $LOCALDIR ; then for skript in $(ls) ; do - if [ -f "$skript" -a -x "$skript" ] ; then + if is_valid_plugin "$skript" ; then ./$skript fi done # Call some plugins only every X'th second for skript in [1-9]*/* ; do - if [ -x "$skript" ] ; then + if is_valid_plugin "$skript" ; then run_cached local_${skript//\//\\} ${skript%/*} "$skript" fi done @@ -742,13 +747,13 @@ fi # Plugins if cd $PLUGINSDIR ; then for skript in $(ls) ; do - if [ -f "$skript" -a -x "$skript" ] ; then + if is_valid_plugin "$skript" ; then ./$skript fi done # Call some plugins only every Xth second for skript in [1-9]*/* ; do - if [ -x "$skript" ] ; then + if is_valid_plugin "$skript" ; then run_cached plugins_${skript//\//\\} ${skript%/*} "$skript" fi done

8 years, 7 months

Fixed missing icon to WATO for hosts in root folder

by Mathias Kettner

Module: check_mk Branch: master Commit: 05419d8b84bac6fd0ac95fc1257f542e95920de7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05419d8b84bac6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 23 20:29:51 2015 +0100 Fixed missing icon to WATO for hosts in root folder --- web/plugins/icons/wato.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index adb47a8..2bcf61b 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -56,12 +56,13 @@ def paint_wato(what, row, tags, custom_vars): return wato_folder = wato_folder_from_filename(row["host_filename"]) - if wato_folder: + if wato_folder != None: if what == "host": return wato_link(wato_folder, row["site"], row["host_name"], "edithost") elif row["service_description"] in [ "Check_MK inventory", "Check_MK Discovery" ]: return wato_link(wato_folder, row["site"], row["host_name"], "inventory") + multisite_icons_and_actions['wato'] = { 'host_columns' : [ "filename" ], 'paint' : paint_wato,

8 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015