Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65244 discussions

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7fd0f837d20cefbf725c6bd9381ff51d462ebce6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fd0f837d20cef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 3 10:11:56 2011 +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: Linux Agent: Added suport for vdx and xvdx volumes (KVM+Virtio, XEN+xvda)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 12e3be6e7e205d0e8b3c5206a854a0994dee444d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12e3be6e7e205d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 3 10:11:49 2011 +0100 Linux Agent: Added suport for vdx and xvdx volumes (KVM+Virtio, XEN+xvda) Signed-off-by: Lars Michelsen <lm(a)mathias-kettner.de> --- ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index be45558..87e634b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * PNP templates for if/if64: fix bugs: outgoing packets had been same as incoming, errors and discards were swapped (thanks to Paul Freeman) + * Linux Agent: Added suport for vdx and xvdx volumes (KVM+Virtio, XEN+xvda) 1.1.9i6: INCOMPATIBLE CHANGES: diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cd24268..436484b 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -157,7 +157,7 @@ cat /proc/mdstat # Performancecounter Platten echo '<<<diskstat>>>' date +%s -egrep ' ([sh]d[a-z]*|cciss/c[0-9]+d[0-9]+) ' < /proc/diskstats +egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+) ' < /proc/diskstats # Performancecounter Kernel echo '<<<kernel>>>'

13 years, 9 months

Check_MK Git: check_mk: WATO: converted services form from GET to POST

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b70a46ef7d72e088e7c565a94ea7843b1ec8e182 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b70a46ef7d72e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 3 09:41:59 2011 +0100 WATO: converted services form from GET to POST --- ChangeLog | 3 +++ web/htdocs/.f12 | 7 ------- web/htdocs/htmllib.py | 6 +++--- web/htdocs/index.py | 14 ++++++++++---- web/htdocs/wato.py | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index be45558..c93718e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ same as incoming, errors and discards were swapped (thanks to Paul Freeman) + WATO: + * Fix too-long-URL problem in cases of many services on one host + 1.1.9i6: INCOMPATIBLE CHANGES: * Removed out-dated checks blade_misc, ironport_misc and snia_sml. Replaced diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 deleted file mode 100644 index 85d9910..0000000 --- a/web/htdocs/.f12 +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e -sudo cp -r images *.css *.py js /omd/versions/default/share/check_mk/web/htdocs -sudo cp ../plugins/pages/*.py /omd/versions/default/share/check_mk/web/plugins/pages/ -sudo cp ../plugins/views/*.py /omd/versions/default/share/check_mk/web/plugins/views/ -sudo cp ../plugins/sidebar/*.py /omd/versions/default/share/check_mk/web/plugins/sidebar/ -sudo omd restart eins apache diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 15d9dc2..d231791 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -158,13 +158,13 @@ class html: days = hours / 24 return "%d days" % days - def begin_form(self, name, action = None): + def begin_form(self, name, action = None, method = "GET"): self.form_vars = [] if action == None: action = self.req.myfile + ".py" self.current_form = name - self.write("<form name=%s class=%s action=\"%s\" method=GET>\n" % - (name, name, action)) + self.write("<form name=%s class=%s action=\"%s\" method=%s>\n" % + (name, name, action, method)) self.hidden_field("filled_in", "on") self.hidden_field("_transid", str(self.current_transid(self.req.user))) self.hidden_fields(self.global_vars) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 765e05b..27349bc 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -48,15 +48,21 @@ if defaults.omd_root: execfile(local_pagehandlers_dir + "/" + fn) def read_get_vars(req): - req.multivars = {} - req.vars = {} - if req.args: - req.rawvars = util.parse_qs(req.args, True) + def parse_vars(vars): + req.rawvars = util.parse_qs(vars, True) for (key,values) in req.rawvars.items(): if len(values) >= 1: req.vars[key] = values[-1] req.multivars[key] = values + req.multivars = {} + req.vars = {} + if req.args: + parse_vars(req.args) + postvars = req.read() + if postvars: + parse_vars(postvars) + def connect_to_livestatus(html): html.site_status = {} # site_status keeps a dictionary for each site with the following diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 45f76fa..7fa5f2c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -669,7 +669,7 @@ def show_service_table(hostname, firsttime): table = check_mk_automation("try-inventory", [hostname]) table.sort() - html.begin_form("checks") + html.begin_form("checks", None, "POST") fixall = 0 for entry in table: if entry[0] == 'new' and not html.has_var("_activate_all") and not firsttime:

13 years, 9 months

Check_MK Git: check_mk: Fixed error handling of clustered SNMP hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a6628cf076544289e5c3ac38456b213a3bf7bdcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6628cf0765442… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 2 09:42:34 2011 +0100 Fixed error handling of clustered SNMP hosts --- ChangeLog | 1 + modules/check_mk_base.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d442f49..b75f5e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.1.9i7: Core, Setup, etc.: * Fix crash on Python 2.4 (e.g. RedHat) with fake_file + * Fixed clustering of SNMP hosts 1.1.9i6: INCOMPATIBLE CHANGES: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 6bfb6eb..f316ef5 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -270,10 +270,10 @@ def get_host_info(hostname, ipaddress, checkname): except MKAgentError, e: exception_texts.append(str(e)) g_broken_agent_hosts.add(node) - except SNMPErrorError, e: + except MKSNMPError, e: exception_texts.append(str(e)) g_broken_snmp_hosts.add(node) - is_snmp_error = true + is_snmp_error = True if not at_least_one_without_exception: if is_snmp_error: raise MKSNMPError(", ".join(exception_texts))

13 years, 9 months

Check_MK Git: check_mk: Fixed status ouput of Check_MK in cluster setup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 19b152a19b457349e74ff4f9b8ed98e43e3aeb19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19b152a19b4573… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 13:01:34 2011 +0100 Fixed status ouput of Check_MK in cluster setup --- ChangeLog | 1 + modules/check_mk_base.py | 10 ++++++---- modules/snmp.py | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b75f5e1..4a6b5ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core, Setup, etc.: * Fix crash on Python 2.4 (e.g. RedHat) with fake_file * Fixed clustering of SNMP hosts + * Fix status output of Check_MK check in mixed cluster setups 1.1.9i6: INCOMPATIBLE CHANGES: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index f316ef5..78ab047 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -268,10 +268,12 @@ def get_host_info(hostname, ipaddress, checkname): info += get_realhost_info(node, ipaddress, checkname, cluster_max_cachefile_age) at_least_one_without_exception = True except MKAgentError, e: - exception_texts.append(str(e)) + if str(e) != "": # only first error contains text + exception_texts.append(str(e)) g_broken_agent_hosts.add(node) except MKSNMPError, e: - exception_texts.append(str(e)) + if str(e) != "": # only first error contains text + exception_texts.append(str(e)) g_broken_snmp_hosts.add(node) is_snmp_error = True if not at_least_one_without_exception: @@ -703,7 +705,7 @@ def do_check(hostname, ipaddress): output = "WARNING - old plugin version %s (should be at least %s)" % (agent_version, agent_min_version) status = 1 else: - output = "OK - Agent Version %s, processed %d host infos" % (agent_version, num_success) + output = "OK - Agent version %s" % (agent_version, num_success) status = 0 except MKGeneralException, e: @@ -720,7 +722,7 @@ def do_check(hostname, ipaddress): raise run_time = time.time() - start_time - output += " in %.1f sec|execution_time=%.3f\n" % (run_time, run_time) + output += ", execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) sys.stdout.write(output) sys.exit(status) diff --git a/modules/snmp.py b/modules/snmp.py index 8229b23..5ed920d 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -108,7 +108,7 @@ def get_snmp_explicit(hostname, ipaddress, mib, baseoid, suffixes): if exitstatus: if opt_verbose: sys.stderr.write(tty_red + tty_bold + "ERROR: " + tty_normal + "SNMP error\n") - raise MKSNMPError("SNMP Error") + raise MKSNMPError("SNMP Error on %s" % ipaddress) return info def snmpwalk_on_suboid(hostname, ip, oid): @@ -153,7 +153,7 @@ def snmpwalk_on_suboid(hostname, ip, oid): if exitstatus: if opt_verbose: sys.stderr.write(tty_red + tty_bold + "ERROR: " + tty_normal + "SNMP error\n") - raise MKSNMPError("SNMP Error") + raise MKSNMPError("SNMP Error on %s" % ip) return rowinfo def get_snmp_table(hostname, ip, oid_info):

13 years, 9 months

Check_MK Git: check_mk: Multisite: fix formatting of ul in views snapin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dffca0f2919582411eb9cb6e95344dc5166fb25f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dffca0f2919582… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 10:43:51 2011 +0100 Multisite: fix formatting of ul in views snapin --- web/plugins/sidebar/shipped.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 2d7cac4..ef9a108 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -103,11 +103,12 @@ def render_views(): continue if t == topic: if first: - html.write("</ul>") html.write("<h3>%s</h3>\n" % topic) first = False html.write("<ul>") bulletlink(title, "view.py?view_name=%s" % name) + if first: # at least one item rendered + html.write("</ul>") s = [ (view.get("topic", "Other"), view["title"], name) for name, view in html.available_views.items() if not view["hidden"] ] s.sort()

13 years, 9 months

Check_MK Git: check_mk: Fix crash in Check_MK normal output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 240635bfafc41ac76828b251042045de00edff85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=240635bfafc41a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 13:49:59 2011 +0100 Fix crash in Check_MK normal output --- modules/check_mk_base.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 78ab047..52df50c 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -705,7 +705,7 @@ def do_check(hostname, ipaddress): output = "WARNING - old plugin version %s (should be at least %s)" % (agent_version, agent_min_version) status = 1 else: - output = "OK - Agent version %s" % (agent_version, num_success) + output = "OK - Agent version %s" % agent_version status = 0 except MKGeneralException, e:

13 years, 9 months

Check_MK Git: check_mk: fix PNP template for if/if64

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: be79fd33dd0459334cb3625e762b2cb05df86c96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be79fd33dd0459… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 14:06:38 2011 +0100 fix PNP template for if/if64 --- ChangeLog | 5 ++ pnp-templates/check_mk-if.php | 145 ++++++++++++++++++++++------------------- 2 files changed, 83 insertions(+), 67 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a6b5ec..be45558 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ * Fixed clustering of SNMP hosts * Fix status output of Check_MK check in mixed cluster setups + Checks & Agents: + * PNP templates for if/if64: fix bugs: outgoing packets had been + same as incoming, errors and discards were swapped (thanks to + Paul Freeman) + 1.1.9i6: INCOMPATIBLE CHANGES: * Removed out-dated checks blade_misc, ironport_misc and snia_sml. Replaced diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index 3bff161..fd82ebe 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -41,10 +41,12 @@ $bitBandwidth = $MAX[1] * 8; $warn = $WARN[1]; $crit = $CRIT[1]; +$megabyte = 1024.0 * 1024.0; + $bandwidth = $bitBandwidth; -$mByteBandwidth = $MAX[1] / 1000 / 1000; -$mByteWarn = $WARN[1] / 1000 / 1000; -$mByteCrit = $CRIT[1] / 1000 / 1000; +$mByteBandwidth = $MAX[1] / $megabyte; +$mByteWarn = $WARN[1] / $megabyte; +$mByteCrit = $CRIT[1] / $megabyte; $bwuom = ' '; $base = 1000; @@ -53,41 +55,50 @@ if($bandwidth > $base * $base * $base) { $crit /= $base * $base * $base; $bandwidth /= $base * $base * $base; $bwuom = 'G'; -} elseif($bandwidth > $base * $base) { +} elseif ($bandwidth > $base * $base) { $warn /= $base * $base; $crit /= $base * $base; $bandwidth /= $base * $base; $bwuom = 'M'; -} elseif($bandwidth > $base) { +} elseif ($bandwidth > $base) { $warn /= $base; $crit /= $base; $bandwidth /= $base; $bwuom = 'K'; } +if ($mByteBandwidth < 10) + $range = $mByteBandwidth; +else + $range = 10.0; + + $ds_name[1] = 'Used bandwidth'; -$opt[1] = "--vertical-label \"MByte/sec\" -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc\" "; +$opt[1] = "--vertical-label \"MByte/sec\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc at $bandwidth${bwuom}Bit/s;\" "; $def[1] = "HRULE:0#c0c0c0 ". - "LINE:$mByteBandwidth#808080:\"Port speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."Bit/s \" ". - "LINE:$mByteWarn#ffff00:\"Warning\: " . sprintf("%.1f", $warn) . " ".$bwuom."Byte/s \" ". - "LINE:$mByteCrit#ff0000:\"Critical\: " . sprintf("%.1f", $crit) . " ".$bwuom."Byte/s\\n\" ". - "LINE:-$mByteWarn#ffff00: ". - "LINE:-$mByteCrit#ff0000: ". - "LINE:-$mByteBandwidth#808080: ". - "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". + "HRULE:$mByteBandwidth#808080:\"Port speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."Bit/s\\n\" ". + "HRULE:-$mByteBandwidth#808080: "; + if ($warn) + $def[1] .= "HRULE:$mByteWarn#ffff00:\"Warning\: " . sprintf("%6.1f", $warn) . " ".$bwuom."B/s\\n\" ". + "HRULE:-$mByteWarn#ffff00: "; + if ($crit) + $def[1] .= "HRULE:$mByteCrit#ff0000:\"Critical\: " . sprintf("%6.1f", $crit) . " ".$bwuom."B/s\\n\" ". + "HRULE:-$mByteCrit#ff0000: "; + + $def[1] .= "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". "DEF:outbytes=$RRDFILE[6]:$DS[6]:MAX ". "CDEF:inmb=inbytes,1048576,/ ". "CDEF:outmb=outbytes,1048576,/ ". "CDEF:minusoutmb=0,outmb,- ". - "AREA:inmb#00e060:\"in \" ". - "GPRINT:inbytes:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:inbytes:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:inbytes:MAX:\"%5.1lf %sB/s max\\n\" ". - "AREA:minusoutmb#0080e0:\"out \" ". - "GPRINT:outbytes:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:outbytes:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:outbytes:MAX:\"%5.1lf %sB/s max\\n\" "; + "AREA:inmb#00e060:\"in \" ". + "GPRINT:inbytes:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:inbytes:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:inbytes:MAX:\"%6.1lf %sB/s max\\n\" ". + "AREA:minusoutmb#0080e0:\"out \" ". + "GPRINT:outbytes:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:outbytes:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:outbytes:MAX:\"%6.1lf %sB/s max\\n\" "; if (isset($DS[12])) { $def[1] .= @@ -96,14 +107,14 @@ if (isset($DS[12])) { "CDEF:inmba=inbytesa,1048576,/ ". "CDEF:outmba=outbytesa,1048576,/ ". "CDEF:minusoutmba=0,outmba,- ". - "LINE:inmba#007030:\"in (avg) \" ". - "GPRINT:inbytesa:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:inbytesa:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:inbytesa:MAX:\"%5.1lf %sB/s max\\n\" ". - "LINE:minusoutmba#004070:\"out (avg) \" ". - "GPRINT:outbytesa:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:outbytesa:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:outbytesa:MAX:\"%5.1lf %sB/s max\\n\" "; + "LINE:inmba#00a060:\"in (avg) \" ". + "GPRINT:inbytesa:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:inbytesa:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:inbytesa:MAX:\"%6.1lf %sB/s max\\n\" ". + "LINE:minusoutmba#0060c0:\"out (avg) \" ". + "GPRINT:outbytesa:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:outbytesa:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:outbytesa:MAX:\"%6.1lf %sB/s max\\n\" "; } # Graph 2: packets @@ -113,52 +124,52 @@ $def[2] = "HRULE:0#c0c0c0 ". "DEF:inu=$RRDFILE[2]:$DS[2]:MAX ". "DEF:innu=$RRDFILE[3]:$DS[3]:MAX ". - "AREA:inu#00ffc0:\"in unicast \" ". - "GPRINT:inu:LAST:\"%5.2lf/s last\" ". - "GPRINT:inu:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:inu:MAX:\"%5.2lf/s max\\n\" ". - "AREA:innu#00c080:\"in broadcast/multicast \":STACK ". - "GPRINT:innu:LAST:\"%5.2lf/s last \" ". - "GPRINT:innu:AVERAGE:\"%5.2lf/s avg \" ". - "GPRINT:innu:MAX:\"%5.2lf/s max\\n\" ". - "DEF:outu=$RRDFILE[2]:$DS[2]:MAX ". - "DEF:outnu=$RRDFILE[3]:$DS[3]:MAX ". + "AREA:inu#00ffc0:\"in unicast \" ". + "GPRINT:inu:LAST:\"%7.2lf/s last \" ". + "GPRINT:inu:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:inu:MAX:\"%7.2lf/s max\\n\" ". + "AREA:innu#00c080:\"in broadcast/multicast \":STACK ". + "GPRINT:innu:LAST:\"%7.2lf/s last \" ". + "GPRINT:innu:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:innu:MAX:\"%7.2lf/s max\\n\" ". + "DEF:outu=$RRDFILE[7]:$DS[7]:MAX ". + "DEF:outnu=$RRDFILE[8]:$DS[8]:MAX ". "CDEF:minusoutu=0,outu,- ". "CDEF:minusoutnu=0,outnu,- ". - "AREA:minusoutu#00c0ff:\"out unicast \" ". - "GPRINT:outu:LAST:\"%5.2lf/s last\" ". - "GPRINT:outu:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:outu:MAX:\"%5.2lf/s max\\n\" ". - "AREA:minusoutnu#0080c0:\"out broadcast/multicast\":STACK ". - "GPRINT:outnu:LAST:\"%5.2lf/s last \" ". - "GPRINT:outnu:AVERAGE:\"%5.2lf/s avg \" ". - "GPRINT:outnu:MAX:\"%5.2lf/s max\\n\" "; + "AREA:minusoutu#00c0ff:\"out unicast \" ". + "GPRINT:outu:LAST:\"%7.2lf/s last \" ". + "GPRINT:outu:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:outu:MAX:\"%7.2lf/s max\\n\" ". + "AREA:minusoutnu#0080c0:\"out broadcast/multicast \":STACK ". + "GPRINT:outnu:LAST:\"%7.2lf/s last \" ". + "GPRINT:outnu:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:outnu:MAX:\"%7.2lf/s max\\n\" "; # Graph 3: errors and discards $ds_name[3] = 'Errors and discards'; $opt[3] = "--vertical-label \"packets/sec\" -X0 --title \"Problems $hostname / $servicedesc\" "; $def[3] = "HRULE:0#c0c0c0 ". - "DEF:inerr=$RRDFILE[4]:$DS[4]:MAX ". - "DEF:indisc=$RRDFILE[5]:$DS[5]:MAX ". - "AREA:inerr#ff0000:\"in errors \" ". - "GPRINT:inerr:LAST:\"%5.2lf/s last\" ". - "GPRINT:inerr:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:inerr:MAX:\"%5.2lf/s max\\n\" ". - "AREA:indisc#ff8000:\"in discards \":STACK ". - "GPRINT:indisc:LAST:\"%5.2lf/s last\" ". - "GPRINT:indisc:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:indisc:MAX:\"%5.2lf/s max\\n\" ". - "DEF:outerr=$RRDFILE[9]:$DS[9]:MAX ". - "DEF:outdisc=$RRDFILE[10]:$DS[10]:MAX ". + "DEF:inerr=$RRDFILE[5]:$DS[5]:MAX ". + "DEF:indisc=$RRDFILE[4]:$DS[4]:MAX ". + "AREA:inerr#ff0000:\"in errors \" ". + "GPRINT:inerr:LAST:\"%7.2lf/s last \" ". + "GPRINT:inerr:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:inerr:MAX:\"%7.2lf/s max\\n\" ". + "AREA:indisc#ff8000:\"in discards \":STACK ". + "GPRINT:indisc:LAST:\"%7.2lf/s last \" ". + "GPRINT:indisc:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:indisc:MAX:\"%7.2lf/s max\\n\" ". + "DEF:outerr=$RRDFILE[10]:$DS[10]:MAX ". + "DEF:outdisc=$RRDFILE[9]:$DS[9]:MAX ". "CDEF:minusouterr=0,outerr,- ". "CDEF:minusoutdisc=0,outdisc,- ". - "AREA:minusouterr#ff0080:\"out errors \" ". - "GPRINT:outerr:LAST:\"%5.2lf/s last\" ". - "GPRINT:outerr:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:outerr:MAX:\"%5.2lf/s max\\n\" ". - "AREA:minusoutdisc#ff8080:\"out discards\":STACK ". - "GPRINT:outdisc:LAST:\"%5.2lf/s last\" ". - "GPRINT:outdisc:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:outdisc:MAX:\"%5.2lf/s max\\n\" "; + "AREA:minusouterr#ff0080:\"out errors \" ". + "GPRINT:outerr:LAST:\"%7.2lf/s last \" ". + "GPRINT:outerr:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:outerr:MAX:\"%7.2lf/s max\\n\" ". + "AREA:minusoutdisc#ff8080:\"out discards \":STACK ". + "GPRINT:outdisc:LAST:\"%7.2lf/s last \" ". + "GPRINT:outdisc:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:outdisc:MAX:\"%7.2lf/s max\\n\" "; ?>

13 years, 9 months

Check_MK Git: check_mk: Multisite: fix views snapin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 02b61da1829138656caffe4443d26079298f6d2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02b61da1829138… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 16:17:08 2011 +0100 Multisite: fix views snapin --- web/plugins/sidebar/shipped.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index ef9a108..9f694ff 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -107,7 +107,7 @@ def render_views(): first = False html.write("<ul>") bulletlink(title, "view.py?view_name=%s" % name) - if first: # at least one item rendered + if not first: # at least one item rendered html.write("</ul>") s = [ (view.get("topic", "Other"), view["title"], name) for name, view in html.available_views.items() if not view["hidden"] ]

13 years, 9 months

Check_MK Git: check_mk: Fix bug with fake_file class

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6d52651a6f070ca897c8571fa33a73c2298299f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6d52651a6f070… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 09:05:15 2011 +0100 Fix bug with fake_file class --- ChangeLog | 4 ++++ modules/check_mk.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87033a1..d442f49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.9i7: + Core, Setup, etc.: + * Fix crash on Python 2.4 (e.g. RedHat) with fake_file + 1.1.9i6: INCOMPATIBLE CHANGES: * Removed out-dated checks blade_misc, ironport_misc and snia_sml. Replaced diff --git a/modules/check_mk.py b/modules/check_mk.py index f338a4e..c9693ae 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3662,7 +3662,7 @@ def automation_restart(): # HTTP connections. Really. os.closerange(3, 256) - class fake_file(): + class null_file: def write(self, stuff): pass def flush(self): @@ -3670,7 +3670,7 @@ def automation_restart(): # Deactivate stdout by introducing fake file without filedescriptor old_stdout = sys.stdout - sys.stdout = fake_file() + sys.stdout = null_file() try: if os.path.exists(nagios_objects_file):

13 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits