Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64204 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: 52c88e00689b623939e7ad6d099f780203f53435 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52c88e00689b62… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 26 09:35:08 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Sidebar localization

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eec8eebfe82080466b0f3cb3dea3297ab80add74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eec8eebfe82080… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 26 09:34:57 2012 +0100 Sidebar localization --- web/htdocs/sidebar.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 6fe7a03..2f2781a 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -132,7 +132,7 @@ def sidebar_foot(): if config.may("logout"): html.write('<li><a class=logout target="_top" href="logout.py" title="%s"></a></li>' % _('Logout')) html.write('</ul>') - html.write("<div class=copyright>© <a target=\"main\" href=\"http://mathias-kettner.de\">Mathias Kettner</a></div>\n") + html.write("<div class=copyright>%s</div>\n" % _("© <a target=\"main\" href=\"http://mathias-kettner.de\">Mathias Kettner</a>")) html.write('</div>') # Standalone sidebar

12 years, 8 months

Check_MK Git: check_mk: Fixed wrong indent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 39731dfc9bb3180a04090744de91dbf05ad06d8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39731dfc9bb318… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 26 14:27:31 2012 +0100 Fixed wrong indent --- checks/dmraid | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/dmraid b/checks/dmraid index 32201f2..c02e28e 100644 --- a/checks/dmraid +++ b/checks/dmraid @@ -56,8 +56,8 @@ def check_dmraid_pdisks(item, _no_params, info): if disk == item: status = line[4].split(",")[0] if status == "ok": - pos=line.index("Model:") - model=" ".join(line[pos+1:]) + pos=line.index("Model:") + model=" ".join(line[pos+1:]) return (0, "OK - Online (%s)" % model) else: return (2, "CRIT - Error on disk!!")

12 years, 8 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: c5d67d92f2420e0fbf7d9c923ba41efbda89d73d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5d67d92f2420e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 26 14:27:37 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: dmraid: fix indentation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 74abdeef2af6ea68227890f45752da591e95f441 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74abdeef2af6ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 26 14:24:19 2012 +0100 dmraid: fix indentation --- checks/dmraid | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/dmraid b/checks/dmraid index 32201f2..59c48a2 100644 --- a/checks/dmraid +++ b/checks/dmraid @@ -56,10 +56,10 @@ def check_dmraid_pdisks(item, _no_params, info): if disk == item: status = line[4].split(",")[0] if status == "ok": - pos=line.index("Model:") - model=" ".join(line[pos+1:]) + pos=line.index("Model:") + model=" ".join(line[pos+1:]) return (0, "OK - Online (%s)" % model) - else: + else: return (2, "CRIT - Error on disk!!") return (2, "CRIT - Missing disk!!")

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0417

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9055aca8cdded0837cf93521daaeb3fb4bec055f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9055aca8cdded0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 26 08:15:52 2012 +0100 Updated bug entries #0417 --- .bugs/417 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/417 b/.bugs/417 index 0b0fb12..a17df5c 100644 --- a/.bugs/417 +++ b/.bugs/417 @@ -1,11 +1,11 @@ Title: Split SNMPv2 and snmpwulkwalk options Component: core +State: done +Class: nastiness Benefit: 4 -State: open Cost: 2 Date: 2011-11-29 15:16:00 Targetversion: 1.1.13i1 -Class: nastiness Einige Geräte können zwar SNMPv2, setzen aber snmpbulkwalks nicht korrekt um oder antworten gar nicht auf bulkwalks. Normale snmpwalks funktionieren gut. @@ -15,3 +15,6 @@ Das ist mir sowohl bei Switchen, als auch gerade bei einem netapp filer aufgefal Für solch einen Fall ist es wichtig, dass man SNMPv2 und die Bulkwalk Option getrennt schalten kann. Man könnte z.B. bei gesetztem "bulk" Implizit "snmpv2" setzen, bei manuell gesetztem "snmpv2" aber nicht automatisch "bulk". + +2012-01-26 08:15:49: changed state open -> done +Erledigt durch neue Variable snmpv2c_hosts (siehe doku).

12 years, 8 months

Check_MK Git: check_mk: New config variable snmpv2c_hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f6817297dbeee3361c10abfa2d03d7cbe65f7188 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6817297dbeee3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 26 08:11:04 2012 +0100 New config variable snmpv2c_hosts --- ChangeLog | 3 +++ modules/check_mk.py | 10 +++++++++- web/plugins/wato/check_mk_configuration.py | 16 ++++++++++++---- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1ccae0..66a31ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,9 @@ display string in the multisite GUI * FIX: Fixed encoding problems with umlauts in group aliases * FIX: honor extra_summary_host_conf (was ignored) + * new config variable snmpv2c_hosts that allows to enable SNMP v2c + but *not* bulkwalk (for some broken devices). bulkwalk_hosts still + implies v2c. Checks & Agents: * Windows agent: output eventlog texts in UTF-8 encoding. This diff --git a/modules/check_mk.py b/modules/check_mk.py index 3df7ff9..5708d28 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -263,6 +263,7 @@ host_paths = {} snmp_hosts = [ (['snmp'], ALL_HOSTS) ] tcp_hosts = [ (['tcp'], ALL_HOSTS), (NEGATE, ['snmp'], ALL_HOSTS), (['!ping'], ALL_HOSTS) ] bulkwalk_hosts = [] +snmpv2c_hosts = [] usewalk_hosts = [] dyndns_hosts = [] # use host name as ip address for these hosts ignored_checktypes = [] # exclude from inventory @@ -593,9 +594,12 @@ def snmp_base_command(what, hostname): if is_bulkwalk_host(hostname): options = '-v2c' else: - options = '-v1' if what == 'walk': command = 'snmpwalk' + if is_snmpv2c_host(hostname): + options = '-v2c' + else: + options = '-v1' options += " -c '%s'" % credentials # Handle V3 @@ -648,6 +652,10 @@ def is_bulkwalk_host(hostname): else: return False +def is_snmpv2c_host(hostname): + return is_bulkwalk_host(hostname) or \ + in_binary_hostlist(hostname, snmpv2c_hosts) + def is_usewalk_host(hostname): return in_binary_hostlist(hostname, usewalk_hosts) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 858d5cb..9430add 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -752,14 +752,22 @@ register_rule(group, register_rule(group, "bulkwalk_hosts", - title = _("Hosts using SNMP v2c (and bulk walk)"), + title = _("Hosts using bulk walk (and SNMP v2c)"), help = _("Most SNMP hosts support SNMP version 2c. However, Check_MK defaults to version 1, " "in order to support as many devices as possible. Please use this ruleset in order " "to configure SNMP v2c for as many hosts as possible. That version has two advantages: " - "it supports 64 bit counters, which avoid problems with wrapping counters at too " - "much traffic. And it support bulk walk, which saves much CPU and network ressourecs. " + "it supports 64 bit counters, which avoids problems with wrapping counters at too " + "much traffic. And it support bulk walk, which saves much CPU and network ressources. " "Please be aware, however, that there are some broken devices out there, that support " - "v2c but behave very bad when it is used. ")) + "bulk walk but behave very bad when it is used. When you want to enable v2c while not using " + "bulk walk, please use the rule set snmpv2c_hosts instead.")) + +register_rule(group, + "snmpv2c_hosts", + title = _("Hosts using SNMP v2c (and no bulk walk)"), + help = _("There exist a few devices out there that behave very badly when using SNMP bulk walk. " + "If you want to use SNMP v2c on those devices, nevertheless, then use this rule set. " + "One reason is enabling 64 bit counters.")) group = _("Operation mode of Check_MK")

12 years, 8 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: 56df8de9a4ad2509fdbc56704528019122fcbd58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56df8de9a4ad25… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 26 08:11:13 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: FIX: fix problem in ipmi_sensors perfometer

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f87b0fd28fb360a202ff3739812067a849c07ce9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f87b0fd28fb360… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 24 17:05:28 2012 +0100 FIX: fix problem in ipmi_sensors perfometer --- ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7bd8d8..d484fa6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -224,6 +224,7 @@ * FIX: detail view of host was missing column headers * FIX: fix problem on IE with background color 'white' * FIX: fix hitting enter in host search form on IE + * FIX: fix problem in ipmi_sensors perfometer Checks & Agents: * FIX: fixed man pages of h3c_lanswitch_sensors and statgrab_cpu diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 8252a95..ca05468 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -182,9 +182,12 @@ perfometers["check_mk-systemtime"] = lambda r, c, p: perfometer_check_mk_ntp(r, def perfometer_check_mk_ipmi_sensors(row, check_command, perf_data): state = row["service_state"] - color = { 0: "#06f", 1: "#ff2", 2: "#f22", 3: "#fa2" }[state] + color = { 0: "#39f", 1: "#ff2", 2: "#f22", 3: "#fa2" }[state] value = float(perf_data[0][1]) - crit = float(perf_data[0][4]) + crit = savefloat(perf_data[0][4]) + if not crit: + return "%d" % int(value), perfometer_logarithmic(value, 40, 1.2, color) + perc = 100 * value / crit # some sensors get critical if the value is < crit (fans), some if > crit (temp) h = '<table><tr>'

12 years, 8 months

Check_MK Git: check_mk: WATO: Only localizing non empty host tag titles

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f64d34fc47c5378ac3ee2f0a4239f11aea52c7b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f64d34fc47c537… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 09:50:16 2012 +0100 WATO: Only localizing non empty host tag titles --- web/htdocs/wato.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0bb819f..7ba93db 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3580,12 +3580,16 @@ class HostTagAttribute(Attribute): def paint(self, value, hostname): # Localize the titles. To make the strings available in the scanned localization # files the _() function must also be placed in the configuration files + # But don't localize empty strings - This empty string is connected to the header + # of the .mo file if len(self._taglist) == 1: title = self._taglist[0][1] + if title: + title = _(title) if value: - return "", _(title) + return "", title else: - return "", "%s %s" % (_("not"), _(title)) + return "", "%s %s" % (_("not"), title) for entry in self._taglist: if value == entry[0]: return "", _(entry[1])

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits