Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 99b2f60874870d1a4b0288b9fdcc5098f484fb88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99b2f60874870d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 7 13:32:29 2016 +0100 Fetched Livestatus from downstream. --- livestatus/src/ContactgroupsColumn.cc | 13 ++++--- livestatus/src/ContactgroupsColumn.h | 11 ++++-- livestatus/src/LogCache.cc | 33 +++++------------- livestatus/src/LogCache.h | 13 +++---- livestatus/src/MonitoringCore.h | 3 ++ livestatus/src/Store.cc | 20 +++++------ livestatus/src/TableComments.cc | 9 ++--- livestatus/src/TableComments.h | 5 +-- livestatus/src/TableContactgroups.cc | 6 ++-- livestatus/src/TableContactgroups.h | 7 ++-- livestatus/src/TableDowntimes.cc | 9 ++--- livestatus/src/TableDowntimes.h | 5 +-- livestatus/src/TableEventConsoleEvents.cc | 9 ++--- livestatus/src/TableEventConsoleEvents.h | 3 +- livestatus/src/TableEventConsoleHistory.cc | 9 ++--- livestatus/src/TableEventConsoleHistory.h | 2 +- livestatus/src/TableHosts.cc | 12 ++++--- livestatus/src/TableHosts.h | 8 +++-- livestatus/src/TableHostsByGroup.cc | 7 ++-- livestatus/src/TableHostsByGroup.h | 4 +-- livestatus/src/TableLog.cc | 30 +++++++---------- livestatus/src/TableLog.h | 10 +++--- livestatus/src/TableServices.cc | 15 +++++---- livestatus/src/TableServices.h | 8 +++-- livestatus/src/TableServicesByGroup.cc | 7 ++-- livestatus/src/TableServicesByGroup.h | 4 +-- livestatus/src/TableServicesByHostGroup.cc | 7 ++-- livestatus/src/TableServicesByHostGroup.h | 4 +-- livestatus/src/TableStateHistory.cc | 28 +++++++--------- livestatus/src/TableStateHistory.h | 54 +++++++++++++++--------------- livestatus/src/module.cc | 9 +++++ 31 files changed, 189 insertions(+), 175 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=99b2f60874…

7 years, 10 months

fixed werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: 6327d85c61d978b6bbadbe600fd3863282e13fa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6327d85c61d978… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 7 13:07:20 2016 +0100 fixed werk text --- .werks/3988 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/3988 b/.werks/3988 index 5ea29da..0813d59 100644 --- a/.werks/3988 +++ b/.werks/3988 @@ -1,4 +1,4 @@ -Title: Windows agent: no global option disabled_sections +Title: Windows agent: new global option disabled_sections Level: 1 Component: checks Compatible: compat

7 years, 10 months

Updated Werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: d7258953704171f67953e8e47b5c15f9df02ac1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7258953704171… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 12:17:59 2016 +0100 Updated Werk description --- .werks/3938 | 7 ++++--- ChangeLog | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.werks/3938 b/.werks/3938 index 036e74d..d2bd87f 100644 --- a/.werks/3938 +++ b/.werks/3938 @@ -1,4 +1,4 @@ -Title: tactical overview: fixed wrong display of number of service problems when stale services are available +Title: tactical overview: fixed wrong display of number of host/service problems Level: 1 Component: multisite Compatible: compat @@ -6,6 +6,7 @@ Version: 1.4.0i2 Date: 1478503370 Class: fix -When stale services where available number of "service problems" and "service problems unhandled" where the same as stale services in tactical overview snapin. -This has been fixed now. +The display number was not the number of problems, but the number of stale +entries - which is most times 0. This had recently been introduced and +is not fixed again. diff --git a/ChangeLog b/ChangeLog index cd1c0f5..4ee89ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,7 +63,7 @@ * 3974 FIX: Sorting comments in hover menu of comments icon by time now * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... * 4046 FIX: Repaired html rendering.... - * 3938 FIX: tactical overview: fixed wrong display of number of service problems when stale services are available... + * 3938 FIX: tactical overview: fixed wrong display of number of host/service problems... WATO: * 3915 User access times: New icon when never logged in; New column "last seen"

7 years, 10 months

3977 FIX Fixed poping up changes button in sidebar snapin after a change

by Lars Michelsen

Module: check_mk Branch: master Commit: fb1a3b18490a1bde42f2e49c6db610e66be36349 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb1a3b18490a1b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 12:04:21 2016 +0100 3977 FIX Fixed poping up changes button in sidebar snapin after a change --- .werks/3977 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/3977 b/.werks/3977 new file mode 100644 index 0000000..a5b5d1d --- /dev/null +++ b/.werks/3977 @@ -0,0 +1,9 @@ +Title: Fixed poping up changes button in sidebar snapin after a change +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i2 +Date: 1478516650 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3091713..cd1c0f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,7 @@ * 4041 FIX: Fix exception when editing global configuration settings... * 3975 FIX: Improved error handling when trying to edit not existing global setting * 3976 FIX: Fixed broken link in LDAP automatic sync help text + * 3977 FIX: Fixed poping up changes button in sidebar snapin after a change Notifications: * 3957 mail: now allows extra HTML section between body and table

7 years, 10 months

Fixed poping up changes button in sidebar snapin after a change

by Lars Michelsen

Module: check_mk Branch: master Commit: c7c2cb06d1557c9bf5985790f45aa7a2729420e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7c2cb06d1557c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 12:04:00 2016 +0100 Fixed poping up changes button in sidebar snapin after a change --- web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f9e7d76..6c96cd7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -277,7 +277,7 @@ def page_handler(): html.show_error(traceback.format_exc().replace('\n', ' ')) html.close_div() - if g_need_sidebar_reload == id(html): + if is_sidebar_reload_needed(): html.reload_sidebar() if config.wato_use_git and html.is_transaction(): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 864984b..cf32385 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4629,6 +4629,10 @@ def need_sidebar_reload(): g_need_sidebar_reload = id(html) +def is_sidebar_reload_needed(): + return g_need_sidebar_reload == id(html) + + def folder_preserving_link(add_vars): return Folder.current().url(add_vars)

7 years, 10 months

agent_tinkerforge: removed install logic ( tinkerforge bindings are now installed with CMK)

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fa46f7b862a7747c06a97f6e4135d39114a507a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fa46f7b862a77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 11:13:28 2016 +0100 agent_tinkerforge: removed install logic (tinkerforge bindings are now installed with CMK) --- agents/special/agent_tinkerforge | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/agents/special/agent_tinkerforge b/agents/special/agent_tinkerforge index 96daa62..fd70f26 100755 --- a/agents/special/agent_tinkerforge +++ b/agents/special/agent_tinkerforge @@ -65,33 +65,6 @@ import sys import os -def install(): - dest = os.path.dirname(os.path.realpath(__file__)) - print("installing tinkerforge python api to %s" % dest) - if os.path.exists(os.path.join(dest, "tinkerforge")): - print("already installed") - return 1 - - import urllib2 - import shutil - from fnmatch import fnmatch - from zipfile import ZipFile - from cStringIO import StringIO - url = "http://download.tinkerforge.com/bindings/python/tinkerforge_python_bindings…" - response = urllib2.urlopen(url) - buf = StringIO(response.read()) - z = ZipFile(buf) - - extract_files = [f for f in z.namelist() if f.startswith("source/tinkerforge")] - z.extractall(dest, extract_files) - - shutil.move(os.path.join(dest, "source", "tinkerforge"), - os.path.join(dest, "tinkerforge")) - shutil.rmtree(os.path.join(dest, "source")) - - return 0 - - DEFAULT_SETTINGS = { 'host': "localhost", 'port': 4223, @@ -271,8 +244,6 @@ def main(): parser.add_option("--segment_display_brightness", type=int, dest="brightness", default=settings['segment_display_brightness'], help="brightness of the 7-segment display (0-7)") - parser.add_option("--install", action="store_true", - help="install tinkerforge python api to same directory as the plugin") (options, args) = parser.parse_args() @@ -283,9 +254,6 @@ def main(): 'segment_display_brightness': options.brightness } - if options.install: - return install() - try: from tinkerforge.ip_connection import IPConnection except ImportError:

7 years, 10 months

added missing check

by Andreas Boesl

Module: check_mk Branch: master Commit: 6f7b837e22ba52c5b3830dcf768bac6029402569 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f7b837e22ba52… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 7 09:57:42 2016 +0100 added missing check --- checks/netapp_api_luns | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/checks/netapp_api_luns b/checks/netapp_api_luns new file mode 100644 index 0000000..bad6515 --- /dev/null +++ b/checks/netapp_api_luns @@ -0,0 +1,69 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# <<<netapp_api_luns:sep(9)>>> +# lun /vol/iscsi_crm_dblogs/crm_dblogs_lu01 read-only false size 644286182400 vserver ISCSI_CRM size-used 538924421120 online true volume iscsi_crm_dblogs + +def inventory_netapp_api_luns(parsed): + for lun in parsed.keys(): + yield lun, {} + +def check_netapp_api_luns(item, params, parsed): + lun = parsed.get(item) + + if not lun: + yield 3, "LUN not found in agent output" + return + + if lun.get("online") != "true": + yield 1, "LUN is %s" % lun.get("online") + + if lun.get("read-only") != "false": + yield 1, "read-only is %s" % lun.get("read-only") + + mega = 1024.0 * 1024.0 + size_total = int(lun.get("size")) / mega + size_avail = size_total - (int(lun.get("size-used")) / mega) + + if params == True: + yield 0, "Total size: %s, Used space is ignored" % get_bytes_human_readable(size_total) + else: + yield df_check_filesystem_single(g_hostname, item, size_total, size_avail, 0, None, None, params) + + +def netapp_api_luns_item(name): + return name.rsplit("/", 1)[-1] + +check_info["netapp_api_luns"] = { + 'check_function' : check_netapp_api_luns, + 'inventory_function' : inventory_netapp_api_luns, + 'parse_function' : lambda x: netapp_api_parse_lines(x,item_func = netapp_api_luns_item), + 'service_description' : 'LUN %s', + 'has_perfdata' : True, + 'group' : "netapp_luns", + 'includes' : [ "df.include", "netapp_api.include" ], + "default_levels_variable" : "filesystem_default_levels", +}

7 years, 10 months

3988 Windows agent: no global option disabled_sections

by Andreas Boesl

Module: check_mk Branch: master Commit: e274c3c4b1c7ce895dcbad67533871e3deb5ef9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e274c3c4b1c7ce… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 7 10:54:17 2016 +0100 3988 Windows agent: no global option disabled_sections This options allows you to disable specific sections. If a section is mentioned in sections and disabled_sections the disabled_sections takes precedence. --- .werks/3988 | 12 ++++++++++++ ChangeLog | 1 + agents/windows/SectionManager.cc | 8 ++++++-- agents/windows/SectionManager.h | 5 +++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1324544 -> 1325056 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15382636 -> 15385708 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1324544 -> 1325056 bytes agents/windows/check_mk_agent.exe | Bin 1299456 -> 1299968 bytes agents/windows/check_mk_agent.msi | Bin 2893824 -> 2894848 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13295415 -> 13297463 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1299456 -> 1299968 bytes agents/windows/install_agent-64.exe | Bin 584764 -> 584849 bytes agents/windows/install_agent.exe | Bin 581452 -> 581547 bytes 14 files changed, 25 insertions(+), 3 deletions(-) diff --git a/.werks/3988 b/.werks/3988 new file mode 100644 index 0000000..5ea29da --- /dev/null +++ b/.werks/3988 @@ -0,0 +1,12 @@ +Title: Windows agent: no global option disabled_sections +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1478512041 +Class: feature + +This options allows you to disable specific sections. +If a section is mentioned in sections and disabled_sections the +disabled_sections takes precedence. + diff --git a/ChangeLog b/ChangeLog index 55e285e..3091713 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 3949 ucd_cpu_load: Genugate devices are now displaying CPU load... * 3950 openbsd_sensors: Genugate devices are now handling hardware sensors... * 3749 storcli_pdisks, storcli_vdrives: New checks to monitor RAID status via StorCLI utility + * 3988 Windows agent: no global option disabled_sections... * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe... diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc index f9aba58..b6b3d8b 100644 --- a/agents/windows/SectionManager.cc +++ b/agents/windows/SectionManager.cc @@ -22,6 +22,7 @@ SectionManager::SectionManager(Configuration &config, const Environment &env) : _ps_use_wmi(config, "ps", "use_wmi", false) , _enabled_sections(config, "global", "sections") + , _disabled_sections(config, "global", "disabled_sections") , _realtime_sections(config, "global", "realtime_sections") , _script_local_includes(config, "local", "include") , _script_plugin_includes(config, "plugin", "include") @@ -41,8 +42,11 @@ void SectionManager::addSection(Section *section) { bool SectionManager::sectionEnabled(const std::string &name) const { // if no sections were set, assume they are all enabled - return !_enabled_sections.wasAssigned() || - (_enabled_sections->find(name) != _enabled_sections->end()); + bool is_disabled = _disabled_sections->find(name) != _disabled_sections->end(); + + bool is_enabled = !_enabled_sections.wasAssigned() || + (_enabled_sections->find(name) != _enabled_sections->end()); + return !is_disabled && is_enabled; } bool SectionManager::realtimeSectionEnabled(const std::string &name) const { diff --git a/agents/windows/SectionManager.h b/agents/windows/SectionManager.h index 870f3b9..d8cc3c0 100644 --- a/agents/windows/SectionManager.h +++ b/agents/windows/SectionManager.h @@ -45,6 +45,11 @@ class SectionManager { SplittingListConfigurable<std::set<std::string>, BlockMode::BlockExclusive<std::set<std::string>>, AddMode::SetInserter<std::set<std::string>>> + _disabled_sections; + + SplittingListConfigurable<std::set<std::string>, + BlockMode::BlockExclusive<std::set<std::string>>, + AddMode::SetInserter<std::set<std::string>>> _realtime_sections; KeyedListConfigurable<std::string> _script_local_includes; diff --git a/agents/windows/build_version b/agents/windows/build_version index dbb8b69..5cc2201 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2138 +2143 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 8c57ce9..75ca096 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 2956574..4d845d3 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index d7146ae..941fdd7 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 6be6e4b..5870e64 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 919fac2..91bc001 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 3f182ec..bb0c6f9 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index b1c101e..b3f010c 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index b79f061..2a721ba 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 20143dd..a585f5c 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

7 years, 10 months

update to werk 3913

by Simon Betz

Module: check_mk Branch: master Commit: 34bd33aae8f94c302e244bf11286dcf1ec9eb11a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34bd33aae8f94c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 7 10:22:30 2016 +0100 update to werk 3913 --- checks/gude_humidity | 14 ++++++++++---- checks/gude_temp | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/checks/gude_humidity b/checks/gude_humidity index 18bb690..19bb102 100644 --- a/checks/gude_humidity +++ b/checks/gude_humidity @@ -34,12 +34,17 @@ gude_humidity_default_levels = (0, 0, 60, 70) def inventory_gude_humidity(info): - if info[0][0].split(".")[-1] != "-9999": - return [ ("Sensor", "gude_humidity_default_levels") ] + for oid_index, reading_str in info: + oid, index = oid_index.split(".") + if reading_str != "-9999": + yield "Sensor %s" % index, "gude_humidity_default_levels" def check_gude_humidity(item, params, info): - return check_humidity(float(info[0][0].split(".")[-1])/10, params) + for oid_index, reading_str in info: + oid, index = oid_index.split(".") + if "Sensor %s" % index == item: + return check_humidity(float(reading_str)/10, params) check_info['gude_humidity'] = { @@ -48,7 +53,8 @@ check_info['gude_humidity'] = { 'service_description' : 'Humidity %s', 'has_perfdata' : True, 'snmp_info' : ('.1.3.6.1.4.1.28507', [ "19", "38" ], [ - "1.6.1.1.3.1", # GUDEADS-EPC****-MIB::epc****HygroSensor + OID_END, + "1.6.1.1.3", # GUDEADS-EPC****-MIB::epc****HygroSensor ]), 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.19") or \ oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.38"), diff --git a/checks/gude_temp b/checks/gude_temp index 951538a..9a9bfd7 100644 --- a/checks/gude_temp +++ b/checks/gude_temp @@ -36,12 +36,17 @@ factory_settings["gude_temp_default_levels"] = { def inventory_gude_temp(info): - if info[0][0].split(".")[-1] != "-9999": - return [ ("Sensor", {}) ] + for oid_index, reading_str in info: + oid, index = oid_index.split(".") + if reading_str != "-9999": + yield "Sensor %s" % index, {} def check_gude_temp(item, params, info): - return check_temperature(float(info[0][0].split(".")[-1])/10, params, "gude_temp.%s" % item) + for oid_index, reading_str in info: + oid, index = oid_index.split(".") + if "Sensor %s" % index == item: + return check_temperature(float(reading_str)/10, params, "gude_temp.%s" % item) check_info['gude_temp'] = { @@ -50,7 +55,8 @@ check_info['gude_temp'] = { 'service_description' : 'Temperature %s', 'has_perfdata' : True, 'snmp_info' : ('.1.3.6.1.4.1.28507', [ "19", "38" ], [ - "1.6.1.1.2.1", # GUDEADS-EPC****-MIB::epc****TempSensor + OID_END, + "1.6.1.1.2", # GUDEADS-EPC****-MIB::epc****TempSensor ]), 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.19") or \ oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.38"),

7 years, 10 months

3976 FIX Fixed broken link in LDAP automatic sync help text

by Lars Michelsen

Module: check_mk Branch: master Commit: 11d199acbaa86db9249818591e7f61bb23518e74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11d199acbaa86d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 09:59:01 2016 +0100 3976 FIX Fixed broken link in LDAP automatic sync help text --- .werks/3976 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3976 b/.werks/3976 new file mode 100644 index 0000000..3f17cb7 --- /dev/null +++ b/.werks/3976 @@ -0,0 +1,10 @@ +Title: Fixed broken link in LDAP automatic sync help text +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1478509127 + + diff --git a/ChangeLog b/ChangeLog index ca82417..55e285e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 4039 FIX: Fix UnicodeEncodeError exception in WATO folder display... * 4041 FIX: Fix exception when editing global configuration settings... * 3975 FIX: Improved error handling when trying to edit not existing global setting + * 3976 FIX: Fixed broken link in LDAP automatic sync help text Notifications: * 3957 mail: now allows extra HTML section between body and table diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b9fcbfd..f9e7d76 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6066,7 +6066,7 @@ def vs_ldap_connection(new, connection_id): title = _('Sync Interval'), help = _('This option defines the interval of the LDAP synchronization. This setting is only ' 'used by sites which have the ' - '<a href="wato.py?mode=edit_configvar&varname=userdb_automatic_sync">Automatic User ' + '<a href="wato.py?mode=sites">Automatic User ' 'Synchronization</a> enabled. ' 'Please note: Passwords of the users are never stored in WATO and therefor never cached!'), minvalue = 60,

7 years, 10 months

← Newer
1
...
23
24
25
26
27
28
29
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016