Checkmk git commits May 2013

checkmk-commits@lists.checkmk.com

3 participants
111 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: 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

Check_MK Git: check_mk: Users can now be locked after N auth failures

by Lars Michelsen

Module: check_mk Branch: master Commit: 490e69d2a215fdd9ae8683332f6bce51987c71d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=490e69d2a215fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 28 12:10:47 2013 +0200 Users can now be locked after N auth failures 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 --- ChangeLog | 6 +++++- web/htdocs/login.py | 4 ++++ web/htdocs/userdb.py | 27 +++++++++++++++++++++++++++ web/plugins/config/builtin.py | 1 + web/plugins/wato/check_mk_configuration.py | 17 +++++++++++++++++ 5 files changed, 54 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6854aab..1090dc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ 1.2.3i2: Core: * New option -B for just generating the configuration - + + 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) + Checks & Agents: * lnx_if: Fixed crash on missing "Address" field * viprinet_router: Now able to set required target state via rule diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 4c4d7b6..f6f1451 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -183,6 +183,9 @@ def do_login(): # False -> failed result = userdb.hook_login(username, password) if result: + # reset failed login counts + userdb.on_succeeded_login(username) + username = result # The login succeeded! Now: # a) Set the auth cookie @@ -207,6 +210,7 @@ def do_login(): return (username, origtarget) else: + userdb.on_failed_login(username) raise MKUserError(None, _('Invalid credentials.')) except MKUserError, e: html.add_user_error(e.varname, e.message) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 8b836b1..2c4f043 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -118,7 +118,24 @@ def user_locked(username): users = load_users() return users[username].get('locked', False) +def on_succeeded_login(username): + users = load_users() + if "num_failed" in users[username]: + users[username]["num_failed"] = 0 + save_users(users) + +def on_failed_login(username): + users = load_users() + if "num_failed" in users[username]: + users[username]["num_failed"] += 1 + else: + users[username]["num_failed"] = 1 + if config.lock_on_logon_failures: + if users[username]["num_failed"] >= config.lock_on_logon_failures: + users[username]["locked"] = True + + save_users(users) root_dir = defaults.check_mk_configdir + "/wato/" multisite_dir = defaults.default_config_dir + "/multisite.d/wato/" @@ -248,6 +265,11 @@ def load_users(): if d[0] != '.': id = d + # read failed login counts + failed_file = dir + d + '/num_failed.mk' + if id in result and os.path.exists(failed_file): + result[id]['num_failed'] = int(file(failed_file).read().strip()) + # read automation secrets and add them to existing # users or create new users automatically secret_file = dir + d + "/automation.secret" @@ -279,6 +301,7 @@ def save_users(profiles): "language", "serial", "connector", + "num_failed", ] + custom_values # Keys to put into multisite configuration @@ -347,6 +370,10 @@ def save_users(profiles): serial_file = user_dir + '/serial.mk' create_user_file(serial_file, 'w').write('%d\n' % user.get('serial', 0)) + # Write out the users number of failed login + failed_file = user_dir + '/num_failed.mk' + create_user_file(failed_file, 'w').write('%d\n' % user.get('num_failed', 0)) + # Remove settings directories of non-existant users. # Beware: we removed this since it leads to violent destructions # if the user database is out of the scope of Check_MK. This is diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 2962f3a..8011c12 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -191,3 +191,4 @@ ldap_debug_log = None default_user_profile = { 'roles': ['user'], } +lock_on_logon_failures = False diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 1f5992b..f16ac04 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -567,6 +567,23 @@ register_configvar(group, "containing details about connecting to LDAP and the single transactions.")), domain = "multisite") +register_configvar(group, + "lock_on_logon_failures", + Optional( + Integer( + label = _("Number of logon failures to lock the account"), + default_value = 3, + minvalue = 1, + ), + none_value = False, + title = _("Lock user accounts after N logon failures"), + label = _("Activate automatic locking of user accounts"), + help = _("This options enables automatic locking of user account after " + "N logon failures. One successful login resets the failure counter.") + ), + domain = "multisite" +) + def list_roles(): roles = userdb.load_roles()

11 years, 4 months

Check_MK Git: check_mk: windows agent: 64 bit version available

by Andreas Boesl

Module: check_mk Branch: master Commit: 7ed7c37a48fdd709bdc1b44c86db3aeb94478263 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ed7c37a48fdd7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 28 11:36:44 2013 +0200 windows agent: 64 bit version available --- ChangeLog | 1 + agents/windows/Makefile | 16 ++++- agents/windows/check_mk_agent-64.exe | Bin 0 -> 131072 bytes agents/windows/check_mk_agent.exe | Bin 113664 -> 112640 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 0 -> 131695 bytes agents/windows/install_agent.exe | Bin 131980 -> 131798 bytes agents/windows/installer-64.nsi | 110 ++++++++++++++++++++++++++++++++++ agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 9 files changed, 126 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6854aab..d31567b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Checks & Agents: * lnx_if: Fixed crash on missing "Address" field * viprinet_router: Now able to set required target state via rule + * windows_agent: Now available as 64 bit version 1.2.3i1: Core: diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 43e60e7..768566b 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -23,11 +23,14 @@ # Boston, MA 02110-1301 USA. ifeq ($(shell uname),Linux) - CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i586-mingw32msvc-g++ + CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i586-mingw32msvc-g++ + CXX_64 = x86_64-w64-mingw32-g++ else CXX = mingw32-g++ endif +all: install_agent.exe install_agent-64.exe + install_agent.exe: check_mk_agent.exe crash.exe nowin.exe if ! which makensis; then \ echo "ERROR: makensis missing. Please install the nsis package." ; \ @@ -36,9 +39,20 @@ install_agent.exe: check_mk_agent.exe crash.exe nowin.exe makensis installer.nsi chmod +x install_agent.exe +install_agent-64.exe: check_mk_agent-64.exe crash.exe nowin.exe + if ! which makensis; then \ + echo "ERROR: makensis missing. Please install the nsis package." ; \ + exit 1 ; \ + fi + makensis installer-64.nsi + chmod +x install_agent-64.exe + check_mk_agent.exe: check_mk_agent.cc Makefile $(CXX) -s -O2 -Wall -Werror -o $@ $< -static -lwsock32 +check_mk_agent-64.exe: check_mk_agent.cc Makefile + $(CXX_64) -s -O2 -Wall -Werror -o $@ $< -static -lwsock32 + crash.exe: crash.cc Makefile $(CXX) -o $@ $< diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe new file mode 100755 index 0000000..073f0e2 Binary files /dev/null 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 aeeaadc..eb5abf3 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index c51b120..65b86d5 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe new file mode 100755 index 0000000..d85c2a0 Binary files /dev/null and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 126ba50..5cad004 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 new file mode 100644 index 0000000..5a6a851 --- /dev/null +++ b/agents/windows/installer-64.nsi @@ -0,0 +1,110 @@ +; This is the NSIS configuration file for the Check_MK windows agent. This is +; the spec file how to build the installer +;-------------------------------- +; Useful sources: +; http://nsis.sourceforge.net/Reusable_installer_script + +!define CHECK_MK_VERSION "1.2.3i1" +!define NAME "Check_MK Agent ${CHECK_MK_VERSION}" + +XPStyle on +Icon "installer.ico" + +; The name of the installer +Name "${NAME}" + +; The file to write +OutFile "install_agent-64.exe" + +SetDateSave on +SetDatablockOptimize on +CRCCheck on +SilentInstall normal + +; The default installation directory +InstallDir "$PROGRAMFILES\check_mk" + +; Registry key to check for directory (so if you install again, it will +; overwrite the old one automatically) +InstallDirRegKey HKLM "Software\check_mk_agent" "Install_Dir" + +; Request application privileges for Windows >Vista +RequestExecutionLevel admin + +ShowInstDetails show + +;-------------------------------- +; Pages + +Page directory +Page components +Page instfiles + +UninstPage uninstConfirm +UninstPage instfiles + +;-------------------------------- + +Section "Check_MK_Agent" + ; Can not be disabled + SectionIn RO + + !include LogicLib.nsh + ExpandEnvStrings $0 "%comspec%" + nsExec::ExecToStack '"$0" /k "net start | FIND /C /I "check_mk_agent""' + Pop $0 + Pop $1 + StrCpy $1 $1 1 + Var /GLOBAL stopped + ${If} "$0$1" == "01" + DetailPrint "Stop running check_mk_agent..." + StrCpy $stopped "1" + nsExec::Exec 'cmd /C "net stop check_mk_agent"' + ${Else} + StrCpy $stopped "0" + ${EndIf} + + SetOutPath "$INSTDIR" + File /oname=check_mk_agent.exe check_mk_agent-64.exe + File check_mk.example.ini + CreateDirectory "$INSTDIR\local" + CreateDirectory "$INSTDIR\plugins" + + ; Write the installation path into the registry + WriteRegStr HKLM SOFTWARE\check_mk_agent "Install_Dir" "$INSTDIR" + + ; Write the uninstall keys for Windows + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\check_mk_agent" "DisplayName" "${NAME}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\check_mk_agent" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\check_mk_agent" "NoModify" 1 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\check_mk_agent" "NoRepair" 1 + WriteUninstaller "uninstall.exe" +SectionEnd + +Section "Install & start service" + DetailPrint "Installing and starting the check_mk_agent service..." + nsExec::Exec 'cmd /C "$INSTDIR\check_mk_agent.exe" install' + nsExec::Exec 'cmd /C "net start check_mk_agent"' +SectionEnd + +Section "Uninstall" + ; Remove the service + DetailPrint "Stopping service..." + nsExec::Exec 'cmd /C "net stop check_mk_agent"' + DetailPrint "Removing service..." + nsExec::Exec 'cmd /C "$INSTDIR\check_mk_agent.exe" remove' + + ; Remove registry keys + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\check_mk_agent" + DeleteRegKey HKLM SOFTWARE\check_mk_agent + + ; Remove files and uninstaller + Delete "$INSTDIR\check_mk_agent.exe" + Delete "$INSTDIR\check_mk.example.ini" + Delete "$INSTDIR\uninstall.exe" + RMDir "$INSTDIR\local" + RMDir "$INSTDIR\plugins" + + ; Remove directories used + RMDir "$INSTDIR" +SectionEnd diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 9c2e4c1..63bdf3c 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

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: e71bfb9385f547b6f43d1948143bff5197c67c8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e71bfb9385f547… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 28 11:34:29 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2013