Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d03ab4d68baf889258f28683011fdeb6d628525 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d03ab4d68baf8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 17:14:46 2016 +0100 Replaced needless eval() calls --- cmk_base/prediction.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmk_base/prediction.py b/cmk_base/prediction.py index 9eb05c0..be6bc7a 100644 --- a/cmk_base/prediction.py +++ b/cmk_base/prediction.py @@ -29,6 +29,7 @@ import os import time import math +import ast import livestatus @@ -238,7 +239,7 @@ def get_levels(hostname, service_description, dsname, params, cf, levels_factor= # - the prediction from the last time is outdated # - the prediction from the last time has done with other parameters try: - last_info = eval(file(info_file).read()) + last_info = ast.literal_eval(file(info_file).read()) for k, v in params.items(): if last_info.get(k) != v: logger.verbose("Prediction parameters have changed") @@ -253,8 +254,7 @@ def get_levels(hostname, service_description, dsname, params, cf, levels_factor= last_info = None if last_info: - # TODO: faster file format. Binary encoded? - prediction = eval(file(pred_file).read()) + prediction = ast.literal_eval(file(pred_file).read()) else: # Remove all prediction files that result from other @@ -263,7 +263,7 @@ def get_levels(hostname, service_description, dsname, params, cf, levels_factor= for f in os.listdir(dir): if f.endswith(".info"): try: - info = eval(file(dir + "/" + f).read()) + info = ast.literal_eval(file(dir + "/" + f).read()) if info["period"] != params["period"]: logger.verbose("Removing obsolete prediction %s", f[:-5]) os.remove(dir + "/" + f)

7 years, 10 months

Fixed integrationtest when having spaces in paths

by Lars Michelsen

Module: check_mk Branch: master Commit: e8f64d3c95a773c1cef4dd46c9c1901b2694ac8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8f64d3c95a773… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 16:34:40 2016 +0100 Fixed integrationtest when having spaces in paths --- tests/testlib/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 5f7e46d..3ec6e7c 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -255,8 +255,8 @@ class Site(object): for path in paths: if os.path.exists("%s/.f12" % path): - print("Executing .f12 in %s" % path) - assert os.system("cd %s ; ONLY_COPY=1 bash .f12" % path) >> 8 == 0 + print("Executing .f12 in \"%s\"" % path) + assert os.system("cd \"%s\" ; ONLY_COPY=1 bash .f12" % path) >> 8 == 0 def rm_if_not_reusing(self):

7 years, 10 months

Fixed changelog entries for next release

by Lars Michelsen

7 years, 10 months

Set missing version entry in changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 09b605b89953c83066667a647fd3a2623a3b29a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09b605b89953c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 16:16:35 2016 +0100 Set missing version entry in changelog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index ff5aa66..1b9ca9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.4.0i3: + 1.4.0i2: Core & Setup: * 4036 Measurement of time used by Check_MK now includes time waited for agent...

7 years, 10 months

Set to next version 1.4.0i3

by Lars Michelsen

Module: check_mk Branch: master Commit: d22ea4139032b0a43f05ee130c028990fdb8807c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d22ea4139032b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 16:15:59 2016 +0100 Set to next version 1.4.0i3 --- Makefile | 2 +- agents/Makefile | 2 +- agents/check-mk-agent-1.4.0i2-1.noarch.rpm | Bin 30081 -> 0 bytes agents/check-mk-agent-1.4.0i3-1.noarch.rpm | Bin 0 -> 30328 bytes agents/check-mk-agent_1.4.0i2-1_all.deb | Bin 21214 -> 0 bytes agents/check-mk-agent_1.4.0i3-1_all.deb | Bin 0 -> 21410 bytes agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.openwrt | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/Makefile | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1325056 -> 1325056 bytes agents/windows/check_mk_agent.exe | Bin 1299968 -> 1299968 bytes agents/windows/check_mk_agent.msi | Bin 2894848 -> 2894848 bytes agents/windows/install_agent-64.exe | Bin 584849 -> 584874 bytes agents/windows/install_agent.exe | Bin 581547 -> 581575 bytes agents/windows/installer-64.nsi | 2 +- agents/windows/installer.nsi | 2 +- bin/mkeventd | 2 +- debian/files | 2 +- lib/__init__.py | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 29 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 30f250f..75b5b78 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL := /bin/bash -VERSION := 1.4.0i2 +VERSION := 1.4.0i3 NAME := check_mk PREFIX := /usr BINDIR := $(PREFIX)/bin diff --git a/agents/Makefile b/agents/Makefile index b2decd4..c8e09b8 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.4.0i2 +VERSION = 1.4.0i3 RPM_VERSION = $(subst -,_,$(VERSION)) NAME = check-mk-agent DISTNAME = $(NAME)-$(VERSION) diff --git a/agents/check-mk-agent-1.4.0i2-1.noarch.rpm b/agents/check-mk-agent-1.4.0i2-1.noarch.rpm deleted file mode 100644 index 86137ca..0000000 Binary files a/agents/check-mk-agent-1.4.0i2-1.noarch.rpm and /dev/null differ diff --git a/agents/check-mk-agent-1.4.0i3-1.noarch.rpm b/agents/check-mk-agent-1.4.0i3-1.noarch.rpm new file mode 100644 index 0000000..b37c1bc Binary files /dev/null and b/agents/check-mk-agent-1.4.0i3-1.noarch.rpm differ diff --git a/agents/check-mk-agent_1.4.0i2-1_all.deb b/agents/check-mk-agent_1.4.0i2-1_all.deb deleted file mode 100644 index bfd1053..0000000 Binary files a/agents/check-mk-agent_1.4.0i2-1_all.deb and /dev/null differ diff --git a/agents/check-mk-agent_1.4.0i3-1_all.deb b/agents/check-mk-agent_1.4.0i3-1_all.deb new file mode 100644 index 0000000..7fa4716 Binary files /dev/null and b/agents/check-mk-agent_1.4.0i3-1_all.deb differ diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 2b6bd44..43aa27e 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -121,7 +121,7 @@ function run_cached { } echo '<<<check_mk>>>' -echo Version: 1.4.0i2 +echo Version: 1.4.0i3 echo AgentOS: aix echo Hostname: $(hostname) diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index a2c7ae2..e362471 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -105,7 +105,7 @@ function run_cached() { } echo '<<<check_mk>>>' -echo Version: 1.4.0i2 +echo Version: 1.4.0i3 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index d821a06..7aca5ab 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -49,7 +49,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.4.0i2 +echo Version: 1.4.0i3 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index e9ba957..e68ebb1 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -239,7 +239,7 @@ function run_real_time_checks() } echo '<<<check_mk>>>' -echo Version: 1.4.0i2 +echo Version: 1.4.0i3 echo AgentOS: linux echo Hostname: $HOSTNAME echo AgentDirectory: $MK_CONFDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index df08794..47d16b1 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -44,7 +44,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.4.0i2 +echo Version: 1.4.0i3 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index bf67bc6..2fb9ed5 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -60,7 +60,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.4.0i2 +echo Version: 1.4.0i3 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 0b41211..4e0ba24 100755 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -60,7 +60,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.4.0i2 +echo Version: 1.4.0i3 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index a3f1bad..c247f6b 100755 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -163,7 +163,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.4.0i2" +$say "Version: 1.4.0i3" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index f0670a0..6c8e85b 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -221,7 +221,7 @@ run_real_time_checks() } echo '<<<check_mk>>>' -echo Version: 1.4.0i2 +echo Version: 1.4.0i3 echo AgentOS: openwrt echo Hostname: $HOSTNAME echo AgentDirectory: $MK_CONFDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 8a6f1fd..c9f0623 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -124,7 +124,7 @@ function run_cached () { echo '<<<check_mk>>>' -echo Version: 1.4.0i2 +echo Version: 1.4.0i3 echo AgentOS: solaris diff --git a/agents/windows/Makefile b/agents/windows/Makefile index bd19e24..b1a5446 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -24,7 +24,7 @@ SHELL = /bin/bash -VERSION = 1.4.0i2 +VERSION = 1.4.0i3 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres GIT_REV = $(shell git describe --abbrev=4 --dirty --always --tags) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 75ca096..4a6e985 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.exe b/agents/windows/check_mk_agent.exe index 5870e64..f94c0c3 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 91bc001..76e2c52 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 2a721ba..20d28cd 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 a585f5c..f44191d 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer-64.nsi b/agents/windows/installer-64.nsi index 6e50c75..b747f48 100644 --- a/agents/windows/installer-64.nsi +++ b/agents/windows/installer-64.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.4.0i2" +!define CHECK_MK_VERSION "1.4.0i3" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index abd0444..2dee831 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.4.0i2" +!define CHECK_MK_VERSION "1.4.0i3" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/bin/mkeventd b/bin/mkeventd index 9a19e15..d6e8c67 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -45,7 +45,7 @@ try: except ImportError: import json -VERSION="1.4.0i2" +VERSION="1.4.0i3" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/debian/files b/debian/files index 8527c58..6cf018f 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.4.0i2-1_all.deb net optional +check-mk_1.4.0i3-1_all.deb net optional diff --git a/lib/__init__.py b/lib/__init__.py index 950c2d6..ed2561c 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -29,7 +29,7 @@ This library is currently handled as internal module of Check_MK and does not offer stable APIs. The code may change at any time.""" -__version__ = "1.4.0i2" +__version__ = "1.4.0i3" import os diff --git a/livestatus/configure.ac b/livestatus/configure.ac index b8516c0..560be2f 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.4.0i2], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.4.0i3], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([config.h.in]) diff --git a/scripts/setup.sh b/scripts/setup.sh index 04237f3..7a058c5 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.4.0i2 +VERSION=1.4.0i3 NAME=check_mk LANG= LC_ALL=

7 years, 10 months

improved postfix status section

by Simon Betz

Module: check_mk Branch: master Commit: 4b8c33404df419df877f7cc0946f443e16c868bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b8c33404df419… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 9 15:19:10 2016 +0100 improved postfix status section --- agents/check_mk_agent.linux | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 1caba17..e9ba957 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -670,7 +670,8 @@ fi # postfix would write to stderr but only if it's a tty if type postmulti >/dev/null ; then echo "<<<postfix_mailq_status:sep(58)>>>" - script -qfc 'postmulti -p status' /dev/null + postfix_out=$(script -qfc 'postmulti -p status' /dev/null) + echo $postfix_out fi

7 years, 10 months

Updated bug entries #2527

by Andreas Boesl

Module: check_mk Branch: master Commit: 41c630e256ddb07c3a72b29a18efffcbb19bcd63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41c630e256ddb0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 9 14:52:37 2016 +0100 Updated bug entries #2527 --- .bugs/2527 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.bugs/2527 b/.bugs/2527 new file mode 100644 index 0000000..b0a5b35 --- /dev/null +++ b/.bugs/2527 @@ -0,0 +1,18 @@ +Title: Fix broken rule evaluation when using multiple negated hosts +Component: checks +State: open +Date: 2016-11-09 14:46:05 +Targetversion: future +Class: bug + +The functions wato.py:rule_matches_host_and_item and modules/check_mk.py:in_extraconf_hostlist +can not handle these kind of hostlist ['!heute1', '!heute', '!heute2', '@all'] +If a ! is detected, the for loop exits immediately after the checked item. + +These conditions specified in WATO do not work: "Host name is not one of heute1, heute or heute2" + +Replay issue: +1) Create a rule: Hosts using SNMP bulk walk (enforces SNMP v2c) +2) Setup hosts as mentioned in the example above +3) Navigate to "Parameters of {hostname}" + Host heute matches, Host heute1 does not match

7 years, 10 months

Reserved 20 bug IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: eb39a85eda36d2d7a2193a04709cf80fe3ce82c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb39a85eda36d2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 9 14:45:49 2016 +0100 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 29de79e..efbf27c 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2527 +2547

7 years, 10 months

Tests can now choose to use the current git state for testing

by Lars Michelsen

Module: check_mk Branch: master Commit: e0ae21a0e37dc7b63be93e82fdeff002c789ea33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0ae21a0e37dc7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 14:11:05 2016 +0100 Tests can now choose to use the current git state for testing --- tests/testlib/__init__.py | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 4ebcd35..5f7e46d 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -54,6 +54,7 @@ def omd(cmd): class CMKVersion(object): DEFAULT = "default" DAILY = "daily" + GIT = "git" CEE = "cee" CRE = "cre" @@ -77,7 +78,7 @@ class CMKVersion(object): def set_version(self, version): - if version == CMKVersion.DAILY: + if version in [ CMKVersion.DAILY, CMKVersion.GIT ]: self.version = time.strftime("%Y.%m.%d") elif version == CMKVersion.DEFAULT: @@ -148,6 +149,8 @@ class Site(object): self.root = "/omd/sites/%s" % self.id self.version = CMKVersion(version, edition) + self.update_with_git = version == CMKVersion.GIT + self.reuse = reuse self.http_proto = "http" @@ -220,6 +223,41 @@ class Site(object): assert omd(["-V", self.version.version_directory(), "create", self.id]) == 0 assert os.path.exists("/omd/sites/%s" % self.id) + if self.update_with_git: + self._update_with_f12_files() + + + def _update_with_f12_files(self): + paths = [ + cmc_path() + "/bin", + cmk_path() + "/modules", + cmc_path() + "/cmk_base", + cmc_path() + "/cmk", + cmk_path() + "/checks", + cmk_path() + "/checkman", + cmk_path() + "/web", + cmk_path() + "/inventory", + cmk_path() + "/notifications", + cmk_path() + "/livestatus", + + cmc_path() + "/bin", + cmc_path() + "/modules", + cmc_path() + "/cmk_base", + cmc_path() + "/cmk", + cmc_path() + "/web", + cmc_path() + "/alert_handlers", + cmc_path() + "/misc", + cmc_path() + "/core", + cmc_path() + "/agents/bakery", + cmc_path() + "/agents/plugins", + cmc_path() + "/agents", + ] + + for path in paths: + if os.path.exists("%s/.f12" % path): + print("Executing .f12 in %s" % path) + assert os.system("cd %s ; ONLY_COPY=1 bash .f12" % path) >> 8 == 0 + def rm_if_not_reusing(self): if not self.reuse:

7 years, 10 months

.f12 scripts: set ONLY_COPY=1 to disable restart/start/reload of processes

by Lars Michelsen

Module: check_mk Branch: master Commit: 08ce310f3fc74bd582d66ce5868dbf115226cc27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08ce310f3fc74b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 14:11:39 2016 +0100 .f12 scripts: set ONLY_COPY=1 to disable restart/start/reload of processes --- bin/.f12 | 5 ++++- doc/predictive/.f12 | 4 +++- livestatus/.f12 | 9 ++++++--- modules/.f12 | 5 ++++- pnp-templates/.f12 | 12 +++++++----- web/.f12 | 7 +++++-- 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/bin/.f12 b/bin/.f12 index 208a079..628c6ac 100644 --- a/bin/.f12 +++ b/bin/.f12 @@ -8,4 +8,7 @@ sudo install -m 755 livedump mkeventd mkeventd_open514 mkevent mkbackup $OMD_ROO sudo chown root.omd $OMD_ROOT/bin/mkeventd_open514 sudo chmod 4750 $OMD_ROOT/bin/mkeventd_open514 echo "Installed to $OMD_ROOT/bin" -sudo omd restart $SITE mkeventd + +if [ -z $ONLY_COPY ]; then + sudo omd restart $SITE mkeventd +fi diff --git a/doc/predictive/.f12 b/doc/predictive/.f12 index 220cd74..d6b8a8a 100644 --- a/doc/predictive/.f12 +++ b/doc/predictive/.f12 @@ -7,4 +7,6 @@ sudo install -m 755 foo.agentplugin /usr/lib/check_mk_agent/plugins/foo sudo install -m 644 foo.check /omd/sites/$SITE/local/share/check_mk/checks/foo sudo install -m 644 foo.wato /omd/sites/$SITE/local/share/check_mk/web/plugins/wato/foo.py -sudo omd restart $SITE apache +if [ -z $ONLY_COPY ]; then + sudo omd restart $SITE apache +fi diff --git a/livestatus/.f12 b/livestatus/.f12 index 25503b2..9ea9892 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -6,6 +6,9 @@ set -e make -C .. livestatus/config.h make -j8 sudo install src/livestatus.o /omd/sites/$SITE/lib/mk-livestatus/livestatus.o -(cd api/python ; .f12 ) -echo "Restarting site $SITE" -sudo omd restart $SITE nagios +(cd api/python ; bash .f12 ) + +if [ -z $ONLY_COPY ]; then + echo "Restarting site $SITE" + sudo omd restart $SITE nagios +fi diff --git a/modules/.f12 b/modules/.f12 index a7c6c61..12c38dc 100644 --- a/modules/.f12 +++ b/modules/.f12 @@ -2,4 +2,7 @@ SITE=${SITE:-$(cat ../.site)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo cp -v *.py /omd/sites/$SITE/share/check_mk/modules/ -sudo su - $SITE -c "cmk --debug -R" + +if [ -z $ONLY_COPY ]; then + sudo su - $SITE -c "cmk --debug -R" +fi diff --git a/pnp-templates/.f12 b/pnp-templates/.f12 index b8f7795..5d82c85 100644 --- a/pnp-templates/.f12 +++ b/pnp-templates/.f12 @@ -3,9 +3,11 @@ SITE=${SITE:-$(cat ../.site || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo rsync --delete -varx ./ /omd/sites/$SITE/share/check_mk/pnp-templates/ -# do nc to port 32000 only if there is someone listening -# (otherwise complete f12 script breaks if no listener on 32000) -if [ $(nmap -PN -p 32000 localhost | egrep "32000.*open" | wc -l) -gt 0 ] -then - echo 'location.reload();' | nc -w 0 localhost 32000 +if [ -z $ONLY_COPY ]; then + # do nc to port 32000 only if there is someone listening + # (otherwise complete f12 script breaks if no listener on 32000) + if [ $(nmap -PN -p 32000 localhost | egrep "32000.*open" | wc -l) -gt 0 ] + then + echo 'location.reload();' | nc -w 0 localhost 32000 + fi fi diff --git a/web/.f12 b/web/.f12 index f41556b..05aa9a4 100644 --- a/web/.f12 +++ b/web/.f12 @@ -7,8 +7,11 @@ sudo rsync \ -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ # --delete \ echo "$C files copied" -if [ "$SITE" != - ] ; then - sudo omd restart $SITE apache + +if [ -z $ONLY_COPY ]; then + if [ "$SITE" != - ] ; then + sudo omd restart $SITE apache + fi fi # Per Default wird geguckt, ob die *_min.js-Dateien älter sind, als

7 years, 10 months

← Newer
1
...
16
17
18
19
20
21
22
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016