Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: FIX: Wrong variable name in get_filesize_human_readable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c10f920d28c2abaae67c71b455144bcf98d17e76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c10f920d28c2ab… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jan 10 17:53:33 2012 +0100 FIX: Wrong variable name in get_filesize_human_readable --- modules/check_mk_base.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index b7b4db0..3d889ff 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1062,9 +1062,9 @@ def get_filesize_human_readable(size): if size < 4 * 1024 * 1024: return str(size) elif size < 4 * 1024 * 1024 * 1024: - return "%.2fMB" % (float(s) / (1024 * 1024)) + return "%.2fMB" % (float(size) / (1024 * 1024)) else: - return "%.2fGB" % (float(s) / (1024 * 1024 * 1024)) + return "%.2fGB" % (float(size) / (1024 * 1024 * 1024)) def get_nic_speed_human_readable(speed):

12 years, 8 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3281a48bfa13ebde2cec82a5070613c7f7482c42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3281a48bfa13eb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jan 10 17:53:43 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 802226cfd4dabdb079d6fe1004bafdf71b05e016 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=802226cfd4dabd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 10 17:30:29 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Fix bug in ValueSpec UserSelection

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 55bac24adc2d0f875894dfd00f07ffacf07b3c1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55bac24adc2d0f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 10 17:30:26 2012 +0100 Fix bug in ValueSpec UserSelection --- web/htdocs/wato.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8b7f75c..d7f6122 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6950,6 +6950,7 @@ class UserSelection(ElementSelection): return elements def value_to_text(self, value): + self.load_elements() return self._elements.get(value, value).split(" - ")[-1] #.

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0584, #0585, #0586

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e107c36f26d336b8c49a86b989a09528530ae2c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e107c36f26d336… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 16:24:23 2012 +0100 Updated bug entries #0584, #0585, #0586 --- .bugs/584 | 9 +++++++++ .bugs/585 | 9 +++++++++ .bugs/586 | 9 +++++++++ 3 files changed, 27 insertions(+), 0 deletions(-) diff --git a/.bugs/584 b/.bugs/584 new file mode 100644 index 0000000..abe9047 --- /dev/null +++ b/.bugs/584 @@ -0,0 +1,9 @@ +Title: How to control windows agent installer via cli +Component: docu +State: open +Date: 2012-01-10 16:19:00 +Targetversion: 1.2.0 +Class: todo + +There are some command line options in the windows agent installer. Create a documentation +for these options. diff --git a/.bugs/585 b/.bugs/585 new file mode 100644 index 0000000..4d310c0 --- /dev/null +++ b/.bugs/585 @@ -0,0 +1,9 @@ +Title: Windows agent installer: Add plugins as optional plugins +Component: core +State: open +Date: 2012-01-10 16:21:20 +Targetversion: 1.2.0 +Class: feature + +It would ne nice to have the option to install optional plugins like windows_updates, the active directory dc +check and so on. They could be optionally selectable as special components. diff --git a/.bugs/586 b/.bugs/586 new file mode 100644 index 0000000..b487c42 --- /dev/null +++ b/.bugs/586 @@ -0,0 +1,9 @@ +Title: Windows agent installer: Option to include custom (config) files +Component: core +State: open +Date: 2012-01-10 16:23:13 +Targetversion: 1.2.0 +Class: feature + +It would be nice to have the option to include custom config files, local files or plugins into +the windows agent installer.

12 years, 8 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 313c84405e13d240cfed539ef6146518e967b862 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=313c84405e13d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 16:18:52 2012 +0100 Reserved 10 bug IDS --- .bugs/420 | 9 +++++++++ .bugs/first_free | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/.bugs/420 b/.bugs/420 new file mode 100644 index 0000000..67e1fa1 --- /dev/null +++ b/.bugs/420 @@ -0,0 +1,9 @@ +Title: local Check Namen mit Leerzeichen erlauben +Component: core +State: open +Date: 2012-01-10 16:17:08 +Targetversion: 1.2.0 +Class: feature + +Momentan sind Leerzeichen offenbar nicht erlaubt. Der Parser kommt durcheinander. +Eventuell könnte man Quotes erlauben um schönere Service Namen bei local Checks zu erlauben. diff --git a/.bugs/first_free b/.bugs/first_free index af368af..3c7cb29 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -584 +594

12 years, 8 months

Check_MK Git: check_mk: Renamed check_mk. ini installed by the installer check_mk.example.ini

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 93d597ac36b40b24226e410e2b5f730ed142f4ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93d597ac36b40b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 15:16:44 2012 +0100 Renamed check_mk.ini installed by the installer check_mk.example.ini --- .../windows/{check_mk.ini => check_mk.example.ini} | 0 agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 124961 -> 124969 bytes agents/windows/installer.nsi | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.example.ini similarity index 100% rename from agents/windows/check_mk.ini rename to agents/windows/check_mk.example.ini diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 84c2fd3..5cc8c8c 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 30ab0b6..640ba3e 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 c48ba7c..c06792d 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 95ac413..7bd35aa 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -66,7 +66,7 @@ Section "Check_MK_Agent" SetOutPath "$INSTDIR" File check_mk_agent.exe - File check_mk.ini + File check_mk.example.ini CreateDirectory "$INSTDIR\local" CreateDirectory "$INSTDIR\plugins" @@ -100,7 +100,7 @@ Section "Uninstall" ; Remove files and uninstaller Delete "$INSTDIR\check_mk_agent.exe" - Delete "$INSTDIR\check_mk.ini" + Delete "$INSTDIR\check_mk.example.ini" Delete "$INSTDIR\uninstall.exe" RMDir "$INSTDIR\local" RMDir "$INSTDIR\plugins"

12 years, 8 months

Check_MK Git: check_mk: windows installer: Fixed quoting for adding/ removing the service

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d9c2bc9a9a97bb88dfa48ec09a01cd365ef476cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9c2bc9a9a97bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 15:10:58 2012 +0100 windows installer: Fixed quoting for adding/removing the service --- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 124972 -> 124961 bytes agents/windows/installer.nsi | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 5be72cf..84c2fd3 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 fd6d20f..30ab0b6 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 23e8a93..c48ba7c 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 df871d4..95ac413 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -83,7 +83,7 @@ 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 "$INSTDIR\check_mk_agent.exe" install' nsExec::Exec 'cmd /C "net start check_mk_agent"' SectionEnd @@ -92,7 +92,7 @@ Section "Uninstall" 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"' + nsExec::Exec 'cmd /C "$INSTDIR\check_mk_agent.exe" remove' ; Remove registry keys DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\check_mk_agent"

12 years, 8 months

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

← Newer
1
...
24
25
26
27
28
29
30
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012