Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: Updated bug entries #1064

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 96e901530a1559008a773ee9bc63d577faa0e042 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96e901530a1559… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Oct 31 15:40:58 2013 +0100 Updated bug entries #1064 --- .bugs/1064 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/1064 b/.bugs/1064 new file mode 100644 index 0000000..3820e2a --- /dev/null +++ b/.bugs/1064 @@ -0,0 +1,8 @@ +Title: problem with strange encoding of Umlauts when querying windows SNMP agent +Component: checks +State: open +Date: 2013-10-31 15:37:33 +Targetversion: future +Class: bug + +for detailed description and snmp walk see ticket 13, customer geobasis

10 years, 8 months

Check_MK Git: check_mk: New filters for selecting several host/

by Mathias Kettner

service-groups at once Message-ID: <527269ab.NfUvVhagv6l5vfK1%mk(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: 2a57db81fd4ef944904a672668d7048266ef17cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a57db81fd4ef9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 31 15:30:12 2013 +0100 New filters for selecting several host/service-groups at once There are two new filters that allow you to select not only one, but several host- and service groups at once. This filters are added to the builtin views "Host Search", "Service Search" and "All hosts". --- .werks/1 | 10 +++++++++ ChangeLog | 3 +++ web/htdocs/valuespec.py | 5 +++-- web/htdocs/views.css | 9 ++++++++ web/plugins/views/builtin.py | 4 ++++ web/plugins/views/filters.py | 47 ++++++++++++++++++++++++++++++++++++++++-- 6 files changed, 74 insertions(+), 4 deletions(-) diff --git a/.werks/1 b/.werks/1 new file mode 100644 index 0000000..fd9236c --- /dev/null +++ b/.werks/1 @@ -0,0 +1,10 @@ +Title: New filters for selecting several host/service-groups at once +Level: 2 +Component: multisite +Version: 1.2.3i7 +Date: 1383229744 +Class: feature + +There are two new filters that allow you to select not only one, but +several host- and service groups at once. This filters are added to +the builtin views "Host Search", "Service Search" and "All hosts". diff --git a/ChangeLog b/ChangeLog index 5554448..4d1fe97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.3i7: + Multisite: + * 0001 : New filters for selecting several host/service-groups at once... + 1.2.3i6: Core & Setup: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 239b87a..00fb846 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1293,6 +1293,7 @@ class MultiSelect(ListChoice): class DualListChoice(ListChoice): def __init__(self, **kwargs): ListChoice.__init__(self, **kwargs) + self._autoheight = kwargs.get("autoheight", True) def render_input(self, varprefix, value): self.load_elements() @@ -1310,11 +1311,11 @@ class DualListChoice(ListChoice): html.write(_('Selected:')) html.write('</td></tr><tr><td>') html.sorted_select(varprefix + '_unselected', unselected, - attrs = {'size': 5, 'style': 'height:auto'}, + attrs = {'size': 5, 'style': self._autoheight and 'height:auto' or ''}, onchange = 'vs_duallist_switch(this, \'%s\');' % varprefix) html.write('</td><td>') html.sorted_select(varprefix + '_selected', selected, - attrs = {'size': 5, 'style': 'height:auto', 'multiple': 'multiple'}, + attrs = {'size': 5, 'style': self._autoheight and 'height:auto' or '', 'multiple': 'multiple'}, onchange = 'vs_duallist_switch(this, \'%s\');' % varprefix) html.write('</td></tr></table>') html.hidden_field(varprefix, '|'.join([k for k, v in selected]), id = varprefix, add_var = True) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 2a1609b..18965f2 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -111,6 +111,15 @@ div.floatfilter .content > select#optservicegroup { width: 240px; } +div.floatfilter .content .multigroup table { + margin-top: -6px; +} + +div.floatfilter .content .multigroup select { + width: 148px; + height: 66px; +} + div.floatfilter .content .filtertime select { width: 136px; } diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index e029d59..639163e 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -56,6 +56,7 @@ multisite_builtin_views.update({ 'host_acknowledged', 'hostregex', 'host_notifications_enabled', + 'hostgroups', 'opthostgroup', 'host_check_command', 'opthost_contactgroup', @@ -1029,6 +1030,7 @@ multisite_builtin_views.update({ 'siteopt', 'hostregex', 'summary_host', + 'hostgroups', 'opthostgroup', 'opthost_contactgroup', 'host_check_command', @@ -1091,6 +1093,8 @@ multisite_builtin_views.update({ 'show_filters': ['service_in_notification_period', 'optservicegroup', 'optservice_contactgroup', + 'hostgroups', + 'servicegroups', 'service_notifications_enabled', 'host_in_notification_period', 'in_downtime', diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 24b9fd7..b1742cb 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -120,6 +120,46 @@ def all_groups(what): groups = dict(html.live.query("GET %sgroups\nCache: reload\nColumns: name alias\n" % what)) return [ (name, groups[name] or name) for name in groups.keys() ] +class FilterMultigroup(Filter): + def __init__(self, what, title): + htmlvars = [ what + "groups" ] + Filter.__init__(self, htmlvars[0], # name + title, + what, # info, e.g. "service" + htmlvars, + []) # no link info needed + self.what = what + self.htmlvar = htmlvars[0] + + def double_height(self): + return True + + def valuespec(self): + return DualListChoice(choices = all_groups(self.what), autoheight=False) + + def selection(self): + current = html.var(self.htmlvar, "").strip().split("|") + if current == ['']: + return [] + else: + return current + + def display(self): + html.write('<div class=multigroup>') + self.valuespec().render_input(self.htmlvar, self.selection()) + html.write('</div>') + + def filter(self, infoname): + current = self.selection() + if len(current) == 0: + return "" # No group selected = all groups selected, filter unused + filters = "" + for group in current: + filters += "Filter: %s_groups >= %s\n" % (self.what, group) + filters += "Or: %d\n" % len(current) + return filters + + class FilterGroupCombo(Filter): def __init__(self, what, title, enforce): self.enforce = enforce @@ -189,10 +229,13 @@ class FilterGroupCombo(Filter): declare_filter(104, FilterGroupCombo("host", _("Hostgroup"), False), _("Optional selection of host group")) declare_filter(104, FilterGroupCombo("host", _("Hostgroup (enforced)"), True), _("Dropdown list, selection of host group is <b>enforced</b>")) +declare_filter(105, FilterMultigroup("host", _("Several Hostgroups")), _("Selection of multiple host groups")) declare_filter(204, FilterGroupCombo("service", _("Servicegroup"), False), _("Optional selection of service group")) declare_filter(205, FilterGroupCombo("service", _("Servicegroup (enforced)"), True), _("Dropdown list, selection of service group is <b>enforced</b>")) -declare_filter(106, FilterGroupCombo("host_contact", _("Host Contactgroup"), False), _("Optional selection of host contact group group")) -declare_filter(206, FilterGroupCombo("service_contact", _("Service Contactgroup"), False), _("Optional selection of service contact group group")) +declare_filter(205, FilterMultigroup("service", _("Several Servicegroups")), _("Selection of multiple service groups")) + +declare_filter(106, FilterGroupCombo("host_contact", _("Host Contactgroup"), False), _("Optional selection of host contact group")) +declare_filter(206, FilterGroupCombo("service_contact", _("Service Contactgroup"), False), _("Optional selection of service contact group")) declare_filter(107, FilterText("host_ctc", _("Host Contact"), "host", "host_contacts", "host_ctc", ">=")) declare_filter(207, FilterText("service_ctc", _("Service Contact"), "service", "service_contacts", "service_ctc", ">="))

10 years, 8 months

Check_MK Git: check_mk: Fixed minor bug in werk tool (grep)

by Mathias Kettner

Module: check_mk Branch: master Commit: 930beb741faf5a8a35f465ccdaadc143698972a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=930beb741faf5a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 31 15:30:49 2013 +0100 Fixed minor bug in werk tool (grep) --- werk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/werk b/werk index 546d48c..cfb8db0 100755 --- a/werk +++ b/werk @@ -40,6 +40,12 @@ else: def tty_colors(c): return "" +grep_colors = [ + tty_bold + tty_magenta, + tty_bold + tty_cyan, + tty_bold + tty_green, +] + def get_tty_size(): import termios,struct,fcntl try:

10 years, 8 months

Check_MK Git: check_mk: Updated version in changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 2e91125ddf12e29af54006ad827e15680f9a6e59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e91125ddf12e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 31 11:32:40 2013 +0100 Updated version in changelog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index f0445dc..5554448 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.2.3i7: + 1.2.3i6: Core & Setup: * 0041 FIX : setup.py now handles non existing wwwuser gracefully...

10 years, 8 months

Check_MK Git: check_mk: Prep for 1.2.3i6 release

by Lars Michelsen

Module: check_mk Branch: master Commit: 03fee488b810f18857dd34a761374c977458fed2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03fee488b810f1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 31 11:15:45 2013 +0100 Prep for 1.2.3i6 release --- ChangeLog | 4 ++-- Makefile | 2 +- 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.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 146763 -> 146758 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 22511 -> 22511 bytes debian/files | 2 +- doc/treasures/mknotifyd | 2 +- livestatus/configure.ac | 2 +- mkeventd/bin/mkeventd | 2 +- scripts/setup.sh | 2 +- werk | 2 +- 23 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 874ad66..ae1de5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,10 @@ 1.2.3i6: Core & Setup: - * FIX 0041: setup.py now handles non existing wwwuser gracefully... + * 0041 FIX: setup.py now handles non existing wwwuser gracefully... Checks & Agents: * 0040: Add agent plugin to test local hostname resolving... - * FIX 0020: Inventory problem with inventory_processes parameter... + * 0020 FIX: Inventory problem with inventory_processes parameter... Multisite: * 0000: Improved performance of LDAP sync by refactoring the group sync code diff --git a/Makefile b/Makefile index f6d149c..588a9af 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.3i5 +VERSION = 1.2.3i6 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 82d8a19..fb0f3ca 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -48,7 +48,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 009e60c..a588707 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index e94f092..c5a75a0 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -48,7 +48,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index ac4d0ee..df160a5 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -89,7 +89,7 @@ function run_cached () { } echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 1148988..2015d66 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -43,7 +43,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index ed00be4..92bbec5 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 2cafe02..53cfc07 100644 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index e9b761a..c7e8a59 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -162,7 +162,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.3i5" +$say "Version: 1.2.3i6" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index f5f6dcb..58cd083 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -49,7 +49,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index f8e8a95..6abcba4 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -75,7 +75,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.3i5" +#define CHECK_MK_VERSION "1.2.3i6" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 09510ef..8a97e00 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 c57be26..00a9d41 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 91e04a1..5be21bf 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 84f2c0b..a60fa29 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.2.3i5" +!define CHECK_MK_VERSION "1.2.3i6" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 57cbc09..0b87628 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index b48ddee..ce39270 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.3i5-1_all.deb net optional +check-mk_1.2.3i6-1_all.deb net optional diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 369010e..014e10c 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -30,7 +30,7 @@ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i5" +VERSION="1.2.3i6" # .--Helper functions----------------------------------------------------. # | _ _ _ | # | | | | | ___| |_ __ ___ _ __ ___ | diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 3a33de7..1f2adb3 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.2.3i5], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.3i6], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 3797d9c..15b424b 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i5" +VERSION="1.2.3i6" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/scripts/setup.sh b/scripts/setup.sh index ae5f238..023393b 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.3i5 +VERSION=1.2.3i6 NAME=check_mk LANG= LC_ALL= diff --git a/werk b/werk index 304bc1f..546d48c 100755 --- a/werk +++ b/werk @@ -159,7 +159,7 @@ def write_changelog_line(chn, werk): omit = "..." else: omit = "" - chn.write(" * %s%04d: %s%s\n" % (prefix, werk["id"], werk["title"], omit)) + chn.write(" * %04d %s: %s%s\n" % (werk["id"], prefix, werk["title"], omit)) if werk["class"].startswith("incomp"): chn.write(" NOTE: Please refer to the migration notes!\n")

10 years, 8 months

Check_MK Git: check_mk: FIX Removed debug outputs from service inventory

by Lars Michelsen

Module: check_mk Branch: master Commit: 335406344ca3e38b7dc2d20d5b3b68db4f682443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=335406344ca3e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 31 11:17:57 2013 +0100 FIX Removed debug outputs from service inventory --- .werks/42 | 8 ++++++++ ChangeLog | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/42 b/.werks/42 new file mode 100644 index 0000000..94b9c7e --- /dev/null +++ b/.werks/42 @@ -0,0 +1,8 @@ +Title: Removed debug outputs from service inventory +Level: 1 +Component: wato +Version: 1.2.3i6 +Date: 1383214609 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ae1de5d..f0445dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,16 @@ 1.2.3i6: Core & Setup: - * 0041 FIX: setup.py now handles non existing wwwuser gracefully... + * 0041 FIX : setup.py now handles non existing wwwuser gracefully... Checks & Agents: - * 0040: Add agent plugin to test local hostname resolving... - * 0020 FIX: Inventory problem with inventory_processes parameter... + * 0040 : Add agent plugin to test local hostname resolving... + * 0020 FIX : Inventory problem with inventory_processes parameter... Multisite: - * 0000: Improved performance of LDAP sync by refactoring the group sync code + * 0000 : Improved performance of LDAP sync by refactoring the group sync code + + WATO: + * 0042 FIX : Removed debug outputs from service inventory... 1.2.3i5:

10 years, 8 months

Check_MK Git: check_mk: FIX setup. py now handles non existing wwwuser gracefully

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c1697fac55b856040786f2487903e88d935ae61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c1697fac55b85… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 31 10:57:25 2013 +0100 FIX setup.py now handles non existing wwwuser gracefully --- .werks/41 | 8 ++++++++ ChangeLog | 3 +++ scripts/setup.sh | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/41 b/.werks/41 new file mode 100644 index 0000000..d558bc3 --- /dev/null +++ b/.werks/41 @@ -0,0 +1,8 @@ +Title: setup.py now handles non existing wwwuser gracefully +Level: 1 +Component: core +Version: 1.2.3i6 +Date: 1383213401 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5d18336..874ad66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.3i6: + Core & Setup: + * FIX 0041: setup.py now handles non existing wwwuser gracefully... + Checks & Agents: * 0040: Add agent plugin to test local hostname resolving... * FIX 0020: Inventory problem with inventory_processes parameter... diff --git a/scripts/setup.sh b/scripts/setup.sh index 054c838..ae5f238 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1006,8 +1006,8 @@ EOF # WATO. Also create an empty and Apache-writable auth.serials serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials && touch "$serials_file" && - chown $wwwuser "$serials_file" && - chown $wwwuser "$htpasswd_file" && + (chown $wwwuser "$serials_file" || true) && + (chown $wwwuser "$htpasswd_file" || true) && create_sudo_configuration && if [ "$enable_mkeventd" = yes ] then

10 years, 8 months

Check_MK Git: check_mk: Add agent plugin to test local hostname resolving

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d84fe6911b45fe9ae6f940a66ce90af3435ab69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d84fe6911b45f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 31 10:53:17 2013 +0100 Add agent plugin to test local hostname resolving In release 1.2.3i5 the Check DNS option in WATO has been cleaned up. It is only meant for really checking DNS servers, not the local resolver of a system. If you like to test the local name resolving on a specific host, you can deploy the agent plugin "resolve_hostname" on the host you like to run the check on. The name to be resolved needs to be changed in the first lines of this plugin. --- .werks/40 | 15 +++++++++++++++ ChangeLog | 3 ++- agents/plugins/resolve_hostname | 20 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/.werks/40 b/.werks/40 new file mode 100644 index 0000000..073a1c8 --- /dev/null +++ b/.werks/40 @@ -0,0 +1,15 @@ +Title: Add agent plugin to test local hostname resolving +Level: 1 +Component: checks +Version: 1.2.3i6 +Date: 1383212574 +Class: feature + +In release 1.2.3i5 the Check DNS option in WATO has been +cleaned up. It is only meant for really checking DNS servers, +not the local resolver of a system. +If you like to test the local name resolving on a specific +host, you can deploy the agent plugin "resolve_hostname" +on the host you like to run the check on. The name to be +resolved needs to be changed in the first lines of this +plugin. diff --git a/ChangeLog b/ChangeLog index 13ff688..5d18336 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.3i6: Checks & Agents: + * 0040: Add agent plugin to test local hostname resolving... * FIX 0020: Inventory problem with inventory_processes parameter... Multisite: @@ -88,7 +89,7 @@ * FIX: local: tolerate invalid output lines * FIX: hp_proliant: Correct handling of missing snmp data * FIX: logwatch.ec: No longer forwards "I" lines to event console - * FIX: check_dns: default to querying the host itself + * FIX: check_dns: default to querying the DNS server on the localhost itself * FIX: ps: do not output perfdata of CPU averaging (use ps.perf for that) * FIX: nfsexports: also support systems with rpcbind instead of portmap * FIX: ups_in_freq: corrected spelling of service description diff --git a/agents/plugins/resolve_hostname b/agents/plugins/resolve_hostname new file mode 100755 index 0000000..2d2da36 --- /dev/null +++ b/agents/plugins/resolve_hostname @@ -0,0 +1,20 @@ +#!/bin/bash +# This check can be used to test the name resolution of a given host +# address using the local resolver of the system this script is +# running on. + +HOSTADDRESS=mathias-kettner.de + +OUTPUT=$(nslookup $HOSTADDRESS 2>&1) +RC=$? +if [ $RC -ne 0 ]; then + STATE=2 + OUTPUT="CRIT - $HOSTADDRESS could not be resolved" +else + STATE=0 + ADDRESSES=$(echo "$OUTPUT" | tail -n+3 | grep Address: | cut -d" " -f2) + OUTPUT="OK - $HOSTADDRESS resolved to ${ADDRESSES//$'\n'/, }" +fi + +echo "<<<mrpe>>>" +echo "Resolve_$HOSTADDRESS $STATE $OUTPUT"

10 years, 8 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: e6c80b0bd1447a0180902741178d3cc10f644c34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6c80b0bd1447a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 31 10:42:50 2013 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 425151f..e373ee6 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -40 +50

10 years, 8 months

Check_MK Git: check_mk: fixed prefix in commit message

by Andreas Boesl

Module: check_mk Branch: master Commit: b1044c2364fe1e4e8a5c835075f7b3ddbe40675d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1044c2364fe1e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 31 10:20:18 2013 +0100 fixed prefix in commit message --- werk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/werk b/werk index 2a41b7a..304bc1f 100755 --- a/werk +++ b/werk @@ -231,7 +231,9 @@ def git_commit(werk): title = werk["title"] for classid, classname, prefix in classes: if werk["class"] == classid: - title = prefix + title + if prefix: + title = "%s %s" % (prefix, title) + os.system("git commit -a -m %s" % quote_shell_string(title + "\n\n" + werk["description"])) def quote_shell_string(s):

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013