Checkmk git commits February 2012

checkmk-commits@lists.checkmk.com

3 participants
223 discussions

Check_MK Git: check_mk: WATO: Better output in case of inventory error

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fea02d5aa329057e7d0a4c89e3424d57dc91bd92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fea02d5aa32905… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 15:34:10 2012 +0100 WATO: Better output in case of inventory error --- ChangeLog | 1 + modules/automation.py | 132 ++++++++++++++++++++++++++++++++++--------------- 2 files changed, 93 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index b79f236..140ba57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ WATO: * Distributed WATO: Made all url calls using curl now * FIX: fix bug in inventory in validate_datatype() + * Better output in case of inventory error Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/modules/automation.py b/modules/automation.py index 1e19a80..0b72d5e 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -173,25 +173,51 @@ def automation_try_inventory_node(hostname): except: raise MKAutomationError("Cannot lookup IP address of host %s" % hostname) - f = [] + found_services = [] + + dual_host = is_snmp_host(hostname) and is_tcp_host(hostname) # if we are using cache files, then we restrict us to existing # check types. SNMP scan is only done without the --cache option + snmp_error = None if is_snmp_host(hostname): - if opt_use_cachefile: - existing_checks = set([ cn for (cn, item) in get_check_table(hostname) ]) - for cn in inventorable_checktypes("snmp"): - if cn in existing_checks: - f += make_inventory(cn, [hostname], True, True) - else: - f = do_snmp_scan([hostname], True, True) + try: + if opt_use_cachefile: + existing_checks = set([ cn for (cn, item) in get_check_table(hostname) ]) + for cn in inventorable_checktypes("snmp"): + if cn in existing_checks: + found_services += make_inventory(cn, [hostname], True, True) + else: + sys_descr = get_single_oid(hostname, ipaddress, ".1.3.6.1.2.1.1.1.0") + if sys_descr != None: + found_services = do_snmp_scan([hostname], True, True) + else: + raise MKSNMPError("Cannot get system description via SNMP. " + "SNMP agent is not responding. Probably wrong " + "community or wrong SNMP version.") + + except Exception, e: + if not dual_host: + raise + snmp_error = str(e) + tcp_error = None if is_tcp_host(hostname): - for cn in inventorable_checktypes("tcp"): - f += make_inventory(cn, [hostname], True, True) + try: + for cn in inventorable_checktypes("tcp"): + found_services += make_inventory(cn, [hostname], True, True) + except Exception, e: + if not dual_host: + raise + tcp_error = str(e) + + # raise MKAutomationError("%s/%s/%s" % (dual_host, snmp_error, tcp_error)) + if dual_host and snmp_error and tcp_error: + raise MKAutomationError("Error using TCP (%s)\nand SNMP (%s)" % + (tcp_error, snmp_error)) found = {} - for hn, ct, item, paramstring, state_type in f: + for hn, ct, item, paramstring, state_type in found_services: found[(ct, item)] = ( state_type, paramstring ) # Check if already in autochecks (but not found anymore) @@ -210,6 +236,7 @@ def automation_try_inventory_node(hostname): for cmd, descr, perf in legchecks: found[('legacy', descr)] = ( 'legacy', 'None' ) + # Collect current status information about all existing checks table = [] for (ct, item), (state_type, paramstring) in found.items(): if state_type != 'legacy': @@ -220,48 +247,73 @@ def automation_try_inventory_node(hostname): opt_dont_submit = True try: + exitcode = None + perfdata = [] info = get_host_info(hostname, ipaddress, infotype) # Handle cases where agent does not output data except MKAgentError, e: - if str(e) == "": - continue - else: - raise - except MKSNMPError, e: - if str(e) == "": - continue - else: - raise + exitcode = 3 + output = "Error getting data from agent" + if str(e): + output += ": %s" % e + tcp_error = output - check_function = check_info[ct][0] - # apply check_parameters - try: - if type(paramstring) == str: - params = eval(paramstring) - else: - params = paramstring - except: - raise MKAutomationError("Invalid check parameter string '%s'" % paramstring) - if state_type != 'manual': - params = compute_check_parameters(hostname, ct, item, params) + except MKSNMPError, e: + exitcode = 3 + output = "Error getting data from agent for %s via SNMP" % infotype + if str(e): + output += ": %s" % e + snmp_error = output - try: - result = check_function(item, params, info) - except MKCounterWrapped, e: - result = (None, "WAITING - Counter based check, cannot be done offline") except Exception, e: - result = (3, "UNKNOWN - invalid output from agent or error in check implementation") - if len(result) == 2: - result = (result[0], result[1], []) - exitcode, output, perfdata = result + exitcode = 3 + output = "Error getting data for %s: %s" % (infotype, e) + if check_uses_snmp(ct): + snmp_error = output + else: + tcp_error = output + + if exitcode == None: + check_function = check_info[ct][0] + # apply check_parameters + try: + if type(paramstring) == str: + params = eval(paramstring) + else: + params = paramstring + except: + raise MKAutomationError("Invalid check parameter string '%s'" % paramstring) + if state_type != 'manual': + params = compute_check_parameters(hostname, ct, item, params) + + try: + result = check_function(item, params, info) + except MKCounterWrapped, e: + result = (None, "WAITING - Counter based check, cannot be done offline") + except Exception, e: + result = (3, "UNKNOWN - invalid output from agent or error in check implementation") + if len(result) == 2: + result = (result[0], result[1], []) + exitcode, output, perfdata = result else: descr = item exitcode = None output = "WAITING - Legacy check, cannot be done offline" perfdata = [] + checkgroup = checkgroup_of.get(ct) table.append((state_type, ct, checkgroup, item, paramstring, params, descr, exitcode, output, perfdata)) + if not table and (tcp_error or snmp_error): + error = "" + if snmp_error: + error = "Error getting data via SNMP: %s" % snmp_error + if tcp_error: + if error: + error += ", " + error += "Error getting data from Check_MK agent: %s" % tcp_error + raise MKAutomationError(error) + return table # Set the new list of autochecks. This list is specified by a

12 years, 4 months

Check_MK Git: check_mk: FIX: fix bug in inventory in validate_datatype()

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73a8d3bb25bc790f94ea9410af8cb56e2c217741 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73a8d3bb25bc79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 14:40:53 2012 +0100 FIX: fix bug in inventory in validate_datatype() --- ChangeLog | 1 + web/htdocs/valuespec.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fbcb19..b79f236 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ WATO: * Distributed WATO: Made all url calls using curl now + * FIX: fix bug in inventory in validate_datatype() Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e25ffa5..83c370c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -862,7 +862,7 @@ class OptionalDropdownChoice(ValueSpec): for val, title in self._choices: if val == value: return - self._explicit.validate_datatype(self, value, varprefix + "_ex") + self._explicit.validate_datatype(value, varprefix + "_ex") # Input of date with optimization for nearby dates

12 years, 4 months

Check_MK Git: check_mk: CascadingDropdown: fix initially displayed valued

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e5d1f16edba0d8976e90cd567036baf8c15d1396 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5d1f16edba0d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 12:28:11 2012 +0100 CascadingDropdown: fix initially displayed valued --- web/htdocs/valuespec.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 516463c..e25ffa5 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -637,7 +637,7 @@ class CascadingDropdown(ValueSpec): options.append((str(nr), title)) if value == val or ( type(value) == tuple and value[0] == val): - def_val = nr + def_val = str(nr) vp = varprefix + "_sel" onchange="valuespec_cascading_change(this, '%s', %d);" % (varprefix, len(self._choices))

12 years, 4 months

Check_MK Git: check_mk: config.py: make user_alias availabe

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 259af1bb334e159aa9c08f72dcbab5b4a5cc8213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=259af1bb334e15… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 12:03:41 2012 +0100 config.py: make user_alias availabe --- web/htdocs/config.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index c3f96ce..13c04e2 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -274,11 +274,13 @@ def login(u): user_baserole_id = "guest" # Prepare user object - global user + global user, user_alias if u in multisite_users: user = multisite_users[u] + user_alias = user.get("alias", user_id) else: user = { "roles" : user_role_ids } + user_alias = user_id # Prepare cache of already computed permissions global user_permissions

12 years, 4 months

Check_MK Git: check_mk: ValueSpec Float: decimal_separator

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1f34bb842dc89e355cf1cf1cbe2d9f47e346a894 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f34bb842dc89e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 11:53:02 2012 +0100 ValueSpec Float: decimal_separator --- web/htdocs/valuespec.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index d6267e0..516463c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -479,10 +479,15 @@ class ListOfStrings(ValueSpec): class Float(Integer): def __init__(self, **kwargs): Integer.__init__(self, **kwargs) + self._decimal_separator = kwargs.get("decimal_separator", ".") + self._display_format = kwargs.get("display_format", "%.2f") def canonical_value(self): return float(Integer.canonical_value(self)) + def value_to_text(self, value): + return Integer.value_to_text(self, value).replace(".", self._decimal_separator) + def from_html_vars(self, varprefix): try: return float(html.var(varprefix))

12 years, 4 months

Check_MK Git: check_mk: New tool: livedump

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 61c149252f86485ec21d4c934be694f6bd0e6e0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61c149252f8648… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 09:32:53 2012 +0100 New tool: livedump --- ChangeLog | 11 +- doc/treasures/README.livedump | 65 +++++++++ doc/treasures/livedump | 310 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 382 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=61c149252f…

12 years, 4 months

Check_MK Git: check_mk: Improve CascadingDropdown

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 32ba1d04d0b19cbb3586b96ed1497cdfe285ef63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32ba1d04d0b19c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 7 13:58:51 2012 +0100 Improve CascadingDropdown --- web/htdocs/valuespec.py | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 21e3d65..d6267e0 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -265,6 +265,7 @@ class Filesize(Integer): class TextAscii(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) + self._label = kwargs.get("label") self._size = kwargs.get("size", 30) self._strip = kwargs.get("strip", True) self._allow_empty = kwargs.get("allow_empty", True) @@ -278,6 +279,9 @@ class TextAscii(ValueSpec): return "" def render_input(self, varprefix, value): + if self._label: + html.write(self._label) + html.write(" ") html.text_input(varprefix, str(value), size = self._size) def value_to_text(self, value): @@ -595,7 +599,9 @@ class DropdownChoice(ValueSpec): # The currently selected ValueSpec will be displayed. # The text representations of the ValueSpecs will be used as texts. # A ValueSpec of None is also allowed and will return -# the value None. +# the value None. It is also allowed to leave out the +# value spec for some of the choices (which is the same as +# using None). # The resulting value is either a single value (if no # value spec is defined for the selected entry) or a pair # of (x, y) where x is the value of the selected entry and @@ -604,7 +610,11 @@ class DropdownChoice(ValueSpec): class CascadingDropdown(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) - self._choices = kwargs["choices"] + self._choices = [] + for entry in kwargs["choices"]: + if len(entry) == 2: + entry = entry + (None,) + self._choices.append(entry) self._separator = kwargs.get("separator", ", ") self._html_separator = kwargs.get("html_separator", "<br>") self._sorted = kwargs.get("sorted", True) @@ -642,13 +652,14 @@ class CascadingDropdown(ValueSpec): else: def_val = vs.default_value() disp = "none" - html.write('<div id="%s_%s_sub" style="display: %s">' % (varprefix, nr, disp)) + html.write('<span id="%s_%s_sub" style="display: %s">' % (varprefix, nr, disp)) vs.render_input(vp, def_val) - html.write('</div>') + html.write('</span>') def value_to_text(self, value): for val, title, vs in self._choices: - if value[0] == val: + if (vs and value[0] == val) or \ + (value == val): if not vs: return title else:

12 years, 4 months

Check_MK Git: check_mk: Switched version to 1.1.13i4

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 205f7d4180d05a05018c9c439bddbd44b2371b30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=205f7d4180d05a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 15:49:40 2012 +0100 Switched version to 1.1.13i4 --- 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.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 124966 -> 124967 bytes agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 14 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 8618985..f6c1490 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.13i3 +VERSION = 1.1.13i4 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 dea2b08..89ce3e4 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.13i3 +echo Version: 1.1.13i4 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index b8a9d23..5cbb1e9 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.1.13i3 +echo Version: 1.1.13i4 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 825a69b..727e0fb 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.1.13i3 +echo Version: 1.1.13i4 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 916bcee..a78eb77 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.1.13i3 +echo Version: 1.1.13i4 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index df1b381..4cf39ab 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -42,7 +42,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.13i3 +echo Version: 1.1.13i4 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a9fe798..a9d8880 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -73,7 +73,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.1.13i3" +#define CHECK_MK_VERSION "1.1.13i4" #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 6db1153..00eaf21 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 440df3f..1dae2f4 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 dc84247..a20d65b 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 7bd35aa..d7e6a6b 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.13i4" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index cf933b9..dc3408d 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.1.13i3-1_all.deb net optional +check-mk_1.1.13i4-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 011ca02..5b4a7a6 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.1.13i3], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.13i4], [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 9f9425d..6345c36 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.13i3 +VERSION=1.1.13i4 NAME=check_mk LANG= LC_ALL=

12 years, 4 months

Check_MK Git: check_mk: Switched version to 1.1.13i4

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a1f6622d6b864e386b9ff30293fd425509d01044 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1f6622d6b864e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 15:46:31 2012 +0100 Switched version to 1.1.13i4 --- 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.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 124966 -> 124971 bytes agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 14 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 8618985..f6c1490 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.13i3 +VERSION = 1.1.13i4 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 dea2b08..89ce3e4 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.13i3 +echo Version: 1.1.13i4 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index b8a9d23..5cbb1e9 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.1.13i3 +echo Version: 1.1.13i4 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 825a69b..727e0fb 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.1.13i3 +echo Version: 1.1.13i4 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 916bcee..a78eb77 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.1.13i3 +echo Version: 1.1.13i4 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index df1b381..4cf39ab 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -42,7 +42,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.13i3 +echo Version: 1.1.13i4 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a9fe798..a9d8880 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -73,7 +73,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.1.13i3" +#define CHECK_MK_VERSION "1.1.13i4" #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 6db1153..7d33eda 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 440df3f..0c14fda 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 dc84247..af48ae2 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 7bd35aa..d7e6a6b 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.13i4" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index cf933b9..dc3408d 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.1.13i3-1_all.deb net optional +check-mk_1.1.13i4-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 011ca02..5b4a7a6 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.1.13i3], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.13i4], [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 9f9425d..6345c36 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.13i3 +VERSION=1.1.13i4 NAME=check_mk LANG= LC_ALL=

12 years, 4 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: 1ca2fefc918e4b5333abb52f8529287c9198f07d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ca2fefc918e4b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 15:46:36 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

← Newer
1
...
15
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2012