Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: Intermediate state of webconf

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1e289d68260ba492b8d60c4c6e06f232d3cbb311 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e289d68260ba4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 12 15:03:02 2010 +0100 Intermediate state of webconf --- web/htdocs/.f12 | 4 ++- web/htdocs/webconf.py | 63 ++++++++++++++++++++++++++++++++++++++---- web/plugins/pages/webconf.py | 3 +- 3 files changed, 62 insertions(+), 8 deletions(-) diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 index 6c63611..0040107 100644 --- a/web/htdocs/.f12 +++ b/web/htdocs/.f12 @@ -1 +1,3 @@ -sudo cp -v *.py /omd/versions/default/share/check_mk/web/htdocs +# sudo cp -v *.py /omd/versions/default/share/check_mk/web/htdocs +sudo cp -v webconf.py ~webconf/local/share/check_mk/web/htdocs +sudo omd restart webconf apache diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index 00a2cea..d7eaeae 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -14,23 +14,30 @@ config.declare_permission("use_webconf", "Only with this permission, users are allowed to use Check_MK web configuration GUI.", [ "admin", ]) -def index(h): - global html - html = h + +def check_filename(): filename = html.var("filename") if not filename: raise MKGeneralException("You called this page without a filename!") + + # Get alias (title) for filename title = None for fn, t, roles in config.config_files: if fn == filename: title = t break - if not title: raise MKGeneralException("No config file <tt>%s</tt> is declared in <tt>multisite.mk</tt>" % filename) if not config.may("use_webconf") or config.role not in roles: raise MKAuthException("You are not allowed to edit this configuration file!") + + return filename, title + +def page_index(h): + global html + html = h + filename, title = check_filename() html.header("Check_MK Configuration: " + title) hosts = read_configuration_file(filename) @@ -39,15 +46,15 @@ def index(h): html.write("<tr><th>Hostname</th><th>IP Address</th><th>Tags</th></tr>\n") odd = "even" for hostname, ipaddress, tags in hosts: + edit_url = "webconf_edithost.py?filename=%s&host=%s" % (filename, hostname) odd = odd == "odd" and "even" or "odd" html.write("<tr class=\"data %s0\"><td>%s</td>" % (odd, hostname)) html.write("<td>%s</td>" % (ipaddress and ipaddress or "(DNS)")) html.write("<td>%s</td>" % ", ".join(tags)) + html.write('<td><a class=button href="%s">edit</a></td>' % edit_url) html.write("</tr>\n") html.write("</table>\n") - - write_configuration_file(filename, hosts) html.footer() @@ -71,6 +78,13 @@ def read_configuration_file(filename): else: return [] +def lookup_host(hosts, hostname): + for hn, ipaddress, tags in hosts: + if hn == hostname: + return ipaddress, tags + raise MKGeneralException("Host %s not configured in this file" % hostname) + + def write_configuration_file(filename, hosts): all_hosts = [] ipaddresses = {} @@ -89,3 +103,40 @@ def write_configuration_file(filename, hosts): out.write(pprint.pformat(ipaddresses)) out.write(")") out.write("\n") + +def page_edithost(h): + global html + html = h + filename, title = check_filename() + hosts = read_configuration_file(filename) + + hostname = html.var("host") + if not hostname: + MKGeneralException("Host %s does not exist." % hostname) + html.header("Edit host %s" % hostname) + + # Form submitted + if html.var("save") and html.check_transaction(): + ipaddress = html.var("ipaddress") + if not ipaddress: + ipaddress = None + hosts = change_host(hosts, hostname, ipaddress) + write_configuration_file(filename, hosts) + html.write("Saved.") + + ipaddress, tags = lookup_host(hosts, hostname) + html.begin_form("edithost") + html.write("<table class=form>\n") + html.write("<tr><td class=legend>Hostname</td><td class=content>%s</td></tr>" % hostname) + html.write("<tr><td class=legend>IP-Address<br>" + "<i>Leave empty for automatic<br>" + "IP address lookup via DNS</td><td class=content>") + html.text_input("ipaddress", ipaddress) + html.write("</td>\n") + html.write('<tr><td class="legend button" colspan=2>') + html.button("save", "Save", "submit") + html.write("</td></tr>\n") + html.write("</table>\n") + html.hidden_fields() + html.end_form() + html.footer() diff --git a/web/plugins/pages/webconf.py b/web/plugins/pages/webconf.py index 34cd557..3e03009 100644 --- a/web/plugins/pages/webconf.py +++ b/web/plugins/pages/webconf.py @@ -1,5 +1,6 @@ import webconf pagehandlers.update({ - "webconf" : webconf.index, + "webconf" : webconf.page_index, + "webconf_edithost" : webconf.page_edithost, })

13 years, 9 months

Check_MK Git: check_mk: Deleting and editing hosts works, even with tags

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a21ec172292cc740ee623098f3ba701ea9a18e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a21ec172292cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 12 16:11:18 2010 +0100 Deleting and editing hosts works, even with tags --- web/htdocs/.f12 | 3 +- web/htdocs/htmllib.py | 3 ++ web/htdocs/webconf.py | 58 +++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 55 insertions(+), 9 deletions(-) diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 index 0040107..6b5892f 100644 --- a/web/htdocs/.f12 +++ b/web/htdocs/.f12 @@ -1,3 +1,2 @@ -# sudo cp -v *.py /omd/versions/default/share/check_mk/web/htdocs -sudo cp -v webconf.py ~webconf/local/share/check_mk/web/htdocs +sudo cp -v *.py /omd/versions/default/share/check_mk/web/htdocs sudo omd restart webconf apache diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 57ba466..88143a7 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -222,6 +222,8 @@ class html: self.text_input(varname, str(deflt), "number", size=size) def text_input(self, varname, default_value = "", cssclass = "text", **args): + if default_value == None: + default_value = "" addprops = "" if "size" in args: addprops += " size=%d" % args["size"] @@ -255,6 +257,7 @@ class html: onchange_code = onchange and " id=\"%s\" onchange=\"%s\"" % (varname, onchange) or "" self.write("<select%s name=\"%s\" size=\"1\">\n" % (onchange_code, varname)) for value, text in options: + if value == None: value = "" sel = value == current and " selected" or "" self.write("<option value=\"%s\"%s>%s</option>\n" % (value, sel, text)) self.write("</select>\n") diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index 8ad8c9f..22eef1a 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -1,10 +1,11 @@ #!/usr/bin/python from mod_python import importer -config = importer.import_module("config", path = ["/omd/sites/webconf/share/check_mk/web/htdocs"]) +import config +#config = importer.import_module("config", path = ["/omd/sites/webconf/share/check_mk/web/htdocs"]) # config = importer.import_module("config") -import sys, pprint +import sys, pprint, socket from lib import * import htmllib # import config @@ -42,21 +43,37 @@ def page_index(h): html.header("Check_MK Configuration: " + title) hosts = read_configuration_file(filename) - hostnames = hosts.keys() - hostnames.sort() + + # Deletion of entries + delname = html.var("_delete") + if delname and delname in hosts and html.confirm("Do you really want to delete the host <tt>%s</tt>?" % delname): + del hosts[delname] + write_configuration_file(filename, hosts) html.write("<table class=services>\n") html.write("<tr><th>Hostname</th><th>IP Address</th><th>Tags</th><th>Actions</th></tr>\n") odd = "even" + hostnames = hosts.keys() + hostnames.sort() for hostname in hostnames: ipaddress, tags = hosts[hostname] edit_url = "webconf_edithost.py?filename=%s&host=%s" % (filename, hostname) + delete_url = "webconf.py?filename=%s&_delete=%s" % (filename, hostname) odd = odd == "odd" and "even" or "odd" html.write("<tr class=\"data %s0\"><td>%s</td>" % (odd, hostname)) - html.write("<td>%s</td>" % (ipaddress and ipaddress or "(DNS)")) + if not ipaddress: + try: + ip = socket.gethostbyname(hostname) + ipaddress = "(DNS: %s)" % ip + except: + ipaddress = "(hostname not resolvable!)" + html.write("<td>%s</td>" % ipaddress) html.write("<td>%s</td>" % ", ".join(tags)) - html.write('<td><a class=button href="%s">edit</a></td>' % edit_url) + html.write("<td>") + html.buttonlink(edit_url, "Edit") + html.buttonlink(delete_url, "Delete") + html.write("</td>") html.write("</tr>\n") html.write("</table>\n") @@ -121,7 +138,12 @@ def page_edithost(h): ipaddress = html.var("ipaddress") if not ipaddress: ipaddress = None - hosts[hostname] = (ipaddress, ['hirntag']) + tags = [] + for tagno, (tagname, taglist) in enumerate(config.host_tags): + value = html.var("tag_%d" % tagno) + if value: + tags.append(value) + hosts[hostname] = (ipaddress, tags) write_configuration_file(filename, hosts) html.set_browser_redirect(1, "webconf.py?filename=%s" % htmllib.urlencode(filename)) html.header("Edit host") @@ -138,7 +160,29 @@ def page_edithost(h): "IP address lookup via DNS</td><td class=content>") html.text_input("ipaddress", ipaddress) html.write("</td>\n") + + # Host tags + found_tags = [] + for tagno, (tagname, taglist) in enumerate(config.host_tags): + # get current value of tag + tagvalue = None + duplicate = False + for tag, descr in taglist: + if tag in tags: + if tagvalue: + duplicate = True + tagvalue = tag + + tagvar = "tag_%d" % tagno + html.write("<tr><td class=legend>%s</td>" % tagname) + html.write("<td class=content>") + html.select(tagvar, taglist, tagvalue) + if duplicate: # tag not unique before editing + html.write("(!)") + html.write("</td></tr>\n") + html.write('<tr><td class="legend button" colspan=2>') + html.buttonlink("webconf.py?filename=%s" % filename, "Cancel") html.button("save", "Save", "submit") html.write("</td></tr>\n") html.write("</table>\n")

13 years, 9 months

Check_MK Git: check_mk: check implemention: allow inventory function to return None

by mk＠mathias-kettner.de

13 years, 9 months

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

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: caf1fc45c97b977b378fd2366ec6e41447fe523c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=caf1fc45c97b97… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 28 09:22:39 2010 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 9 months

Check_MK Git: check_mk: Added simple pnp template for printer_supply check - thanks to Oliver Borgmann

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c005d17d9023c4c1f8afe0ccff9349221cc9e1a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c005d17d9023c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 24 16:34:17 2010 +0100 Added simple pnp template for printer_supply check - thanks to Oliver Borgmann --- ChangeLog | 1 + pnp-templates/check_mk-printer_supply.php | 50 +++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21f029b..a432d35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * printer_supply: In case of OKI c5900 devices the name of the supply units ins not unique. The color of the supply unit is reported in a dedicated OID and added to the check item name to have a unique name now. + * prnter_supply: Added simple pnp template to have better graph formating for the check results Multisite: * The custom open/close states of custom links are now stored for each diff --git a/pnp-templates/check_mk-printer_supply.php b/pnp-templates/check_mk-printer_supply.php new file mode 100644 index 0000000..d08cb49 --- /dev/null +++ b/pnp-templates/check_mk-printer_supply.php @@ -0,0 +1,50 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# +------------------------------------------------------------------+ +# +# 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. + +# Template contributed by Oliver Borgmann, Copyright 2010 + +$CRITPERC = $CRIT[1]*100/$MAX[1]; +$WARNPERC = $WARN[1]*100/$MAX[1]; + +$opt[1] = "--vertical-label \"Percent left\" -l -20 -u 100 --title \"$hostname / $servicedesc \" "; + +if(preg_match('/black/i', $servicedesc)) + $color = '000000'; +elseif(preg_match('/magenta/i', $servicedesc)) + $color = 'fc00ff'; +elseif(preg_match('/yellow/i', $servicedesc)) + $color = 'ff0000'; +elseif(preg_match('/cyan/i', $servicedesc)) + $color = '00ffff'; +else + $color = 'cccccc'; + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "CDEF:perc1=var1,100,* "; +$def[1] .= "CDEF:perc=perc1,$MAX[1],/ "; +$def[1] .= "HRULE:$CRITPERC#ff0000:\"Crit\: $CRITPERC%\" "; +$def[1] .= "HRULE:$WARNPERC#ffff00:\"Warn\: $WARNPERC%\" "; +$def[1] .= "AREA:perc#$color:\"Percent\:\" "; +$def[1] .= "GPRINT:perc:MAX:\"%2.0lf%%\\n\" "; +?>

13 years, 9 months

Check_MK Git: check_mk: Added options show_header and show_controls to remove the page headers from views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4f78af2951d394c3c21c4e0e2bf12a1b3fd6c5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4f78af2951d39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 23 21:24:15 2010 +0100 Added options show_header and show_controls to remove the page headers from views --- ChangeLog | 2 ++ web/htdocs/htmllib.py | 4 ++++ web/htdocs/views.py | 39 +++++++++++++++++++++++++++++---------- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 009e682..21f029b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,8 @@ * New view for all services of a site * Sidebar snapin site_status: make link target configurable * Multisite view "Recently changed services": sort newest first + * Added options show_header and show_controls to remove the page headers + from views 1.1.8: Core, Setup, etc.: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 57ba466..0948360 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -361,6 +361,10 @@ class html: (title, login_text, time.strftime("%H:%M"))) self.write("<hr class=header>\n") + def body_start(self, title=''): + self.html_head(title) + self.write("<body class=main>") + def footer(self): if self.req.header_sent: if self.focus_object: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c3f147b..9b696ab 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -609,6 +609,12 @@ function toggle_section(nr, oImg) { html.write("<tr><td>Automatic reload (0 or empty for none):</td><td>") html.number_input("browser_reload", 0) html.write("</td></tr>\n") + html.write("<tr><td>Show page header:</td><td>") + html.checkbox("show_header", True) + html.write("</td></tr>\n") + html.write("<tr><td>Show page controls:</td><td>") + html.checkbox("show_controls", True) + html.write("</td></tr>\n") html.write("<tr><td>Play %s:</td><td>" % docu_link("multisite_sounds", "alarm sounds")) html.checkbox("play_sounds", False) html.write("</td></tr>\n") @@ -652,6 +658,8 @@ def load_view_into_html_vars(view): html.set_var("public", view["public"] and "on" or "") html.set_var("hidden", view["hidden"] and "on" or "") html.set_var("mustsearch", view["mustsearch"] and "on" or "") + html.set_var("show_header", view.get("show_header", True) and "on" or "") + html.set_var("show_controls", view.get("show_controls", True) and "on" or "") # [3] Filters for name, filt in multisite_filters.items(): @@ -732,11 +740,13 @@ def create_view(): except: browser_reload = 0 - play_sounds = html.var("play_sounds", "") != "" - public = html.var("public", "") != "" and config.may("publish_views") - hidden = html.var("hidden", "") != "" - mustsearch = html.var("mustsearch", "") != "" + play_sounds = html.var("play_sounds", "") != "" + public = html.var("public", "") != "" and config.may("publish_views") + hidden = html.var("hidden", "") != "" + mustsearch = html.var("mustsearch", "") != "" column_headers = html.var("column_headers") + show_header = html.var("show_header", "") != "" + show_controls = html.var("show_controls", "") != "" show_filternames = [] hide_filternames = [] hard_filternames = [] @@ -806,7 +816,9 @@ def create_view(): "hard_filtervars" : hard_filtervars, "sorters" : sorternames, "group_painters" : group_painternames, - "painters" : painternames + "painters" : painternames, + "show_header" : show_header, + "show_controls" : show_controls, } @@ -845,8 +857,10 @@ def show_view(view, show_heading = False, show_buttons = True): # User can override the layout settings via HTML variables (buttons) # which are safed persistently. This is known as "view options" vo = view_options(view["name"]) - num_columns = vo.get("num_columns", view.get("num_columns", 1)) - browser_reload = vo.get("refresh", view.get("browser_reload", None)) + num_columns = vo.get("num_columns", view.get("num_columns", 1)) + browser_reload = vo.get("refresh", view.get("browser_reload", None)) + show_header = vo.get("show_header", view.get("show_header", 1)) + show_controls = vo.get("show_controls", view.get("show_controls", 1)) if browser_reload: html.set_browser_reload(browser_reload) @@ -914,12 +928,16 @@ def show_view(view, show_heading = False, show_buttons = True): else: columns, rows = [], [] - # Show heading + # Show heading (change between "preview" mode and full page mode) if show_heading: - html.header(view_title(view)) + # Show/Hide the header with page title, MK logo, etc. + if show_header: + html.header(view_title(view)) + else: + html.body_start(view_title(view)) has_done_actions = False - if show_buttons: + if show_buttons and show_controls: show_context_links(view, hide_filters) html.write("<table class=navi><tr>\n") @@ -1033,6 +1051,7 @@ def view_options(viewname): vo = config.load_user_file("viewoptions", {}) v = vo.get(viewname, {}) must_save = False + if config.user_may(config.user, "view_option_refresh"): if html.has_var("refresh"): try:

13 years, 9 months

Check_MK Git: check_mk: printer_supply: In case of OKI c5900 devices the name of the supply

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8c43bacf1c7c90c63143c41b5f2a52beff867b30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c43bacf1c7c90… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 23 20:48:21 2010 +0100 printer_supply: In case of OKI c5900 devices the name of the supply units ins not unique. The color of the supply unit is reported in a dedicated OID and added to the check item name to have a unique name now. --- ChangeLog | 3 +++ checkman/printer_supply | 9 ++++----- checks/printer_supply | 43 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d9241e..009e682 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,9 @@ * Cleaned up several checks to meet the variable naming conventions * drbd: Handling unconfigured drbd devices correctly. These devices are ignored during nventory + * printer_supply: In case of OKI c5900 devices the name of the supply units ins not + unique. The color of the supply unit is reported in a dedicated OID and added to the + check item name to have a unique name now. Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checkman/printer_supply b/checkman/printer_supply index 2977f6c..7f3118b 100644 --- a/checkman/printer_supply +++ b/checkman/printer_supply @@ -13,11 +13,10 @@ description: how much is remaining in a supply, so the printer says "some remaining". This value produces a warning. - Please note, that some manufactures do not have unique names for - their supply units in the MIB. They for example name all for toner - units {Toner Cartridge OKI DATA CORP}. In that case, only the first - unit will be checked (which does not make much sense). A future version - of the check might handle that problem - the current one not. + In case of OKI c5900 devices the name of the supply units ins not unique. + One example is {Toner Cartridge OKI DATA CORP}. In this case the color of + the supply unit is added to the beginning of the name to get a unique + item name. perfdata: The remaining filling level in units (pages remaining). diff --git a/checks/printer_supply b/checks/printer_supply index 5fc0f35..2c9d742 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -30,13 +30,47 @@ # | Peter Lauk <lauk(a)stuttgart-airport.com> Copyright 2010 | # +------------------------------------------------------------------+ +# In some cases the name of the part is not uniq. e.g. for c5900 +# devices. In this cases add the color from the dedicated OID to +# the item name. +# +# Example output for this case: +# +#['Toner Cartridge OKI DATA CORP', '100', '30', 'black'] +#['Toner Cartridge OKI DATA CORP', '100', '10', 'cyan'] +#['Toner Cartridge OKI DATA CORP', '100', '10', 'magenta'] +#['Toner Cartridge OKI DATA CORP', '100', '40', 'yellow'] +#['Image Drum Unit OKI DATA CORP', '20000', '-409', ''] +#['Image Drum Unit OKI DATA CORP', '20000', '7969', ''] +#['Image Drum Unit OKI DATA CORP', '20000', '11597', ''] +#['Image Drum Unit OKI DATA CORP', '20000', '4621', ''] +#['Belt Unit OKI DATA CORP', '60000', '47371', ''] +#['Fuser Unit OKI DATA CORP', '60000', '26174', ''] +#['Waste Toner box OKI DATA CORP', '1', '-2', ''] + printer_supply_default_levels = (20, 10) +# Workaround for toners and drum units in c5900 devices +# which have equal names for the single parts. +# Add the color description to that item +def printer_supply_fix_infos(info): + colors = [] + for index, line in enumerate(info): + if line[0].startswith('Toner Cartridge') \ + or line[0].startswith('Image Drum Unit'): + if line[3]: + colors += [ line[3] ] + color = line[3] + elif line[3] == '': + color = colors[index - len(colors)] + info[index][0] = '%s %s' % (color.title(), line[0]) + return info + def inventory_printer_supply(checkname, info): - return [ (line[0], "printer_supply_default_levels") for line in info ] + return [ (line[0], "printer_supply_default_levels") for line in printer_supply_fix_infos(info) ] def check_printer_supply(item, params, info): - for line in info: + for line in printer_supply_fix_infos(info): if line[0] == item: maxlevel = float(line[1]) current = float(line[2]) @@ -61,7 +95,10 @@ def check_printer_supply(item, params, info): check_info['printer_supply'] = (check_printer_supply, "Supply %s", 1, inventory_printer_supply) -snmp_info['printer_supply'] = ( ".1.3.6.1.2.1.43.11.1.1", [ 6, 8, 9 ] ) +snmp_info['printer_supply'] = ( ".1.3.6.1.2.1.43", [ '11.1.1.6', + '11.1.1.8', + '11.1.1.9', + '12.1.1.4' ] ) snmp_scan_functions['printer_supply'] = \ lambda oid: not not oid(".1.3.6.1.2.1.43.11.1.1.6.1.1")

13 years, 9 months

Check_MK Git: check_mk: sylo: fix performance data on counter wrap

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1e73208e3963546cff978f3ff824f03a713c63d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e73208e396354… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 17 13:15:07 2010 +0100 sylo: fix performance data on counter wrap --- ChangeLog | 2 ++ checks/sylo | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e94d0db..0f3591d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,8 @@ jmx4perl agent (does not need jmx4perl on Nagios) * j4p_performance.mem: added new experimental check for memory usage via JMX. * if/if64: added Perf-O-Meter for Multisite + * sylo: fix performance data: on first execution (counter wrap) the check did + output only one value instead of three. That lead to an invalid RRD. Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checks/sylo b/checks/sylo index 7e6fdd6..0df7bee 100644 --- a/checks/sylo +++ b/checks/sylo @@ -89,7 +89,7 @@ def check_sylo(item, params, info): # Rates for input and output rate_output = '' - rate_perfdata = [] + rate_perfdata = [ ('in', 0.0), ('out', 0.0) ] try: timedif, in_rate = get_counter("sylo.in", mtime, inOffset) timedif, out_rate = get_counter("sylo.out", mtime, outOffset)

13 years, 10 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: 30eba3d72aa30e31798ed5fa52631fbb8fceef7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30eba3d72aa30e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 21 13:22:45 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

13 years, 10 months

Check_MK Git: check_mk: drbd checks handle unconfigured devices correctly now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4f9a0e78176356880fce646cc64a0ccf5a128f2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9a0e78176356… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 18 18:35:00 2010 +0100 drbd checks handle unconfigured devices correctly now --- ChangeLog | 2 ++ checkman/drbd | 3 ++- checkman/drbd.disk | 3 ++- checkman/drbd.net | 3 ++- checkman/drbd.stats | 3 ++- checks/drbd | 22 +++++++++++++++++----- 6 files changed, 27 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39d657f..3ca81d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,8 @@ * j4p_performance.mem: added new experimental check for memory usage via JMX. * if/if64: added Perf-O-Meter for Multisite * Cleaned up several checks to meet the variable naming conventions + * drbd: Handling unconfigured drbd devices correctly. These devices are + ignored during nventory Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checkman/drbd b/checkman/drbd index d907d00..b6fbf10 100644 --- a/checkman/drbd +++ b/checkman/drbd @@ -24,7 +24,8 @@ examples: ] inventory: - Each DRBD device will result in one service during inventory. + Each configured DRBD device will result in one service during inventory. All + devices with the connection state "Unconfigured" are skipped. [parameters] roles (list): The expected role of each node diff --git a/checkman/drbd.disk b/checkman/drbd.disk index 840849a..b80eecc 100644 --- a/checkman/drbd.disk +++ b/checkman/drbd.disk @@ -13,7 +13,8 @@ item: The name of the DRBD device e.g. drbd0 inventory: - Each DRBD device will result in one service during inventory. + Each configured DRBD device will result in one service during inventory. All + devices with the connection state "Unconfigured" are skipped. perfdata: It contains the current read and write disk I/O given as kb/s diff --git a/checkman/drbd.net b/checkman/drbd.net index 29ae710..04482f0 100644 --- a/checkman/drbd.net +++ b/checkman/drbd.net @@ -14,7 +14,8 @@ item: The name of the DRBD device e.g. drbd0 inventory: - Each DRBD device will result in one service during inventory. + Each configured DRBD device will result in one service during inventory. All + devices with the connection state "Unconfigured" are skipped. perfdata: It contains the current inbound and outbound network load given as kb/s diff --git a/checkman/drbd.stats b/checkman/drbd.stats index 0049a03..5c0b5c4 100644 --- a/checkman/drbd.stats +++ b/checkman/drbd.stats @@ -19,7 +19,8 @@ item: The name of the DRBD device e.g. drbd0 inventory: - Each DRBD device will result in one service during inventory. + Each configured DRBD device will result in one service during inventory. All + devices with the connection state "Unconfigured" are skipped. perfdata: One dataset is appended for each of the counters above. diff --git a/checks/drbd b/checks/drbd index f415dbf..c9af72e 100644 --- a/checks/drbd +++ b/checks/drbd @@ -146,9 +146,9 @@ drbd_stats_default_levels = ( None, None, None, None, None, None, None, None, drbd_block_start_match = re.compile('^[0-9]+:') drbd_general_map = [ 'cs', 'ro', 'ds' ] -drbd_net_map = [ 'ns', 'nr' ] -drbd_disk_map = [ 'dw', 'dr' ] -drbd_stats_map = [ 'al', 'bm', 'lo', 'pe', 'ua', 'ap', 'ep', 'wo', 'oos' ] +drbd_net_map = [ 'cs', 'ns', 'nr' ] +drbd_disk_map = [ 'cs', 'dw', 'dr' ] +drbd_stats_map = [ 'cs', 'al', 'bm', 'lo', 'pe', 'ua', 'ap', 'ep', 'wo', 'oos' ] drbd_cs_map = { 'StandAlone': 1, 'Disconnecting': 1, @@ -169,7 +169,11 @@ def inventory_drbd(checktype, info): for line in info[2:]: if drbd_block_start_match.search(line[0]) > 0: parsed = drbd_parse_block(drbd_extract_block('drbd%s' % line[0][:-1], info), checktype) - if checktype == 'drbd': + # Skip unconfigured drbd devices + if parsed['cs'] == 'Unconfigured': + continue + + if checktye == 'drbd': levels = '( [ "%s", "%s" ], [ "%s", "%s" ] )' % \ (parsed['ro'][0], parsed['ro'][1], parsed['ds'][0], parsed['ds'][1]) @@ -235,7 +239,9 @@ def drbd_get_block(item, info, checktype): def check_drbd_general(item, params, info): parsed = drbd_get_block(item, info, 'drbd') if not parsed is None: - if not parsed['cs'] in drbd_cs_map: + if parsed['cs'] == 'Unconfigured': + return (2, 'CRITICAL - The device is "Unconfigured"') + elif not parsed['cs'] in drbd_cs_map: return (3, 'UNKNOWN - Undefined "connection state" in drbd output') # Weight of connection state is calculated by the drbd_cs_map. @@ -274,6 +280,8 @@ def drbd_get_counters(list): def check_drbd_net(item, params, info): parsed = drbd_get_block(item, info, 'drbd.net') if not parsed is None: + if parsed['cs'] == 'Unconfigured': + return (2, 'CRITICAL - The device is "Unconfigured"') output, perfdata = drbd_get_counters([ ('drbd.net', 'in', item, int(parsed['nr']), 'kb'), ('drbd.net', 'out', item, int(parsed['ns']), 'kb') ]) # FIXME: Maybe handle thresholds in the future @@ -284,6 +292,8 @@ def check_drbd_net(item, params, info): def check_drbd_disk(item, params, info): parsed = drbd_get_block(item, info, 'drbd.disk') if not parsed is None: + if parsed['cs'] == 'Unconfigured': + return (2, 'CRITICAL - The device is "Unconfigured"') output, perfdata = drbd_get_counters([ ('drbd.disk', 'write', item, int(parsed['dw']), 'kb'), ('drbd.disk', 'read', item, int(parsed['dr']), 'kb') ]) # FIXME: Maybe handle thresholds in the future @@ -294,6 +304,8 @@ def check_drbd_disk(item, params, info): def check_drbd_stats(item, params, info): parsed = drbd_get_block(item, info, 'drbd.stats') if not parsed is None: + if parsed['cs'] == 'Unconfigured': + return (2, 'CRITICAL - The device is "Unconfigured"') output = '' perfdata = [] for key, label in [ ('al', 'activity log updates'), ('bm', 'bit map updates'),

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits