Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

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: 01076376ff42a095f249666657dd4581ffcb854b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01076376ff42a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 16:29:48 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: linux agent - ipmi: Creating directory of cache file if not exists

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 246e3e02c9128716b47d5af1e906e37b260f4f39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=246e3e02c91287… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 16:02:50 2011 +0100 linux agent - ipmi: Creating directory of cache file if not exists --- ChangeLog | 4 ++++ agents/check_mk_agent.linux | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a66111..63b9683 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.13i2 + Checks & Agents: + * linux agent - ipmi: Creating directory of cache file if not exists + 1.1.13i1: Multisite: * New nifty sidebar snapin "Speed-O-Meter" diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 0424c40..595a934 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -187,6 +187,9 @@ if which ipmitool >/dev/null then echo '<<<ipmi>>>' IPMI_FILE=$MK_CONFDIR/ipmitool_sensors.cache + if [ ! -d $MK_CONFDIR ]; then + mkdir -p $MK_CONFDIR + fi # Do not use cache file after 20 minutes IPMI_MAXAGE=1200

12 years, 6 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: d9814a291a9e9a9c7c9a7b2c895909f561d2a734 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9814a291a9e9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 16:12:51 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: Switched version to 1.1.13i2

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1a9491ec3171035b5775b20cf5e74351360d0c82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a9491ec317103… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 16:02:25 2011 +0100 Switched version to 1.1.13i2 --- 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 debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 1d23a31..db0263c 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.13i1 +VERSION = 1.1.13i2 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 15faae9..fde17f2 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.13i1 +echo Version: 1.1.13i2 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index bc755fb..2497640 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.13i1 +echo Version: 1.1.13i2 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 0cb78ab..bb65fee 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.13i1 +echo Version: 1.1.13i2 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 0424c40..f75f229 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.13i1 +echo Version: 1.1.13i2 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index c81a7d3..20f4c05 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.13i1 +echo Version: 1.1.13i2 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 1680b46..5798f48 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.13i1" +#define CHECK_MK_VERSION "1.1.13i2" #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 1a87076..743aa7f 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 b69d1ae..6574045 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/debian/files b/debian/files index 377e262..3a140a7 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.1.13i1-1_all.deb net optional +check-mk_1.1.13i2-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 3e1e333..8124054 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.13i1], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.13i2], [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 62589ba..0af62db 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.13i1 +VERSION=1.1.13i2 NAME=check_mk LANG= LC_ALL=

12 years, 6 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: 96c2e18da573407811917aa55cc5ac6c9fa39539 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96c2e18da57340… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 15:19:48 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: FIX: PNP template if if/if64: reset LC_ALL, avoids syntax error

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: df4ae23e54cb86c2a19d49b46a80b8270c4a2c87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df4ae23e54cb86… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 15:18:38 2011 +0100 FIX: PNP template if if/if64: reset LC_ALL, avoids syntax error --- ChangeLog | 1 + pnp-templates/check_mk-if.php | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a66111..c34d862 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,7 @@ * FIX: bluecoat_diskcpu: repair scan function * FIX: mem.vmalloc: fix default levels (32 and 64 was swapped) * FIX: smart: make levels work (thanks to Bernhard Schmidt) + * FIX: PNP template if if/if64: reset LC_ALL, avoids syntax error 1.1.12p4: Multisite: diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index fdab1f9..1012b70 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -23,6 +23,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +setlocale(LC_ALL, 'C'); + # Performance data from check: # in=6864.39071505;0.01;0.1;0;125000000.0 # inucast=48.496962273;0.01;0.1;;

12 years, 6 months

Check_MK Git: check_mk: Fixed the migration script from 1.1.12 wato to 1.1. 13 wato

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 461df8a12f552bea900487eac210d263287a4cd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=461df8a12f552b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 15:08:15 2011 +0100 Fixed the migration script from 1.1.12 wato to 1.1.13 wato --- doc/helpers/wato-migrate-1.2.0.sh | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/doc/helpers/wato-migrate-1.2.0.sh b/doc/helpers/wato-migrate-1.2.0.sh index 305d5d9..4578a80 100755 --- a/doc/helpers/wato-migrate-1.2.0.sh +++ b/doc/helpers/wato-migrate-1.2.0.sh @@ -46,12 +46,20 @@ then echo "-----------------------------------------" fi +echo find * -name "*.mk.wato" | while read line do - thedir=${line%/*} - thefile=${line##*/} - echo "Moving $thefile in $thedir..." - newdir="wato/${thefile%.mk.wato}" + tmpline=/$line + thedir=${tmpline%/*} + thedir=${thedir:1} + thefile=${tmpline##*/} + if [ -z "$thedir" ]; then + newdir=wato/${thefile//.mk.wato} + else + newdir=wato/$thedir/${thefile//.mk.wato} + fi + + echo "Migrating hostlist $thefile to folder $newdir..." mkdir -vp "$newdir" mv -v "$line" "$newdir/.wato" mv -v "${line%.wato}" "$newdir/hosts.mk" @@ -60,10 +68,11 @@ done # No move also the empty WATO directories find * -name ".wato" | while read line do - if [ ${line:0:7} = ./wato/ ] ; then continue ; fi + # Skip files in wato/ directory (already migrated) + if [ ${line:0:5} = wato/ ] ; then continue ; fi thedir=${line%/*} thefile=${line##*/} - echo "Moving empty directory $thedir..." + echo "Moving empty directory $thedir to wato/$thedir..." mkdir -p "wato/$thedir" mv -v $line "wato/$thedir" rmdir -v "$thedir" 2>/dev/null || true

12 years, 6 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: 7bd40dda75d6e2a74a7a852d6b9e53db95ce2945 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bd40dda75d6e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 15:11:48 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: WATO: fix editing of icon images (none-case)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91dedde6faf4d06996a69790755b0109f4de3861 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91dedde6faf4d0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 15:06:07 2011 +0100 WATO: fix editing of icon images (none-case) --- web/plugins/wato/check_mk_configuration.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 076e3d8..f5504eb 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -582,7 +582,7 @@ class MonitoringIcon(ValueSpec): def render_input(self, varprefix, value): num_columns = 12 html.write("<table>") - for nr, filename in enumerate([None] + self.available_icons()): + for nr, filename in enumerate([""] + self.available_icons()): if nr % num_columns == 0: html.write("<tr>") html.write("<td>") @@ -605,13 +605,13 @@ class MonitoringIcon(ValueSpec): def from_html_vars(self, varprefix): nr = int(html.var(varprefix)) if nr == 0: - return None + return "" else: return self.available_icons()[nr-1] def validate_datatype(self, value, varprefix): - if value != None and type(value) != str: - raise MKUserError(varprefix, _("The type is %s, but should be None or str") % + if type(value) != str: + raise MKUserError(varprefix, _("The type is %s, but should be str") % type(value)) def validate_value(self, value, varprefix):

12 years, 6 months

Check_MK Git: check_mk: FIX: add notifications to host/service event view

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7afc637cb8195f7091f6560110a3f965615683fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7afc637cb8195f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 14:56:46 2011 +0100 FIX: add notifications to host/service event view --- ChangeLog | 1 + web/plugins/views/datasources.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c99cd86..0a66111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,7 @@ * FIX: single dataset layout honors column header settings * FIX: quote '#' in PNP links (when # is contained in services) * FIX: quote '#' in PNP image links also + * FIX: add notifications to host/service event view Checks & Agents: * FIX: lnx_if: assume interfaces as up if ethtool is missing or diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 7ff4547..fc6eae2 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -139,7 +139,7 @@ multisite_datasources["log"] = { multisite_datasources["log_events"] = { "title" : _("Host and Service Events"), "table" : "log", - "add_headers" : "Filter: class = 1\n", + "add_headers" : "Filter: class = 1\nFilter: class = 3\nOr: 2\n", "infos" : [ "log", "host", "service" ], "keys" : [], "idkeys" : [ "log_lineno" ], @@ -148,7 +148,7 @@ multisite_datasources["log_events"] = { multisite_datasources["log_host_events"] = { "title" : _("Host Events"), "table" : "log", - "add_headers" : "Filter: class = 1\nFilter: service_description = \n", + "add_headers" : "Filter: class = 1\nFilter: class = 3\nOr: 2\nFilter: service_description = \n", "infos" : [ "log", "host" ], "keys" : [], "idkeys" : [ "log_lineno" ],

12 years, 6 months

← Newer
1
...
9
10
11
12
13
14
15
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011