Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64454 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: cd27cbc78f96fb7987e11599162e676465b5d55f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd27cbc78f96fb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 29 08:56:15 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 4 months

Check_MK Git: check_mk: disable 64 bit version until correct 64 bit compiler is found

by Andreas Boesl

Module: check_mk Branch: master Commit: 93ce81010bfc1a8feb1554e6782baddb0d069d1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93ce81010bfc1a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 29 08:56:48 2013 +0200 disable 64 bit version until correct 64 bit compiler is found --- agents/windows/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 768566b..bc4984f 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -29,7 +29,10 @@ else CXX = mingw32-g++ endif -all: install_agent.exe install_agent-64.exe +all: install_agent.exe + +test.exe: test.cc + $(CXX) -s -O2 -o $@ $< -static -lwsock32 install_agent.exe: check_mk_agent.exe crash.exe nowin.exe if ! which makensis; then \

11 years, 4 months

Check_MK Git: check_mk: Revert "correct packaging of installer/

by Andreas Boesl

check_mk_agent-64.exe" Message-ID: <51a5a6c0.m8cleIjbSqtmm3s2%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 9e1f26cc3360d801820b34f69f9e492d0f07f96d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e1f26cc3360d8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 29 08:55:52 2013 +0200 Revert "correct packaging of installer/check_mk_agent-64.exe" Temporarily remove 64 bit version This reverts commit 9b296792c420ddbe50a03ed086cbb6d63c25dc48. --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index da40d9b..a5a53ca 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,6 @@ setversion: sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms sed -i 's/#define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/check_mk_agent.cc ; \ sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \ - sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer-64.nsi ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' mkeventd/bin/mkeventd ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' doc/treasures/mknotifyd ; \ @@ -159,7 +158,6 @@ setversion: echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ cd agents/windows ; rm *.exe ; make ; cd ../.. ; \ cp agents/windows/install_agent.exe check-mk-agent-$(NEW_VERSION).exe - cp agents/windows/install_agent-64.exe check-mk-agent-64-$(NEW_VERSION).exe headers: doc/helpers/headrify

11 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 58188710867ffbfb2fb5058fe4cde12a56b2712d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58188710867ffb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 28 18:23:39 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 4 months

Check_MK Git: check_mk: livecheck: fixed handling of one-line plugin outputs and missing \n

by Andreas Boesl

Module: check_mk Branch: master Commit: 7078ea7ae796b22c811a8fd805b5aa8647f30c42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7078ea7ae796b2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 28 18:17:18 2013 +0200 livecheck: fixed handling of one-line plugin outputs and missing \n Conflicts: ChangeLog --- ChangeLog | 5 +++++ livestatus/src/livecheck.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index e6faeb4..005d64d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Multisite: * User accounts can now be locked after a specified amount of auth failures (lock_on_logon_failures can be set to a number of tries) + * FIX: better error message in case of exception in SNMP handling Checks & Agents: * lnx_if: Fixed crash on missing "Address" field @@ -149,6 +150,10 @@ 1.2.2p2: + Core: + * FIX: livecheck: fixed handling of one-line plugin outputs and missing \n + (Thanks to Florent Peterschmitt) + Checks & Agents: * FIX: jolokia_info: ignore ERROR instances * FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index 0527b58..b295507 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -235,6 +235,9 @@ int main(int argc, char **argv) break; ptr_walk++; } + if(*ptr_output) { + fputs(ptr_output, checkfile); + } fputs("\n", checkfile); fchown(fd, real_uid, real_gid);

11 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: f62bea68e911bb48932a65358981f050c6efdfc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f62bea68e911bb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 28 18:06:52 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 4 months

Check_MK Git: check_mk: correct packaging of installer/check_mk_agent-64. exe

by Andreas Boesl

Module: check_mk Branch: master Commit: 9b296792c420ddbe50a03ed086cbb6d63c25dc48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b296792c420dd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 28 18:06:46 2013 +0200 correct packaging of installer/check_mk_agent-64.exe --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index a5a53ca..da40d9b 100644 --- a/Makefile +++ b/Makefile @@ -151,6 +151,7 @@ setversion: sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms sed -i 's/#define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/check_mk_agent.cc ; \ sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \ + sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer-64.nsi ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' mkeventd/bin/mkeventd ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' doc/treasures/mknotifyd ; \ @@ -158,6 +159,7 @@ setversion: echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ cd agents/windows ; rm *.exe ; make ; cd ../.. ; \ cp agents/windows/install_agent.exe check-mk-agent-$(NEW_VERSION).exe + cp agents/windows/install_agent-64.exe check-mk-agent-64-$(NEW_VERSION).exe headers: doc/helpers/headrify

11 years, 4 months

Check_MK Git: check_mk: Fixed error output of .f12 file

by Mathias Kettner

Module: check_mk Branch: master Commit: 645198e16838978c79a6ca5f31fda45739148187 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=645198e1683897… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 28 17:39:12 2013 +0200 Fixed error output of .f12 file --- .f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.f12 b/.f12 index 5d9c867..6f787eb 100644 --- a/.f12 +++ b/.f12 @@ -17,7 +17,7 @@ do if bash .f12 ; then echo "OK." else - echo "FEHLER in doc. Abbruch" + echo "FEHLER in $dir. Abbruch" exit 1 fi cd ..

11 years, 4 months

Check_MK Git: check_mk: Fix main .f12 file

by Mathias Kettner

Module: check_mk Branch: master Commit: 78c954bbdee47e526fcdc8578ec2e996fcdcbe30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78c954bbdee47e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 28 17:23:40 2013 +0200 Fix main .f12 file --- .f12 | 24 ++++++++++++++---------- doc/.f12 | 2 +- web/.f12 | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.f12 b/.f12 index 9b77ef2..5d9c867 100644 --- a/.f12 +++ b/.f12 @@ -8,13 +8,17 @@ sed -e "s#@BINDIR@#/omd/sites/$SITE/bin#g" \ sudo mv /tmp/check_mk_templates.cfg /omd/sites/$SITE/etc/nagios/conf.d -(cd doc ; bash .f12) -(cd web ; bash .f12) -(cd modules ; bash .f12) -(cd checks ; bash .f12) -(cd checkman ; bash .f12) -(cd mkeventd ; bash .f12) -(cd notifications ; bash .f12) -(cd agents ; bash .f12) -(cd livestatus ; bash .f12) -(cd pnp-templates ; bash .f12) +for dir in doc web modules checks checkman mkeventd notifications agents livestatus pnp-templates +do + echo "*******************************************************" + echo "VERZEICHNIS $dir **********************************" + echo "*******************************************************" + cd $dir + if bash .f12 ; then + echo "OK." + else + echo "FEHLER in doc. Abbruch" + exit 1 + fi + cd .. +done diff --git a/doc/.f12 b/doc/.f12 index 096bb80..85605be 100644 --- a/doc/.f12 +++ b/doc/.f12 @@ -1 +1 @@ -sudo cp -pr * /omd/versions/default/share/doc/check_mk +sudo cp -vpr * /omd/versions/default/share/doc/check_mk diff --git a/web/.f12 b/web/.f12 index 59f0223..fccf129 100644 --- a/web/.f12 +++ b/web/.f12 @@ -6,4 +6,4 @@ if [ "$SITE" != - ] ; then sudo omd restart $SITE apache fi echo "Using RemoteControl..." -echo 'reload' | nc -w 0 localhost 32000 +echo 'reload' | nc -w 0 localhost 32000 || true

11 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a286910bf08782a58ff67f7fa702ab38ad62dce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a286910bf0878… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 28 12:11:26 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits