Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

checktestlib: Gut {Basic, Compound}CheckResult classes of unused logic. This is likely better handled in the tests themselves.

by Konstantin Büttner

Module: check_mk Branch: master Commit: 410592a8b58c85eddb0a4e992b47fb6427b2b9a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=410592a8b58c85… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 20 10:44:06 2017 +0100 checktestlib: Gut {Basic,Compound}CheckResult classes of unused logic. This is likely better handled in the tests themselves. Change-Id: I40006a0f25b75fab21bc0f5ec4479a215d95b847 --- tests/checks/checktestlib.py | 54 --------------------------------- tests/checks/test_df_check.py | 1 - tests/checks/test_statgrab_cpu_check.py | 1 - 3 files changed, 56 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 8bae61c..2b65354 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -51,47 +51,6 @@ class BasicCheckResult(object): else: self.perfdata = None - def match_status(self, expected_status): - """Check if this result's status matches a given value. Exact match.""" - return self.status == expected_status - - def match_infotext(self, expected_infotext): - """Check whether this result's infotext contains a given string. Case-sensitive.""" - return expected_infotext in self.infotext - - def match_perfdata(self, expected_perfdata): - """Check whether this result's perfdata matches a given value. Exact match.""" - return expected_perfdata == self.perfdata - - def match(self, expected_result): - """Check whether a result matches certain criteria - - expected_result is a Dictionary defining the criteria, allowing to not - rigidly define every detail about the check result, but only what we - really want to test. Unset fields mean we don't care. - """ - - if "status" in expected_result and not match_status(expected_result["status"]): - return False - if "infotext" in expected_result and not match_infotext(expected_result["infotext"]): - return False - if "perfdata" in expected_result and not match_perfdata(expected_result["perfdata"]): - return False - return True - - def assert_result(self, expected_result): - """Assert that a result matches certain criteria - - expected_result works as in match_result - """ - - if "status" in expected_result: - assert match_status(expected_result["status"]) - if "infotext" in expected_result: - assert match_infotext(expected_result["infotext"]) - if "perfdata" in expected_result: - assert match_perfdata(expected_result["perfdata"]) - class CompoundCheckResult(object): """A check result consisting of multiple subresults, as returned by yield-style checks""" @@ -102,16 +61,3 @@ class CompoundCheckResult(object): self.subresults = [] for subresult in result: self.subresults.append(BasicCheckResult(*subresult)) - - def match_subresult(self, expected_result): - """Checks whether a subresult matching certain criteria is contained in this compound result""" - - for subresult in self.subresults: - if subresult.match(expected_result): - return True - return False - - def assert_result(self, expected_result): - """Assert that a subresult matching certain criteria is contained in this compound result""" - - assert self.match_subresult(expected_result) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index 57f5abd..d02e698 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -267,4 +267,3 @@ def test_df_check_with_parse(check_manager, monkeypatch, item, params, info, exp params = check.default_parameters() result = checktestlib.BasicCheckResult(*check.run_check(item, params, check.run_parse(info))) - result.assert_result(expected_result) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index 1e4026d..711e213 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -27,4 +27,3 @@ def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, ex pass monkeypatch.setattr("time.time", lambda: 60) result = checktestlib.CompoundCheckResult(check.run_check(None, params, time_to_info(60))) - result.assert_result(expected_result)

6 years, 6 months

checktestlib: Generalize CompoundCheckResult to also handle the non-yield case. Rename accordingly , remove calls to BasicCheckResult in tests

by Konstantin Büttner

Module: check_mk Branch: master Commit: 1a74e8acc73e185e632ac816fd1f56110ec3a2f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a74e8acc73e18… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 20 13:52:32 2017 +0100 checktestlib: Generalize CompoundCheckResult to also handle the non-yield case. Rename accordingly, remove calls to BasicCheckResult in tests Change-Id: I7fe8a980f520a31c0d551dd66e3cd3d2fdeea15d --- tests/checks/checktestlib.py | 21 +++++++++++++++------ tests/checks/test_df_check.py | 2 +- tests/checks/test_statgrab_cpu_check.py | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 2b65354..c8a723d 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -1,3 +1,5 @@ +import types + class PerfValue(object): """Represents a single perf value""" @@ -52,12 +54,19 @@ class BasicCheckResult(object): self.perfdata = None -class CompoundCheckResult(object): - """A check result consisting of multiple subresults, as returned by yield-style checks""" +class CheckResult(object): + """A check result potentially consisting of multiple subresults, as returned by yield-style checks""" def __init__(self, result): - """Initializes a list of subresults using BasicCheckResult""" + """Initializes a list of subresults using BasicCheckResult. + + If the result is already a plain check result in its tuple representation, we initialize + a list of length 1. + """ - self.subresults = [] - for subresult in result: - self.subresults.append(BasicCheckResult(*subresult)) + if type(result) == types.GeneratorType: + self.subresults = [] + for subresult in result: + self.subresults.append(BasicCheckResult(*subresult)) + else: + self.subresults = [ BasicCheckResult(*result) ] diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index d02e698..ce8386e 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -266,4 +266,4 @@ def test_df_check_with_parse(check_manager, monkeypatch, item, params, info, exp if params == "default": params = check.default_parameters() - result = checktestlib.BasicCheckResult(*check.run_check(item, params, check.run_parse(info))) + result = checktestlib.CheckResult(check.run_check(item, params, check.run_parse(info))) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index 711e213..cfec920 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -26,4 +26,4 @@ def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, ex except MKCounterWrapped: pass monkeypatch.setattr("time.time", lambda: 60) - result = checktestlib.CompoundCheckResult(check.run_check(None, params, time_to_info(60))) + result = checktestlib.CheckResult(check.run_check(None, params, time_to_info(60)))

6 years, 6 months

5601 fortinet_controller_aps: New check which monitors the number of WiFi access points for Fortinet WLAN controller

by Simon Betz

Module: check_mk Branch: master Commit: 6bf408c051f43dbd731c8e561346798ce309c73a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bf408c051f43d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 20 10:40:14 2017 +0100 5601 fortinet_controller_aps: New check which monitors the number of WiFi access points for Fortinet WLAN controller Change-Id: I50499069419651283ae609430b38e048c43aa786 --- .werks/5601 | 10 ++++ checkman/fortinet_controller_aps | 17 ++++++ checks/fortinet_controller_aps | 117 +++++++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 12 ++++ 4 files changed, 156 insertions(+) diff --git a/.werks/5601 b/.werks/5601 new file mode 100644 index 0000000..1a82e5f --- /dev/null +++ b/.werks/5601 @@ -0,0 +1,10 @@ +Title: fortinet_controller_aps: New check which monitors the number of WiFi access points for Fortinet WLAN controller +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1513762766 +Class: feature + + diff --git a/checkman/fortinet_controller_aps b/checkman/fortinet_controller_aps new file mode 100644 index 0000000..1b1c621 --- /dev/null +++ b/checkman/fortinet_controller_aps @@ -0,0 +1,17 @@ +title: Fortinet WLAN Controller APs: Number of Wifi Access Points +agents: snmp +catalog: hw/network/fortinet +license: GPL +distribution: check_mk +description: + This checks displays the amount of connected access points on the controller. + Per default the check only displays the information for each Access Point. + Levels are fixed and the service goes CRIT if an inventorized Access Point is down + or not availible. + +item: + The name of the access point. + +inventory: + One check for each access point which is successfully connected. + diff --git a/checks/fortinet_controller_aps b/checks/fortinet_controller_aps new file mode 100644 index 0000000..da76475 --- /dev/null +++ b/checks/fortinet_controller_aps @@ -0,0 +1,117 @@ +#!/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. +# +# .1.3.6.1.4.1.15983.1.1.4.2.1.1.2.1 AP1 +# .1.3.6.1.4.1.15983.1.1.4.2.1.1.4.1 1 +# .1.3.6.1.4.1.15983.1.1.4.2.1.1.8.1 +# .1.3.6.1.4.1.15983.1.1.4.2.1.1.17.1 990625700 +# .1.3.6.1.4.1.15983.1.1.4.2.1.1.26.1 1 +# .1.3.6.1.4.1.15983.1.1.4.2.1.1.27.1 3 +# .1.3.6.1.4.1.15983.1.1.3.1.7.1.3.1 "00 0C E6 XX XX XX " +# .1.3.6.1.4.1.15983.1.1.3.1.7.1.5.1 1 +# .1.3.6.1.4.1.15983.1.1.3.1.7.1.9.1 1 + +ap_state = { + '1' : ( 0, 'AP is up' ), + '2' : ( 1, 'AP is down' ), + } + +ap_avail = { + '1' : ( 3, 'availibility status unknown' ), + '2' : ( 2, 'availibility status is disabled' ), + '3' : ( 0, 'availibility status is enabled' ), + } + +def parse_fortinet_controller_aps(info): + new_info = [] + for ap_table in info[0]: + new_element = [] + for client_table in info[1]: + if ap_table[1] == client_table[2]: + if new_element == []: + new_element = [ ap_table, client_table ] + else: + new_element.append(client_table) + if new_element != []: + new_info.append(new_element) + return new_info + + +def inventory_fortinet_controller_aps(info): + for element in info: + yield element[0][1], {} + + +def check_fortinet_controller_aps(item, params, info): + for element in info: + if item == element[0][1]: + client_count_24 = 0 + client_count_5 = 0 + for client in element[1:]: + if client[1] == '1': + client_count_24 += 1 + elif client[1] == '2': + client_count_5 += 1 + else: + continue + perfdata = [ + ( 'uptime', element[0][3] ), + ( '5ghz_clients', client_count_5 ), + ( '24ghz_clients', client_count_24 ), + ] + yield 0, 'AP %s' % element[0][1], perfdata + if element[0][4] == '1' and element[0][5] == '3': + yield 0, 'Status: online' + else: + yield ap_state[element[0][4]] + yield ap_avail[element[0][5]] + yield 0, 'connected Clients (2,4 ghz / 5 Ghz): %s/%s' % ( client_count_24, client_count_5 ) + if element[0][2] != '': + yield 0, 'located at %s' % element[0][2] + + +check_info['fortinet_controller_aps'] = { + 'parse_function' : parse_fortinet_controller_aps, + 'inventory_function' : inventory_fortinet_controller_aps, + 'check_function' : check_fortinet_controller_aps, + 'service_description' : 'AP %s', + 'has_perfdata' : True, + 'snmp_info' : [('.1.3.6.1.4.1.15983.1.1.4.2.1.1', [ + '2', # mwApDescr + '4', # mwApID + '8', # mwApLocation + '17', # mwApUpTime + '26', # mwApOperationalState + '27' # mwApAvailabilityStatus + ] ), + ( '.1.3.6.1.4.1.15983.1.1.3.1.7.1', [ + '3', # Client Mac + '5', # Iface Name + '9' # AP_ID + ] + )], + 'snmp_scan_function' : lambda oid : '.1.3.6.1.4.1.15983' in oid('.1.3.6.1.2.1.1.2.0').lower(), +} diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index e321a98..a51c979 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1093,6 +1093,18 @@ metric_info["threads_busy"] = { "color" : "34/a", } +metric_info["5ghz_clients"] = { + "title" : _("Client connects for 5 Ghz Band"), + "unit" : "count", + "color" : "13/a", +} + +metric_info["24ghz_clients"] = { + "title" : _("Client connects for 2,4 Ghz Band"), + "unit" : "count", + "color" : "14/a", +} + for what, color in [ ("msg", "12"), ("rollovers", "13"), ("regular", "14"), ("warning", "15"), ("user", "16") ]: metric_info["assert_%s" % what] = {

6 years, 6 months

Ignore temporary files in chroot during bandit scans

by Lars Michelsen

Module: check_mk Branch: master Commit: a98ece45cbb578fd7d64de75cda1d67ce1cb626a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a98ece45cbb578… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 20 08:07:08 2017 +0100 Ignore temporary files in chroot during bandit scans Change-Id: I065925f262a9b33748daf21605a771e21a89d8c5 --- bandit.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/bandit.yaml b/bandit.yaml index de91751..0e42cae 100644 --- a/bandit.yaml +++ b/bandit.yaml @@ -7,6 +7,7 @@ exclude_dirs: - '/doc/treasures/notifications' - '/scripts' - '/agents/windows/plugins/build' + - '/agents/windows/chroot' ### Bandit config file generated from: # '/usr/local/bin/bandit-config-generator -o ../bandit.yaml'

6 years, 6 months

Bandit: Do not try to scan non python files in agent plugins directory

by Lars Michelsen

Module: check_mk Branch: master Commit: b5d2354115c22641b17310286c8ebf9fa88982a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5d2354115c226… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 20 08:14:58 2017 +0100 Bandit: Do not try to scan non python files in agent plugins directory Change-Id: Icaaacd3bd48a50d33bd2ebf55666e7d87f605afb --- tests/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 671f257..8f481db 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -38,7 +38,8 @@ test-bandit: $$(grep -l python "$$CMK_DIR"/bin/*) \ "$$CMK_DIR"/{checks,inventory}/* \ $$(grep -l python "$$ENTERPRISE_DIR"/bin/*) \ - "$$ENTERPRISE_DIR"/agents/{plugins,bakery}/* + "$$ENTERPRISE_DIR"/agents/plugins/*.py \ + "$$ENTERPRISE_DIR"/agents/bakery/* test-bandit-ci:

6 years, 6 months

AC tests: Minor subprocess call cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: b22b79da63deec05903b4dd0fcf6b69f6647218c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b22b79da63deec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 20 08:12:07 2017 +0100 AC tests: Minor subprocess call cleanup Change-Id: Ibbdb608f1c589d71af00eab1fa2229f9209ce582 --- web/plugins/wato/ac_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/ac_tests.py b/web/plugins/wato/ac_tests.py index 9bd8cc1..ba7779a 100644 --- a/web/plugins/wato/ac_tests.py +++ b/web/plugins/wato/ac_tests.py @@ -399,8 +399,8 @@ class ACTestApacheNumberOfProcesses(ACTest, BPApacheTest): raise MKGeneralException(_("Failed to read the apache process ID")) sizes = [] - for pid in os.popen("ps --ppid %s h o pid" % ppid): - summary_line = os.popen("pmap -d %d" % int(pid)).readlines()[-1] + for pid in subprocess.check_output(["ps", "--ppid", "%d" % ppid, "h", "o", "pid"]).splitlines(): + summary_line = subprocess.check_output(["pmap", "-d", "%d" % int(pid)]).splitlines()[-1] sizes.append(int(summary_line.split()[3][:-1])*1024.0) if not sizes:

6 years, 6 months

Tests: Enable debug mode for liveproxyd during tests

by Lars Michelsen

Module: check_mk Branch: master Commit: ea4e5cc9d8ea95b1f09aa38ebe0271d1106932d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea4e5cc9d8ea95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 20 08:39:50 2017 +0100 Tests: Enable debug mode for liveproxyd during tests Change-Id: Ieaa99f7af20fc15f03eb724ac8789af053f73b13 --- tests/testlib/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 08c91d7..d5b3570 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -433,6 +433,7 @@ class Site(object): assert os.path.exists("/omd/sites/%s" % self.id) self._enable_mod_python_debug() + self._enabled_liveproxyd_debug_logging() self._install_test_python_modules() @@ -543,6 +544,12 @@ class Site(object): self._add_version_path_to_index_py() + def _enabled_liveproxyd_debug_logging(self): + self.makedirs("etc/check_mk/liveproxyd.d/wato") + self.write_file("etc/check_mk/liveproxyd.d/wato/global.mk", + "liveproxyd_log_levels = {'cmk.liveproxyd': 10}") + + def _enable_mod_python_debug(self): path = "etc/check_mk/apache.conf" content = self.read_file(path)

6 years, 6 months

5586 FIX Raw edition: Fixed adding graphs to dashboards

by Lars Michelsen

Module: check_mk Branch: master Commit: f10cd513227743d363981175bf031ded138cddba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f10cd513227743… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 19 16:02:35 2017 +0100 5586 FIX Raw edition: Fixed adding graphs to dashboards Change-Id: Id9610aee4522f215c90fba48be27ce26b87cffb2 --- .werks/5586 | 11 +++++++++++ web/htdocs/dashboard.py | 7 +++++-- web/htdocs/js/checkmk.js | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/5586 b/.werks/5586 new file mode 100644 index 0000000..7579f14 --- /dev/null +++ b/.werks/5586 @@ -0,0 +1,11 @@ +Title: Raw edition: Fixed adding graphs to dashboards +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1513695677 + + diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index b6543d3..9dd3079 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1300,10 +1300,13 @@ def popup_add_dashlet(dashboard_name, dashlet_type, context, params): # Exceptions do not work here. return - if dashlet_type == "pnpgraph": + if dashlet_type == "pnpgraph" and context is None: + # Raw Edition graphs are added correctly by htdocs/js/checkmk.js create_pnp_graph(). + # Enterprise Edition graphs: + # # Context will always be None here, but the specification (in params) # will contain it. Transform the data to the format needed by the dashlets. - + # # Example: # params = [ 'template', {'service_description': 'CPU load', 'site': 'mysite', # 'graph_index': 0, 'host_name': 'server123'}]) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 0ecd9ac..8ecb1f0 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -805,7 +805,7 @@ function create_pnp_graph(data, params) { var view = data['view'] == '' ? 0 : data['view']; // needs to be extracted from "params", hack! - var source = parseInt(getUrlParam('source', params)); + var source = parseInt(getUrlParam('source', params)) + 1; // Add the control for adding the graph to a visual var visualadd = document.createElement('a');

6 years, 6 months

5585 FIX Added missing icon "host is currently not being checked" to host views

by Lars Michelsen

Module: check_mk Branch: master Commit: 6253bb9841e42000ca1f80b4e55beb0fea8c7ec0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6253bb9841e420… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 19 15:27:56 2017 +0100 5585 FIX Added missing icon "host is currently not being checked" to host views Change-Id: I17da14bd396eadfad2babcfdaf2b39cd09d385e6 --- .werks/5585 | 11 +++++++++++ web/plugins/icons/builtin.py | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/5585 b/.werks/5585 new file mode 100644 index 0000000..f8c1744 --- /dev/null +++ b/.werks/5585 @@ -0,0 +1,11 @@ +Title: Added missing icon "host is currently not being checked" to host views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1513693650 + + diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 5ec70cd..9c3d10d 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -884,11 +884,15 @@ def paint_icon_check_period(what, row, tags, host_custom_vars): if what == "service": if row['%s_in_passive_check_period' % what] == 0\ or row['%s_in_check_period' % what] == 0: - return 'pause', _("This service is currently not being checked") + return "pause", _("This service is currently not being checked") + elif what == "host": + if row['%s_in_check_period' % what] == 0: + return "pause", _("This host is currently not being checked") multisite_icons_and_actions['check_period'] = { - 'service_columns' : ['in_passive_check_period', 'in_check_period'], + 'columns' : ['in_check_period'], + 'service_columns' : ['in_passive_check_period'], 'paint' : paint_icon_check_period, 'toplevel' : True, }

6 years, 6 months

Removed broken symlink

by Lars Michelsen

Module: check_mk Branch: master Commit: 3933472c7554da462d2936da4d3fa263706068c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3933472c7554da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 19 15:04:00 2017 +0100 Removed broken symlink Change-Id: I2954582d6b5295756e41d9b50f55a82f0a8decf9 --- pnp-templates/check_mk-hitachi_hnas_cpu.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pnp-templates/check_mk-hitachi_hnas_cpu.php b/pnp-templates/check_mk-hitachi_hnas_cpu.php deleted file mode 120000 index 104023f..0000000 --- a/pnp-templates/check_mk-hitachi_hnas_cpu.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-hr_cpu.php \ No newline at end of file

6 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017