Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Added windows agent installer exe to gitignore

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1a3e0a485259eb3c52482174fdbe018ea34d0cb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a3e0a485259eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 13:16:36 2012 +0100 Added windows agent installer exe to gitignore --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 7152901..d0d4a50 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ rpm.buildroot/ rpm.topdir/ *.rpm *.deb +check-mk-*.exe var/ .bugs/.my_ids .bugs/.last

12 years, 8 months

Check_MK Git: check_mk: make clean removes agent installer

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d456967f139664ed30baf71af1be2bc0b6381965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d456967f139664… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 13:15:35 2012 +0100 make clean removes agent installer --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 296f352..8618985 100644 --- a/Makefile +++ b/Makefile @@ -179,7 +179,7 @@ deb-agent: $(NAME)-agent-$(VERSION)-1.noarch.rpm $(NAME)-agent-logwatch-$(VERSIO clean: - rm -rf dist.tmp rpm.topdir *.rpm *.deb mk-livestatus-*.tar.gz $(NAME)-*.tar.gz *~ counters autochecks precompiled cache + rm -rf dist.tmp rpm.topdir *.rpm *.deb *.exe mk-livestatus-*.tar.gz $(NAME)-*.tar.gz *~ counters autochecks precompiled cache find -name "*~" | xargs rm -f mrproper:

12 years, 8 months

Check_MK Git: check_mk: Check_MK: Replaced misleading error message when trying to inventorize unreachable snmp hosts

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4e4baf55e68b570c53e87099e538b5fc6cd6137f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e4baf55e68b57… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 12:43:16 2012 +0100 Check_MK: Replaced misleading error message when trying to inventorize unreachable snmp hosts --- modules/check_mk_base.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 348b4aa..b7b4db0 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -371,7 +371,8 @@ def read_cache_file(relpath, max_cache_age): raise MKGeneralException("Simulation mode and no cachefile present.") if opt_no_tcp: - raise MKGeneralException("Cache file '%s' missing or too old. TCP disallowed by you." % cachefile) + raise MKGeneralException("Host is unreachable") + #Cache file '%s' missing or too old. TCP disallowed by you." % cachefile) def write_cache_file(relpath, output):

12 years, 8 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9090e65e0390ee481ef60f6f4cafce3d79d9a5ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9090e65e0390ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 11:34:24 2012 +0100 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3aded0..8a55ff3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Checks & Agents: * Windows agent: output eventlog texts in UTF-8 encoding. This should fix problems with german umlauts in message texts. + * Windows agent: Added installer for the windows agent (install_agent.exe) * Disabled obsolete checks fc_brocade_port and fc_brocade_port_detailed. Please use brocade_fcport instead. * aironet_errors, statgrab_disk, statgrab_net: Performance data has

12 years, 8 months

Check_MK Git: check_mk: Agent Installer wird nun ordentlich gebaut und kopiert

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1274403835dd18f973a6026d55a2a79db96119f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1274403835dd18… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 11:59:49 2012 +0100 Agent Installer wird nun ordentlich gebaut und kopiert --- Makefile | 5 +++-- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 124971 -> 124972 bytes agents/windows/installer.nsi | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 49d32ff..296f352 100644 --- a/Makefile +++ b/Makefile @@ -117,11 +117,12 @@ setversion: fi ; \ done ; \ 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.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)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ - cd agents/windows ; rm *.exe ; make + cd agents/windows ; rm *.exe ; make ; cd ../.. ; \ + cp agents/windows/install_agent.exe check-mk-agent-$(NEW_VERSION).exe headers: doc/helpers/headrify diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 5b1ca11..5be72cf 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 ff7c400..fd6d20f 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index e973cd4..23e8a93 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 4a6e9f8..df871d4 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.1.13i3" +!define CHECK_MK_VERSION "1.1.13i3" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on

12 years, 8 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ba7e1b6c836e12528f3d7c9b41eb0737645e859e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba7e1b6c836e12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 12:14:07 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Added NSIS based installer for the windows agent

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5e1b1a1411de487975ea1b10501480aacaf534fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e1b1a1411de48… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 10:36:17 2012 +0100 Added NSIS based installer for the windows agent --- agents/windows/Makefile | 9 +++- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/installer.ico | Bin 0 -> 1406 bytes agents/windows/installer.nsi | 92 +++++++++++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+), 1 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index c31f78f..036ac08 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -28,7 +28,14 @@ else CXX = mingw32-g++ endif -all: check_mk_agent.exe crash.exe +all: check_mk_agent.exe crash.exe installer + +installer: + if ! which makensis; then \ + echo "ERROR: makensis missing. Please install the nsis package." ; \ + exit 1 ; \ + fi + makensis installer.nsi check_mk_agent.exe: check_mk_agent.cc Makefile $(CXX) -s -O2 -Wall -Werror -o $@ $< -lwsock32 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index b4c6f45..08976c5 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 7eaa34e..e3c5b3e 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/installer.ico b/agents/windows/installer.ico new file mode 100644 index 0000000..2e8c4ea Binary files /dev/null and b/agents/windows/installer.ico differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi new file mode 100644 index 0000000..715197d --- /dev/null +++ b/agents/windows/installer.nsi @@ -0,0 +1,92 @@ +; 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 VERSION "1.1.13i3" +!define NAME "Check_MK Agent ${VERSION}" + +XPStyle on +Icon "installer.ico" + +; The name of the installer +Name "${NAME}" + +; The file to write +OutFile "check_mk_agent_install-${VERSION}.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 + + SetOutPath "$INSTDIR" + File check_mk_agent.exe + File check_mk.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" + ExecWait '"$INSTDIR\check_mk_agent.exe" install' + ExecWait 'net start check_mk_agent' +SectionEnd + +Section "Uninstall" + ; Remove the service + ExecWait 'net stop check_mk_agent' + ExecWait '"$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.ini" + Delete "$INSTDIR\uninstall.exe" + RMDir "$INSTDIR\local" + RMDir "$INSTDIR\plugins" + + ; Remove directories used + RMDir "$INSTDIR" +SectionEnd

12 years, 8 months

Check_MK Git: check_mk: make version also updates the windows agent installer

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fa7181c81727ac75f41ba77ee412ba2bd8004852 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa7181c81727ac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 10:37:54 2012 +0100 make version also updates the windows agent installer --- Makefile | 1 + agents/windows/installer.nsi | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 569484d..49d32ff 100644 --- a/Makefile +++ b/Makefile @@ -117,6 +117,7 @@ setversion: fi ; \ done ; \ 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/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 715197d..025583e 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,8 +4,8 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define VERSION "1.1.13i3" -!define NAME "Check_MK Agent ${VERSION}" +!define CHECK_MK_VERSION "1.1.13i3" +!define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on Icon "installer.ico" @@ -14,7 +14,7 @@ Icon "installer.ico" Name "${NAME}" ; The file to write -OutFile "check_mk_agent_install-${VERSION}.exe" +OutFile "check_mk_agent_install-${CHECK_MK_VERSION}.exe" SetDateSave on SetDatablockOptimize on

12 years, 8 months

Check_MK Git: check_mk: Added compiled agent installer; Improved installer

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 95ab09d30bdaaa2337601ff4615d68ec6fab5441 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95ab09d30bdaaa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 11:33:24 2012 +0100 Added compiled agent installer; Improved installer --- agents/windows/Makefile | 5 +- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 0 -> 124971 bytes agents/windows/installer.ico | Bin 1406 -> 12862 bytes agents/windows/installer.nsi | 94 ++++++++++++++++++++++--------------- 6 files changed, 58 insertions(+), 41 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 036ac08..31a2105 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -28,14 +28,13 @@ else CXX = mingw32-g++ endif -all: check_mk_agent.exe crash.exe installer - -installer: +install_agent.exe: check_mk_agent.exe crash.exe if ! which makensis; then \ echo "ERROR: makensis missing. Please install the nsis package." ; \ exit 1 ; \ fi makensis installer.nsi + chmod +x install_agent.exe check_mk_agent.exe: check_mk_agent.cc Makefile $(CXX) -s -O2 -Wall -Werror -o $@ $< -lwsock32 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 08976c5..5b1ca11 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 e3c5b3e..ff7c400 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe new file mode 100755 index 0000000..e973cd4 Binary files /dev/null and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.ico b/agents/windows/installer.ico index 2e8c4ea..a56e224 100644 Binary files a/agents/windows/installer.ico and b/agents/windows/installer.ico differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 025583e..4a6e9f8 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -14,7 +14,7 @@ Icon "installer.ico" Name "${NAME}" ; The file to write -OutFile "check_mk_agent_install-${CHECK_MK_VERSION}.exe" +OutFile "install_agent.exe" SetDateSave on SetDatablockOptimize on @@ -46,47 +46,65 @@ UninstPage instfiles ;-------------------------------- Section "Check_MK_Agent" - ; Can not be disabled - SectionIn RO - - SetOutPath "$INSTDIR" - File check_mk_agent.exe - File check_mk.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" + ; 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 check_mk_agent.exe + File check_mk.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" - ExecWait '"$INSTDIR\check_mk_agent.exe" install' - ExecWait 'net start check_mk_agent' + 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 - ExecWait 'net stop check_mk_agent' - ExecWait '"$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.ini" - Delete "$INSTDIR\uninstall.exe" - RMDir "$INSTDIR\local" - RMDir "$INSTDIR\plugins" - - ; Remove directories used - RMDir "$INSTDIR" + ; 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.ini" + Delete "$INSTDIR\uninstall.exe" + RMDir "$INSTDIR\local" + RMDir "$INSTDIR\plugins" + + ; Remove directories used + RMDir "$INSTDIR" SectionEnd

12 years, 8 months

Check_MK Git: check_mk: ValueSpec: Allow regex in all TextInputs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 27fc195746f14e6f0d8b91f4cd135a61e761583c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27fc195746f14e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 10 12:04:33 2012 +0100 ValueSpec: Allow regex in all TextInputs --- web/htdocs/valuespec.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e0bfcef..669beb7 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -232,6 +232,9 @@ class TextAscii(ValueSpec): ValueSpec.__init__(self, **kwargs) self._size = kwargs.get("size", 30) self._allow_empty = kwargs.get("allow_empty", True) + self._regex = kwargs.get("regex") + if type(self._regex) == str: + self._regex = re.compile(self._regex) def canonical_value(self): return "" @@ -252,21 +255,19 @@ class TextAscii(ValueSpec): def validate_value(self, value, varprefix): if not self._allow_empty and value.strip() == "": raise MKUserError(varprefix, _("An empty value is not allowed here.")) + if value and self._regex: + if not self._regex.match(value): + raise MKUserError(varprefix, _("Your input odes not match the required format.")) class EmailAddress(TextAscii): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs) - self._re_email = re.compile('^[A-Z0-9._%+-]+(a)[A-Z0-9.-]+\.[A-Z]{2,4}$', re.I) + self._regex = re.compile('^[A-Z0-9._%+-]+(a)[A-Z0-9.-]+\.[A-Z]{2,4}$', re.I) def value_to_text(self, value): return '<a href="mailto:%s">%s</a>' % (value, value) - def validate_value(self, value, varprefix): - TextAscii.validate_value(self, value, varprefix) - if value: - if not self._re_email.match(value): - raise MKUserError(varprefix, _("You entered an invalid email address.")) class TextUnicode(TextAscii): def __init__(self, **kwargs):

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits