Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

Build cmc tar file for dist target, too.

by Sven Panne

Module: check_mk Branch: master Commit: e0e94c53725440819acf6937cddea4fed3a2a9c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0e94c53725440… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 3 14:22:02 2017 +0100 Build cmc tar file for dist target, too. Change-Id: Ie0a4a707a24cd4203a9bb3b5ccb98184d818ea28 --- .gitignore | 1 + Makefile | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 04f1bd9..9332ce5 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ autom4te.cache/ check_mk-*.spec check_mk-*.tar.gz clang-analyzer/ +cmc-*.tar.gz compile compile_commands.json config.guess diff --git a/Makefile b/Makefile index 2668640..89a02ae 100644 --- a/Makefile +++ b/Makefile @@ -174,6 +174,9 @@ dist: mk-livestatus precompile-werks echo "$(VERSION)" > $(DISTNAME)/VERSION tar czf $(DISTNAME).tar.gz $(TAROPTS) $(DISTNAME) rm -rf $(DISTNAME) + + test -d enterprise && tar czf cmc-$(VERSION).tar.gz $(TAROPTS) -C enterprise $$(cd enterprise && echo .bugs .werks *) + @echo "==============================================================================" @echo " FINISHED. " @echo "=============================================================================="

7 years, 9 months

4020 windows/megaraid.bat: now also provides information for the megaraid_bbu check ( Battery Backup Unit)

by Andreas Boesl

Module: check_mk Branch: master Commit: ab2dc9eff864889b6df9124d3cf653ad9ae441c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab2dc9eff86488… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 3 13:56:32 2017 +0100 4020 windows/megaraid.bat: now also provides information for the megaraid_bbu check (Battery Backup Unit) Change-Id: Idebc32fde02f70806160eafa8a22d9e3806ca239 --- .werks/4020 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/megaraid.bat | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/.werks/4020 b/.werks/4020 new file mode 100644 index 0000000..5d7bbbf --- /dev/null +++ b/.werks/4020 @@ -0,0 +1,9 @@ +Title: windows/megaraid.bat: now also provides information for the megaraid_bbu check (Battery Backup Unit) +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486126523 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index bf87a7c..c16c2cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * 4334 mssql_instance: now the connection status is configurable * 4336 diskstat: now detects NVMe drives, eg. solid-state drives * 4019 Windows powershell scripts are now always called with the options -noprofile -executionpolicy bypass... + * 4020 windows/megaraid.bat: now also provides information for the megaraid_bbu check (Battery Backup Unit) * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/agents/windows/plugins/megaraid.bat b/agents/windows/plugins/megaraid.bat index 889e716..de05916 100644 --- a/agents/windows/plugins/megaraid.bat +++ b/agents/windows/plugins/megaraid.bat @@ -60,6 +60,10 @@ REM get logical disc info ECHO ^<^<^<megaraid_ldisks^>^>^> "!MegaCli!" -LDInfo -Lall -aALL -NoLog | FINDSTR "Size State Number Adapter Virtual" +REM get bbu info +ECHO ^<^<^<megaraid_bbu^>^>^> +"!MegaCli!" -AdpBbuCmd -GetBbuStatus -aAll -NoLog | FINDSTR /V "Exit" + REM delete tmpfiles DEL "!tmpfile!" DEL "!enclist!"

7 years, 9 months

4019 Windows powershell scripts are now always called with the options -noprofile -executionpolicy bypass

by Andreas Boesl

Module: check_mk Branch: master Commit: ba32da568a355a0fe0c6812aabf9920927e4322f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba32da568a355a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 3 13:44:59 2017 +0100 4019 Windows powershell scripts are now always called with the options -noprofile -executionpolicy bypass The -noprofile option improves the startup of the powershell interpreter. The "-executionpolicy bypass" means that the agent will no longer check any signatures of powershell scripts, since we don't provide them in ps1 script, anyway. Change-Id: I6bed38679df31b19cdeec8afddf086fd2a60ec34 --- .werks/4019 | 12 ++++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1328640 -> 1328640 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15652368 -> 15652368 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1328640 -> 1328640 bytes agents/windows/check_mk_agent.exe | Bin 1305088 -> 1305088 bytes agents/windows/check_mk_agent.msi | Bin 2903552 -> 2903552 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13543976 -> 13543976 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1305088 -> 1305088 bytes agents/windows/install_agent-64.exe | Bin 586638 -> 586639 bytes agents/windows/install_agent.exe | Bin 583697 -> 583691 bytes 12 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4019 b/.werks/4019 new file mode 100644 index 0000000..facca67 --- /dev/null +++ b/.werks/4019 @@ -0,0 +1,12 @@ +Title: Windows powershell scripts are now always called with the options -noprofile -executionpolicy bypass +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486125546 +Class: feature + +The -noprofile option improves the startup of the powershell interpreter. +The "-executionpolicy bypass" means that the agent will no longer check any +signatures of powershell scripts, since we don't provide them in ps1 script, anyway. + diff --git a/ChangeLog b/ChangeLog index 4bc55d7..bf87a7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 4332 check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option... * 4334 mssql_instance: now the connection status is configurable * 4336 diskstat: now detects NVMe drives, eg. solid-state drives + * 4019 Windows powershell scripts are now always called with the options -noprofile -executionpolicy bypass... * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/agents/windows/build_version b/agents/windows/build_version index 5cf52bb..6357d64 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2520 +2522 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 144e0f9..aadbe3e 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.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 40ec91b..fead502 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index e433ce3..599cfa7 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 dbd5c70..bb27778 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 e6aad8c..8cb6c97 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.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index ebf005c..6a56d88 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 74668ad..3c80bab 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 ad7f116..44c648b 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 b83676d..714e77f 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

7 years, 9 months

Fixed dist target.

by Sven Panne

Module: check_mk Branch: master Commit: f6d4a0047d01b2175a8c8474fd54cced42cd18bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6d4a0047d01b2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 3 13:27:54 2017 +0100 Fixed dist target. Change-Id: I0b2dafc6b876e86c677537d46b9a7200331f9a6c --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 44f372f..2668640 100644 --- a/Makefile +++ b/Makefile @@ -140,7 +140,9 @@ dist: mk-livestatus precompile-werks $(MAKE) minify-js tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs plugins - tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) + tar xzf mk-livestatus-$(VERSION).tar.gz + tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C mk-livestatus-$(VERSION) $$(cd mk-livestatus-$(VERSION) ; ls -A ) + rm -rf mk-livestatus-$(VERSION) tar czf $(DISTNAME)/pnp-templates.tar.gz $(TAROPTS) -C pnp-templates $$(cd pnp-templates ; ls *.php) tar cf $(DISTNAME)/doc.tar $(TAROPTS) -C doc $$(cd doc ; ls)

7 years, 9 months

Fixed highlighting of rules when ruleset already matches a search

by Lars Michelsen

Module: check_mk Branch: master Commit: ac944ea7431eb65c5fb3470d39b0ceb5d0fd274c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac944ea7431eb6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 3 13:05:02 2017 +0100 Fixed highlighting of rules when ruleset already matches a search Change-Id: I5a89ce2984c59ded8487acb2be491e96a6b55459 --- web/htdocs/wato.py | 6 ++--- web/htdocs/watolib.py | 63 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9b94877..3e6f834 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12210,9 +12210,9 @@ class ModeEditRuleset(WatoMode): if rule.is_disabled(): css.append("disabled") - has_rule_search_options = bool([ k for k in search_options.keys() - if k == "fulltext" or k.startswith("rule_") ]) - if has_rule_search_options and rule.matches_search(search_options): + if ruleset.has_rule_search_options(search_options) \ + and rule.matches_search(search_options) \ + and ("fulltext" in search_options and not ruleset.matches_fulltext_search(search_options)): css.append("matches_search") table.row(css=" ".join(css) if css else None) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 8e3c979..83897b1 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6217,7 +6217,7 @@ class SearchedRulesets(FilteredRulesetCollection): e.g. by their name, title or help.""" for ruleset in self._origin_rulesets.get_rulesets().values(): - if ruleset.matches_search(self._search_options): + if ruleset.matches_search_with_rules(self._search_options): self._rulesets[ruleset.name] = ruleset @@ -6319,7 +6319,39 @@ class Ruleset(object): return content - def matches_search(self, search_options): + # Whether or not either the ruleset itself matches the search or the rules match + def matches_search_with_rules(self, search_options): + if not self.matches_ruleset_search_options(search_options): + return False + + # The ruleset matched or did not decide to skip the whole ruleset. + # The ruleset should be matched in case a rule matches. + + if not self.has_rule_search_options(search_options): + return self.matches_fulltext_search(search_options) + + # Store the matching rules for later result rendering + self.search_matching_rules = [] + for folder, rule_index, rule in self.get_rules(): + if rule.matches_search(search_options): + self.search_matching_rules.append(rule) + + if not self.search_matching_rules: + return self.matches_fulltext_search(search_options) + else: + return True + + + def has_rule_search_options(self, search_options): + return bool([ k for k in search_options.keys() if k == "fulltext" or k.startswith("rule_") ]) + + + def matches_fulltext_search(self, search_options): + return match_one_of_search_expression(search_options, "fulltext", + [self.name, self.title(), self.help()]) + + + def matches_ruleset_search_options(self, search_options): if "ruleset_deprecated" in search_options and search_options["ruleset_deprecated"] != self.is_deprecated(): return False @@ -6339,28 +6371,6 @@ class Ruleset(object): if not match_search_expression(search_options, "ruleset_help", self.help()): return False - has_rules_search = bool([ s for s in search_options.keys() \ - if s == "fulltext" or s.startswith("rule_") ]) - - if not has_rules_search and "fulltext" not in search_options: - return True - - # Store the matching rules for later result rendering - self.search_matching_rules = [] - for folder, rule_index, rule in self.get_rules(): - if rule.matches_search(search_options): - self.search_matching_rules.append(rule) - - if "fulltext" not in search_options: - return bool(self.search_matching_rules) - - if not match_one_of_search_expression(search_options, "fulltext", - [self.name, self.title(), self.help()]): - if self.search_matching_rules: - return True - else: - return False - return True @@ -6781,6 +6791,9 @@ class Rule(object): if not match_search_expression(search_options, "rule_comment", self.comment()): return False + if "rule_value" in search_options and not self.ruleset.valuespec(): + return False + if self.ruleset.valuespec() and \ not match_search_expression(search_options, "rule_value", "%s" % self.ruleset.valuespec().value_to_text(self.value)): @@ -6843,8 +6856,8 @@ def match_one_of_search_expression(search_options, attr_name, search_in_list): return True return False -#. +#. # .--Read-Only-----------------------------------------------------------. # | ____ _ ___ _ | # | | _ \ ___ __ _ __| | / _ \ _ __ | |_ _ |

7 years, 9 months

Fixed mk-livestatus target.

by Sven Panne

Module: check_mk Branch: master Commit: 6e5a6af821175a7cfd86baf94d6a510369929236 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e5a6af821175a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 16:22:02 2017 +0100 Fixed mk-livestatus target. Change-Id: Ibaf6eb097eb4a5a6333e8aaefa5b994f6a535344 --- Makefile | 10 +++++++--- configure.ac | 13 +++++-------- livestatus/config_files.m4 | 2 ++ livestatus/standalone/config_files.m4 | 2 ++ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 33496c8..44f372f 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,9 @@ LIVESTATUS_SOURCES := $(LIVESTATUS_AUTO) configure.ac \ Makefile.am nagios/README nagios/*.h \ nagios4/README m4/* nagios4/*.h src/*.{h,cc} \ src/Makefile.am api/python/{*.py,README} api/perl/* +LIVESTATUS_SRCS := Makefile.am api/c++/{Makefile,*.{h,cc}} api/perl/* \ + api/python/{README,*.py} {nagios,nagios4}/{README,*.h} \ + src/{Makefile.am,*.{cc,h}} standalone/config_files.m4 CORE_SOURCES := $(wildcard $(addprefix enterprise/core/src/,*.cc *.h)) CHECKHELPER_SOURCES := $(wildcard $(addprefix enterprise/core/src/checkhelper/,*.cc *.h)) @@ -178,14 +181,15 @@ packages: # NOTE: Old tar versions (e.g. on CentOS 5) don't have the --transform option, # so we do things in a slightly complicated way. -mk-livestatus: $(addprefix livestatus/,$(LIVESTATUS_AUTO)) +mk-livestatus: rm -rf mk-livestatus-$(VERSION) mkdir -p mk-livestatus-$(VERSION) - tar cf - $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) | tar xf - -C mk-livestatus-$(VERSION) + tar cf - $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SRCS) ) | tar xf - -C mk-livestatus-$(VERSION) + cp -a configure.ac m4 mk-livestatus-$(VERSION) + cd mk-livestatus-$(VERSION) && autoreconf --install --include=m4 && rm -rf autom4te.cache tar czf mk-livestatus-$(VERSION).tar.gz $(TAROPTS) mk-livestatus-$(VERSION) rm -rf mk-livestatus-$(VERSION) - check-version: @sed -n 1p ChangeLog | fgrep -qx '$(VERSION):' || { \ echo "Version $(VERSION) not listed at top of ChangeLog!" ; \ diff --git a/configure.ac b/configure.ac index 93c932d..13487a1 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,6 @@ AC_DEFINE_UNQUOTED([BUILD_HOSTNAME], ["`uname -n`"], [name of the build host]) AC_REQUIRE_AUX_FILE([compile]) AC_REQUIRE_AUX_FILE([config.guess]) AC_REQUIRE_AUX_FILE([config.sub]) -AM_CONDITIONAL([ENTERPRISE_OPT], [test -d enterprise]) # Checks for programs. AC_PROG_CC([gcc-6 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang]) @@ -135,12 +134,10 @@ AC_SUBST(nagios_headers) AC_DEFINE([_GLIBCXX_REGEX_STATE_LIMIT], [2500], [the maximum number of states the regex NFA can have]) -AC_CONFIG_FILES([livestatus/Makefile - livestatus/src/Makefile]) -AM_COND_IF([ENTERPRISE_OPT], - [AC_CONFIG_FILES([enterprise/core/Makefile - enterprise/core/src/Makefile - enterprise/core/src/livestatus/Makefile - enterprise/core/src/checkhelper/Makefile])]) +# HACKING ALERT: automake can't really handle optional subdirectories, so we +# have to do this in a slightly hacky way by using M4's silent includes. +m4_sinclude([livestatus/config_files.m4]) +m4_sinclude([enterprise/config_files.m4]) +m4_sinclude([standalone/config_files.m4]) AC_OUTPUT diff --git a/livestatus/config_files.m4 b/livestatus/config_files.m4 new file mode 100644 index 0000000..dd8cb8d --- /dev/null +++ b/livestatus/config_files.m4 @@ -0,0 +1,2 @@ +AC_CONFIG_FILES([livestatus/Makefile + livestatus/src/Makefile]) diff --git a/livestatus/standalone/config_files.m4 b/livestatus/standalone/config_files.m4 new file mode 100644 index 0000000..443ac17 --- /dev/null +++ b/livestatus/standalone/config_files.m4 @@ -0,0 +1,2 @@ +AC_CONFIG_FILES([Makefile + src/Makefile])

7 years, 9 months

4318 FIX Rule editor: Fixed wrong default value for yes/no rulesets

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a5d81af9d810dd573df164d82fc19a77081f91d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a5d81af9d810d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 3 09:46:05 2017 +0100 4318 FIX Rule editor: Fixed wrong default value for yes/no rulesets Change-Id: I6f9b47e80df25a5138c0ca3b7eb085fe86c00b83 --- .werks/4318 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 1 - web/htdocs/watolib.py | 6 +++++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/4318 b/.werks/4318 new file mode 100644 index 0000000..f46b362 --- /dev/null +++ b/.werks/4318 @@ -0,0 +1,9 @@ +Title: Rule editor: Fixed wrong default value for yes/no rulesets +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1486111533 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5b9fcc9..4bc55d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ * 4237 FIX: Fixed rendering of old timestamps... * 4231 FIX: Fixed broken host renaming when files are in var/check_mk/web * 4317 FIX: Rule list: Removed the row limit of the rule tables + * 4318 FIX: Rule editor: Fixed wrong default value for yes/no rulesets Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6d59833..9b94877 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12946,7 +12946,6 @@ class ModeEditRule(WatoMode): for posneg, img in [ ("positive", "yes"), ("negative", "no")]: val = img == "yes" html.img("images/rule_%s.png" % img, class_="ruleyesno", align="top") - html.radiobutton("value", img, self._rule.value == val, _("Make the outcome of the ruleset <b>%s</b><br>") % posneg) # Conditions forms.header(_("Conditions")) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index f7fdf4c..8e3c979 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6545,12 +6545,16 @@ class Rule(object): def _initialize(self): - self.value = None self.tag_specs = [] self.host_list = [] self.item_list = None self.rule_options = {} + if self.ruleset.valuespec(): + self.value = None + else: + self.value = True + def from_config(self, rule_config): try:

7 years, 9 months

Fixed setversion target.

by Sven Panne

Module: check_mk Branch: master Commit: 1e310bc0708fea3d546e0199def4a40131534a62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e310bc0708fea… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 16:11:22 2017 +0100 Fixed setversion target. Change-Id: I148289a07d78b9b688cdc3a402c11037721a5f94 --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 9fd4e5e..33496c8 100644 --- a/Makefile +++ b/Makefile @@ -217,6 +217,11 @@ setversion: sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion +ifeq ($(ENTERPRISE),yes) + sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' enterprise/bin/liveproxyd + sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' enterprise/bin/cmcdump + sed -i 's/^__version__ = ".*/__version__ = "$(NEW_VERSION)"/' enterprise/agents/plugins/cmk-update-agent +endif headers: doc/helpers/headrify

7 years, 9 months

Make IWYU and clang-tidy happy again.

by Sven Panne

Module: check_mk Branch: master Commit: 7da6b3c46284747a7f9401dc3fc4080703c3c291 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7da6b3c4628474… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 15:52:24 2017 +0100 Make IWYU and clang-tidy happy again. Change-Id: I89d9919cf8ae94f70fcc0261d10b12fbda4ad0c3 --- livestatus/src/ContactGroupsColumn.h | 7 ++++++- livestatus/src/ContactGroupsMemberColumn.h | 1 + livestatus/src/HostListColumn.h | 1 + livestatus/src/HostListStateColumn.h | 1 + livestatus/src/ServiceListColumn.h | 1 + livestatus/src/ServiceListStateColumn.h | 1 + livestatus/src/TableComments.h | 1 + livestatus/src/TableDowntimes.h | 1 + 8 files changed, 13 insertions(+), 1 deletion(-) diff --git a/livestatus/src/ContactGroupsColumn.h b/livestatus/src/ContactGroupsColumn.h index 23e5ca8..90c4cac 100644 --- a/livestatus/src/ContactGroupsColumn.h +++ b/livestatus/src/ContactGroupsColumn.h @@ -41,7 +41,12 @@ public: : ListColumn(name, description, indirect_offset, extra_offset, extra_extra_offset) , _core(core) - , _offset(offset) {} + , _offset(offset) { +#ifdef CMC + (void)_core; + (void)_offset; +#endif + } void output(void *row, RowRenderer &r, contact *auth_user) override; std::unique_ptr<Contains> makeContains(const std::string &name) override; bool isEmpty(void *data) override; diff --git a/livestatus/src/ContactGroupsMemberColumn.h b/livestatus/src/ContactGroupsMemberColumn.h index 6a4a7c5..e09c6ce 100644 --- a/livestatus/src/ContactGroupsMemberColumn.h +++ b/livestatus/src/ContactGroupsMemberColumn.h @@ -31,6 +31,7 @@ #include "ContactsColumn.h" #ifdef CMC +#include "cmc.h" class RowRenderer; #else #include "nagios.h" diff --git a/livestatus/src/HostListColumn.h b/livestatus/src/HostListColumn.h index 139a7eb..f0895eb 100644 --- a/livestatus/src/HostListColumn.h +++ b/livestatus/src/HostListColumn.h @@ -35,6 +35,7 @@ class RowRenderer; #ifdef CMC #include <unordered_set> +#include "cmc.h" class Host; #else #include "nagios.h" diff --git a/livestatus/src/HostListStateColumn.h b/livestatus/src/HostListStateColumn.h index 8f8d50b..c738346 100644 --- a/livestatus/src/HostListStateColumn.h +++ b/livestatus/src/HostListStateColumn.h @@ -33,6 +33,7 @@ #ifdef CMC #include <unordered_set> +#include "cmc.h" class Host; #else #include "nagios.h" diff --git a/livestatus/src/ServiceListColumn.h b/livestatus/src/ServiceListColumn.h index f52bb99..bb85991 100644 --- a/livestatus/src/ServiceListColumn.h +++ b/livestatus/src/ServiceListColumn.h @@ -35,6 +35,7 @@ class RowRenderer; #ifdef CMC #include <unordered_set> +#include "cmc.h" class Service; #else #include "nagios.h" diff --git a/livestatus/src/ServiceListStateColumn.h b/livestatus/src/ServiceListStateColumn.h index 2685e67..fb5265b 100644 --- a/livestatus/src/ServiceListStateColumn.h +++ b/livestatus/src/ServiceListStateColumn.h @@ -32,6 +32,7 @@ #ifdef CMC #include <unordered_set> +#include "cmc.h" class Service; typedef std::unordered_set<Service *> servicelist_t; #else diff --git a/livestatus/src/TableComments.h b/livestatus/src/TableComments.h index b4c8b1f..a91d58a 100644 --- a/livestatus/src/TableComments.h +++ b/livestatus/src/TableComments.h @@ -33,6 +33,7 @@ class Query; #ifdef CMC #include <mutex> #include "Notes.h" +#include "cmc.h" class Core; #else #include "nagios.h" diff --git a/livestatus/src/TableDowntimes.h b/livestatus/src/TableDowntimes.h index 415ae62..517c54b 100644 --- a/livestatus/src/TableDowntimes.h +++ b/livestatus/src/TableDowntimes.h @@ -33,6 +33,7 @@ class Query; #ifdef CMC #include <mutex> #include "Notes.h" +#include "cmc.h" class Core; #else #include "nagios.h"

7 years, 9 months

4336 diskstat: now detects NVMe drives, eg. solid-state drives

by Simon Betz

Module: check_mk Branch: master Commit: 2885a346254e964a3221a1cfed49cdc619cdd424 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2885a346254e96… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 2 15:28:03 2017 +0100 4336 diskstat: now detects NVMe drives, eg. solid-state drives Change-Id: I90b5a1632d5d84fd363724b2619d5caf2777fed7 --- .werks/4336 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4336 b/.werks/4336 new file mode 100644 index 0000000..360ab1d --- /dev/null +++ b/.werks/4336 @@ -0,0 +1,9 @@ +Title: diskstat: now detects NVMe drives, eg. solid-state drives +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486045514 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 86d940d..5b9fcc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 4215 hp_webmgmt_status: Now also displays device model and serial number * 4332 check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option... * 4334 mssql_instance: now the connection status is configurable + * 4336 diskstat: now detects NVMe drives, eg. solid-state drives * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 146cd70..092a571 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -395,7 +395,7 @@ fi # Performancecounter Platten echo '<<<diskstat>>>' date +%s -egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*|dasd[a-z]*|bcache[0-9]+) ' < /proc/diskstats +egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*|dasd[a-z]*|bcache[0-9]+|nvme[0-9]+n[0-9]+) ' < /proc/diskstats if type dmsetup >/dev/null ; then echo '[dmsetup_info]' dmsetup info -c --noheadings --separator ' ' -o name,devno,vg_name,lv_name

7 years, 9 months

← Newer
1
...
35
36
37
38
39
40
41
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017