Checkmk git commits September 2012

checkmk-commits@lists.checkmk.com

1 participants
212 discussions

Check_MK Git: check_mk: Updated bug entries #0761, #0723

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4143f9de93d4a0a878197cd80a4d54acbce6d63e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4143f9de93d4a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 24 14:07:18 2012 +0200 Updated bug entries #0761, #0723 --- .bugs/723 | 7 +++++-- .bugs/761 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/723 b/.bugs/723 index eecd7ef..d98a119 100644 --- a/.bugs/723 +++ b/.bugs/723 @@ -1,12 +1,15 @@ Title: Simulation mode overrides usewalk_hosts Component: core -State: open +Class: nastiness +State: wontfix Date: 2012-08-16 12:55:42 Targetversion: 1.2.0 -Class: nastiness If you have some hosts defined as usewalk hosts so that they'll check based on their already recorded snmpwalks and then enable simulation_mode, it breaks usewalk for some reason. The result is that the snmp devices are checked against 127.0.0.1. This is a big problem if you simulate a customer site. + +2012-09-24 14:06:03: changed state open -> wontfix +Thats the way we want it to be. diff --git a/.bugs/761 b/.bugs/761 index c3c2287..0302f87 100644 --- a/.bugs/761 +++ b/.bugs/761 @@ -1,11 +1,14 @@ Title: ValueSpec ListOf breaks during user input error Component: multisite -State: open +Class: bug +State: done Date: 2012-05-30 10:23:56 Targetversion: 1.2.0 -Class: bug When an element of a ListOf() raises a user validation error then the total ListOf() seems to fall back to its original value - for example I've added a value and then changed its position to top and then saved. + +2012-09-24 14:07:12: changed state open -> done +Repaired.

11 years, 11 months

Check_MK Git: check_mk: ValueSpec Dict: new horizontal layout possible

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08dd7535c575fcbcdd530d03936b8583fef47e29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08dd7535c575fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 24 13:56:33 2012 +0200 ValueSpec Dict: new horizontal layout possible --- web/htdocs/htmllib.py | 5 +++- web/htdocs/valuespec.py | 63 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 50 insertions(+), 18 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index cc5a93a..ca5ae2e 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -642,7 +642,10 @@ class html: # Check if the current form is currently filled in (i.e. we display # the form a second time while showing value typed in at the first # time and complaining about invalid user input) - def form_filled_in(self): + def form_filled_in(self, form_name = None): + if form_name == None: + form_name = self.form_name + return self.has_var("filled_in") and ( self.form_name == None or \ self.form_name in self.list_var("filled_in")) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8fce87b..cb1495f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1297,18 +1297,25 @@ class AbsoluteDate(ValueSpec): if self._label: html.write("%s " % self._label) - html.write('<table class=vs_date>') if self._show_titles: + html.write('<table class=vs_date>') html.write('<tr><th>%s</th><th>%s</th><th>%s</th></tr>' % ( _("Year"), _("Month"), _("Day"))) - html.write('<tr><td>') + html.write('<tr><td>') year, month, day = self.split_date(value) html.number_input(varprefix + "_year", year, size=4) - html.write('</td><td>') + if self._show_titles: + html.write('</td><td>') + else: + html.write(" ") html.number_input(varprefix + "_month", month, size=2) - html.write('</td><td>') + if self._show_titles: + html.write('</td><td>') + else: + html.write(" ") html.number_input(varprefix + "_day", day, size=2) - html.write('</td></tr></table>') + if self._show_titles: + html.write('</td></tr></table>') def set_focus(self, varprefix): html.set_focus(varprefix + "_year") @@ -1760,12 +1767,14 @@ class Dictionary(ValueSpec): if self._render == "form": self.render_input_form(varprefix, value) else: - self.render_input_normal(varprefix, value) + self.render_input_normal(varprefix, value, self._render == "oneline") - def render_input_normal(self, varprefix, value): - html.write("<table class=dictionary>") + def render_input_normal(self, varprefix, value, oneline = False): + if not oneline: + html.write("<table class=dictionary>") for param, vs in self._elements: - html.write('<tr><td class=dictleft>') + if not oneline: + html.write('<tr><td class=dictleft>') div_id = varprefix + "_d_" + param vp = varprefix + "_p_" + param if self._optional_keys and param not in self._required_keys: @@ -1779,22 +1788,29 @@ class Dictionary(ValueSpec): visible = True if vs.title(): html.write(" %s" % vs.title()) + if oneline: + html.write(": ") if self._columns == 2: if vs.title(): html.write(':') html.help(vs.help()) - html.write('</td><td class=dictright>') + if not oneline: + html.write('</td><td class=dictright>') else: - html.write("<br>") + if not oneline: + html.write("<br>") html.write('<div class=dictelement id="%s" style="display: %s">' % ( - div_id, not visible and "none" or "")) + div_id, not visible and "none" or (oneline and "inline-block" or ""))) if self._columns == 1: html.help(vs.help()) vs.render_input(vp, value.get(param, vs.default_value())) - html.write("</div></td></tr>") - html.write("</table>") + html.write("</div>") + if not oneline: + html.write("</td></tr>") + if not oneline: + html.write("</table>") def render_input_form(self, varprefix, value): if self._headers: @@ -1849,14 +1865,27 @@ class Dictionary(ValueSpec): return def_val def value_to_text(self, value): + oneline = self._render == "oneline" if not value: return self._empty_text - s = '<table>' + + if not oneline: + s = '<table>' + else: + s = "" for param, vs in self._elements: if param in value: - s += "<tr><td>%s</td><td>%s</td></tr>" % (vs.title(), vs.value_to_text(value[param])) - return s + '</table>' + text = vs.value_to_text(value[param]) + if oneline: + if param != self._elements[0][0]: + s += ", " + s += "%s: %s" % (vs.title(), text) + else: + s += "<tr><td>%s</td><td>%s</td></tr>" % (vs.title(), text) + if not oneline: + s += '</table>' + return s def from_html_vars(self, varprefix): value = {}

11 years, 11 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: f9729e8ab3c86146bda2a234a660d54ad8353e58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9729e8ab3c861… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 24 13:56:40 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Fixed reged handling in check_http

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 04eaaa97ddc98bc7e2c095033158ec74affe977d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04eaaa97ddc98b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 24 12:02:53 2012 +0200 Fixed reged handling in check_http --- checks/check_http | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/checks/check_http b/checks/check_http index 46bfbb5..9a3f31c 100644 --- a/checks/check_http +++ b/checks/check_http @@ -84,9 +84,11 @@ def check_http_arguments(params): args += ' -s %s' % quote_shell_string(settings["expect_string"]) if "expect_regex" in settings: - args += ' -r %s' % quote_shell_string(settings['expect_regex'][0]) if settings['expect_regex'][1]: args += ' -R' + else: + args += ' -r' + args += ' %s' % quote_shell_string(settings['expect_regex'][0]) if settings['expect_regex'][2]: args += ' --invert-regex'

11 years, 11 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: 0ec0d7a83c4cedc5bc514a99b36f44f43e3ccd5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ec0d7a83c4ced… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 24 12:03:02 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Fixed missing sign

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b10577949beb0a9ae57fb8e9caa12dde4963cc49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b10577949beb0a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 11:56:34 2012 +0200 Fixed missing sign --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20c81a4..129299c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.2.1i1 +1.2.1i1: Core: * Allow to add options to rules. Currently the options "disabled" and "comment" are allowed. Options are kept in an optional dict at the

11 years, 11 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 42c1ef80253e3d5212c467d0a41a6c24cb5d2201 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42c1ef80253e3d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 11:54:15 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Updated version to 1.2.1i1

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6167d1e97318183a9ed27adcafe18dcfb4d63355 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6167d1e9731818… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 11:54:08 2012 +0200 Updated version to 1.2.1i1 --- Makefile | 3 ++- 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 105472 -> 105472 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 126266 -> 127803 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 22511 -> 22511 bytes debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 19 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index edaf85a..3ba36cb 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.0p3 +VERSION = 1.2.1i1 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot @@ -104,6 +104,7 @@ version: [ "$$(head -c 12 /etc/issue)" = "Ubuntu 10.10" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 11.04" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 11.10" \ + -o "$$(head -c 12 /etc/issue)" = "Ubuntu 12.04" \ -o "$$(head -c 20 /etc/issue)" = "Debian GNU/Linux 6.0" ] \ || { echo 'You are not on the reference system!' ; exit 1; } @newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \ diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 4c1e96f..1856fde 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -40,7 +40,7 @@ LOCALDIR=$MK_LIBDIR/local export LC_NUMERIC="en_US" echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i1 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 3dc4198..1b28acd 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.0p3 +echo Version: 1.2.1i1 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 2a3ca9b..863698f 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i1 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 069680a..96578be 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i1 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index a943469..1b9b8c0 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -34,7 +34,7 @@ export MK_LIBDIR="/to/be/changed" export MK_CONFDIR="/to/be/changed" echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i1 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index d65437c..25d6f4c 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.0p2 +echo Version: 1.2.1i1 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 366cbd5..8130284 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.0p2 +echo Version: 1.2.1i1 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index 8217395..c61e175 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.0p3" +$say "Version: 1.2.1i1" $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 961e785..2a0bce9 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -41,7 +41,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i1 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 7e20554..64d32da 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.0p3" +#define CHECK_MK_VERSION "1.2.1i1" #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 539941a..983771b 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 02c2f2a..d563c00 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 c98e6ff..f0deecf 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 16d3021..91a654f 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.0p3" +!define CHECK_MK_VERSION "1.2.1i1" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 1aed146..6300f78 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index 96a7de8..9cbf72f 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.0p3-1_all.deb net optional +check-mk_1.2.1i1-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index f560801..e78cd09 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.0p3], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.1i1], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/setup.sh b/scripts/setup.sh index 58c1aca..4a530d1 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.0p3 +VERSION=1.2.1i1 NAME=check_mk LANG= LC_ALL=

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0742

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b822ea8a68135587ca3222e0bcd60af7a2c66839 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b822ea8a681355… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 24 10:53:21 2012 +0200 Updated bug entries #0742 --- .bugs/742 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/742 b/.bugs/742 new file mode 100644 index 0000000..2185147 --- /dev/null +++ b/.bugs/742 @@ -0,0 +1,9 @@ +Title: Livestatus Error when searching with wildcards in multisite +Component: multisite +State: open +Date: 2012-09-24 10:51:47 +Targetversion: future +Class: nastiness + +A Search with wildcards in the quicksearch, leads to: +Livestatus problem: Unhandled exception: 400: error in Filter header: invalid regular expression '*omd*'

11 years, 11 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: 555b74cb44c4679b569d47211fc409e436d3cec9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=555b74cb44c467… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 24 11:52:14 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

← Newer
1
2
3
4
5
6
7
8
9
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2012