Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

Add locking for performance counters in EC

by Mathias Kettner

Module: check_mk Branch: master Commit: 698d4697b6c506846896b99a5e8387787bba3126 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=698d4697b6c506… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 12:58:19 2016 +0100 Add locking for performance counters in EC Change-Id: I576a99351c0c57c307f70a8495bce67938af4140 --- bin/mkeventd | 112 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 50 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index ae28ce7..4e85f67 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1030,6 +1030,7 @@ def get_logfile_timespan(path): # '----------------------------------------------------------------------' class Perfcounters: def __init__(self): + self._lock = thread.allocate_lock() # Event counters self._counters = { "messages" : 0, @@ -1054,68 +1055,77 @@ class Perfcounters: self._times = {} self._last_statistics = None + def count(self, counter): - self._counters[counter] += 1 + with self._lock: + self._counters[counter] += 1 + def count_time(self, counter, ptime): - if counter not in self._times: - self._times[counter] = ptime - else: - weight = self._weights[counter] - self._times[counter] *= weight - self._times[counter] += (1.00 - weight) * ptime + with self._lock: + if counter not in self._times: + self._times[counter] = ptime + else: + weight = self._weights[counter] + self._times[counter] *= weight + self._times[counter] += (1.00 - weight) * ptime def do_statistics(self): - now = time.time() - weight = 0.9 # We could make this configurable - if self._last_statistics: - duration = now - self._last_statistics - else: - duration = 0 - for name, value in self._counters.items(): - if duration: - delta = value - self._old_counters[name] - rate = delta / duration - self._rates[name] = rate - if name in self._average_rates: - self._average_rates[name] = \ - self._average_rates[name] * weight + rate * (1.0 - weight) - else: - self._average_rates[name] = rate + with self._lock: + now = time.time() + weight = 0.9 # We could make this configurable + if self._last_statistics: + duration = now - self._last_statistics + else: + duration = 0 + for name, value in self._counters.items(): + if duration: + delta = value - self._old_counters[name] + rate = delta / duration + self._rates[name] = rate + if name in self._average_rates: + self._average_rates[name] = \ + self._average_rates[name] * weight + rate * (1.0 - weight) + else: + self._average_rates[name] = rate - self._last_statistics = now - self._old_counters = self._counters.copy() + self._last_statistics = now + self._old_counters = self._counters.copy() - def status_columns(self): - columns = [] - for name in self._counters: - columns.append(("status_" + name, 0.0)) - columns.append(("status_" + name.rstrip("s") + "_rate", 0.0)) - columns.append(("status_average_" + name.rstrip("s") + "_rate", 0.0)) - for name in self._weights: - columns.append(("status_average_%s_time" % name, 0.0)) + def status_columns(self): + with self._lock: + columns = [] + for name in self._counters: + columns.append(("status_" + name, 0.0)) + columns.append(("status_" + name.rstrip("s") + "_rate", 0.0)) + columns.append(("status_average_" + name.rstrip("s") + "_rate", 0.0)) - return columns + for name in self._weights: + columns.append(("status_average_%s_time" % name, 0.0)) - def get_status(self): - headers = [] - row = [] - for name, value in self._counters.items(): - rate_name = name.rstrip("s") + "_rate" - average_rate_name = "average_" + name.rstrip("s") + "_rate" - headers.append("status_" + name) - headers.append("status_" + rate_name) - headers.append("status_" + average_rate_name) - row.append(value) - row.append(self._rates.get(name, 0.0)) - row.append(self._average_rates.get(name, 0.0)) + return columns - for name in self._weights.keys(): - headers.append("status_average_%s_time" % name) - row.append(self._times.get(name, 0.0)) - return headers, row + def get_status(self): + with self._lock: + headers = [] + row = [] + for name, value in self._counters.items(): + rate_name = name.rstrip("s") + "_rate" + average_rate_name = "average_" + name.rstrip("s") + "_rate" + headers.append("status_" + name) + headers.append("status_" + rate_name) + headers.append("status_" + average_rate_name) + row.append(value) + row.append(self._rates.get(name, 0.0)) + row.append(self._average_rates.get(name, 0.0)) + + for name in self._weights.keys(): + headers.append("status_average_%s_time" % name) + row.append(self._times.get(name, 0.0)) + + return headers, row #. @@ -1682,6 +1692,7 @@ class EventServer: elapsed = time.time() - before g_perfcounters.count_time("processing", elapsed) + # Takes several lines of messages, handles encoding and processes them separated def process_raw_lines(self, data, address = None): lines = data.splitlines() @@ -1693,6 +1704,7 @@ class EventServer: except Exception: log('Exception handling a log line (skipping this one): %s' % format_exception()) + def do_housekeeping(self): with lock_eventstatus: with lock_configuration:

7 years, 9 months

Fixed .f12 of livestatus/api/python

by Mathias Kettner

Module: check_mk Branch: master Commit: 4d1368ff3d39e3f64eff81d1533d67d62537dad6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d1368ff3d39e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 12:55:56 2016 +0100 Fixed .f12 of livestatus/api/python Change-Id: Icf02ae126e84f1981d060ce80ed3d597fad9b348 --- livestatus/api/python/.f12 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/livestatus/api/python/.f12 b/livestatus/api/python/.f12 index 89826a3..74b28b5 100644 --- a/livestatus/api/python/.f12 +++ b/livestatus/api/python/.f12 @@ -1,5 +1,10 @@ #!/bin/bash -SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} +SITE=${SITE:-$(cat ../../../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo rsync livestatus.py /omd/sites/$SITE/lib/python/ +if [ -z $ONLY_COPY ]; then + if [ "$SITE" != - ] ; then + sudo omd restart $SITE apache + fi +fi

7 years, 9 months

4117 FIX HPUX agent: fixed determination of cpu/core information

by Marcel Schulte

Module: check_mk Branch: master Commit: af68d1dcd1e5961eb372b547a9253ce84f1e4d44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af68d1dcd1e596… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Dec 14 12:38:36 2016 +0100 4117 FIX HPUX agent: fixed determination of cpu/core information Previously cpu information for just 1 socket was reported and thus wrong information about the number of cores where displayed. This has been fixed now. Change-Id: I068f5eef1d017fdfa7c1eb6041d3d297290e3b69 --- .werks/4117 | 12 ++++++++++++ ChangeLog | 1 + agents/check_mk_agent.hpux | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4117 b/.werks/4117 new file mode 100644 index 0000000..c0eaa22 --- /dev/null +++ b/.werks/4117 @@ -0,0 +1,12 @@ +Title: HPUX agent: fixed determination of cpu/core information +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1481715069 + +Previously cpu information for just 1 socket was reported and thus wrong information about the number of cores where displayed. + +This has been fixed now. diff --git a/ChangeLog b/ChangeLog index 9930fdf..8d2fed0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,7 @@ * 4179 FIX: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes... * 4180 FIX: fileinfo: Made paths for file grouping compatible for windows... * 4165 FIX: tsm_stagingpools: fixed node info handling + * 4117 FIX: HPUX agent: fixed determination of cpu/core information... Multisite: * 4070 Added a painter for the service check period diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 7aca5ab..c27b210 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -70,7 +70,7 @@ UNIX95=yes ps -ef -o user,vsz,pcpu,args | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ echo '<<<hpux_cpu>>>' uptime # machinfo is unsupported addon thus not in $PATH -/usr/contrib/bin/machinfo | grep 'logical proc' +/usr/contrib/bin/machinfo | grep -E 'logical proc|core' | tail -1 # Several machine performance counters echo '<<<hpux_vmstat>>>'

7 years, 9 months

Caching the apache TCP port through tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 12037bf375848d72658f442d76ad3515662bad6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12037bf375848d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 11:42:38 2016 +0100 Caching the apache TCP port through tests Change-Id: Ief71b42d6d634efe480513e59af5d97812cab218 --- tests/testlib/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 9776de4..3c8e5f2 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -163,12 +163,16 @@ class Site(object): self.http_address = "127.0.0.1" self.url = "%s://%s/%s/check_mk/" % (self.http_proto, self.http_address, self.id) + self._apache_port = None # internal cache for the port + self._gather_livestatus_port() @property def apache_port(self): - return int(self.get_config("APACHE_TCP_PORT")) + if self._apache_port == None: + self._apache_port = int(self.get_config("APACHE_TCP_PORT")) + return self._apache_port @property

7 years, 9 months

GUI crawl test does not involve the system apache anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: ddaa797d0ea9c91c7e7ba06a30b555f3fdbebfdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddaa797d0ea9c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 11:40:49 2016 +0100 GUI crawl test does not involve the system apache anymore Change-Id: Ibfd6f162ac1045ae7ab20c1b1d9aa6b90092783f --- tests/testlib/__init__.py | 9 +++++++++ tests/web/test_crawl.py | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 2f1b5c7..9776de4 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -167,6 +167,15 @@ class Site(object): @property + def apache_port(self): + return int(self.get_config("APACHE_TCP_PORT")) + + + @property + def internal_url(self): + return "%s://%s:%s/%s/check_mk/" % (self.http_proto, self.http_address, self.apache_port, self.id) + + @property def livestatus_port(self): if self._livestatus_port == None: raise Exception("Livestatus TCP not opened yet") diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index 32a178f..7af4a68 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -190,7 +190,7 @@ class Worker(threading.Thread): for element in elements: orig_url = element.get(attr) - url = self.normalize_url(self.crawler.site.url, orig_url) + url = self.normalize_url(self.crawler.site.internal_url, orig_url) if url is not None and self.is_valid_url(url) \ and url not in self.crawler.visited: @@ -214,7 +214,7 @@ class Worker(threading.Thread): return False # skip external urls - if url.startswith("http://") and not url.startswith(self.crawler.site.url): + if url.startswith("http://") and not url.startswith(self.crawler.site.internal_url): #print("Skipping external URL: %s" % url) return False @@ -283,7 +283,7 @@ class TestCrawler(object): self.load_stats() - self.todo.put(Url("/%s/check_mk/" % site.id)) + self.todo.put(Url(site.internal_url)) self.crawl()

7 years, 9 months

4165 FIX tsm_stagingpools: fixed node info handling

by Simon Betz

Module: check_mk Branch: master Commit: 99245a42ee01337d3285f062e038401910b434af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99245a42ee0133… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 14 11:08:08 2016 +0100 4165 FIX tsm_stagingpools: fixed node info handling Change-Id: I7d473d7e83b6c1a9f7f14fa96d348ca231e36809 --- .werks/4165 | 10 ++++++++++ ChangeLog | 1 + checks/tsm_stagingpools | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4165 b/.werks/4165 new file mode 100644 index 0000000..579af78 --- /dev/null +++ b/.werks/4165 @@ -0,0 +1,10 @@ +Title: tsm_stagingpools: fixed node info handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1481710032 + + diff --git a/ChangeLog b/ChangeLog index 4152334..9930fdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 4178 FIX: apt: Fixed crash on unexpected output... * 4179 FIX: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes... * 4180 FIX: fileinfo: Made paths for file grouping compatible for windows... + * 4165 FIX: tsm_stagingpools: fixed node info handling Multisite: * 4070 Added a painter for the service check period diff --git a/checks/tsm_stagingpools b/checks/tsm_stagingpools index a2cbf93..db613b5 100644 --- a/checks/tsm_stagingpools +++ b/checks/tsm_stagingpools @@ -76,7 +76,8 @@ def check_tsm_stagingpools(item, params, parsed): datasets, nodeinfos = [], [] for node, data in parsed[item].items(): - nodeinfos.append(node) + if node is not None: + nodeinfos.append(node) datasets.append( tuple(data) ) num_tapes = 0

7 years, 9 months

Adapted HTML class tests to reflect currently expected behaviour

by Lars Michelsen

Module: check_mk Branch: master Commit: 550acbbe47903ba0c4b28900d77777030964d41b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=550acbbe47903b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 09:39:13 2016 +0100 Adapted HTML class tests to reflect currently expected behaviour Change-Id: I0724f1befad5fda96022b8801c2026b87e4c42e9 --- tests/web/test_html.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/web/test_html.py b/tests/web/test_html.py index 07c30ec..f2eb8a6 100644 --- a/tests/web/test_html.py +++ b/tests/web/test_html.py @@ -44,10 +44,11 @@ def test_class_HTML(): assert HTML(None) == HTML(u"%s" % None) assert HTML() == HTML('') - assert str(A) == a, str(A) - assert "%s" % A == a, "%s" % A + # One day we will fix this! + assert unicode(A) == a.decode("utf-8"), unicode(A) + assert "%s" % A == a.decode("utf-8"), "%s" % A assert json.loads(json.dumps(A)) == A - assert repr(A) == 'HTML(\"%s\")' % A + assert repr(A) == 'HTML(\"%s\")' % A.value.encode("utf-8") assert len(B) == len(b) assert unicode(B) == unicode(b) @@ -58,14 +59,15 @@ def test_class_HTML(): assert HTML().join([a, b]) == a + b assert HTML("jo").join([A, B]) == A + "jo" + B assert HTML("jo").join([a, b]) == a + "jo" + b - assert ''.join(map(str, [A, B])) == A + B + assert ''.join(map(unicode, [A, B])) == A + B assert isinstance(A, HTML), type(A) # assert isinstance(A, unicode), type(A) assert not isinstance(A, str), type(A) assert isinstance(unicode(A), unicode), unicode(A) - assert isinstance(str(A), str), str(A) + # One day we will fix this! + assert isinstance(unicode(A), unicode), unicode(A) assert isinstance(A + B, HTML), type(A + B) assert isinstance(HTML('').join([A, B]), HTML) assert isinstance(HTML().join([A, B]), HTML) @@ -92,7 +94,7 @@ def test_class_HTML(): assert A == a - assert ("%s" % A) == a + assert ("%s" % A) == a.decode("utf-8") assert B + C != C + B @@ -106,7 +108,7 @@ def test_class_HTML(): assert A != B assert isinstance(HTML(HTML(A)), HTML) - assert isinstance("%s" % HTML(HTML(A)), str) + assert isinstance("%s" % HTML(HTML(A)), unicode) assert isinstance(A, HTML) A += (" JO PICASSO! ") @@ -114,14 +116,14 @@ def test_class_HTML(): assert isinstance(A + "TEST" , HTML) - assert isinstance("TEST%s" % A, str) + assert isinstance("TEST%s" % A, unicode) assert "test" + C == "test" + c assert D == d assert "%s" % D == "%s" % d assert isinstance(u"%s" % D, unicode) - assert isinstance("%s" % D, str) + assert isinstance("%s" % D, unicode) E = A + B e = "%s" % E

7 years, 9 months

Updated bug entries #2549

by Mathias Kettner

Module: check_mk Branch: master Commit: 7cb41e3d566dafa80cdb027eb1833106cf9ca8f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cb41e3d566daf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 09:32:38 2016 +0100 Updated bug entries #2549 Change-Id: Ie3170e139b0b11ad9839d5cda5faa74d5755181a --- .bugs/2549 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2549 b/.bugs/2549 new file mode 100644 index 0000000..c8e87f8 --- /dev/null +++ b/.bugs/2549 @@ -0,0 +1,12 @@ +Title: Import of ical files into timeperiod does not honor multiday events correctly +Component: wato +State: open +Date: 2016-12-14 09:31:57 +Targetversion: 1.2.8 +Class: bug + +Wenn für Time Periods eine iCal-Datei mit einem Mehrtagestermin +importiert wird (also z.B. DTSTART=20161212T000000 und +DTEND=20161215T235959) dann wird nur der erste Tag als Eintrag in der +Time Period generiert. Hier sollten analog zu Wiederholungsterminen +mehrere Tage in der Time Period angelegt werden.

7 years, 9 months

Updated bug entries #2548

by Mathias Kettner

Module: check_mk Branch: master Commit: de4d9f5b6a7770e77dce4bb6eaa91f2432e8d848 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de4d9f5b6a7770… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 09:30:58 2016 +0100 Updated bug entries #2548 Change-Id: Ia650109e1e2d5ea121cb35eb550ff3318000ce75 --- .bugs/2548 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.bugs/2548 b/.bugs/2548 new file mode 100644 index 0000000..01bb993 --- /dev/null +++ b/.bugs/2548 @@ -0,0 +1,16 @@ +Title: Validate deletion of host if that is used as a parent somewhere +Component: wato +State: open +Date: 2016-12-14 09:29:22 +Targetversion: future +Class: nastiness + +If you delete a host that is a parent of some other host then +you should not be able to delete that host. + +The question is, if deleting of hole folders or even folder trees +should also be validated (complicated). Same holds for bulk delets. +Here we would need to validate the situation after *all* +deletes have been done. + +Suggestion: we validate just when deleting one single host.

7 years, 9 months

updated some catalog paths

by Simon Betz

Module: check_mk Branch: master Commit: 28d9de0db12cc55f9ac0754b888d439f1f2bd6f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28d9de0db12cc5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 14 09:06:52 2016 +0100 updated some catalog paths Change-Id: I06c879dcde50b9bb133ebb1518cc0a8e21829eb1 --- checkman/apc_netbotz_other_sensors | 2 +- checkman/apc_netbotz_sensors | 2 +- checkman/apc_netbotz_sensors.dewpoint | 2 +- checkman/apc_netbotz_sensors.humidity | 2 +- checkman/barracuda_mail_latency | 2 +- checkman/barracuda_mailqueues | 2 +- checkman/barracuda_system_cpu_util | 2 +- checkman/didactum_sensors_analog | 2 +- checkman/didactum_sensors_analog.voltage | 2 +- checkman/didactum_sensors_discrete | 2 +- checkman/gude_humidity | 2 +- checkman/gude_powerbanks | 2 +- checkman/gude_relayport | 2 +- checkman/gude_temp | 2 +- lib/man_pages.py | 3 +++ 15 files changed, 17 insertions(+), 14 deletions(-) diff --git a/checkman/apc_netbotz_other_sensors b/checkman/apc_netbotz_other_sensors index 963f1d0..4ad044b 100644 --- a/checkman/apc_netbotz_other_sensors +++ b/checkman/apc_netbotz_other_sensors @@ -1,6 +1,6 @@ title: APC Netbotz Devices: Other numeric sensors summary agents: snmp -catalog: hw/other +catalog: hw/power/apc license: GPL distribution: check_mk description: diff --git a/checkman/apc_netbotz_sensors b/checkman/apc_netbotz_sensors index ab87dd6..4e80701 100644 --- a/checkman/apc_netbotz_sensors +++ b/checkman/apc_netbotz_sensors @@ -1,6 +1,6 @@ title: APC Netbotz Devices: Temperature sensor agents: snmp -catalog: hw/other +catalog: hw/power/apc license: GPL distribution: check_mk description: diff --git a/checkman/apc_netbotz_sensors.dewpoint b/checkman/apc_netbotz_sensors.dewpoint index b949026..f05fb9d 100644 --- a/checkman/apc_netbotz_sensors.dewpoint +++ b/checkman/apc_netbotz_sensors.dewpoint @@ -1,6 +1,6 @@ title: APC Netbotz Devices: Dewpoint sensor agents: snmp -catalog: hw/other +catalog: hw/power/apc license: GPL distribution: check_mk description: diff --git a/checkman/apc_netbotz_sensors.humidity b/checkman/apc_netbotz_sensors.humidity index c416195..bc7fa09 100644 --- a/checkman/apc_netbotz_sensors.humidity +++ b/checkman/apc_netbotz_sensors.humidity @@ -1,6 +1,6 @@ title: APC Netbotz Devices: Humidity sensor agents: snmp -catalog: hw/other +catalog: hw/power/apc license: GPL distribution: check_mk description: diff --git a/checkman/barracuda_mail_latency b/checkman/barracuda_mail_latency index e6188f4..7aeb3c4 100644 --- a/checkman/barracuda_mail_latency +++ b/checkman/barracuda_mail_latency @@ -1,6 +1,6 @@ title: Barracuda SPAM Firewall: Mail Latency agents: snmp -catalog: hw/other +catalog: app/barracuda license: GPL distribution: check_mk description: diff --git a/checkman/barracuda_mailqueues b/checkman/barracuda_mailqueues index f3c129a..f086f6d 100644 --- a/checkman/barracuda_mailqueues +++ b/checkman/barracuda_mailqueues @@ -1,6 +1,6 @@ title: Barracuda SPAM Firewall: Active and Deferred Mail Queue Length agents: snmp -catalog: hw/other +catalog: app/barracuda license: GPL distribution: check_mk description: diff --git a/checkman/barracuda_system_cpu_util b/checkman/barracuda_system_cpu_util index e95beee..231406a 100644 --- a/checkman/barracuda_system_cpu_util +++ b/checkman/barracuda_system_cpu_util @@ -1,6 +1,6 @@ title: Barracuda SPAM Firewall: System CPU Utilization agents: snmp -catalog: hw/other +catalog: app/barracuda license: GPL distribution: check_mk description: diff --git a/checkman/didactum_sensors_analog b/checkman/didactum_sensors_analog index 4186b7c..583fddf 100644 --- a/checkman/didactum_sensors_analog +++ b/checkman/didactum_sensors_analog @@ -1,6 +1,6 @@ title: Didactum devices: Temperature agents: snmp -catalog: hw/other +catalog: hw/environment/didactum license: GPL distribution: check_mk description: diff --git a/checkman/didactum_sensors_analog.voltage b/checkman/didactum_sensors_analog.voltage index 9b06b5f..2214771 100644 --- a/checkman/didactum_sensors_analog.voltage +++ b/checkman/didactum_sensors_analog.voltage @@ -1,6 +1,6 @@ title: Didactum devices: Voltage agents: snmp -catalog: hw/other +catalog: hw/environment/didactum license: GPL distribution: check_mk description: diff --git a/checkman/didactum_sensors_discrete b/checkman/didactum_sensors_discrete index f429aed..44fe197 100644 --- a/checkman/didactum_sensors_discrete +++ b/checkman/didactum_sensors_discrete @@ -1,6 +1,6 @@ title: Didactum devices: Discrete sensors agents: snmp -catalog: hw/other +catalog: hw/environment/didactum license: GPL distribution: check_mk description: diff --git a/checkman/gude_humidity b/checkman/gude_humidity index 1c3b3d0..32e9153 100644 --- a/checkman/gude_humidity +++ b/checkman/gude_humidity @@ -1,6 +1,6 @@ title: GUDE Power Control: Humidity agents: snmp -catalog: hw/other +catalog: hw/power/gude license: GPL distribution: check_mk description: diff --git a/checkman/gude_powerbanks b/checkman/gude_powerbanks index 08df5e4..26a688b 100644 --- a/checkman/gude_powerbanks +++ b/checkman/gude_powerbanks @@ -1,6 +1,6 @@ title: GUDE Power Control: Powerbank status and electricity agents: snmp -catalog: hw/other +catalog: hw/power/gude license: GPL distribution: check_mk description: diff --git a/checkman/gude_relayport b/checkman/gude_relayport index 6396d4d..9f325b3 100644 --- a/checkman/gude_relayport +++ b/checkman/gude_relayport @@ -1,6 +1,6 @@ title: GUDE Power Control: Relay port status and electricity agents: snmp -catalog: hw/other +catalog: hw/power/gude license: GPL distribution: check_mk description: diff --git a/checkman/gude_temp b/checkman/gude_temp index accf41b..69fce15 100644 --- a/checkman/gude_temp +++ b/checkman/gude_temp @@ -1,6 +1,6 @@ title: GUDE Power Control: Temperature agents: snmp -catalog: hw/other +catalog: hw/power/gude license: GPL distribution: check_mk description: diff --git a/lib/man_pages.py b/lib/man_pages.py index 13a0312..bfa7ac0 100644 --- a/lib/man_pages.py +++ b/lib/man_pages.py @@ -65,6 +65,7 @@ catalog_titles = { "climaveneta" : "Climaveneta", "eaton" : "Eaton", "emerson" : "EMERSON", + "epson" : "Epson", "hwg" : "HW group", "kentix" : "Kentix", "knuerr" : "Knuerr", @@ -74,6 +75,7 @@ catalog_titles = { "stulz" : "STULZ", "wagner" : "WAGNER Group", "wut" : "Wiesemann & Theis", + "didactum" : "Didactum", "other" : "Other devices", "time" : "Clock Devices", "meinberg" : "Meinberg", @@ -161,6 +163,7 @@ catalog_titles = { "sansymphony" : "Datacore SANsymphony", "kaspersky" : "Kaspersky Lab", "mcafee" : "McAfee", + "barracuda" : "Barracuda", "os" : "Operating Systems", "aix" : "AIX",

7 years, 9 months

← Newer
1
...
21
22
23
24
25
26
27
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016