Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64692 discussions

Check_MK Git: check_mk: #1639 FIX Interfaces with speed more than 10GBit/ s can now be configured correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 26fc40afdced8f1ad8be122422a4251e18edd58b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26fc40afdced8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 11:43:33 2014 +0100 #1639 FIX Interfaces with speed more than 10GBit/s can now be configured correctly --- .werks/1639 | 7 +++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.werks/1639 b/.werks/1639 new file mode 100644 index 0000000..26a842e --- /dev/null +++ b/.werks/1639 @@ -0,0 +1,7 @@ +Title: Interfaces with speed more than 10GBit/s can now be configured correctly +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417689631 +Class: fix diff --git a/ChangeLog b/ChangeLog index 32a6929..8eb9264 100644 --- a/ChangeLog +++ b/ChangeLog @@ -165,6 +165,7 @@ * 1620 FIX: Fixed exception during host renaming when host has no perfdata * 1625 FIX: Safely handle characters that have a special meaning in regexes when creating service-specific rules... * 1637 FIX: Fixed exception in notification analysis when notifications have not NOTIFICATIONTYPE set + * 1639 FIX: Interfaces with speed more than 10GBit/s can now be configured correctly Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 131718e..a8896ff 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -292,7 +292,7 @@ class Integer(ValueSpec): return text def validate_datatype(self, value, varprefix): - if type(value) != int: + if type(value) not in [ int, long ]: raise MKUserError(varprefix, _("The value %r has the wrong type %s, but must be of type int") % (value, type_name(value))) @@ -1085,7 +1085,7 @@ class Float(Integer): def validate_datatype(self, value, varprefix): if type(value) != float and not \ - (type(value) == int and self._allow_int): + (type(value) not in [ int, long ] and self._allow_int): raise MKUserError(varprefix, _("The value %r has type %s, but must be of type float%s") % (value, type_name(value), self._allow_int and _(" or int") or ""))

9 years, 10 months

Check_MK Git: check_mk: #1640 FIX check_jolokia_metrics_serv_req: Fixed wrong levels shown for upper thresholds

by Lars Michelsen

Module: check_mk Branch: master Commit: ee4619a272af7eec73f30aa43ba140de6f83f276 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee4619a272af7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 12:15:58 2014 +0100 #1640 FIX check_jolokia_metrics_serv_req: Fixed wrong levels shown for upper thresholds --- .werks/1640 | 9 +++++++++ ChangeLog | 1 + checks/jolokia_metrics | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1640 b/.werks/1640 new file mode 100644 index 0000000..23745d3 --- /dev/null +++ b/.werks/1640 @@ -0,0 +1,9 @@ +Title: check_jolokia_metrics_serv_req: Fixed wrong levels shown for upper thresholds +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417691732 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8eb9264..ae862ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ * 1617 FIX: lnx_if: Deal with data provided by cluster host * 1618 FIX: ad_replication: Output of timeLastSuccess and timeLastFailure was inverted... * 1623 FIX: hp_proliant_mem: support for some yet unhandled status situations + * 1640 FIX: check_jolokia_metrics_serv_req: Fixed wrong levels shown for upper thresholds Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index af330b3..c744cbc 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -437,10 +437,10 @@ def check_jolokia_metrics_serv_req(item, params, info): status_txt = ' (Below or equal %d)' % lo_warn elif hi_crit is not None and req >= hi_crit: status = 2 - status_txt = ' (Above or equal %d)' % lo_warn + status_txt = ' (Above or equal %d)' % hi_crit elif hi_warn is not None and req >= hi_warn: status = 1 - status_txt = ' (Above or equal %d)' % lo_crit + status_txt = ' (Above or equal %d)' % hi_warn output = ['Requests: %d%s' % (req, status_txt)] perfdata = [('Requests', req, hi_warn, hi_crit)]

9 years, 10 months

Check_MK Git: check_mk: #1641 FIX Quicksearch: Now able to search for services with backslashes in names

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f3eb0049ac507724995ea336a396582d543a45c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f3eb0049ac507… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 13:04:24 2014 +0100 #1641 FIX Quicksearch: Now able to search for services with backslashes in names --- .werks/1641 | 9 +++++++++ ChangeLog | 1 + web/htdocs/sidebar.py | 48 ++++++++++++++++++++++++++++++++---------------- 3 files changed, 42 insertions(+), 16 deletions(-) diff --git a/.werks/1641 b/.werks/1641 new file mode 100644 index 0000000..5849b58 --- /dev/null +++ b/.werks/1641 @@ -0,0 +1,9 @@ +Title: Quicksearch: Now able to search for services with backslashes in names +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417694635 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ae862ee..5a95559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -137,6 +137,7 @@ * 1614 FIX: Fixed wrong URL in webapi.py documentation * 1619 FIX: Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups" * 1638 FIX: Fixed styling small styling problems in wiki snapin + * 1641 FIX: Quicksearch: Now able to search for services with backslashes in names WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index faf8b34..97aa15a 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -703,7 +703,17 @@ def parse_search_query(s): if found_filters: return found_filters else: - return [("hosts", s.replace('*', '.*'))] + return [("hosts", to_regex(s))] + +# Ensures the provided search string is a regex, does some basic conversion +# and then tries to verify it is a regex +def to_regex(s): + s = s.replace('*', '.*') + try: + re.compile(s) + except re.error: + raise MKGeneralException(_('You search statement is not valid. You need to provide a regular expression (regex). For example you need to e use <tt>\\\\</tt> instead of <tt>\\</tt> if you like to search for a single backslash.')) + return s def is_ipaddress(s): try: @@ -758,45 +768,50 @@ def search_url_tmpl(used_filters, row, exact = True): def find_tmpl(): if exact: # Get the match template if plugin.get("match_url_tmpl_func"): - return plugin['match_url_tmpl_func'](used_filters, row_data) + return False, plugin['match_url_tmpl_func'](used_filters, row_data) if plugin.get("match_url_tmpl"): - return plugin.get("match_url_tmpl") + return False, plugin.get("match_url_tmpl") # Default match templates ty = plugin.get("dftl_url_tmpl", plugin.get("id")) if ty == 'hosts': - return 'view.py?view_name=host&host=%(name)s&site=%(site)s' + return False, 'view.py?view_name=host&host=%(name)s&site=%(site)s' elif ty == 'hostgroups': - return 'view.py?view_name=hostgroup&hostgroup=%(name)s&site=%(site)s' + return False, 'view.py?view_name=hostgroup&hostgroup=%(name)s&site=%(site)s' elif ty == 'servicegroups': - return 'view.py?view_name=servicegroup&servicegroup=%(name)s&site=%(site)s' + return False, 'view.py?view_name=servicegroup&servicegroup=%(name)s&site=%(site)s' elif ty == 'services': - return 'view.py?view_name=allservices&service_regex=%(name)s&site=%(site)s' + return True, 'view.py?view_name=allservices&service_regex=%(name)s&site=%(site)s' else: # Get the search template if plugin.get("search_url_tmpl_func"): - return plugin['search_url_tmpl_func'](used_filters, row_data) + return False, plugin['search_url_tmpl_func'](used_filters, row_data) if plugin.get("search_url_tmpl"): - return plugin.get("search_url_tmpl") + return False, plugin.get("search_url_tmpl") # Default search templates ty = plugin.get("dftl_url_tmpl", plugin.get("id")) if ty == 'hosts': - return 'view.py?view_name=searchhost&host_regex=%(name)s&filled_in=filter' + return False, 'view.py?view_name=searchhost&host_regex=%(name)s&filled_in=filter' elif ty == 'hostgroups': - return 'view.py?view_name=hostgroups&hostgroup_regex=%(name)s&site=%(site)s' + return False, 'view.py?view_name=hostgroups&hostgroup_regex=%(name)s&site=%(site)s' elif ty == 'servicegroups': - return 'view.py?view_name=svcgroups&servicegroup_name=%(name)s&site=%(site)s' + return False, 'view.py?view_name=svcgroups&servicegroup_name=%(name)s&site=%(site)s' elif ty == 'services': - return 'view.py?view_name=allservices&service_regex=%(name)s&site=%(site)s' + return False, 'view.py?view_name=allservices&service_regex=%(name)s&site=%(site)s' # Search the template - url_tmpl = find_tmpl() + escape_regex, url_tmpl = find_tmpl() # Some templates with single filters contain %(name)s, %(search)s, %(site) if len(used_filters) == 1: if exact: site = row_data.get("site") name = row_data.get(get_row_name(row)) + # In case of an exact match, not the original search statement is used, + # instead the name of the row provided by livestatus is used. This needs + # to be escaped as it is no regex + if escape_regex: + name = name.replace('\\', '\\\\') else: site = "" name = used_filters[0][1] @@ -914,8 +929,9 @@ def format_result(row, render_options): if name_append: name = "%s %s" % (name, name_append) + escaped_name = name.replace('\\', '\\\\') html.write('<a id="result_%s" class="%s" href="%s" onClick="mkSearchClose()" target="main">%s' % - (name, css, url, name)) + (escaped_name, css, url, name)) html.write('</a>\n') @@ -964,7 +980,7 @@ def process_search(q): data = search_livestatus(used_filters) if len(used_filters) == 1 and used_filters[0][0] == "hosts" and not data: # When asking for hosts and no host found, try searching services instead - data = search_livestatus( [("services", used_filters[0][1])] ) + data = search_livestatus([("services", used_filters[0][1])]) return data, [("services", used_filters[0][1])] return data, used_filters

9 years, 10 months

Check_MK Git: check_mk: Also validating subregexes e.g. h:... s:...

by Lars Michelsen

Module: check_mk Branch: master Commit: 99bf4ce41bf09c5461ed1eee4dc523e8031fa520 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99bf4ce41bf09c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 13:07:05 2014 +0100 Also validating subregexes e.g. h:... s:... --- web/htdocs/sidebar.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 97aa15a..132e0f0 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -697,7 +697,7 @@ def parse_search_query(s): current_string = s for token_type, token_offset in found[-1::-1]: found_filters.append( (types[token_type.lstrip()], - current_string[token_offset+len(token_type)+1:].replace("*", ".*").strip()) ) + to_regex(current_string[token_offset+len(token_type)+1:]).strip()) ) current_string = current_string[:token_offset] if found_filters: @@ -712,7 +712,9 @@ def to_regex(s): try: re.compile(s) except re.error: - raise MKGeneralException(_('You search statement is not valid. You need to provide a regular expression (regex). For example you need to e use <tt>\\\\</tt> instead of <tt>\\</tt> if you like to search for a single backslash.')) + raise MKGeneralException(_('You search statement is not valid. You need to provide a regular ' + 'expression (regex). For example you need to e use <tt>\\\\</tt> instead of <tt>\\</tt> ' + 'if you like to search for a single backslash.')) return s def is_ipaddress(s):

9 years, 10 months

Check_MK Git: check_mk: #1642 FIX Quicksearch: Improved error handling on invalid search statements (invalid regexes)

by Lars Michelsen

Module: check_mk Branch: master Commit: c4b44aaff62285bdc2f756ed2e886754021a24a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4b44aaff62285… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 13:04:46 2014 +0100 #1642 FIX Quicksearch: Improved error handling on invalid search statements (invalid regexes) --- .werks/1642 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/1642 b/.werks/1642 new file mode 100644 index 0000000..172e5cd --- /dev/null +++ b/.werks/1642 @@ -0,0 +1,9 @@ +Title: Quicksearch: Improved error handling on invalid search statements (invalid regexes) +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417694664 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5a95559..3d5db0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -138,6 +138,7 @@ * 1619 FIX: Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups" * 1638 FIX: Fixed styling small styling problems in wiki snapin * 1641 FIX: Quicksearch: Now able to search for services with backslashes in names + * 1642 FIX: Quicksearch: Improved error handling on invalid search statements (invalid regexes) WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog

9 years, 10 months

Check_MK Git: check_mk: #1638 FIX Fixed styling small styling problems in wiki snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: fe89ccd85f753f14fcd43802f228f2ba8262ab3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe89ccd85f753f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 11:08:38 2014 +0100 #1638 FIX Fixed styling small styling problems in wiki snapin --- .werks/1638 | 9 +++++++++ ChangeLog | 1 + web/plugins/sidebar/search.py | 3 ++- web/plugins/sidebar/shipped.py | 14 ++++++++++---- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/1638 b/.werks/1638 new file mode 100644 index 0000000..5afeb70 --- /dev/null +++ b/.werks/1638 @@ -0,0 +1,9 @@ +Title: Fixed styling small styling problems in wiki snapin +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417687698 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index caca78c..32a6929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 1607 FIX: check_http: Fixed broken links in escaped plugin output * 1614 FIX: Fixed wrong URL in webapi.py documentation * 1619 FIX: Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups" + * 1638 FIX: Fixed styling small styling problems in wiki snapin WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 7494ab6..6e60dab 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -53,7 +53,8 @@ sidebar_snapins["search"] = { height: 26px; margin-top: -25px; left: 196px; - float:right; + float: left; + position: relative; z-index:100; } diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 1fb38a4..210e2ab 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1165,6 +1165,8 @@ def render_wiki(): if start_ul == True: if title: html.begin_foldable_container("wikisnapin", title, True, title, indent=True) + else: + html.write('<ul>') start_ul = False ul_started = True @@ -1179,7 +1181,6 @@ def render_wiki(): link = erg[0] name = erg[0] - if link.startswith("http://") or link.startswith("https://"): simplelink(name, link, "_blank") else: @@ -1196,8 +1197,8 @@ def render_wiki(): if ul_started == True: html.write("</ul>") except IOError: - html.write("You have to create a <a href='/%s/wiki/doku.php?id=%s'>sidebar</a> first" % - (defaults.omd_site, _("sidebar") )) + html.write("<p>To get a navigation menu, you have to create a <a href='/%s/wiki/doku.php?id=%s' " + "target='main'>sidebar</a> in your wiki first.</p>" % (defaults.omd_site, _("sidebar"))) if defaults.omd_root: sidebar_snapins["wiki"] = { @@ -1211,6 +1212,10 @@ if defaults.omd_root: color: white; } + #snapin_container_wiki div.content p { + font-weight: normal; + } + #wiki_navigation { text-align: left; } @@ -1229,7 +1234,8 @@ if defaults.omd_root: height: 26px; margin-top: -25px; left: 196px; - float:right; + float: left; + position: relative; z-index:100; }

9 years, 10 months

Check_MK Git: check_mk: #1630 smart: update in plugin that also outputs information about disks attached to a MegaRAID controller

by Mathias Kettner

Module: check_mk Branch: master Commit: 70ddb46c2c5e856d65091341d3d33d6aaf965d3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70ddb46c2c5e85… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 12:56:32 2014 +0100 #1630 smart: update in plugin that also outputs information about disks attached to a MegaRAID controller Thanks to Florian Heigl --- .werks/1630 | 9 +++++++++ ChangeLog | 1 + agents/plugins/smart | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/.werks/1630 b/.werks/1630 new file mode 100644 index 0000000..ee15952 --- /dev/null +++ b/.werks/1630 @@ -0,0 +1,9 @@ +Title: smart: update in plugin that also outputs information about disks attached to a MegaRAID controller +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417694156 +Class: feature + +Thanks to Florian Heigl diff --git a/ChangeLog b/ChangeLog index 44b2f22..0bf94f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * 1626 Renamed service descriptions of filesystem, process and logwatch checks... * 1627 megaraid_ldisks: Warn if current cache or write policy differs from logical drive default policy... * 1629 check_mk_agent.freebsd: several new features and improvements, now only use statgrab... + * 1630 smart: update in plugin that also outputs information about disks attached to a MegaRAID controller... * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/agents/plugins/smart b/agents/plugins/smart index 3b5faf2..1a0f250 100755 --- a/agents/plugins/smart +++ b/agents/plugins/smart @@ -23,6 +23,51 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + + + +# This will be called on LSI based raidcontrollers and accesses +# the SMART data of SATA disks attached to a SAS Raid HBA via +# SCSI protocol interface. +megaraid_info() +{ + + PDINFO=$(MegaCli -PDlist -a0) + + echo "$PDINFO" | \ + while read line ; do + case "$line" in + # FIRST LINE + "Enclosure Device ID"*) #Enclosure Device ID: 252 + ENC=$( echo "$line" | awk '{print $4}') + unset SLOT LOG_DEV_ID VEND MODEL + ;; + "Slot Number"*) #Slot Number: 7 + SLOT=$( echo "$line" | awk '{print $3}') + ;; + # Identify the logical device ID. smartctl needs it to access the disk. + "Device Id"*) #Device Id: 19 + LOG_DEV_ID=$( echo "$line" | awk '{print $3}') + ;; + "PD Type"*) #PD Type: SATA + VEND=$( echo "$line" | awk '{print $3}') + ;; + # This is the last value, generate output here + "Inquiry Data"*) + #Inquiry Data: WD-WCC1T1035197WDC WD20EZRX-00DC0B0 80.00A80 + # $4 seems to be better for some vendors... wont be possible to get this perfect. + MODEL=$( echo "$line" | awk '{print $3}') + + # /dev/sdc ATA SAMSUNG_SSD_830 5 Reallocated_Sector_Ct 0x0033 100 100 010 Pre-fail Always - + smartctl -d megaraid,${LOG_DEV_ID} -v 9,raw48 -A /dev/sg0 | \ + grep Always | egrep -v '^190(.*)Temperature(.*)' | \ + sed "s|^|Enc${ENC}/Slot${SLOT} $VEND $MODEL |" + ;; + esac + done +} + + # Only handle always updated values, add device path and vendor/model if which smartctl > /dev/null 2>&1 ; then # @@ -106,4 +151,11 @@ if which smartctl > /dev/null 2>&1 ; then [ -n "$CMD" ] && $CMD | grep Always | egrep -v '^190(.*)Temperature(.*)' | sed "s|^|$DNAME $VEND $MODEL |" done 2>/dev/null + + + # Call MegaRaid submodule if conditions are met + if which MegaCli > /dev/null && [ -c /dev/sg0 ] ; then + megaraid_info + fi fi +

9 years, 10 months

Check_MK Git: check_mk: #1629 check_mk_agent.freebsd: several new features and improvements, now only use statgrab

by Mathias Kettner

Module: check_mk Branch: master Commit: 80c19d5dacde18372f2f26c0e1b49639adcbe30b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80c19d5dacde18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 12:53:15 2014 +0100 #1629 check_mk_agent.freebsd: several new features and improvements, now only use statgrab Thanks to Florian Heigl --- .werks/1629 | 9 ++ ChangeLog | 1 + agents/check_mk_agent.freebsd | 190 ++++++++++++++++++++++++++++------------- 3 files changed, 142 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=80c19d5dac…

9 years, 10 months

Check_MK Git: check_mk: postfix_mailq: small fix for better handling empty queues

by Mathias Kettner

Module: check_mk Branch: master Commit: e7d50ff8e2ca27bab2c509190d75b4029b558c25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7d50ff8e2ca27… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 12:48:50 2014 +0100 postfix_mailq: small fix for better handling empty queues --- agents/check_mk_agent.linux | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index b301727..73f103a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -503,9 +503,15 @@ fi # but it could be used to get the timestamp of the last message. if type postconf ; then echo '<<<postfix_mailq>>>' - echo -- \ - $(du -kd0 $(postconf -h queue_directory)/deferred | awk '{print $1 }') Kbytes in \ - $(find $(postconf -h queue_directory)/deferred/. ! -name '?' -print | wc -l) Requests. + postfix_queue_dir=$(postconf -h queue_directory) + postfix_count=$(find $postfix_queue_dir/deferred -type f | wc -l) + postfix_size=$(du -ks $postfix_queue_dir/deferred | awk '{print $1 }') + if [ $postfix_count -gt 0 ] + then + echo -- $postfix_size Kbytes in $postfix_count Requests. + else + echo Mail queue is empty + fi elif [ -x /usr/sbin/ssmtp ] ; then echo '<<<postfix_mailq>>>' mailq 2>&1 | sed 's/^[^:]*: $.*$/\1/' | tail -n 6

9 years, 10 months

Check_MK Git: check_mk: #1628 FIX Remove trailing backslashes from service descriptions

by Mathias Kettner

Module: check_mk Branch: master Commit: 34f45af94ce9ee14c0331515371361bb10ac4790 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34f45af94ce9ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 12:43:52 2014 +0100 #1628 FIX Remove trailing backslashes from service descriptions The Nagios core does not support these. But it can happen e.g. due to trailing backslashes in the names of network interfaces. --- .werks/1628 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1628 b/.werks/1628 new file mode 100644 index 0000000..b318c85 --- /dev/null +++ b/.werks/1628 @@ -0,0 +1,10 @@ +Title: Remove trailing backslashes from service descriptions +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i7 +Date: 1417693356 +Class: fix + +The Nagios core does not support these. But it can happen e.g. due to trailing +backslashes in the names of network interfaces. diff --git a/ChangeLog b/ChangeLog index 128ace9..66eb805 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 1555 FIX: Improved validation on timeperiod references of non existing periods... * 1574 FIX: Hosts named like used python modules do not break precompiled checks anymore... * 1624 FIX: Remove illegal characters from service descriptions of active checks... + * 1628 FIX: Remove trailing backslashes from service descriptions... Checks & Agents: * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices diff --git a/modules/check_mk.py b/modules/check_mk.py index 2065584..0e7ed51 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1353,7 +1353,7 @@ def exit_code_spec(hostname): # Remove illegal characters from a service description def sanitize_service_description(descr): - return "".join([ c for c in descr if c not in nagios_illegal_chars ]) + return "".join([ c for c in descr if c not in nagios_illegal_chars ]).rstrip("\\") def service_description(check_type, item):

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits