Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65303 discussions

Check_MK Git: check_mk: WATO: improved linking with status GUI

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c44850025c75f3d1f1268a3cac2947d4e865f445 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c44850025c75f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 25 17:02:53 2011 +0200 WATO: improved linking with status GUI --- web/htdocs/config.py | 9 +++-- web/htdocs/htmllib.py | 4 ++- web/htdocs/images/icon_abort.png | Bin 0 -> 3681 bytes web/htdocs/images/icon_apply.png | Bin 0 -> 2855 bytes web/htdocs/images/icon_back.png | Bin 0 -> 2687 bytes web/htdocs/images/icon_new.png | Bin 0 -> 3005 bytes web/htdocs/images/icon_properties.png | Bin 0 -> 5083 bytes web/htdocs/images/icon_search.png | Bin 0 -> 3885 bytes web/htdocs/images/icon_status.png | Bin 0 -> 4401 bytes web/htdocs/images/icon_trash.png | Bin 0 -> 3550 bytes web/htdocs/images/icon_wato.png | Bin 0 -> 3408 bytes web/htdocs/images/icon_wato_changes.png | Bin 0 -> 1869 bytes web/htdocs/views.py | 2 +- web/htdocs/wato.py | 51 ++++++++++++++++++------------- web/plugins/sidebar/wato.py | 2 +- 15 files changed, 40 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c44850025c…

13 years, 4 months

Check_MK Git: check_mk: WATO: bring tree structure in status GUI

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 24c2d1eb0b9a1ef9497a46ac87bb831580bac8ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24c2d1eb0b9a1e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 25 16:26:12 2011 +0200 WATO: bring tree structure in status GUI --- LIESMICH.baum | 33 ++++++++++++--- web/htdocs/check_mk.css | 10 ++++ web/htdocs/js/sidebar.js | 34 +++++++++++++++ web/htdocs/js/wato.js | 1 + web/htdocs/views.py | 52 +++++++++++++++++++---- web/htdocs/wato.py | 96 ++++++++++++++++++++++++----------------- web/plugins/sidebar/wato.py | 31 ++++++++++++-- web/plugins/views/filters.py | 1 - web/plugins/views/wato.py | 11 ++++- 9 files changed, 206 insertions(+), 63 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=24c2d1eb0b…

13 years, 4 months

Check_MK Git: check_mk: Remove debug output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: da4f68113bde3ee934d4ee9a7eb4c3ddc05a9753 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da4f68113bde3e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 25 11:47:58 2011 +0200 Remove debug output --- modules/check_mk.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 71b9667..14c3699 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3615,8 +3615,6 @@ for _f in list_of_files: else: raise -import pprint ; pprint.pprint(host_paths) ; del pprint - # Strip off host tags from the list of all_hosts. Host tags can be # appended to the hostnames in all_hosts, separated by pipe symbols, # e.g. "zbghlnx04|bgh|linux|test" and are stored in a separate

13 years, 4 months

Check_MK Git: check_mk: WATO: snapin now also shows files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bdbcae396bead9226dbf29adf38a83889fd45188 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdbcae396bead9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 25 12:07:25 2011 +0200 WATO: snapin now also shows files --- web/htdocs/wato.py | 87 ++++++++++++++++++++++-------------------- web/plugins/sidebar/wato.py | 2 +- 2 files changed, 47 insertions(+), 42 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 14f8f0e..f12fc68 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1214,47 +1214,6 @@ def bulk_cleanup_attributes(the_file, hosts): return num_shown > 0 - - - - -# +----------------------------------------------------------------------+ -# | ____ _ _ _ | -# | / ___|(_) __| | ___| |__ __ _ _ __ | -# | \___ \| |/ _` |/ _ \ '_ \ / _` | '__| | -# | ___) | | (_| | __/ |_) | (_| | | | -# | |____/|_|\__,_|\___|_.__/ \__,_|_| | -# | | -# +----------------------------------------------------------------------+ -# | Functions called from the WATO sidebar snapin | -# +----------------------------------------------------------------------+ - -def render_link_tree(format): - load_folder_config() - - def render_folder(f): - - subfolders = f[".folders"] - path = f[".path"] - filename = "/" + "/".join(path) + "/" - if len(path) > 0: - url = "wato.py?filename=" + htmllib.urlencode(filename) - if len(subfolders) == 0: - title = format % (url, f["title"]) - else: - title = '<a target=main href="%s">%s</a>' % (url, f["title"]) - else: - title = '<a target=main href="wato.py">%s</a>' % f["title"] - - if len(subfolders) > 0: - html.begin_foldable_container('wato', filename, False, title) - for sf in sort_by_title(subfolders.values()): - render_folder(sf) - html.end_foldable_container() - else: - html.write(title) - - render_folder(g_root_folder) # +----------------------------------------------------------------------+ @@ -2808,6 +2767,52 @@ class API: result.append((attr.title(), content)) return result + # Get information about the folder and directory tree. + # This is useful for components that display hosts in + # the tree (e.g. the status GUI). + def get_folder_tree(self): + load_folder_config() + return g_root_folder + + + # Render clickable and foldable tree of all WATO folders + # and files (e.g. used by sidebar snapins) + def render_link_tree(self, format): + self._render_linktree_folder(self.get_folder_tree(), format) + + + # BELOW ARE PRIVATE HELPER FUNCTIONS + + def _render_linktree_folder(self, f, format): + subfolders = f.get(".folders", {}) + subfiles = f.get(".files", {}) + is_leaf = len(subfolders) == 0 and len(subfiles) == 0 + + path = f[".path"] + filename = "/" + "/".join(path) + if not filename.endswith(".mk"): + filename += "/" + + if len(path) > 0: + url = "wato.py?filename=" + htmllib.urlencode(filename) + if is_leaf: + title = format % (url, f["title"]) + else: + title = '<a target=main href="%s">%s</a>' % (url, f["title"]) + else: + title = '<a target=main href="wato.py">%s</a>' % f["title"] + + + if not is_leaf: + html.begin_foldable_container('wato', filename, False, title) + for sf in sort_by_title(subfolders.values()): + self._render_linktree_folder(sf, format) + for sf in sort_by_title(subfiles.values()): + self._render_linktree_folder(sf, format) + html.end_foldable_container() + else: + html.write(title) + def _cleanup_directory(self, thing): # drop 'parent' entry, recursively diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 8bed022..38e49d4 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -47,7 +47,7 @@ def render_wato_files(): def ajax_wato_files(): if config.may("use_wato"): format = ("<li>%s</li>" % link("XX", "XX")).replace("XX", "%s") - wato.render_link_tree(format) + wato.api.render_link_tree(format) sidebar_snapins["wato"] = {

13 years, 4 months

Check_MK Git: check_mk: Multisite: new filter for WATO folder of host

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bba8d401d05bd31b796f370b37222ae21a863856 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bba8d401d05bd3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 25 12:08:22 2011 +0200 Multisite: new filter for WATO folder of host --- ChangeLog | 1 + web/htdocs/htmllib.py | 7 ++-- web/htdocs/views.py | 16 ++++++++++ web/plugins/views/wato.py | 73 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b101cd..8a11d3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * Introduced basic infrastructure for multilanguage support in Multisite * Make 'Views' snapin foldable * Replace old main view by dashboard. + * new filter for WATO folder of host WATO: * Configration files can now be administered via the WEB UI diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4c0878d..ed73cbd 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -336,10 +336,9 @@ class html: def sorted_select(self, varname, options, deflt="", onchange=None): # Sort according to display texts, not keys - swapped = [ (disp, key) for key, disp in options ] - swapped.sort() - swapped = [ (key, disp) for disp, key in swapped ] - html.select(self, varname, swapped, deflt, onchange) + sorted = options[:] + sorted.sort(lambda a,b: cmp(a[1].lower(), b[1].lower())) + html.select(self, varname, sorted, deflt, onchange) def select(self, varname, options, deflt="", onchange=None): current = self.var(varname, deflt) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 238156f..bfb11ce 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -186,6 +186,22 @@ def declare_filter(sort_index, f, comment = None): f.sort_index = sort_index # Base class for all filters +# name: The unique id of that filter. This id is e.g. used in the +# persisted view configuration +# title: The title of the filter visible to the user. This text +# may be localized +# info: The datasource info this filter needs to work. If this +# is "service", the filter will also be available in tables +# showing service information. "host" is available in all +# service and host views. The log datasource provides both +# "host" and "service". Look into datasource.py for which +# datasource provides which information +# htmlvars: HTML variables this filter uses +# link_columns: If this filter is used for linking (state "hidden"), then +# these Livestatus columns are needed to fill the filter with +# the proper information. In most cases, this is just []. Only +# a few filters are useful for linking (such as the host_name and +# service_description filters with exact match) class Filter: def __init__(self, name, title, info, htmlvars, link_columns): self.name = name diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py new file mode 100644 index 0000000..69a087a --- /dev/null +++ b/web/plugins/views/wato.py @@ -0,0 +1,73 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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- +# ails. 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. + +import wato + + +class FilterWatoFile(Filter): + def __init__(self): + Filter.__init__(self, "watofile", "WATO Folder/File", "host", ["watofile"], []) + self.tree = wato.api.get_folder_tree() + self.path_to_tree = {} # keep mapping from string-paths to folders/files + self.selection = self.folder_selection(self.tree, "", 0) + + def display(self): + html.select(self.name, [("", "")] + self.selection) + + def filter(self, infoname): + current = html.var(self.name) + if current and current in self.path_to_tree: + return "Filter: host_custom_variables ~ PATH ^%s\n" % current + else: + return "" + + def folder_selection(self, folder, prefix, depth): + my_path = prefix + folder[".name"] + if not my_path.endswith(".mk"): + my_path += "/" + + if depth: + title_prefix = "   " * depth + "` " + "- " * depth + else: + title_prefix = "" + self.path_to_tree[my_path] = True + sel = [ (my_path , title_prefix + folder["title"]) ] + sel += self.sublist(folder.get(".files", {}), my_path, depth) + sel += self.sublist(folder.get(".folders", {}), my_path, depth) + return sel + + def sublist(self, elements, my_path, depth): + vs = elements.values() + vs.sort(lambda a, b: cmp(a["title"].lower(), b["title"].lower())) + sel = [] + for e in vs: + sel += self.folder_selection(e, my_path, depth + 1) + return sel + + + +declare_filter(10, FilterWatoFile()) +

13 years, 4 months

Check_MK Git: check_mk: add variable _PATH to all hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e1017f897f8c49dce9c7c2890b2d7b6ed75cc2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e1017f897f8c4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 24 17:57:08 2011 +0200 add variable _PATH to all hosts This variable keeps information about the path of the host below conf.d/. This allows the status GUI to display tree information of the hosts and also to use Livestatus for displaying only parts of the host tree. --- LIESMICH.baum | 4 ++++ modules/check_mk.py | 24 +++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/LIESMICH.baum b/LIESMICH.baum index b491911..d176dd5 100644 --- a/LIESMICH.baum +++ b/LIESMICH.baum @@ -11,6 +11,8 @@ Baumartige Darstellung von Daten im Multisite: Beim Schreiben der Nagios-Konfig wird aus diesem Dictionary der _PATH gesetzt. + => ERLEDIGT + [2] Im Livestatus brauchen wir jetzt einen Filter auf diesen _PATH. Der ist ja dummerweise in einer Custom-Variable ge- speichert. @@ -41,6 +43,8 @@ Baumartige Darstellung von Daten im Multisite: sondern nur die neue Spalte custom_variables, die ich eh schon programmieren wollte. + => ERLEDIGT. + [3] Jetzt baut man einen neuen Filter, mit dem man den Ort In einem Folder eingeben kann. Dazu macht man ein großes Select mit allen Foldern. Diese werden aus WATO eingelesen. diff --git a/modules/check_mk.py b/modules/check_mk.py index d9d3b0c..71b9667 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -257,6 +257,7 @@ checks = [] check_parameters = [] legacy_checks = [] all_hosts = [] +host_paths = {} snmp_hosts = [ (['snmp'], ALL_HOSTS) ] tcp_hosts = [ (['tcp'], ALL_HOSTS), (NEGATE, ['snmp'], ALL_HOSTS), (['!ping'], ALL_HOSTS) ] bulkwalk_hosts = [] @@ -1268,6 +1269,12 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write(" address\t\t\t%s\n" % (ip and ip or "0.0.0.0")) outfile.write(" _TAGS\t\t\t\t%s\n" % " ".join(tags_of_host(hostname))) + # WATO folder path + path = host_paths.get(hostname) + if path: + outfile.write(" _PATH\t\t\t\t%s\n" % path) + + # Host groups: If the host has no hostgroups it gets the default # hostgroup (Nagios requires each host to be member of at least on # group. @@ -1330,6 +1337,9 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write(" __REALNAME\t\t\t%s\n" % hostname) outfile.write(" parents\t\t\t%s\n" % hostname) + if path: + outfile.write(" _PATH\t\t\t\t%s\n" % path) + hgs = summary_hostgroups_of(hostname) hostgroups = ",".join(hgs) if len(hgs) == 0: @@ -3564,7 +3574,15 @@ for varname in check_default_levels.values(): def all_nonfunction_vars(): return set([ name for name,value in globals().items() if name[0] != '_' and type(value) != type(lambda:0) ]) - +def marks_hosts_with_path(old, all, filename): + if not filename.startswith(check_mk_configdir): + return + path = filename[len(check_mk_configdir):] + old = set([ o.split("|", 1)[0] for o in old ]) + all = set([ a.split("|", 1)[0] for a in all ]) + for host in all: + if host not in old: + host_paths[host] = path # Create list of all files to be included list_of_files = reduce(lambda a,b: a+b, @@ -3587,7 +3605,9 @@ for _f in list_of_files: try: if opt_debug: sys.stderr.write("Reading config file %s...\n" % _f) + _old_all_hosts = all_hosts[:] execfile(_f) + marks_hosts_with_path(_old_all_hosts, all_hosts, _f) except Exception, e: sys.stderr.write("Cannot read in configuration file %s:\n%s\n" % (_f, e)) if __name__ == "__main__": @@ -3595,6 +3615,8 @@ for _f in list_of_files: else: raise +import pprint ; pprint.pprint(host_paths) ; del pprint + # Strip off host tags from the list of all_hosts. Host tags can be # appended to the hostnames in all_hosts, separated by pipe symbols, # e.g. "zbghlnx04|bgh|linux|test" and are stored in a separate

13 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1a63a9f8205c7155ae36b4d16a6a1086e25db112 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a63a9f8205c71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 24 17:57:12 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: Livestatus: new column custom_variables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3bdd13893456621d5d742a9bb48682925dc39129 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bdd1389345662… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 24 17:52:18 2011 +0200 Livestatus: new column custom_variables for hosts, services and contacts. Also with new filter possibility: Filter: custom_variables ~ PATH ^/folder1/ --- ChangeLog | 2 + livestatus/src/Column.h | 1 + livestatus/src/CustomVarsColumn.cc | 32 ++++++++++- livestatus/src/CustomVarsColumn.h | 4 +- livestatus/src/CustomVarsFilter.cc | 103 ++++++++++++++++++++++++++++++++---- livestatus/src/CustomVarsFilter.h | 10 +++- livestatus/src/Query.cc | 26 +++++++++ livestatus/src/Query.h | 4 ++ livestatus/src/TableContacts.cc | 2 + livestatus/src/TableHosts.cc | 2 + livestatus/src/TableServices.cc | 2 + 11 files changed, 172 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3bdd138934…

13 years, 4 months

Check_MK Git: check_mk: bluecoat_diskcpu: add scan function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 14a7744df4bce1c75a1e04eea4645b345406779a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14a7744df4bce1… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 24 17:48:43 2011 +0200 bluecoat_diskcpu: add scan function postfix_mailq: remove oum as we supply a template that doesnt need it postfix_mailq.php: above pnp template nvidia.temp: linked to ipmi temperature template various indentation fixes --- checks/bluecoat_diskcpu | 3 ++ checks/f5_bigip_temp | 4 +- checks/mcdata_fcport | 4 +- checks/postfix_mailq | 4 +- pnp-rraconf/check_mk-nvidia.temp.rra.cfg | 1 + pnp-templates/check_mk-nvidia.temp.php | 1 + pnp-templates/check_mk-postfix_mailq.php | 53 ++++++++++++++++++++++++++++++ 7 files changed, 64 insertions(+), 6 deletions(-) diff --git a/checks/bluecoat_diskcpu b/checks/bluecoat_diskcpu index 6b0e074..a4893d6 100644 --- a/checks/bluecoat_diskcpu +++ b/checks/bluecoat_diskcpu @@ -48,3 +48,6 @@ check_info['bluecoat_diskcpu'] = ( snmp_info['bluecoat_diskcpu'] = ( ".1.3.6.1.4.1.3417.2.4.1.1.1", [ 3, 4, 6 ]) # BLUECOAT disk und CPU-Tabelle + +snmp_scan_functions["bluecoat_sensors"] = \ + lambda oid: '1.3.6.1.4.1.3417.1.1' in oid(".1.3.6.1.2.1.1.2.0") diff --git a/checks/f5_bigip_temp b/checks/f5_bigip_temp index c1c98f0..91ef6d1 100644 --- a/checks/f5_bigip_temp +++ b/checks/f5_bigip_temp @@ -76,7 +76,7 @@ def check_f5_bigip_temp(item, params, info): warn = nom_temp + 9 crit = nom_temp + 18 msgtxt = " - Temperature is %dC, Levels at %d/%d" % (cur_temp, warn, crit) - perfdata = [ ("temp", cur_temp, warn, crit) ] + perfdata = [("temp", cur_temp, warn, crit)] if warn >= cur_temp: return (0, "OK" + msgtxt, perfdata) elif crit <= cur_temp: @@ -96,7 +96,7 @@ snmp_info["f5_bigip_temp"] = \ ( ".1.3.6.1.4.1.3375.2.1.3.1.2.1", [ 1, 2 ]), ] -check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "TEMP %s", 1, inventory_f5_bigip_temp ) +check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "TEMP %s", 1, inventory_f5_bigip_temp) # Get ID and Speed from the CPU and chassis fan tables diff --git a/checks/mcdata_fcport b/checks/mcdata_fcport index 2dff73b..e035136 100644 --- a/checks/mcdata_fcport +++ b/checks/mcdata_fcport @@ -28,7 +28,7 @@ mcdata_fcport_speedbits = { "2": '1000000000', "3": '2000000000' } mcdata_fcport_opstatus = { "1" : "1", "2": "2", "3": "testing", "4": "faulty" } def mcdata_bin_to_64(bin, mult = 1): - # McData encodes 64 bit counters as big endian HEX strings, + # McData encodes 64 bit counters as big endian HEX strings, # e.g. Hex-STRING: 00 00 00 01 AC C2 8C EE. Check_MK converts # such strings into binary Python strings value = 0 @@ -70,7 +70,7 @@ def mcdata_fcport_convert_line_to_if64(line): '0', # ifOutQLen 17 index, # ifAlias 18 ] - + def inventory_mcdata_fcport(checkname, info): return inventory_if_common(mcdata_fcport_convert_to_if64(info)) diff --git a/checks/postfix_mailq b/checks/postfix_mailq index f5c410e..c1021f9 100644 --- a/checks/postfix_mailq +++ b/checks/postfix_mailq @@ -72,12 +72,12 @@ def check_postfix_mailq(item, params, info): for line in info: if " ".join(line[-2:]) == 'is empty': return (0, 'OK - The mailqueue is empty ', [ ('length', 0, params[0], params[1]), - ('size', '0b') ]) + ('size', '0') ]) elif line[0] == '--': size = postfix_mailq_to_bytes(float(line[1]), line[2]) len = int(line[4]) perfdata = [ ('length', len, params[0], params[1]), - ('size', '%db' % size) ] + ('size', '%d' % size) ] if len > params[1]: return (2, 'CRITICAL - Mailqueue length is %d ' diff --git a/pnp-rraconf/check_mk-nvidia.temp.rra.cfg b/pnp-rraconf/check_mk-nvidia.temp.rra.cfg new file mode 120000 index 0000000..19dbf77 --- /dev/null +++ b/pnp-rraconf/check_mk-nvidia.temp.rra.cfg @@ -0,0 +1 @@ +max.rra.cfg \ No newline at end of file diff --git a/pnp-templates/check_mk-nvidia.temp.php b/pnp-templates/check_mk-nvidia.temp.php new file mode 120000 index 0000000..6f57a09 --- /dev/null +++ b/pnp-templates/check_mk-nvidia.temp.php @@ -0,0 +1 @@ +check_mk-ipmi_sensors.php \ No newline at end of file diff --git a/pnp-templates/check_mk-postfix_mailq.php b/pnp-templates/check_mk-postfix_mailq.php new file mode 100644 index 0000000..33837c1 --- /dev/null +++ b/pnp-templates/check_mk-postfix_mailq.php @@ -0,0 +1,53 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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- +# ails. 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. + +# (length=22;10;20;; size=2048;;;;) +$opt[1] = "--vertical-label Mails -l0 --title \"Mail Queue Length\" "; +$def[1] = "DEF:length=$RRDFILE[1]:$DS[1]:MAX " ; +$def[1] .= "HRULE:$WARN[1]#FFFF00 "; +$def[1] .= "HRULE:$CRIT[1]#FF0000 "; +$def[1] .= "AREA:length#6890a0:\"Mails\" " ; +$def[1] .= "LINE:length#2060a0 " ; +$def[1] .= "GPRINT:length:LAST:\"%6.2lf last\" " ; +$def[1] .= "GPRINT:length:AVERAGE:\"%6.2lf avg\" " ; +$def[1] .= "GPRINT:length:MAX:\"%6.2lf max\\n\" "; + + +$opt[2] = "--vertical-label MBytes -b1024 -X6 -l0 --title \"Mail Queue Size\" "; +$def[2] = "DEF:size=$RRDFILE[2]:$DS[2]:MAX " ; +$def[2] .= "CDEF:queue_mb=size,1048576,/ "; +$def[2] .= "AREA:queue_mb#65ab0e:\"Megabytes\" "; +$def[2] .= "LINE:queue_mb#206a0e "; +$def[2] .= "GPRINT:queue_mb:MAX:\"%6.2lf MB max\\n\" "; + +# geht nicht. +#$def[2] .= "DEF:size_avg=$RRDFILE[2]:$DS[2]:AVG " ; +#$def[2] .= "DEF:size_last=$RRDFILE[2]:$DS[2]:LAST " ; +#$def[2] .= "CDEF:queue_mb_avg=size_avg,1048576,/ "; +#$def[2] .= "CDEF:queue_mb_last=size_last,1048576,/ "; +#$def[2] .= "GPRINT:queue_mb:LAST:\"%6.2lf MB last\" "; +#$def[2] .= "GPRINT:queue_mb:AVERAGE:\"%6.2lf MB avg\" "; + +?>

13 years, 4 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fe3638b5c5e030ba5da1e87331099fdec59b5d40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe3638b5c5e030… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 24 16:11:27 2011 +0200 Updated internal doku --- LIESMICH.baum | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/LIESMICH.baum b/LIESMICH.baum new file mode 100644 index 0000000..b491911 --- /dev/null +++ b/LIESMICH.baum @@ -0,0 +1,83 @@ +Baumartige Darstellung von Daten im Multisite: + +[1] Check_MK erzeugt in der Konfiguration automatisch für jeden + Host eine Nagios-Custom-Variable mit dem Pfad im Baum. Dazu + wird einfach beim Laden der Konfigurationsdateien sich gemerkt, + aus welcher Datei der Host kam, und der String dann in eine + Customvariable _PATH geschrieben. Dazu muss check_mk.py + angepasst werden. Vor dem Einlesen einer Datei muss all_hosts + und clusters jeweils wegkopiert werden, dann gelesen werden + und dann für die neu eingelesenen Hosts ein Dictionary gepflegt. + Beim Schreiben der Nagios-Konfig wird aus diesem Dictionary + der _PATH gesetzt. + +[2] Im Livestatus brauchen wir jetzt einen Filter auf diesen + _PATH. Der ist ja dummerweise in einer Custom-Variable ge- + speichert. + + Filter: host_custom_variables[PATH] >= /bayern/munich.mk + + Bei der Gelegenheit führen wir gleich noch die neue Spalte + custom_variables ein, die beim Ausgeben ein schönes Python/Json + dict erzeugt. In CSV nimmt man irgendeinen sinnfreien Trenner + her, z.B. den Balken | + + Man könnte aber auch sagen, dass Livestatus von sich aus + Spalten anlegt, die custom_variablen entsprechen. Dann + könnte man sagen: + + Filter: host_path ~ ^/wfewefew/ + + Die Frage ist, wo diese Spalten deklariert werden. Das + könnte über Module-Lade-Optione geschehen. Oder eine Konfigdatei. + Oder fest einkompiliert. + + Dritte Variante: Man macht den Filter so: + + Filter: host_custom_variables ~ PATH:/bayern/munich.mk. + Die Spalte schneidet vorne bis zum Doppelpunkt den Variablennamen + ab und berechnet dann den Operator mit dem Rest der Zeile. + Dazu braucht man garkeine globale Anpassungen am Livestatus, + sondern nur die neue Spalte custom_variables, die ich eh + schon programmieren wollte. + +[3] Jetzt baut man einen neuen Filter, mit dem man den Ort + In einem Folder eingeben kann. Dazu macht man ein großes + Select mit allen Foldern. Diese werden aus WATO eingelesen. + Dazu muss views die Folderstruktur selbst laden. Frage + ist aber, ob das nicht zu sehr zu lasten der Performance + geht. Andererseits ist es nur die HTML-Darstellung. Wenn + wir in unseren eigenen Views den Filter als "hidden" de- + klarieren, wird der Filter ja nicht angezeigt. Wir müssten + uns außerdem eh mal eine Optimierung überlegen, dass wir + das Filter-Formular per Ajax nachladen, damit das holen + der Dropdown-Inhalte (z.B. Hostgruppen) per Livestatus + nicht bei jeder View-Anzeige gemacht wird. Jetzt kann man + dadurch einer View per URL-Variable einen Folder-Path-Filter + mitgeben. Dieser Filter sollte in jeder View verfügbar sein. + Aber nur, wenn es überhaupt Folder gibt. Die Hosts in der + main.mk haben ja überhaupt keinen Folder-Ort. + +[4] Ein neues Sidebarsnapin, das analog zum WATO-Snapin + aufgebaut ist, modifiziert Views auf der Rechten Seite so, + dass der Filter hinzugefügt wird. Dazu holt man per Javascript + die URL von Rechts. Wenn das eine View ist, hängt man den + neuen Pfad dran. Im Snapin wird der aktuelle Ort farbig + gekennzeichnet. + + Der Scheduler der Sidebar holt regelmäßig die URL und + schaut, ob das ein Hinweis auf einen Pfad ist und ob + es eine View ist. Wenn ja, wird der Pfad im Bau gehilitet + und das Snapin aktiviert. Wenn rechts keine View ist, + graut sich das Snapin aus. Alternativ verwendet man + Standardlinks auf "allhosts". + +[5] In den Views wird im Titel zusätzlich der Ort im + Folder angezeigt. Wenn der Folder nicht / ist, wird + auch eine Navigationsleiste gezeigt wie im WATO. Diese + enthält dann immer den Link auf die gleiche View mit + angepasstem Filter. + + + +

13 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits