Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: Set version to 1.1.10b1

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 63e4334d05a798d17e742661291c7cae65e9fd5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63e4334d05a798… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 15:53:51 2011 +0100 Set version to 1.1.10b1 --- 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 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index db5b658..574c130 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.9i10 +VERSION = 1.1.10b1 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 68a39e7..3c99c4d 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.9i10 +echo Version: 1.1.10b1 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index b5a508e..934a123 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.9i10 +echo Version: 1.1.10b1 echo AgentOS: freebsd # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 6dd58a6..89905d9 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.9i10 +echo Version: 1.1.10b1 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9e252d7..e07c7e2 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.9i10 +echo Version: 1.1.10b1 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 13cb99a..cf46bd3 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -38,7 +38,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i10 +echo Version: 1.1.10b1 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 7e4c38e..b7a76a4 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.9i10" +#define CHECK_MK_VERSION "1.1.10b1" #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 a1d825d..81a3c6a 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 8f291c5..73382a1 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/livestatus/configure.ac b/livestatus/configure.ac index e297c0c..eff7ca6 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.9i10], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.10b1], [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/install_nagios.sh b/scripts/install_nagios.sh index 73ecbb5..c6df59b 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -57,7 +57,7 @@ set -e NAGIOS_VERSION=3.2.3 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.4 -CHECK_MK_VERSION=1.1.9i10 +CHECK_MK_VERSION=1.1.10b1 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.6 diff --git a/scripts/setup.sh b/scripts/setup.sh index 35b5379..e9b7b89 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.9i10 +VERSION=1.1.10b1 NAME=check_mk LANG= LC_ALL=

13 years, 6 months

Check_MK Git: check_mk: Added perf-o-meter for h3c_lanswitch_cpu

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: d52c3ade2babf64c02b1c6115ac24a810e5cf901 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d52c3ade2babf6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 15:51:23 2011 +0100 Added perf-o-meter for h3c_lanswitch_cpu --- README.writing_checks | 4 +++- web/plugins/perfometer/check_mk.py | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/README.writing_checks b/README.writing_checks index 0e22d34..21771b0 100644 --- a/README.writing_checks +++ b/README.writing_checks @@ -134,7 +134,9 @@ Performance data: graph in its current (and maybe future) forms. Those are in pnp-rraconf. Use a symlink here. -* pnp rra configuration +* Each check that outputs performance data should have a perf-o-meter. + For checks part of Check_MK this must be done in web/plugins/perfometer/check_mk.py. + For third party checks this should be done in a separate file in web/plugins/perfometer. SNMP based checks: * Only use numeric OIDs in your checks. Name based OIDs rely on MIB files diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 28deb9c..8f6e0cd 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -241,3 +241,18 @@ def perfometer_oracle_sessions(row, check_command, perf_data): perfometers["check_mk-oracle_sessions"] = perfometer_oracle_sessions perfometers["check_mk-oracle_logswitches"] = perfometer_oracle_sessions +def perfometer_h3c_lanswitch_cpu(row, check_command, perf_data): + util = float(perf_data[0][1]) # is already percentage + warn = float(perf_data[0][3]) + crit = float(perf_data[0][4]) + if util < warn: + color = "#6f2" + elif util < crit: + color = "#9f2" + else: + color = "#cf2" + + return "%.0f%%" % util, perfometer_linear(util, color) + +#perfometer_linear(perc, color) +perfometers["check_mk-h3c_lanswitch_cpu"] = perfometer_h3c_lanswitch_cpu

13 years, 6 months

Check_MK Git: check_mk: Added perf-o-meter for h3c_lanswitch_cpu

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1d83f6081d2676961c4c004f11e57693b2816758 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d83f6081d2676… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 15:51:51 2011 +0100 Added perf-o-meter for h3c_lanswitch_cpu --- README.writing_checks | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.writing_checks b/README.writing_checks index 21771b0..b473704 100644 --- a/README.writing_checks +++ b/README.writing_checks @@ -59,8 +59,9 @@ Coding style must return None as parameter and the check function must name the parameter argument _no_params. -* The name of the inventory and check function must be prefixed with the name of the check type, for example inventory_h3c_lanswitch_cpu - for 'h3c_lanswitch' +* The name of the inventory and check function must be + prefixed with the name of the check type, for example + inventory_h3c_lanswitch_cpu for 'h3c_lanswitch' * Order of implementation:

13 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 mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 253b700219a186e73e74705e1beeb30e83f21a5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=253b700219a186… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 15:51:58 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 48583b397f622707e663d3991e117367a02841a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48583b397f6227… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 15:48:18 2011 +0100 Updated bug entries --- .bugs/111 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/111 b/.bugs/111 index 117e19c..fa23cc2 100644 --- a/.bugs/111 +++ b/.bugs/111 @@ -1,11 +1,15 @@ Title: View editor does not save tool tips (in group header) Component: multisite +State: done +Class: bug +Date: 2011-01-27 17:02:58 Benefit: 2 -State: open Cost: 1 -Date: 2011-01-27 17:02:58 -Class: bug +Fun: 0 When you add tooltips to a group column in the view editor, the tooltip is not saved. This might appear at normal columns also, but is not tested. + +2011-02-25 15:48:13: changed state open -> done +The tooltips work now in group headers

13 years, 6 months

Check_MK Git: check_mk: Multisite: Tooltips work in group headers now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91b8d5925e0d04b7c1caf60515c8f47e2d765050 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91b8d5925e0d04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 15:47:02 2011 +0100 Multisite: Tooltips work in group headers now --- ChangeLog | 1 + web/htdocs/views.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b37776..38a100e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * FIX: Customlinks snapin persists folding states again * FIX: PNP timerange painter option field takes selected value as default now * FIX: Fixed perfometer styling in single dataset layouts + * FIX: Tooltips work in group headers now WATO: * FIX: fix problem with vanishing services on Windows. Affected were services diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 88f30e7..e8c9498 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -868,10 +868,11 @@ def create_view(): for n in range(1, 500): pname = html.var("group_%d" % n) viewname = html.var("group_link_%d" % n) + tooltip = html.var("group_tooltip_%d" % n) if pname: if viewname not in html.available_views: viewname = None - group_painternames.append((pname, viewname)) + group_painternames.append((pname, viewname, tooltip)) painternames = [] # User can set more than max_display_columns. We cannot easily know @@ -1902,7 +1903,7 @@ def prepare_paint(p, row): content = link_to_view(content, row, linkview) # Tooltip - if tooltip: + if content != '' and tooltip: cla, txt = multisite_painters[tooltip]["paint"](row) tooltiptext = htmllib.strip_tags(txt) content = '<span title="%s">%s</span>' % (tooltiptext, content) @@ -1957,12 +1958,12 @@ def register_events(row): # two rows are in the same group or not def group_value(row, group_painters): group = [] - for p, l in group_painters: - groupvalfunc = p.get("groupby") + for p in group_painters: + groupvalfunc = p[0].get("groupby") if groupvalfunc: group.append(groupvalfunc(row)) else: - for c in p["columns"]: + for c in p[0]["columns"]: group.append(row[c]) return group

13 years, 6 months

Check_MK Git: check_mk: FIX: PNP timerange painter option field takes selected value as default now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: cd76deae979ce5ed5127917aa2f34cc0ddb370ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd76deae979ce5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 14:53:23 2011 +0100 FIX: PNP timerange painter option field takes selected value as default now --- ChangeLog | 1 + web/htdocs/views.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13a751a..f75c1eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * FIX: Fixed view column editor forgetting pending changes to other form fields * FIX: Customlinks snapin persists folding states again + * FIX: PNP timerange painter option field takes selected value as default now WATO: * FIX: fix problem with vanishing services on Windows. Affected were services diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 055df9c..88f30e7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -139,7 +139,7 @@ def show_painter_options(painter_options): html.write("<tr>") html.write("<td class=legend>%s</td>" % opt["title"]) html.write("<td class=content>") - html.select(on, opt["values"], opt["default"], "submit();" ) + html.select(on, opt["values"], get_painter_option(on), "submit();" ) html.write("</td></tr>\n") html.write("</table>\n")

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 99d47425d8e7c539bc77d12721d144a91ea5726d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99d47425d8e7c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 14:54:16 2011 +0100 Updated bug entries --- .bugs/150 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/150 b/.bugs/150 index e0d0cff..86ecc51 100644 --- a/.bugs/150 +++ b/.bugs/150 @@ -1,13 +1,17 @@ Title: Display options show wrong value at start Component: multisite +State: done +Class: bug +Date: 2011-02-18 09:44:34 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-18 09:44:34 -Class: bug +Fun: 0 When you enter a view where the display options for the PNP timerange had been set to 4 hours (which is persistet), then the graphs are showing 4 hours. Good. But when you open the tab "Display Options", the dropdown is preset to 25h (which is the default), rather then to 4h (which is the current setting). + +2011-02-25 14:54:12: changed state open -> done +Fixed. Using get_painter_option function now to retrieve the configured value

13 years, 6 months

Check_MK Git: check_mk: Multisite: Fixed perfometer styling in single dataset layouts

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 855913950f9c29d83b7d404c196e0b6505d95034 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=855913950f9c29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 15:20:27 2011 +0100 Multisite: Fixed perfometer styling in single dataset layouts --- ChangeLog | 1 + web/htdocs/check_mk.css | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f75c1eb..4b37776 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ fields * FIX: Customlinks snapin persists folding states again * FIX: PNP timerange painter option field takes selected value as default now + * FIX: Fixed perfometer styling in single dataset layouts WATO: * FIX: fix problem with vanishing services on Windows. Affected were services diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 583f1d4..95c5b4d 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -790,7 +790,9 @@ td.count { font-family: sans-serif; } -table.services tr.data td.perfometer { +/* Performeter styling */ + +td.perfometer { padding: 1px 2px; width: 120px; height: 22px; @@ -810,20 +812,21 @@ td.perfometer table { width: 120px; height: 22px; border-spacing: 0px; + border-collapse:collapse; padding: 0px; margin: 0px; border: 1px solid #aaa; height: 100%; } -table.services tr.data td.perfometer table td { +td.perfometer td { padding: 0px; margin: 0px; border: none; height: 22px; } -table.services tr.data td.perfometer a { +td.perfometer a { color: black; text-decoration: none; }

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f7b14a17ebb0f3284e0a506fbd95807958808021 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7b14a17ebb0f3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 15:21:05 2011 +0100 Updated bug entries --- .bugs/140 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/140 b/.bugs/140 index fc18009..3ef28e4 100644 --- a/.bugs/140 +++ b/.bugs/140 @@ -1,9 +1,13 @@ Title: Perf-O-Meter in single datasetlayout has wrong height Component: multisite +State: done +Class: bug +Date: 2011-02-16 10:18:38 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-16 10:18:38 -Class: bug +Fun: 0 Just try ist out. Height is too low. + +2011-02-25 15:20:58: changed state open -> done +Fixed CSS definitions of the perfometers. Some selectors were wrong.

13 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits