Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

Man page painter now also uses cmk.man_pages module

by Lars Michelsen

Module: check_mk Branch: master Commit: 23a2c5cef8b98fc788fd61348384c635f987ba33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23a2c5cef8b98f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 23 14:28:40 2016 +0200 Man page painter now also uses cmk.man_pages module --- web/plugins/views/painters.py | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 94abe97..9ca75c4 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -66,6 +66,7 @@ import bi # Needed for BI Icon. For arkane reasons (ask htdocs/module.py) this # cannot be imported in views.py directly. import cmk.paths +import cmk.man_pages as man_pages from cmk.regex import regex from cmk.defines import short_service_state_name, short_host_state_name from lib import * @@ -1048,42 +1049,31 @@ multisite_painters["svc_pnpgraph" ] = { } -def paint_check_manpage(row): +def paint_check_man_page(row): command = row["service_check_command"] if not command.startswith("check_mk-"): return "", "" checktype = command[9:] - # Honor man-pages in OMD's local structure - p = cmk.paths.local_check_manpages_dir + "/" + checktype - if not os.path.exists(p): - p = cmk.paths.check_manpages_dir + "/" + checktype - if not os.path.exists(p): - return "", _("Man-Page: %s not found.") % p - - description = None - for line in file(p): - line = line.rstrip() - if line == "description:": - description = "" - elif line.strip() == "" and description != None: - description += "<p>" - elif not line.startswith(' ') and line[-1] == ':': - break - elif description != None: - description += " " + line.replace("<", "<").replace(">", ">") - if not description: - return "", "" - else: - return "", description.replace("{", "<b>").replace("}", "</b>") + page = man_pages.load_man_page(checktype) + if page is None: + return "", _("Man page %s not found.") % checktype + + description = page["header"]["description"] + return "", description.replace("<", "<") \ + .replace(">", ">") \ + .replace("{", "<b>") \ + .replace("}", "</b>") \ + .replace("<br>", "<br>") multisite_painters["check_manpage"] = { "title" : _("Check manual (for Check_MK based checks)"), "short" : _("Manual"), "columns" : [ "service_check_command" ], - "paint" : paint_check_manpage, + "paint" : paint_check_man_page, } + def paint_comments(prefix, row): comments = row[ prefix + "comments_with_info"] text = ", ".join(["<i>%s</i>: %s" % (a, html.attrencode(c)) for (id, a, c) in comments ])

7 years, 12 months

Removed get-check-catalog automation (not needed anymore)

by Lars Michelsen

Module: check_mk Branch: master Commit: e65fa6b66a4e0f9c76ccdbc0a36f811d89e5532a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e65fa6b66a4e0f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 23 14:18:55 2016 +0200 Removed get-check-catalog automation (not needed anymore) --- modules/automation.py | 36 +---------------------------- web/htdocs/wato.py | 63 +++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 50 insertions(+), 49 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 10b856e..5685d2d 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -27,6 +27,7 @@ import signal import cmk.paths +import cmk.man_pages as man_pages # TODO: Inherit from MKGeneralException class MKAutomationError(Exception): @@ -63,8 +64,6 @@ def do_automation(cmd, args): result = automation_get_real_time_checks() elif cmd == "get-check-manpage": result = automation_get_check_manpage(args) - elif cmd == "get-check-catalog": - result = automation_get_check_catalog(args) elif cmd == "get-package-info": result = automation_get_package_info(args) elif cmd == "get-package": @@ -555,39 +554,6 @@ def automation_get_configuration(): return result -def automation_get_check_catalog(args): - def path_prefix_matches(p, op): - if op and not p: - return False - elif not op: - return True - else: - return p[0] == op[0] and path_prefix_matches(p[1:], op[1:]) - - tree = {} - if len(args) > 0: - only_path = tuple(args) - else: - only_path = () - - for path, entries in man_pages.load_man_page_catalog().items(): - if not path_prefix_matches(path, only_path): - continue - subtree = tree - for component in path[:-1]: - subtree = subtree.setdefault(component, {}) - subtree[path[-1]] = map(strip_manpage_entry, entries) - - for p in only_path: - tree = tree[p] - - return tree, man_pages.man_page_catalog_titles() - -def strip_manpage_entry(entry): - return dict([ (k,v) for (k,v) in entry.items() if k in [ - "name", "agents", "title" - ]]) - def automation_get_check_information(): manuals = man_pages.all_man_pages() diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0ebd625..c5bcbca 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -100,6 +100,7 @@ from watolib import * import cmk.paths import cmk.store as store +import cmk.man_pages as man_pages from cmk.regex import escape_regex_chars, regex from cmk.defines import short_service_state_name @@ -14946,7 +14947,8 @@ def declare_custom_host_attrs(): # '----------------------------------------------------------------------' # topic, has_second_level, title, description -check_manpage_topics = [ +def man_page_catalog_topics(): + return [ ("hw", True, _("Appliances, other dedicated hardware"), _("Switches, load balancers, storage, UPSes, " "environmental sensors, etc. ")), @@ -14972,31 +14974,27 @@ check_manpage_topics = [ def mode_check_plugins(phase): topic = html.var("topic") if topic: - path = topic.split("/") # e.g. [ "hw", "network" ] + path = tuple(topic.split("/")) # e.g. [ "hw", "network" ] if not re.match("^[a-zA-Z0-9_./]+$", topic): raise Exception("Invalid topic") else: - path = [] + path = tuple() - if html.is_cached("check_manpages"): - manpages, titles = html.get_cached("check_manpages") - else: - for comp in path: - ID().validate_value(comp, None) # Beware against code injection! - manpages, titles = check_mk_local_automation("get-check-catalog", path) - html.set_cache("check_manpages", (manpages, titles)) + for comp in path: + ID().validate_value(comp, None) # Beware against code injection! + + manpages = get_check_catalog(path) + titles = man_pages.man_page_catalog_titles() has_second_level = None if topic: - path = topic.split("/") # e.g. [ "hw", "network" ] - for t, has_second_level, title, helptext in check_manpage_topics: + for t, has_second_level, title, helptext in man_page_catalog_topics(): if t == path[0]: topic_title = title break if len(path) == 2: topic_title = titles.get(path[1], path[1]) - if phase == "title": heading = _("Catalog of Check Plugins") if topic: @@ -15030,12 +15028,46 @@ def mode_check_plugins(phase): render_manpage_topic(manpages, titles, has_second_level, path, topic_title) else: menu_items = [] - for topic, has_second_level, title, helptext in check_manpage_topics: + for topic, has_second_level, title, helptext in man_page_catalog_topics(): menu_items.append(( html.makeuri([("topic", topic)]), title, "plugins_" + topic, None, helptext)) render_main_menu(menu_items) +def get_check_catalog(args): + def path_prefix_matches(p, op): + if op and not p: + return False + elif not op: + return True + else: + return p[0] == op[0] and path_prefix_matches(p[1:], op[1:]) + + def strip_manpage_entry(entry): + return dict([ (k,v) for (k,v) in entry.items() if k in [ + "name", "agents", "title" + ]]) + + tree = {} + if len(args) > 0: + only_path = tuple(args) + else: + only_path = () + + for path, entries in man_pages.load_man_page_catalog().items(): + if not path_prefix_matches(path, only_path): + continue + subtree = tree + for component in path[:-1]: + subtree = subtree.setdefault(component, {}) + subtree[path[-1]] = map(strip_manpage_entry, entries) + + for p in only_path: + tree = tree[p] + + return tree + + def render_manpage_topic(manpages, titles, has_second_level, path, topic_title): if type(manpages) == list: render_manpage_list(manpages, titles, path[-1], topic_title) @@ -15103,6 +15135,9 @@ def mode_check_manpage(phase): if not re.match("^[-a-zA-Z0-9_.]+$", check_type): raise Exception("Invalid check type") + # TODO: remove call of automation and then the automation. This can be done once the check_info + # data is also available in the "cmk." module because the get-check-manpage automation not only + # fetches the man page. It also contains info from check_info. What a hack. manpage = check_mk_local_automation("get-check-manpage", [ check_type ]) if manpage == None: raise MKUserError(None, _("There is no manpage for this check."))

7 years, 12 months

updated werk

by Simon Betz

Module: check_mk Branch: master Commit: cd1734d1e578d218ea4fd27ac11fbf56dc38050a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd1734d1e578d2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 23 13:00:27 2016 +0200 updated werk --- .werks/3864 | 4 ++-- ChangeLog | 2 +- web/plugins/sidebar/shipped.py | 31 ++++++++++++++++++++++--------- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.werks/3864 b/.werks/3864 index 1dea583..05262a1 100644 --- a/.werks/3864 +++ b/.werks/3864 @@ -1,4 +1,4 @@ -Title: tactical overview now shows the number of stale hosts and services +Title: Now tactical overview is able to show the number of stale hosts and services Level: 1 Component: multisite Compatible: compat @@ -6,4 +6,4 @@ Version: 1.4.0i1 Date: 1472469803 Class: feature - +If and only if there are some stale hosts or services then an additional column is shown automatically. diff --git a/ChangeLog b/ChangeLog index 85676c0..d4c0235 100644 --- a/ChangeLog +++ b/ChangeLog @@ -431,7 +431,7 @@ * 3640 new filter option for status details: can now be negated * 3713 new filter: hosts with certain service problems * 3780 availability: now limit of fetched logfile rows is configurable. - * 3864 tactical overview now shows the number of stale hosts and services + * 3864 Now tactical overview is able to show the number of stale hosts and services... * 3847 Painter options can now be reset to defaults... * 3856 Improved handling of Check_MK GUI request timeouts... * 3876 New filter option: negation for several service and host groups diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 77a1f2a..7fd2b76 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -608,29 +608,37 @@ def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): html.write("<center>No data from any site</center>") return + td_class = 'col3' + if hstdata[-1] or svcdata[-1]: + td_class = 'col4' + html.write("<table class=\"content_center tacticaloverview\" cellspacing=2 cellpadding=0 border=0>\n") for title, data, view, stale_view, what in [ (_("Hosts"), hstdata, 'hostproblems', 'stale_hosts', 'host'), (_("Services"), svcdata, 'svcproblems', 'uncheckedsvc', 'service')]: amount, problems, unhandled_problems, stales = data - html.write("<tr><th>%s</th><th>%s</th><th>%s</th>" - "<th>%s</th></tr>\n" % (title, _('Problems'), _('Unhandled'), _("Stale"))) - html.write("<tr>") + title_row = "<tr><th>%s</th><th>%s</th><th>%s</th>" % (title, _('Problems'), _('Unhandled')) + if td_class == 'col4': + title_row += "<th>%s</th></tr>" % _("Stale") + html.write("%s\n" % title_row) + + html.write("<tr>") url = html.makeuri_contextless([("view_name", "all" + what + "s")] + extra_url_variables, filename="view.py") - html.write('<td class=total><a target="main" href="%s">%d</a></td>' % (url, amount)) + html.write('<td class="total %s"><a target="main" href="%s">%d</a></td>' % (td_class, url, amount)) for value, unhandled in [ (problems, False), (unhandled_problems, True) ]: url = html.makeuri_contextless([("view_name", view)] + extra_url_variables, filename="view.py") if unhandled: url += "&is_%s_acknowledged=0" % what text = link(str(value), url) - html.write('<td class="%s">%s</td>' % (value == 0 and " " or "states prob", text)) + html.write('<td class="%s%s">%s</td>' % (td_class, value == 0 and "" or ' states prob', text)) - url = html.makeuri_contextless([("view_name", stale_view)] + extra_url_variables, filename="view.py") - text = link(str(stales), url) - html.write('<td class="%s">%s</td>' % (stales == 0 and " " or "states prob", text)) + if td_class == 'col4': + url = html.makeuri_contextless([("view_name", stale_view)] + extra_url_variables, filename="view.py") + text = link(str(stales), url) + html.write('<td class="%s%s">%s</td>' % (td_class, value == 0 and "" or ' states prob', text)) html.write("</tr>\n") html.write("</table>\n") @@ -672,7 +680,6 @@ table.tacticaloverview th { vertical-align: bottom; } table.tacticaloverview td { - width: 25%%; text-align: right; /* border: 1px solid #123a4a; */ background-color: #6da1b8; @@ -683,6 +690,12 @@ table.tacticaloverview td { table.tacticaloverview td.prob { box-shadow: 0px 0px 4px #ffd000; } +table.tacticaloverview td.col3 { + width:33%%; +} +table.tacticaloverview td.col4 { + width:25%%; +} table.tacticaloverview a { display: block; margin-right: 2px; } div.tacticalalert { font-weight: bold;

7 years, 12 months

Removed nowiki special case for man pages from Check_MK

by Lars Michelsen

Module: check_mk Branch: master Commit: 38206f92c765c07da09358c9e73a839fcf4aaedb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38206f92c765c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 23 12:56:00 2016 +0200 Removed nowiki special case for man pages from Check_MK --- lib/man_pages.py | 48 +++++++++++++++++++++++++++++---------------- modules/check_mk.py | 10 ++-------- tests/lib/test_man_pages.py | 25 ++++++++++++++++------- 3 files changed, 51 insertions(+), 32 deletions(-) diff --git a/lib/man_pages.py b/lib/man_pages.py index 67c1639..ad0a5f7 100644 --- a/lib/man_pages.py +++ b/lib/man_pages.py @@ -34,6 +34,7 @@ Linux/Unix man pages""" import os import re import sys +import StringIO import subprocess import time @@ -202,6 +203,7 @@ check_mk_agents = { "vsphere" : "vSphere" } + def man_page_exists(name): return man_page_path(name) != None @@ -497,10 +499,6 @@ def load_man_page(name): return man_page -def print_man_page_nowiki(name): - NowikiManPageRenderer(name).paint() - - def print_man_page(name): renderer = ConsoleManPageRenderer(name) renderer.init_output() @@ -525,22 +523,26 @@ class ManPageRenderer(object): self._parameters_color = tty.colorset(6, 4, 1) self._examples_color = tty.colorset(6, 4, 1) + self._load() - def paint(self): - man_page = load_man_page(self.name) - if not man_page: + + def _load(self): + self.man_page = load_man_page(self.name) + if not self.man_page: sys.stdout.write("ERROR: No manpage for %s. Sorry.\n" % self.name) return + + def paint(self): try: - self._paint_man_page(man_page) + self._paint_man_page() except Exception, e: sys.stdout.write("ERROR: Invalid check manpage %s: %s\n" % (self.name, e)) - def _paint_man_page(self, man_page): + def _paint_man_page(self): self._print_header() - header = man_page['header'] + header = self.man_page['header'] self._print_sectionheader(header['title']) @@ -563,10 +565,10 @@ class ManPageRenderer(object): self._print_textbody(header['item']) self._print_subheader("Check parameters") - if man_page.has_key('parameters'): + if self.man_page.has_key('parameters'): self._begin_table(["Parameter", "Type", "Description"]) first = True - for parameter_name, text in man_page['parameters']: + for parameter_name, text in self.man_page['parameters']: if not first: self._print_empty_line() first = False @@ -588,10 +590,10 @@ class ManPageRenderer(object): self._print_textbody("No inventory supported.") self._print_subheader("Configuration variables") - if man_page.has_key('configuration'): + if self.man_page.has_key('configuration'): self._begin_table(["Variable", "Type", "Description"]) first = True - for conf_name, text in man_page['configuration']: + for conf_name, text in self.man_page['configuration']: if not first: self._print_empty_line() first = False @@ -818,6 +820,21 @@ class ConsoleManPageRenderer(ManPageRenderer): class NowikiManPageRenderer(ManPageRenderer): + def __init__(self, name): + super(NowikiManPageRenderer, self).__init__(name) + self.output = StringIO.StringIO() + + + def index_entry(self): + return "<tr><td class=tt>%s</td><td>[check_%s|%s]</td></tr>\n" % \ + (self.name, self.name, self.man_page["header"]["title"]) + + + def render(self): + self.paint() + return self.output.getvalue() + + def _markup(self, line, ignored=None): # preserve the inner { and } in double braces and then replace the braces left return line.replace('{{', '{{') \ @@ -834,9 +851,6 @@ class NowikiManPageRenderer(ManPageRenderer): def _print_sectionheader(self, title): self.output.write("H1:%s\n" % title) - # Be aware: the entry for the "index" goes to stderr. What a hack. - sys.stderr.write("<tr><td class=tt>%s</td><td>[check_%s|%s]</td></tr>\n" % - (self.name, self.name, title)) def _print_subheader(self, line): diff --git a/modules/check_mk.py b/modules/check_mk.py index fedbcbc..795d156 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4593,7 +4593,6 @@ def output_profile(): register_sigint_handler() load_checks() -opt_nowiki = False opt_split_rrds = False opt_delete_rrds = False opt_log_to_stdout = False @@ -4608,7 +4607,7 @@ long_options = [ "help", "version", "verbose", "compile", "debug", "interactive" "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", "convert-rrds", "compress-history", "split-rrds", "delete-rrds", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", - "man", "nowiki", "config-check", "backup=", "restore=", + "man", "config-check", "backup=", "restore=", "check-inventory=", "check-discovery=", "discover-marked-hosts", "paths", "checks=", "inventory", "inventory-as-check=", "hw-changes=", "sw-changes=", "sw-missing=", "inv-fail-status=", "cmc-file=", "browse-man", "list-man", "update-dns-cache", "cap", "real-time-checks", @@ -4676,8 +4675,6 @@ for o,a in opts: opt_extra_oids.append(a) elif o == '--procs': max_num_processes = int(a) - elif o == '--nowiki': - opt_nowiki = True elif o == '--debug': opt_debug = True elif o == '--interactive': @@ -4780,10 +4777,7 @@ try: done = True elif o in [ '-M', '--man' ]: if args: - if opt_nowiki: - man_pages.print_man_page_nowiki(args[0]) - else: - man_pages.print_man_page(args[0]) + man_pages.print_man_page(args[0]) else: man_pages.print_man_page_table() done = True diff --git a/tests/lib/test_man_pages.py b/tests/lib/test_man_pages.py index a3ac723..a28ae73 100644 --- a/tests/lib/test_man_pages.py +++ b/tests/lib/test_man_pages.py @@ -144,16 +144,27 @@ def test_load_man_page_format(): assert len(entry) == 2 -def test_print_man_page_nowiki(capsys): - man_pages.print_man_page_nowiki("if64") +def test_print_man_page_nowiki_index(capsys): + renderer = man_pages.NowikiManPageRenderer("if64") + index_entry = renderer.index_entry() out, err = capsys.readouterr() + assert out == "" + assert err == "" + + assert "<tr>" in index_entry + assert "[check_if64|" in index_entry + - # Entry for index page - assert "<tr>" in err - assert "[check_if64|" in err - assert out.startswith("TI:") - assert "\nH1:" in out +def test_print_man_page_nowiki_content(capsys): + renderer = man_pages.NowikiManPageRenderer("if64") + content = renderer.render() + out, err = capsys.readouterr() + assert out == "" + assert err == "" + + assert content.startswith("TI:") + assert "\nH1:" in content def test_print_man_page(capsys):

7 years, 12 months

3840 FIX cisco_qos: Fixed wrong units in graphs

by Marcel Arentz

Module: check_mk Branch: master Commit: c0bb36c9e04de31232b30a1fba57407462d1babc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0bb36c9e04de3… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Sep 23 11:58:21 2016 +0200 3840 FIX cisco_qos: Fixed wrong units in graphs The used units in graphs for QoS-Services changed from bytes/s to bits/s and is now equivalent to other network service graphs. --- .werks/3840 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3840 b/.werks/3840 new file mode 100644 index 0000000..4f1849b --- /dev/null +++ b/.werks/3840 @@ -0,0 +1,10 @@ +Title: cisco_qos: Fixed wrong units in graphs +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1474624292 +Class: fix + +The used units in graphs for QoS-Services changed from bytes/s to bits/s +and is now equivalent to other network service graphs. diff --git a/ChangeLog b/ChangeLog index e954315..85676c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -407,6 +407,7 @@ * 3812 FIX: winperf_phydisk: reintroduced read and write queue length performance data... * 3813 FIX: check_mail: fixed missing base64 decoding on multipart mails * 3888 FIX: df checks: Fixed invalid displayed WARN / CRIT lines in graphs when using "bytes left" thresholds + * 3840 FIX: cisco_qos: Fixed wrong units in graphs... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 45144ff..5f16b11 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5780,8 +5780,8 @@ graph_info.append({ graph_info.append({ "title" : _("QoS class traffic"), "metrics" : [ - ( "qos_outbound_bytes_rate", "area" ), - ( "qos_dropped_bytes_rate", "-area" ), + ( "qos_outbound_bytes_rate,8,*@bits/s", "area" ), + ( "qos_dropped_bytes_rate,8,*@bits/s", "-area" ), ], })

7 years, 12 months

Removed stepwise mode by default

by Lars Michelsen

Module: check_mk Branch: master Commit: f34b45966a5d5bf81ee34f46ad5f07a4e7dd27c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f34b45966a5d5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 23 11:32:07 2016 +0200 Removed stepwise mode by default --- pytest.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest.ini b/pytest.ini index 19f7e6e..d0924d8 100644 --- a/pytest.ini +++ b/pytest.ini @@ -3,4 +3,4 @@ testpaths = tests # Fail on first error and enable stepwise plugin to track steps and # be able to continue with the failed test after analyzing and fixing # the issue -addopts = -rs --maxfail=1 --stepwise +addopts = -rs --maxfail=1

7 years, 12 months

Internal cleanup: Moved man page handling to Check_MK module cmk.man_pages and introduced tests

by Lars Michelsen

Module: check_mk Branch: master Commit: a93b7e383385fee0617126199d275c6feff60e2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a93b7e383385fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 23 11:42:29 2016 +0200 Internal cleanup: Moved man page handling to Check_MK module cmk.man_pages and introduced tests --- lib/man_pages.py | 892 ++++++++++++++++++++++++++++++++++++++++++++ lib/paths.py | 14 +- lib/tty.py | 33 ++ modules/automation.py | 11 +- modules/catalog.py | 164 -------- modules/check_mk.py | 584 +---------------------------- modules/packaging.py | 2 +- tests/lib/test_man_pages.py | 165 ++++++++ tests/lib/test_paths.py | 13 +- tests/testlib/pylint_cmk.py | 1 - 10 files changed, 1120 insertions(+), 759 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a93b7e3833…

7 years, 12 months

3879 ipmi, ipmi_sensors: unified ipmi checks which now work the same way

by Simon Betz

Module: check_mk Branch: master Commit: 3aee1fe89d7a4c1a32063f67dbef6fcf3a4798ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3aee1fe89d7a4c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 23 08:49:13 2016 +0200 3879 ipmi, ipmi_sensors: unified ipmi checks which now work the same way Default discovery rule of ipmi is "summary mode", the one of ipmi_sensors is "single mode". --- .werks/3879 | 9 ++ ChangeLog | 1 + agents/special/agent_ipmi_sensors | 8 +- checks/ipmi | 175 ++------------------------------- checks/ipmi_common.include | 181 +++++++++++++++++++++++++++++++++++ checks/ipmi_sensors | 176 +++++++++++++++++++++------------- web/plugins/wato/check_parameters.py | 1 - 7 files changed, 308 insertions(+), 243 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3aee1fe89d…

7 years, 12 months

3878 apc_symmetra: divided into several checks

by Simon Betz

Module: check_mk Branch: master Commit: 7bf390b406bf6033a3903baf81baf8fdc56fdf19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bf390b406bf60… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 23 08:29:53 2016 +0200 3878 apc_symmetra: divided into several checks Now the check is more clearer and each check has its own, already existing WATO group. The separation of apc_symmetra is as follows: - apc_symmetra monitors some states and battery aspects (as before) - apc_symmetra.temp reports the battery temperature - apc_symmetra.elphase reports the battery current - apc_symmetra_input checks the electrical inphase - apc_symmetra_output checks the electrical outphase --- .werks/3878 | 17 +++ ChangeLog | 2 + checkman/apc_symmetra | 92 ++---------- checkman/apc_symmetra.elphase | 12 ++ checkman/apc_symmetra.temp | 14 ++ checkman/apc_symmetra_input | 12 ++ checkman/apc_symmetra_output | 14 ++ checks/apc_symmetra | 276 +++++++++++++++++++++-------------- checks/apc_symmetra_input | 47 ++++++ checks/apc_symmetra_output | 62 ++++++++ web/plugins/metrics/check_mk.py | 9 ++ web/plugins/wato/check_parameters.py | 75 ++++------ 12 files changed, 395 insertions(+), 237 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7bf390b406…

7 years, 12 months

new bug related to mass host tag removement

by Sven Rueß

Module: check_mk Branch: master Commit: c0ae60d1d776151b036434310f25b85ad1dd733d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0ae60d1d77615… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Thu Sep 22 17:07:35 2016 +0200 new bug related to mass host tag removement --- .bugs/2520 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/2520 b/.bugs/2520 new file mode 100644 index 0000000..15adeba --- /dev/null +++ b/.bugs/2520 @@ -0,0 +1,14 @@ +Title: WATO mass host tags remove does not work +Component: wato +State: open +Date: 2016-09-22 17:03:35 +Targetversion: 1.2.8 +Class: bug + +If hosts tags are assigned to hosts and you want to remove a specific host tag in mass edit action of hosts, +it will be not removed. The host tag is stiull assigned to the hosts. + +Inheritance of folder host tags does not work if you try to remove the host tags. + +Workaround: +Please edit single hosts and remove the wrong host tag. This will remove the host tag from the host.

7 years, 12 months

← Newer
1
...
8
9
10
11
12
13
14
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016