Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64478 discussions

Check_MK Git: check_mk: agent_vsphere: new option --tracefile,

by Andreas Boesl

minor code cleanup and new TODOs Message-ID: <5257e16c.PqcYHeM/KZaSktGd%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: a71a1e27c7883602a030dd4a4e0ede07e9987e26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a71a1e27c78836… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 11 13:30:49 2013 +0200 agent_vsphere: new option --tracefile, minor code cleanup and new TODOs --- ChangeLog | 1 + agents/special/agent_vsphere | 76 ++++++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2a1920..7a2b1e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * cpu_netapp: added Perf-O-Meter and PNP template * cisco_cpu: added Perf-O-Meter and PNP template * apc_symmetra: add input voltage to informational output + * agent_vsphere: new debug option --tracefile * FIX: windows_agent: fixed bug in cleanup of open thread handles * FIX: cups default printer is now monitored again in linux agent * FIX: host notification email in html format: fixed formating error diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 4580645..949bcaa 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -35,7 +35,7 @@ # Note: This agent is still in development -import httplib, pprint, sys, os, getopt, socket, time +import httplib, pprint, sys, os, getopt, socket, time, datetime, re #execfile("soap_commands.py", globals(), globals()) @@ -144,27 +144,30 @@ OPTIONS: subquery. --debug Debug mode: let Python exceptions come through + --tracefile FILENAME Log all outgoing and incoming data into the given tracefile -i MODULES, --modules MODULES Modules to query. This is a comma separated list of hostsystem, virtualmachine and storage. Default is to query all modules. - -c, --dump-counters Simply dumping out all available counters and their values. - This mode is meant for debugging and diagnostic purposes. """) +# TODO: implement +# -c, --dump-counters Simply dumping out all available counters and their values. +# This mode is meant for debugging and diagnostic purposes. short_options = 'hi:u:s:Dat:H:c' long_options = [ 'help', 'user=', 'secret=', 'direct', 'agent', 'debug', 'modules=', 'timeout=', 'hostname=', - 'dump-counters', + 'dump-counters', 'tracefile=', ] opt_debug = False opt_direct = False opt_agent = False -opt_dump_counters = False +opt_dump_counters = False # TODO: implement opt_timeout = 60 opt_hostname = None +opt_tracefile = None error = None error_exit = 1 @@ -172,6 +175,7 @@ error_exit = 1 host_address = None user = None secret = None +tracefile = None query_objects = [ 'hostsystem', 'virtualmachine', 'datastore', 'counters', 'required' ] try: @@ -183,6 +187,8 @@ except getopt.GetoptError, err: for o,a in opts: if o in [ '--debug' ]: opt_debug = True + elif o in [ '--tracefile' ]: + opt_tracefile = a elif o in [ '-D', '--direct' ]: opt_direct = True elif o in [ '-a', '--agent' ]: @@ -268,19 +274,26 @@ if opt_agent: results = {} -# Debugging stuff -query_duration = 0 -query_start = 0 esx_version_num = None -esx_name = "" +esx_name = "" + +if opt_tracefile: + if os.path.exists(os.path.dirname(opt_tracefile)): + tracefile = file(opt_tracefile, "w") + elif opt_debug: + sys.stderr.write("Path for tracefile %s does not exist" % opt_tracefile) + sys.stderr.flush() -import re def get_pattern(pattern, line): if not line: return [] p = re.compile(pattern) return p.findall(line) +if tracefile: + tracefile.write("Tracefile %s Host address: %s\n" % + (datetime.datetime.now().strftime("%Y-%m-%d %H:%M"), host_address)) + try: my_cookie = None netloc = host_address @@ -294,26 +307,31 @@ try: sys.stderr.write("Connecting to %s..." % host_address) sys.stderr.flush() - start = time.time() - def query_server(soapdata): handle.putrequest("POST", request_uri) handle.putheader("Content-Length", "%d" % len(soapdata)) handle.putheader("Content-Type", 'text/xml; charset="utf-8"') handle.putheader("SOAPAction", "urn:vim25/5.0") - handle.putheader("User-Agent", "VMware VI Client/5.0.0") + handle.putheader("User-Agent", "VMware VI Client/5.0.0") # TODO: set client version? if my_cookie: handle.putheader("Cookie", my_cookie) - handle.endheaders() + handle.send(soapdata) + time_sent = time.time() response = handle.getresponse() - return response.status, response.reason, response.msg, response.read() + time_response = time.time() - def get_counter_instances(): + body = response.read() + if tracefile: + tracefile.write("#### Sent ####\n%s" % soapdata) + timing_info = "Response took: %f" % (time_response - time_sent) + tracefile.write("\n#### Received #### %s\n%s" % (timing_info, body)) - import re + return response.status, response.reason, response.msg, body + + def get_counter_instances(): p = re.compile("<counterId>([0-9]*)</counterId><instance>([^<]*)") m = p.findall( results["7_query_avail_perf_metric"] ) @@ -324,10 +342,10 @@ try: return counters_avail - for (used_by, name, soapdata) in soapdata_list: + for (objects, name, soapdata) in soapdata_list: # Only sent queries we actually need - for item in used_by: - if item in query_objects: + for entry in objects: + if entry in query_objects: break else: continue @@ -359,6 +377,8 @@ try: soapdata = soapdata.replace("###counters###", "".join(counter_data)) # Query data + if tracefile: + tracefile.write("\n\nStart query: %s\n" % name) reply_code, reply_msg, reply_headers, reply_data = query_server(soapdata) results[name] = reply_data @@ -379,16 +399,6 @@ except Exception, e: "credentials. Please check your connection settings and try " \ "again." -# Debugging -#try: -# os.mkdir("results") -#except: -# pass -# -#for name, value in results.items(): -# file("results/%s.%s" % (host, name), "w").write(value) - - if not error: try: @@ -521,7 +531,6 @@ if not error: if "virtualmachine" in query_objects: vms = {} - start = time.time() elements = get_pattern("<objects>(.*?)</objects>", results["11_virtualmachine"]) for entry in elements: vm_data = get_pattern("<name>(.*?)</name><val.*?>(.*?)</val>", entry) @@ -560,13 +569,14 @@ if not error: running_on = hostsystem_name.get(data.get("runtime.host"), data.get("runtime.host")) print "virtualmachine\t%s\t%s\t%s" % (data.get("name").replace(" ","_"), running_on, data.get("runtime.powerState")) - #print "query", query_duration - #print "processing", time.time() - start - query_duration except Exception, e: if opt_debug: raise error = "Error while processing received data" +if tracefile: + tracefile.close() + if error: sys.stderr.write(error + "\n") sys.exit(error_exit)

10 years, 12 months

Check_MK Git: check_mk: livestatus: fixed incorrect staleness value for

by Andreas Boesl

Module: check_mk Branch: master Commit: bc80ce8588dab35b9726fcb737d70aac81403039 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc80ce8588dab3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 11 12:29:21 2013 +0200 livestatus: fixed incorrect staleness value for check_mk snmp checks with custom check interval --- ChangeLog | 4 ++++ livestatus/src/ServiceSpecialDoubleColumn.cc | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d439fee..e2a1920 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,10 @@ * FIX: livestatus table statehist: fixed rubbish entries whenever logfile instances got unloaded + Livestatus: + * FIX: check_mk snmp checks with a custom check interval no longer + have an incorrect staleness value + Notifications: * mkeventd: new notification plugin for forwarding notifications to the Event Console. See inline docu in share/check_mk/notification/mkeventd diff --git a/livestatus/src/ServiceSpecialDoubleColumn.cc b/livestatus/src/ServiceSpecialDoubleColumn.cc index 952a152..62804ab 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.cc +++ b/livestatus/src/ServiceSpecialDoubleColumn.cc @@ -38,16 +38,17 @@ double ServiceSpecialDoubleColumn::getValue(void *data) switch (_type) { case SSDC_STALENESS: { - bool is_cmk_passive = !strncmp(svc->check_command_ptr->name, "check_mk-", 9); - time_t check_result_age = time(0) - svc->last_check; - service *tmp_svc; + if (svc->check_interval != 0) + return check_result_age / (svc->check_interval * interval_length); - // check_mk PASSIVE CHECK: Find check-mk service and get its check interval + // check_mk PASSIVE CHECK without check interval uses + // the check interval of its check-mk service + bool is_cmk_passive = !strncmp(svc->check_command_ptr->name, "check_mk-", 9); if (is_cmk_passive) { host *host = svc->host_ptr; + service *tmp_svc; servicesmember *svc_member = host->services; - double check_interval = 1; while (svc_member != 0) { tmp_svc = svc_member->service_ptr; if (!strncmp(tmp_svc->check_command_ptr->name, "check-mk", 9)) { @@ -55,11 +56,11 @@ double ServiceSpecialDoubleColumn::getValue(void *data) } svc_member = svc_member->next; } - return 1; // Shouldnt happen! We always except check-mk service + return 1; // Shouldnt happen! We always expect a check-mk service } - else // Other non-cmk passive and active checks + else // Other non-cmk passive and active checks without check_interval { - return check_result_age / ((svc->check_interval == 0 ? 1 : svc->check_interval) * interval_length); + return check_result_age / interval_length; } } }

10 years, 12 months

Check_MK Git: check_mk: Updated bug entries #0983

by Mathias Kettner

Module: check_mk Branch: master Commit: 35e3a9a139f6627ca2963ed74dd3e0bb38d4d145 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35e3a9a139f662… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 11 03:59:22 2013 +0200 Updated bug entries #0983 --- .bugs/983 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/983 b/.bugs/983 index b939259..6282a6f 100644 --- a/.bugs/983 +++ b/.bugs/983 @@ -1,9 +1,9 @@ Title: Multisite: cut down number of Livestatus queries Component: multisite -State: open +Class: nastiness +State: done Date: 2013-10-10 23:24:22 Targetversion: 1.2.3i3 -Class: nastiness Currently for each page one query of SET status is being done. On low-latency connections this hurts. We could either do without @@ -29,3 +29,6 @@ if "\nCache:" in request: Cache: 500 --> Sekunden Cache: reload --> Bis config reload + +2013-10-11 03:59:21: changed state open -> done +Done.

10 years, 12 months

Check_MK Git: check_mk: Enable Caching for Sidebar search

by Mathias Kettner

Module: check_mk Branch: master Commit: 42963b3b460d6a9572fe31dbb6b2aadc0c43b7bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42963b3b460d6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 11 03:55:27 2013 +0200 Enable Caching for Sidebar search --- web/htdocs/sidebar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 31d5bdd..e8eece5 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -668,7 +668,7 @@ def search_livestatus(ty, q): filt.append('Or: %d\n' % (len(filt))) column = ty == 'service' and 'description' or 'name' - lq = "GET %ss\nColumns: %s\n%sLimit: %d\n" % \ + lq = "GET %ss\nCache: reload\nColumns: %s\n%sLimit: %d\n" % \ (ty, column, ''.join(filt), limit) html.live.set_prepend_site(True) data = html.live.query(lq)

10 years, 12 months

Check_MK Git: check_mk: liveproxyd: Implement caching of non-status requests (together with Multisite)

by Mathias Kettner

Module: check_mk Branch: master Commit: 5bea0156b549a701f49aa18cad9762f385ce281d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bea0156b549a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 11 03:49:35 2013 +0200 liveproxyd: Implement caching of non-status requests (together with Multisite) --- ChangeLog | 1 + doc/treasures/liveproxy/liveproxyd | 101 ++++++++++++++++++++++------ web/htdocs/config.py | 2 + web/htdocs/index.py | 5 ++ web/htdocs/livestatus.py | 28 ++++++-- web/htdocs/wato.py | 11 ++- web/plugins/views/filters.py | 10 +-- web/plugins/wato/check_mk_configuration.py | 1 + 8 files changed, 125 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5bea0156b5…

10 years, 12 months

Check_MK Git: check_mk: Updated bug entries #0983

by Mathias Kettner

Module: check_mk Branch: master Commit: c66a942015572b64edef23933b45c5bba8cd0c32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c66a942015572b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 11 01:17:11 2013 +0200 Updated bug entries #0983 --- .bugs/983 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/983 b/.bugs/983 index 6e8d41d..b939259 100644 --- a/.bugs/983 +++ b/.bugs/983 @@ -15,3 +15,17 @@ with a cached result. Also we should cache queries needed for the search filters that are contained in many views. The caching could be done by the livproxyd. + +The caching should take into account if the core has been +changed its configuration. For example the list of check +commands, host groups and stuff can only change due to +a configuration reload. So we can safely cache such a query. + +Question is, how the proxy could know that it should cache. +A new Cache: header? But then the proxy would need to parse +the headers completely. Or we simply make a: +if "\nCache:" in request: + .... + +Cache: 500 --> Sekunden +Cache: reload --> Bis config reload

10 years, 12 months

Check_MK Git: check_mk: Updated bug entries #0983

by Mathias Kettner

Module: check_mk Branch: master Commit: 15c8820707bbab924e8c21472de4287d214d5e12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15c8820707bbab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 10 23:32:34 2013 +0200 Updated bug entries #0983 --- .bugs/983 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.bugs/983 b/.bugs/983 new file mode 100644 index 0000000..6e8d41d --- /dev/null +++ b/.bugs/983 @@ -0,0 +1,17 @@ +Title: Multisite: cut down number of Livestatus queries +Component: multisite +State: open +Date: 2013-10-10 23:24:22 +Targetversion: 1.2.3i3 +Class: nastiness + +Currently for each page one query of SET status is being done. +On low-latency connections this hurts. We could either do without +that or let liveproxyd cache that kind of query. We could make +the Heartbeat of the liveproxyd query exactly the same columns +as Multisite needs for its status-query and then simply answer +with a cached result. + +Also we should cache queries needed for the search filters that +are contained in many views. The caching could be done by +the livproxyd.

10 years, 12 months

Check_MK Git: check_mk: Updated draft for rule based notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: 875f48ee6d52eeee5b2fdc5d8a86040380cb032a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=875f48ee6d52ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 10 21:46:37 2013 +0200 Updated draft for rule based notifications --- doc/drafts/LIESMICH.rule_based_notifications | 2 + doc/drafts/README.rule_based_notifications | 74 ++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/doc/drafts/LIESMICH.rule_based_notifications b/doc/drafts/LIESMICH.rule_based_notifications index 89d3254..ca2c751 100644 --- a/doc/drafts/LIESMICH.rule_based_notifications +++ b/doc/drafts/LIESMICH.rule_based_notifications @@ -178,3 +178,5 @@ wurde. Bei der Konfigerzeugung für Nagios/CMC muss man einen speziellen Benutzer anlegen, der für alles Kontakt ist. +===> ACHTUNG: Es gibt jetzt ein englisches Dokument, das etwas aktueller +ist und auch noch etwas zu den Bulk-Notifications schreibt. diff --git a/doc/drafts/README.rule_based_notifications b/doc/drafts/README.rule_based_notifications index 49f5775..169a81e 100644 --- a/doc/drafts/README.rule_based_notifications +++ b/doc/drafts/README.rule_based_notifications @@ -187,3 +187,77 @@ or not (presumed you have a high enough log level). During the configuration generation for Nagios/CMC a special user needs to be created who is contact for everything. + + +BULK NOTIFICATIONS +------------------ +The idea of "bulk notifications" or "notification aggregation" is to cut +down the number of notifications in cases where some general problem causes +hundreds or thousands of similar alerts at the same time. In some cases this +problem can be tackled with Nagios "service dependencies". The problem is +that this is very tedious to configure and includes the risk of blocking +critical notification per mistake. + +The bulk notification feature would collect all notifications of the same +channel and target user for a certain time into a pool and then send *one* +notification email/sms/whatever that contains all those notifications. A +typical time frame of such a pooling could be 1 minute. Assuming that your +check period is one minute, that would mean that all alerts that origin from +the same problem would be packed into one single notification. + +In order to make you not blind to *other* problems that happen during such a +burst of alerts the pooling could be done on a per-checktype or per-hostgroup +or per-whatever base. It also could take the service level of objects into +account so that e.g. all alerts of the level "Tier 3" is bulked by 5 minutes, +the alerts of "Tier 1" would not be bulked by sent independently. + +The configuration of the notification aggregation could be done as a parameter +to the notification rules. Example: + +Condition: +- Service Level <= 10 (Tier 3) + +Notification: +- Send to all configured monitoring contacts +- Send via Email + +Aggregation: +- Aggregate up to 2 minutes +- Aggregate by check type + +Possible options for the aggregation: + - time range (e.g. collect notifications up to 2 minutes) + - force separate notifications for different + [ ] hosts + [ ] check types + [ ] states (WARN, CRIT, etc.) + [ ] service descriptions + [ ] service levels + + +OVERRIDING +---------- +If there is a global rule that configures a notification without aggregation, +then a later rule can override that and add an aggregation. That way a user +can enable bulk notifications for otherwise un-bulked ones. + +Vice versa: if in a rule notifications are aggregated and a later rule +(e.g. one of a user) has aggregation disabled, that setting has precedence. + +IMPLEMENTATION +-------------- +In order to send bulk notifications the notification plugin +API needs to be extended. Currently each plugin expects information +about *one* alert only in environment varibles like +NOTIFY_HOSTNAME and NOTIFY_HOSTSTATE. A plugin supporting +bulk notifications would need another API allowing to handle +a *list* of such alerts. Instead of environment variable we +could have the plugin reading lines like +NOTIFY_HOSTNAME=foo +NOTIFY_HOSTATE=2 + +A plugin should tell Check_MK that is using that new API by +putting some information into its first or second comment line. +That way the notification configurator can make sure that the +user can only select those plugins for bulk notification that +support it.

10 years, 12 months

Check_MK Git: check_mk: apc_symmetra: add input voltage to informational output

by Mathias Kettner

Module: check_mk Branch: master Commit: 21918cfc7a01b218b1a40d10ed04ccc288c66f88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21918cfc7a01b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 10 18:10:30 2013 +0200 apc_symmetra: add input voltage to informational output --- ChangeLog | 1 + checks/apc_symmetra | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b5ee2c..f252d29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * esx_vsphere_hostsystem.multipath: now able to set warn/crit levels * cpu_netapp: added Perf-O-Meter and PNP template * cisco_cpu: added Perf-O-Meter and PNP template + * apc_symmetra: add input voltage to informational output * FIX: windows_agent: fixed bug in cleanup of open thread handles * FIX: cups default printer is now monitored again in linux agent * FIX: host notification email in html format: fixed formating error diff --git a/checks/apc_symmetra b/checks/apc_symmetra index a77554f..2fa5e82 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -73,9 +73,9 @@ apc_default_levels = { "levels": ( 95, 40, 1, 220 ) } def check_apc(item, params, info): BasicBatteryStatus, BasicOutputStatus, AdvBatteryCapacity, \ - AdvBatteryTemperature, AdvBatteryCurrent, AdvOutputVoltage, \ + AdvBatteryTemperature, AdvBatteryCurrent, AdvInputVoltage, AdvOutputVoltage, \ AdvOutputCurrent, AdvBatteryRunTimeRemaining, AdvTestCalibrationResults \ - = [ saveint(x) for x in info[0][:9] ] + = [ saveint(x) for x in info[0][:10] ] LastDiagnosticsDate = info[0][-1] RunTimeRemaining = AdvBatteryRunTimeRemaining / 100 @@ -157,6 +157,9 @@ def check_apc(item, params, info): state = 0 single_states.append( (state, infotxt, ("batcurr", AdvBatteryCurrent, "", crit_batt_curr, 0) ) ) + # 6a. Simply show input voltage (no performance data) + single_states.append( (0, "input voltage %dV" % AdvInputVoltage, None) ) + # 6. Check output voltage infotxt = "output voltage %dV" % AdvOutputVoltage if AdvOutputVoltage <= crit_voltage: @@ -195,6 +198,17 @@ check_info['apc_symmetra'] = { "group" : "apc_symentra", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "snmp_info" : (".1.3.6.1.4.1.318.1.1.1", - [ "2.1.1.0", "4.1.1.0", "2.2.1.0", "2.2.2.0", - "2.2.9.0", "4.2.1.0", "4.2.4.0", "2.2.3.0", "7.2.6.0", "7.2.4.0" ] ) + [ + "2.1.1.0", # BasicBatteryStatus, + "4.1.1.0", # BasicOutputStatus, + "2.2.1.0", # AdvBatteryCapacity, + "2.2.2.0", # AdvBatteryTemperature, + "2.2.9.0", # AdvBatteryCurrent, + "3.2.1.0", # AdvInputVoltage, + "4.2.1.0", # AdvOutputVoltage, + "4.2.4.0", # AdvOutputCurrent, + "2.2.3.0", # AdvBatteryRunTimeRemaining, + "7.2.6.0", # AdvTestCalibrationResults + "7.2.4.0", # LastDiagnosticsDate + ] ) }

10 years, 12 months

Check_MK Git: check_mk: finally(?) fixed pnpgraphs for brocade_fcport

by Andreas Boesl

Module: check_mk Branch: master Commit: 3a187d58fcb935aa5c731756b295fe9c40b2c1d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a187d58fcb935… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 10 17:52:44 2013 +0200 finally(?) fixed pnpgraphs for brocade_fcport --- pnp-templates/check_mk-brocade_fcport.php | 32 +++++++++++++++++------------ 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pnp-templates/check_mk-brocade_fcport.php b/pnp-templates/check_mk-brocade_fcport.php index 4de80a4..0cb19ab 100644 --- a/pnp-templates/check_mk-brocade_fcport.php +++ b/pnp-templates/check_mk-brocade_fcport.php @@ -46,13 +46,13 @@ $opt[1] = "--vertical-label \"MByte/sec\" -X0 -b 1024 --title \"Traffic for $ho $def[1] = "" . "HRULE:0#c0c0c0 " . "DEF:in=$RRD[in] " - . "DEF:inavg=$RRDAVG[in] " - . "DEF:outavg=$RRDAVG[out] " . "DEF:out=$RRD[out] " . "CDEF:inmb=in,1048576,/ " + . "CDEF:outmb=out,1048576,/ " + . "DEF:inavg=$RRDAVG[in] " + . "DEF:outavg=$RRDAVG[out] " . "CDEF:inmbavg=inavg,1048576,/ " . "CDEF:outmbavg=outavg,1048576,/ " - . "CDEF:outmb=out,1048576,/ " . "AREA:inmb#60a020:\"in \" " . "GPRINT:inmb:LAST:\"%5.3lf MB/s last\" " . "GPRINT:inmbavg:AVERAGE:\"%5.3lf MB/s avg\" " @@ -70,15 +70,19 @@ $def[1] .= "" . "DEF:outavg=$RRD[out_avg] " . "CDEF:inavgmb=inavg,1048576,/ " . "CDEF:outavgmb=outavg,1048576,/ " + . "DEF:inavgavg=$RRDAVG[in_avg] " + . "DEF:outavgavg=$RRDAVG[out_avg] " + . "CDEF:inavgmbavg=inavgavg,1048576,/ " + . "CDEF:outavgmbavg=outavgavg,1048576,/ " . "CDEF:outavgmbdraw=outavg,-1048576,/ " . "LINE:inavgmb#a0d040:\"in (avg) \" " - . "GPRINT:inavgmb:LAST:\"%5.1lf MB/s last\" " - . "GPRINT:inavgmb:AVERAGE:\"%5.1lf MB/s avg\" " - . "GPRINT:inavgmb:MAX:\"%5.1lf MB/s max\\n\" " + . "GPRINT:inavgmb:LAST:\"%5.3lf MB/s last\" " + . "GPRINT:inavgmbavg:AVERAGE:\"%5.3lf MB/s avg\" " + . "GPRINT:inavgmb:MAX:\"%5.3lf MB/s max\\n\" " . "LINE:outavgmbdraw#40a0d0:\"out (avg)\" " - . "GPRINT:outavgmb:LAST:\"%5.1lf MB/s last\" " - . "GPRINT:outavgmb:AVERAGE:\"%5.1lf MB/s avg\" " - . "GPRINT:outavgmb:MAX:\"%5.1lf MB/s max\\n\" " + . "GPRINT:outavgmb:LAST:\"%5.3lf MB/s last\" " + . "GPRINT:outavgmbavg:AVERAGE:\"%5.3lf MB/s avg\" " + . "GPRINT:outavgmb:MAX:\"%5.3lf MB/s max\\n\" " ; } @@ -103,16 +107,18 @@ $ds_name[2] = 'Frames'; $opt[2] = "--vertical-label \"Frames/sec\" -b 1024 --title \"Frames per second\" "; $def[2] = "" . "HRULE:0#c0c0c0 " - . "DEF:in=$RRDAVG[rxframes] " - . "DEF:out=$RRDAVG[txframes] " + . "DEF:in=$RRD[rxframes] " + . "DEF:out=$RRD[txframes] " + . "DEF:inavg=$RRDAVG[rxframes] " + . "DEF:outavg=$RRDAVG[txframes] " . "AREA:in#a0d040:\"in \" " . "GPRINT:in:LAST:\"%5.1lf/s last\" " - . "GPRINT:in:AVERAGE:\"%5.1lf/s avg\" " + . "GPRINT:inavg:AVERAGE:\"%5.1lf/s avg\" " . "GPRINT:in:MAX:\"%5.1lf/s max\\n\" " . "CDEF:out_draw=out,-1,* " . "AREA:out_draw#40a0d0:\"out \" " . "GPRINT:out:LAST:\"%5.1lf/s last\" " - . "GPRINT:out:AVERAGE:\"%5.1lf/s avg\" " + . "GPRINT:outavg:AVERAGE:\"%5.1lf/s avgargs\" " . "GPRINT:out:MAX:\"%5.1lf/s max\\n\" " ;

10 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits