Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64450 discussions

Check_MK Git: check_mk: Fix missing command check-mk-ping

by Mathias Kettner

Module: check_mk Branch: master Commit: 15e31306ef0bf01b2d7db2a0a875d21ab98f3410 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15e31306ef0bf0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 10 17:32:52 2013 +0100 Fix missing command check-mk-ping --- check_mk_templates.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index f20ac04..e21e65d 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -316,13 +316,13 @@ define command { } define command { - command_name check-mk-host-ping + command_name check-mk-ping command_line @CHECK_ICMP@ $ARG1$ $HOSTADDRESS$ } # Check for clusters: it is UP if at least one node is up define command { - command_name check-mk-host-ping-cluster + command_name check-mk-ping-cluster command_line @CHECK_ICMP@ -m 1 $ARG1$ $_HOSTNODEIPS$ }

11 years, 6 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: a8736d4731869f1c63eb65ad99f674d2ce2d4ffc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8736d4731869f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 10 17:29:39 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Check_MK Git: check_mk: htmllib: new function del_all_vars()

by Mathias Kettner

Module: check_mk Branch: master Commit: b036893636d90d24e49aaa0d3fadc1b25a847cc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b036893636d90d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 10 17:29:36 2013 +0100 htmllib: new function del_all_vars() --- web/htdocs/forms.py | 2 +- web/htdocs/htmllib.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index a519e7f..1cee46a 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -54,7 +54,7 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, messages.append(u"%s: %s" % (vs.title(), e.message)) html.add_user_error(e.varname, e.message) - if validate: + if validate and not html.has_user_errors(): try: validate(new_value) except MKUserError, e: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 2128ad4..dc8f8d8 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1041,6 +1041,10 @@ class html: if varname in self.req.listvars: del self.req.listvars[varname] + def del_all_vars(self): + self.req.vars = {} + self.req.listvars = {} + def javascript(self, code): self.write("<script language=\"javascript\">\n%s\n</script>\n" % code)

11 years, 6 months

Check_MK Git: check_mk: Dashboards can now be configured to be reloaded on resizing

by Lars Michelsen

Module: check_mk Branch: master Commit: b089424b9056c5e783221ecda95e9380e7cd2eed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b089424b9056c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Mar 9 15:28:12 2013 +0100 Dashboards can now be configured to be reloaded on resizing (automatically adds width/height url parameters) --- ChangeLog | 2 ++ web/htdocs/dashboard.py | 15 +++++++++++++-- web/htdocs/js/dashboard.js | 17 +++++++++++++++++ web/plugins/dashboard/builtin.py | 16 ++++++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c12d58d..723cc7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ correctly even for multisite related settings * perfometer: Bit values now using base of 1000 * ADD: check_disk_smb pnp-template + * Dashboards can now be configured to be reloaded on resizing + (automatically adds width/height url parameters) Event Console: * New rule feature: automatically delete event after actions diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index d124a60..d270fcc 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -213,16 +213,27 @@ def render_dashlet(nr, dashlet, wato_folder): if "view" in dashlet: dashlet["iframe"] = "view.py?view_name=%s&_display_options=HRSIXL&_body_class=dashlet" % dashlet["view"] + if dashlet.get("reload_on_resize"): + dashlet["onload"] = "dashlet_add_dimensions('dashlet_%d', this)" % nr + # The content is rendered only if it is fixed. In the # other cases the initial (re)-size will paint the content. if "content" in dashlet: # fixed content html.write(dashlet["content"]) elif "iframe" in dashlet: # fixed content containing iframe + if not dashlet.get("reload_on_resize"): + url = add_wato_folder_to_url(dashlet["iframe"], wato_folder) + else: + url = 'about:blank' + # Fix of iPad >:-P html.write('<div style="width: 100%; height: 100%; -webkit-overflow-scrolling:touch; overflow: auto;">') - html.write('<iframe allowTransparency="true" frameborder="0" width="100%%" height="100%%" src="%s"></iframe>' % - add_wato_folder_to_url(dashlet["iframe"], wato_folder)) + html.write('<iframe id="dashlet_iframe_%d" allowTransparency="true" frameborder="0" width="100%%" ' + 'height="100%%" src="%s"> </iframe>' % (nr, url)) html.write('</div>') + if dashlet.get("reload_on_resize"): + html.javascript('reload_on_resize["%d"] = "%s"' % + (nr, add_wato_folder_to_url(dashlet["iframe"], wato_folder))) html.write("</div></div>\n") # Here comes the brain stuff: An intelligent liquid layout algorithm. diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index f0b9a75..43d1338 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -22,6 +22,9 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +// snapin ids and urls +var reload_on_resize = {}; + function resize_dashlets(id, code) { var resize_info = eval(code); @@ -102,6 +105,14 @@ function resize_dashlets(id, code) if (netto_height > 0) oDash.style.height = netto_height + "px"; } + + if (typeof reload_on_resize[d_number] != 'undefined') { + var base_url = reload_on_resize[d_number]; + var iframe = document.getElementById("dashlet_iframe_" + d_number); + iframe.src = base_url + '&width=' + oDash.clientWidth + + '&height=' + oDash.clientHeight; + iframe = null; + } } oDash = null; } @@ -158,3 +169,9 @@ function update_dashlet(id, code) { obj = null; } } + +//function dashlet_open_with_dimensions(id, url) { +// var dashlet = document.getElementById('dashlet_' + id); +// alert(dashlet.clientWidth); +// //iframe.src = url + '&width=' + iframe.clientWidth + '&height=' + iframe.clientHeight; +//} diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index ad0fef6..dc942ff 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -68,3 +68,19 @@ builtin_dashboards["main"] = { }, ] } + +builtin_dashboards["topology"] = { + "title" : _("Network Topology"), + "dashlets" : [ + { + "title" : "Topology of Site " + defaults.omd_site, + "iframe" : defaults.url_prefix + 'nagvis/frontend/nagvis-js/index.php?' + \ + 'mod=Map&header_template=default&header_menu=0&label_show=1' + \ + '&sources=automap&act=view&backend_id=' + defaults.omd_site + \ + '&render_mode=undirected&url_target=main', + "reload_on_resize" : True, + "position" : (1, 0), + "size" : (GROW, GROW), + }, + ] +}

11 years, 6 months

Check_MK Git: check_mk: Host check command configurable via WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 4099be80723cf8dd70035bbc2e55b9ae86af6929 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4099be80723cf8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 8 19:01:14 2013 +0100 Host check command configurable via WATO including automatic command definition for Nagios --- .f12 | 11 +++++ ChangeLog | 3 + check_mk_templates.cfg | 16 ++++++- doc/.f12 | 13 ------ modules/check_mk.py | 63 ++++++++++++++++++++++++---- web/plugins/wato/active_checks.py | 1 + web/plugins/wato/check_mk_configuration.py | 33 ++++++++++++-- 7 files changed, 111 insertions(+), 29 deletions(-) diff --git a/.f12 b/.f12 index 3871f7d..9b77ef2 100644 --- a/.f12 +++ b/.f12 @@ -1,3 +1,14 @@ +SITE=${SITE:-$(omd sites --bare | head -n 1)} +sed -e "s#@BINDIR@#/omd/sites/$SITE/bin#g" \ + -e "s#@VARDIR@#/omd/sites/$SITE/var/check_mk#g" \ + -e "s#@CHECK_ICMP@#/omd/sites/$SITE/lib/nagios/plugins/check_icmp#g" \ + -e "s#@PNPURL@#/$SITE/pnp4nagios/#g" \ + -e "s#@CGIURL@#/$SITE/nagios/cgi-bin#g" \ + < check_mk_templates.cfg > /tmp/check_mk_templates.cfg + +sudo mv /tmp/check_mk_templates.cfg /omd/sites/$SITE/etc/nagios/conf.d + +(cd doc ; bash .f12) (cd web ; bash .f12) (cd modules ; bash .f12) (cd checks ; bash .f12) diff --git a/ChangeLog b/ChangeLog index 64a5db7..f6eec15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Core: * Agents can send data for other hosts "piggyback". This is being used by the vSphere and SAP plugins + * New variable host_check_commands, that allows the definition of + an alternative host check command (without manually defining one) Multisite: * New availability view for arbitrary host/service collections @@ -58,6 +60,7 @@ * Removed global option logwatch_forward_to_ec, moved this to the logwatch_ec ruleset. With this option the forwarding can now be enabled for each logfile on a host + * Configuration of an alternativ host check command 1.2.2b5: Core: diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index 381e585..f20ac04 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -316,16 +316,28 @@ define command { } define command { - command_name check-mk-ping + command_name check-mk-host-ping command_line @CHECK_ICMP@ $ARG1$ $HOSTADDRESS$ } # Check for clusters: it is UP if at least one node is up define command { - command_name check-mk-ping-cluster + command_name check-mk-host-ping-cluster command_line @CHECK_ICMP@ -m 1 $ARG1$ $_HOSTNODEIPS$ } +# Dummy host check that always assumes that the host is up +define command { + command_name check-mk-host-ok + command_line echo "OK - Host is always assumed to be up" +} + +define command { + command_name check-mk-host-tcp + command_line $USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ +} + + # General notification script. Details can be configured # in main.mk via notification_... options define command { diff --git a/doc/.f12 b/doc/.f12 index 64efbb0..096bb80 100644 --- a/doc/.f12 +++ b/doc/.f12 @@ -1,14 +1 @@ -#!/bin/bash -SITE=${SITE:-$(omd sites --bare | head -n 1)} -set -xe - -sed -e "s#@BINDIR@#/omd/sites/$SITE/bin#g" \ - -e "s#@VARDIR@#/omd/sites/$SITE/var/check_mk#g" \ - -e "s#@CHECK_ICMP@#/omd/sites/$SITE/lib/nagios/plugins/check_icmp#g" \ - -e "s#@PNPURL@#/$SITE/pnp4nagios/#g" \ - -e "s#@CGIURL@#/$SITE/nagios/cgi-bin#g" \ - < check_mk_templates.cfg > /tmp/check_mk_templates.cfg - -sudo mv /tmp/check_mk_templates.cfg /omd/sites/$SITE/etc/nagios/conf.d -sudo omd restart $SITE nagios sudo cp -pr * /omd/versions/default/share/doc/check_mk diff --git a/modules/check_mk.py b/modules/check_mk.py index a56ad20..24fa8c8 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -320,9 +320,11 @@ donation_command = 'mail -r checkmk(a)yoursite.de -s "Host do scanparent_hosts = [ ( ALL_HOSTS ) ] host_attributes = {} # needed by WATO, ignored by Check_MK ping_levels = [] # special parameters for host/PING check_command +host_check_commands = [] # alternative host check instead of check_icmp check_periods = [] + # global variables used to cache temporary values (not needed in check_mk_base) ip_to_hostname_cache = None @@ -1268,6 +1270,43 @@ def extra_conf_of(confdict, hostname, service): result += format % (key, values[0]) return result +def host_check_command(hostname, ip, is_clust): + # Check dedicated host check command + values = host_extra_conf(hostname, host_check_commands) + if values: + value = values[0] + else: + value = "ping" + + if value == "ping": + ping_args = check_icmp_arguments(hostname) + if is_clust and ip: # Do check cluster IP address if one is there + return "check-mk-host-ping!%s" % ping_args + elif ping_args and is_clust: # use check_icmp in cluster mode + return "check-mk-host-ping-cluster!%s" % ping_args + elif ping_args: # use special arguments + return "check-mk-host-ping!%s" % ping_args + else: + return None + + elif value == "ok": + return "check-mk-host-ok" + + elif value == "agent" or value[0] == "service": + service = value == "agent" and "Check_MK" or value[1] + command = "check-mk-host-custom-%d" % (len(hostcheck_commands_to_define) + 1) + hostcheck_commands_to_define.append((command, + 'echo "$SERVICEOUTPUT:%s:%s$" && exit $SERVICESTATEID:%s:%s$' % (hostname, service, hostname, service))) + return command + + elif value[0] == "tcp": + return "check-mk-host-tcp!" + str(value[1]) + + raise MKGeneralException("Invalid value %r for host_check_command of host %s." % ( + value, hostname)) + + + def check_icmp_arguments(hostname): values = host_extra_conf(hostname, ping_levels) levels = {} @@ -1499,6 +1538,8 @@ def create_nagios_config(outfile = sys.stdout, hostnames = None): active_checks_to_define = set([]) global custom_commands_to_define custom_commands_to_define = set([]) + global hostcheck_commands_to_define + hostcheck_commands_to_define = [] if host_notification_periods != []: raise MKGeneralException("host_notification_periods is not longer supported. Please use extra_host_conf['notification_period'] instead.") @@ -1571,15 +1612,10 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write(" address\t\t\t%s\n" % (ip and make_utf8(ip) or "0.0.0.0")) outfile.write(" _TAGS\t\t\t\t%s\n" % " ".join(tags_of_host(hostname))) - # Levels for host check - ping_args = check_icmp_arguments(hostname) - if is_clust and ip: # Do check cluster IP address if one is there - outfile.write(" check_command\t\t\tcheck-mk-ping!%s\n" % ping_args) - elif ping_args and is_clust: # use check_icmp in cluster mode - outfile.write(" check_command\t\t\tcheck-mk-ping-cluster!%s\n" % ping_args) - elif ping_args: # use special arguments - outfile.write(" check_command\t\t\tcheck-mk-ping!%s\n" % ping_args) - + # Host check command might differ from default + command = host_check_command(hostname, ip, is_clust) + if command: + outfile.write(" check_command\t\t\t%s\n" % command) # WATO folder path path = host_paths.get(hostname) @@ -2093,6 +2129,15 @@ def create_nagios_config_commands(outfile): """ % command_name) + # custom host checks + for command_name, command_line in hostcheck_commands_to_define: + outfile.write("""define command { + command_name\t\t\t%s + command_line\t\t\t%s +} + +""" % (command_name, command_line)) + def create_nagios_config_timeperiods(outfile): if len(timeperiods) > 0: diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index e18d2de..4a1b3d0 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -892,3 +892,4 @@ register_rule(group, match = 'all' ) + diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 528ed29..0a9fcf2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1153,15 +1153,38 @@ register_rule(group, "the state of the host will stay at its last status.")), ) +register_rule( + group, + "host_check_commands", + CascadingDropdown( + title = _("Host Check Command"), + help = _("Usually Check_MK uses a series of PING (ICMP echo request) in order to determine " + "whether a host is up. In some cases this is not possible, however. With this rule " + "you can specify an alternative way of determining the host's state."), + choices = [ + ( "ping", _("PING (ICMP echo request)") ), + ( "tcp" , _("TCP Connect"), Integer(label = _("to port:"), minvalue=1, maxvalue=65535, default_value=80 )), + ( "ok", _("Always assume host to be up") ), + ( "agent", _("Use the status of the Check_MK Agent") ), + ( "service", _("Use the status of the service..."), TextUnicode(label = ":", size=32, allow_empty=False )), + ], + default_value = "ping", + html_separator = " ", + ), + match = 'first' +) + + register_rule(group, "extra_host_conf:check_command", TextAscii( + title = _("Internal Command for Hosts Check"), label = _("Command:"), - title = _("Check Command for Hosts Check"), - help = _("This parameter changes the default check_command for " - "a host check"), - ), - ) + help = _("This ruleset is deprecated and will be removed soon: " + "it changes the default check_command for a host check. You need to " + "define that command manually in your monitoring configuration."), + ), +) group = "monconf/" + _("Notifications") register_rule(group,

11 years, 6 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 32e6f6b361f2b725de13a54a8c60d84ba44fffaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32e6f6b361f2b7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 8 19:01:18 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Check_MK Git: check_mk: fixed typo: Unsed rulesets

by Andreas Boesl

Module: check_mk Branch: master Commit: 7cdb1e29d440bf95fecf397e6a33e3c8dca4339b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cdb1e29d440bf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 8 17:08:51 2013 +0100 fixed typo: Unsed rulesets --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5c81dc7..c678911 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9868,7 +9868,7 @@ def mode_edit_ruleset(phase): make_link([("mode", "rulesets"), ("group", group), ("host", hostname)]), "back") html.context_button(_("Used Rulesets"), make_link([("mode", "rulesets"), ("group", "used"), ("host", hostname)]), "usedrulesets") - html.context_button(_("Unsed Rulesets"), + html.context_button(_("Unused Rulesets"), make_link([("mode", "rulesets"), ("group", "unused")]), "usedrulesets") if hostname: html.context_button(_("Services"),

11 years, 6 months

Check_MK Git: check_mk: cisco_qos: pnp template coloring. added perfometer. fixed unit conversion(base 1000)

by Andreas Boesl

Module: check_mk Branch: master Commit: 2594bb5e3c300a3624a30d00c7de7f63b30efaad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2594bb5e3c300a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 8 15:41:07 2013 +0100 cisco_qos: pnp template coloring. added perfometer. fixed unit conversion(base 1000) --- pnp-templates/check_mk-cisco_qos.php | 6 +++--- web/plugins/perfometer/check_mk.py | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pnp-templates/check_mk-cisco_qos.php b/pnp-templates/check_mk-cisco_qos.php index f74f417..c7ff952 100644 --- a/pnp-templates/check_mk-cisco_qos.php +++ b/pnp-templates/check_mk-cisco_qos.php @@ -47,7 +47,7 @@ if($bandwidth > $base * $base * $base) { } $ds_name[1] = 'QoS Class Traffic'; -$opt[1] = "--vertical-label \"MBit/sec\" -X0 -b 1024 --title \"$hostname / $servicedesc\" "; +$opt[1] = "--vertical-label \"MBit/sec\" -X0 -b 1000 --title \"$hostname / $servicedesc\" "; $def[1] = "HRULE:0#c0c0c0 ". "HRULE:$bandwidth#808080:\"Interface speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."Bit/s\\n\" ". @@ -76,11 +76,11 @@ $def[1] .= "DEF:postbytes_avg=$RRDFILE[3]:$DS[1]:MAX ". "CDEF:drop_traffic_avg=dropbytes_avg,8,* ". "CDEF:postmbit_avg=post_traffic_avg,1000000,/ ". "CDEF:dropmbit_avg=drop_traffic_avg,1000000,/ ". - "LINE:postmbit_avg#a3f090:\"post avg \" ". + "LINE:postmbit_avg#3b762e:\"post avg \" ". "GPRINT:post_traffic_avg:LAST:\"%5.1lf %sBit/s last\" ". "GPRINT:post_traffic_avg:AVERAGE:\"%5.1lf %sBit/s avg\" ". "GPRINT:post_traffic_avg:MAX:\"%5.1lf %sBit/s max\\n\" ". - "LINE:dropmbit_avg#6030f0:\"drop avg \" ". + "LINE:dropmbit_avg#1255a9:\"drop avg \" ". "GPRINT:drop_traffic_avg:LAST:\"%5.1lf %sBit/s last\" ". "GPRINT:drop_traffic_avg:AVERAGE:\"%5.1lf %sBit/s avg\" ". "GPRINT:drop_traffic_avg:MAX:\"%5.1lf %sBit/s max\\n\" "; diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index a8ea017..12612db 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -300,6 +300,16 @@ def perfometer_check_mk_brocade_fcport(row, check_command, perf_data): out_bw = savefloat(perf_data[1][6]), ) +def perfometer_check_mk_cisco_qos(row, check_command, perf_data): + unit = "Bit/s" in row["service_plugin_output"] and "Bit" or "B" + return perfometer_bandwidth( + in_traffic = savefloat(perf_data[0][1]), + out_traffic = savefloat(perf_data[1][1]), + in_bw = savefloat(perf_data[0][5]) , + out_bw = savefloat(perf_data[1][5]) , + unit = unit + ) + perfometers["check_mk-if"] = perfometer_check_mk_if perfometers["check_mk-if64"] = perfometer_check_mk_if perfometers["check_mk-vms_if"] = perfometer_check_mk_if @@ -308,6 +318,7 @@ perfometers["check_mk-lnx_if"] = perfometer_check_mk_if perfometers["check_mk-hpux_if"] = perfometer_check_mk_if perfometers["check_mk-mcdata_fcport"] = perfometer_check_mk_if perfometers["check_mk-brocade_fcport"] = perfometer_check_mk_brocade_fcport +perfometers["check_mk-cisco_qos"] = perfometer_check_mk_cisco_qos def perfometer_oracle_tablespaces(row, check_command, perf_data): current = float(perf_data[0][1])

11 years, 6 months

Check_MK Git: check_mk: perfometer: Bit values now using base of 1000

by Andreas Boesl

Module: check_mk Branch: master Commit: 33ccf81c4bfee98b018bc5a53b215976cd9e31cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33ccf81c4bfee9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 8 15:39:59 2013 +0100 perfometer: Bit values now using base of 1000 --- ChangeLog | 1 + web/plugins/views/perfometer.py | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92fe1ad..b64a43c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * Added plugins to config module to make registration of default values possible for addons like mkeventd - reset to default values works now correctly even for multisite related settings + * perfometer: Bit values now using base of 1000 * ADD: check_disk_smb pnp-template Event Console: diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 8553c3f..a334f05 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -91,14 +91,18 @@ def perfometer_logarithmic_dual(value_left, color_left, value_right, color_right def number_human_readable(n, precision=1, unit="B"): + base = 1024.0 + if unit == "Bit": + base = 1000.0 + n = float(n) f = "%." + str(precision) + "f" - if abs(n) > 1024 * 1024 * 1024: - return (f + "G%s") % (n / (1024.0 * 1024 * 1024), unit) - elif abs(n) > 1024 * 1024: - return (f + "M%s") % (n / (1024.0 * 1024), unit) - elif abs(n) > 1024: - return (f + "k%s") % (n / 1024.0, unit) + if abs(n) > base * base * base: + return (f + "G%s") % (n / (base * base * base), unit) + elif abs(n) > base * base: + return (f + "M%s") % (n / (base * base), unit) + elif abs(n) > base: + return (f + "k%s") % (n / base, unit) else: return (f + "%s") % (n, unit)

11 years, 6 months

Check_MK Git: check_mk: new: check_disk_smb pnp template

by Andreas Boesl

Module: check_mk Branch: master Commit: 04d5c4b6d5a203754208a7d124c3eddb45f369c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04d5c4b6d5a203… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 8 14:34:16 2013 +0100 new: check_disk_smb pnp template --- ChangeLog | 1 + pnp-templates/check_mk_active-disk_smb.php | 63 ++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce91457..070e965 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * Added plugins to config module to make registration of default values possible for addons like mkeventd - reset to default values works now correctly even for multisite related settings + * ADD: check_disk_smb pnp-template Event Console: * New rule feature: automatically delete event after actions diff --git a/pnp-templates/check_mk_active-disk_smb.php b/pnp-templates/check_mk_active-disk_smb.php new file mode 100644 index 0000000..f5ee3e9 --- /dev/null +++ b/pnp-templates/check_mk_active-disk_smb.php @@ -0,0 +1,63 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +setlocale(LC_ALL, "POSIX"); + +# RRDtool Options +#$servicedes=$NAGIOS_SERVICEDESC + +$fsname = str_replace("_", "/", substr($servicedesc, 3)); +$fstitle = $fsname; + +# Hack for windows: replace C// with C:\ +if (strlen($fsname) == 3 && substr($fsname, 1, 2) == '//') { + $fsname = $fsname[0] . "\:\\\\"; + $fstitle = $fsname[0] . ":\\"; +} + +$mega = 1024.0 * 1024.0; +$giga = 1024.0 * 1024.0 * 1024.0; +$sizegb = sprintf("%.1f", $MAX[1] / $giga); +$maxgb = $MAX[1] / $giga; +$warngb = $WARN[1] / $giga; +$critgb = $CRIT[1] / $giga; +$warngbtxt = sprintf("%.1f", $warngb); +$critgbtxt = sprintf("%.1f", $critgb); + +$opt[1] = "--vertical-label GB -l 0 -u $maxgb -b 1024 --title '$hostname: Filesystem $fstitle ($sizegb GB)' "; + +# First graph show current filesystem usage +$def[1] = "DEF:used_bytes=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "CDEF:var1=used_bytes,$giga,/ "; +$def[1] .= "AREA:var1#00ffc6:\"used space on $fsname\\n\" "; +$def[1] .= "LINE1:var1#226600: "; +$def[1] .= "HRULE:$maxgb#003300:\"Size ($sizegb GB) \" "; +$def[1] .= "HRULE:$warngb#ffff00:\"Warning at $warngbtxt GB \" "; +$def[1] .= "HRULE:$critgb#ff0000:\"Critical at $critgbtxt GB \\n\" "; +$def[1] .= "GPRINT:var1:LAST:\"current\: %6.2lf GB\" "; +$def[1] .= "GPRINT:var1:MAX:\"max\: %6.2lf GB \" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"avg\: %6.2lf GB\" "; + +?>

11 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits