Checkmk git commits October 2011

checkmk-commits@lists.checkmk.com

2 participants
109 discussions

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: fdefe99347120ddce6fa8ccdebe974387d97d116 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdefe99347120d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 21 10:05:49 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 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: 5c4100cf7535c8abf8fa555b80b523ebf0cc774d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c4100cf7535c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 21 10:08:05 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0020

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8aba5e69481ad85ed20a625d93c8d75701aa6bcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8aba5e69481ad8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 21 10:07:32 2011 +0200 Updated bug entries #0020 --- .bugs/20 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.bugs/20 b/.bugs/20 index db32805..b6278a6 100644 --- a/.bugs/20 +++ b/.bugs/20 @@ -15,5 +15,6 @@ Meldungen aus den Threads kommen. Die Startmeldungen sollen trotzdem Problem ist, dass Nagios und vor allem Icinga abnippeln, wenn ein Thread die Logfunktion aufruft. + 2011-10-21 10:04:56: changed state open -> done Ist erledigt und dokumentiert.

12 years, 8 months

Check_MK Git: check_mk: gb: add bug ids to commit message

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf772ad89fda7ca74290dfe9fdeb1c642028b1bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf772ad89fda7c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 21 10:07:58 2011 +0200 gb: add bug ids to commit message --- gb | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/gb b/gb index 89c07ec..94c5210 100755 --- a/gb +++ b/gb @@ -494,7 +494,8 @@ def main_commit(args): sys.stdout.write("Commiting:\n") for id in g_modified: list_bug(g_bugs[id]) - if 0 == os.system("git commit -m 'Updated bug entries' ."): + if 0 == os.system("git commit -m 'Updated bug entries %s' ." % ( + ", ".join(["#%04d" % id for id in g_modified]))): sys.stdout.write("--> Successfully committed %d bugs.\n" % len(g_modified)) else: bail_out("Cannot commit.")

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9795ca48da165ade416e5815ddf7db3a9cad437a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9795ca48da165a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 21 10:04:59 2011 +0200 Updated bug entries --- .bugs/20 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/20 b/.bugs/20 index 40e0af2..db32805 100644 --- a/.bugs/20 +++ b/.bugs/20 @@ -1,10 +1,11 @@ Title: Eigenes Logfile für Livestatus Component: livestatus +State: done +Class: bug +Date: 2010-12-21 16:22:55 Benefit: 2 -State: open Cost: 1 -Date: 2010-12-21 16:22:55 -Class: bug +Fun: 0 Ein eigenes Logfile für Livestatus anlegen, sofern das konfiguriert wird (über Modul-Parameter). Dorthin sollen Debugmeldungen und alle @@ -13,3 +14,6 @@ Meldungen aus den Threads kommen. Die Startmeldungen sollen trotzdem Problem ist, dass Nagios und vor allem Icinga abnippeln, wenn ein Thread die Logfunktion aufruft. + +2011-10-21 10:04:56: changed state open -> done +Ist erledigt und dokumentiert.

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c2943667361431785efefec4521b17c49eb100c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2943667361431… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 08:52:01 2011 +0200 Updated bug entries --- .bugs/395 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/395 b/.bugs/395 new file mode 100644 index 0000000..f8466b5 --- /dev/null +++ b/.bugs/395 @@ -0,0 +1,10 @@ +Title: Alias is created twice +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2011-10-18 08:51:10 +Class: cleanup + +When a host gets an explicit alias, the host definition will contain +two alias entries. One should be removed.

12 years, 8 months

Check_MK Git: check_mk: Dashboard: use more space on the right side

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 940af76d55a3e78805c4c917b03e8f512ca3a9a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=940af76d55a3e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 08:46:22 2011 +0200 Dashboard: use more space on the right side --- web/htdocs/js/dashboard.js | 2 +- web/plugins/dashboard/builtin.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 462234c..b96d812 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -98,7 +98,7 @@ function resize_dashlets(id, code) function set_dashboard_size() { - var body_padding = 10; + var body_padding = 0; var width = pageWidth(); var height = pageHeight(); width = width - 2*screen_margin - 2*body_padding; diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 9064434..7215a84 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -28,17 +28,17 @@ builtin_dashboards = { "main" : { "title" : _("Main Overview"), "dashlets" : [ - { - "url" : "dashlet_mk_logo.py", - "position" : (1, 1), - "size" : (4, 5), - "shadow" : False, - "background" : False, - }, +# { +# "url" : "dashlet_mk_logo.py", +# "position" : (1, 1), +# "size" : (4, 5), +# "shadow" : False, +# "background" : False, +# }, { "title" : _("Host Statistics"), "url" : "dashlet_hoststats.py", - "position" : (6, 1), + "position" : (1, 1), "size" : (10, 6), "shadow" : True, "background" : True, @@ -47,7 +47,7 @@ builtin_dashboards = { { "title" : _("Service Statistics"), "url" : "dashlet_servicestats.py", - "position" : (16, 1), + "position" : (11, 1), "size" : (10, 6), "shadow" : True, "background" : True,

12 years, 8 months

Check_MK Git: check_mk: Update ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2d14d3e2d757f8cbcfc66b3c0193a9e0d844eacd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d14d3e2d757f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 08:47:42 2011 +0200 Update ChangeLog --- ChangeLog | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8b4fa9..c6bb332 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.1.12b2: + Multisite: + * Remove Check_MK logo from default dashboard + * Let dashboard use 10 more pixels right and bottom + 1.1.12b1: Core, Setup, etc.: * FIX: fix cmk -D on cluster hosts

12 years, 8 months

Check_MK Git: check_mk: Switched version to 1.1.12b2

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f639294cc0991b9259b32d5c4133f84755ea1796 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f639294cc0991b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 16 14:05:50 2011 +0200 Switched version to 1.1.12b2 --- 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.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 97280 -> 97280 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 12 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 4f3f9b4..7e786e8 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.12b1 +VERSION = 1.1.12b2 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot @@ -102,6 +102,7 @@ mk-livestatus: 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 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 5ed3bcc..c669343 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.12b1 +echo Version: 1.1.12b2 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 9c1c79b..764fd53 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.12b1 +echo Version: 1.1.12b2 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index ca421d0..aab9625 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.12b1 +echo Version: 1.1.12b2 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a985ff4..bf75078 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.12b1 +echo Version: 1.1.12b2 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 69ced44..421c096 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.12b1 +echo Version: 1.1.12b2 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index c80c73b..3bb9077 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.12b1" +#define CHECK_MK_VERSION "1.1.12b2" #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 d003fe4..a9ea99e 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 abde0a3..cd59684 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/debian/files b/debian/files index 1767909..7b81f7f 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.1.12b1-1_all.deb net optional +check-mk_1.1.12b2-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 442eeee..1efcc9a 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.12b1], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.12b2], [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 fc22548..c66c43f 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.12b1 +VERSION=1.1.12b2 NAME=check_mk LANG= LC_ALL=

12 years, 8 months

Check_MK Git: check_mk: Changed some more localisation strings

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 373dd4b4c054fc940376715d0779e9b11ecc2d01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=373dd4b4c054fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 13:03:12 2011 +0200 Changed some more localisation strings --- web/htdocs/wato.py | 2 +- web/plugins/views/sorters.py | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0133f5d..8221051 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1376,7 +1376,7 @@ def mode_bulk_inventory(phase): # Start button html.write('<tr><td colspan=2 class="buttons">') - html.button("_start", _("Start!")) + html.button("_start", _("Start")) html.write("</tr>") html.write("</table>") diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 0ad3848..75e1d56 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -166,52 +166,52 @@ def cmp_perfdata_nth_value(r1, r2, n): return cmp(saveint(get_perfdata_nth_value(r1, n)), saveint(get_perfdata_nth_value(r2, n))) multisite_sorters['svc_perf_val01'] = { - "title" : _("Service performance data - value number 01"), + "title" : _("Service performance data - value number %02d") % 1, "columns" : [ 'service_perf_data' ], "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 0), } multisite_sorters['svc_perf_val02'] = { - "title" : _("Service performance data - value number 02"), + "title" : _("Service performance data - value number %02d"), "columns" : [ 'service_perf_data' ], - "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 1), + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 1 % 2), } multisite_sorters['svc_perf_val03'] = { - "title" : _("Service performance data - value number 03"), + "title" : _("Service performance data - value number %02d" % 3), "columns" : [ 'service_perf_data' ], "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 2), } multisite_sorters['svc_perf_val04'] = { - "title" : _("Service performance data - value number 04"), + "title" : _("Service performance data - value number %02d" % 4), "columns" : [ 'service_perf_data' ], "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 3), } multisite_sorters['svc_perf_val05'] = { - "title" : _("Service performance data - value number 05"), + "title" : _("Service performance data - value number %02d" % 5), "columns" : [ 'service_perf_data' ], "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 4), } multisite_sorters['svc_perf_val06'] = { - "title" : _("Service performance data - value number 06"), + "title" : _("Service performance data - value number %02d" % 6), "columns" : [ 'service_perf_data' ], "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 5), } multisite_sorters['svc_perf_val07'] = { - "title" : _("Service performance data - value number 07"), + "title" : _("Service performance data - value number %02d" % 7), "columns" : [ 'service_perf_data' ], "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 6), } multisite_sorters['svc_perf_val08'] = { - "title" : _("Service performance data - value number 08"), + "title" : _("Service performance data - value number %02d" % 8), "columns" : [ 'service_perf_data' ], "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 7), } multisite_sorters['svc_perf_val09'] = { - "title" : _("Service performance data - value number 09"), + "title" : _("Service performance data - value number %02d" % 9), "columns" : [ 'service_perf_data' ], "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 8), } multisite_sorters['svc_perf_val10'] = { - "title" : _("Service performance data - value number 10"), + "title" : _("Service performance data - value number %02d" % 10), "columns" : [ 'service_perf_data' ], "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 9), }

12 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2011