Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

Check_MK Git: check_mk: Availability: fix text of notifcation period option

by Mathias Kettner

Module: check_mk Branch: master Commit: f6a40620602ba2bcbcf3c7285761cd8eac8e5e74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6a40620602ba2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 15 15:10:31 2013 +0100 Availability: fix text of notifcation period option --- web/plugins/views/availability.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 2586bf1..bd612f5 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -211,7 +211,7 @@ avoption_entries = [ choices = [ ( "honor", _("Honor notification period") ), ( "ignore", _("Ignore notification period") ), - ( "exclude", _("Exclude notification period" ) ), + ( "exclude", _("Exclude times out of notif. period" ) ), ] ) ),

11 years, 3 months

Check_MK Git: check_mk: ValueSpec TextAreaUnicode support keyboard codes

by Mathias Kettner

Module: check_mk Branch: master Commit: a66cf554b862e9afc8b89db968ccff23e12d0179 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a66cf554b862e9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 17 22:56:27 2013 +0100 ValueSpec TextAreaUnicode support keyboard codes --- web/htdocs/forms.py | 14 +++++++++--- web/htdocs/js/search.js | 2 +- web/htdocs/valuespec.py | 48 +++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 27 ++++++++++++++----------- 4 files changed, 74 insertions(+), 17 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 1cee46a..ffe451d 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -41,7 +41,9 @@ def get_input(valuespec, varprefix): return value -def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, buttontext = None, title = None): +def edit_dictionary(entries, value, focus=None, hover_help=True, + validate=None, buttontext=None, title=None, + buttons = None): new_value = value.copy() if html.var("filled_in") == "form" and html.check_transaction(): messages = [] @@ -82,9 +84,13 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, first = False end() - if buttontext == None: - buttontext = _("Save") - html.button("save", buttontext) + if buttons: + for name, title, icon in buttons: + html.button(name, title) + else: + if buttontext == None: + buttontext = _("Save") + html.button("save", buttontext) html.hidden_fields() html.end_form() diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js index 06f1273..741e250 100644 --- a/web/htdocs/js/search.js +++ b/web/htdocs/js/search.js @@ -37,7 +37,7 @@ function mkSearchAddField(field, targetFrame) { } oField.onkeydown = function(e) { if (!e) e = window.event; return mkSearchKeyDown(e, oField); } - oField.onkeyup = function(e) { if (!e) e = window.event; return mkSearchKeyUp(e, oField);} + oField.onkeyup = function(e) { if (!e) e = window.event; return mkSearchKeyUp(e, oField); } oField.onclick = function(e) { mkSearchClose(); return true; } // On doubleclick toggle the list diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a114846..cd2cc11 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -502,12 +502,19 @@ class HTTPUrl(TextAscii): (self._target and 'target="%s" ' % self._target or ""), url, text) +RETURN = 13 +SHIFT = 16 +CTRL = 17 +ALT = 18 +BACKSPACE = 8 class TextAreaUnicode(TextUnicode): def __init__(self, **kwargs): TextUnicode.__init__(self, **kwargs) self._cols = kwargs.get("cols", 60) self._rows = kwargs.get("rows", 20) # Allowed: "auto" -> Auto resizing + self._minrows = kwargs.get("minrows", 0) # Minimum number of initial rows when "auto" + self._submit_keys = kwargs.get("submit_keys", []) def value_to_text(self, value): return "<pre class=ve_textarea>%s</pre>" % value @@ -521,11 +528,52 @@ class TextAreaUnicode(TextUnicode): rows = len(html.var(varprefix).splitlines()) else: rows = len(value.splitlines()) + rows = max(rows, self._minrows) else: attrs = {} rows = self._rows + if self._submit_keys: + attrs['id'] = "textarea_%s" % varprefix + commit_code = "" + for keylist, code in self._submit_keys: + commit_code += " textarea_%s_trysubmit(e, %r, %s);\n" % ( + varprefix, keylist, repr(code)) + + html.final_javascript(""" +textarea_text_keys = []; +function textarea_%s_keydown(e) { + if (!e) e = window.event; + var keyCode = e.which || e.keyCode; + textarea_%s_keys.push(keyCode); +%s} +function textarea_%s_keyup(e) { + if (!e) e = window.event; + var keyCode = e.which || e.keyCode; + for (var i in textarea_%s_keys) { + if (textarea_%s_keys[i] == keyCode) { + textarea_%s_keys.splice(i, 1); + break; + } + } +} +function textarea_%s_trysubmit(e, keylist, code) { + for (var i in keylist) { + if (textarea_%s_keys.indexOf(keylist[i]) < 0) { + return; + } + } + if (e.stopPropagation) + e.stopPropagation(); + e.cancelBubble = true; + eval(code); +} +var t = document.getElementById("textarea_%s"); +t.onkeydown = function(e) { return textarea_%s_keydown(e); } +t.onkeyup = function(e) { return textarea_%s_keyup(e); } +""" % ((varprefix, varprefix, commit_code) + (varprefix,)*9)) html.text_area(varprefix, value, rows=rows, cols=self._cols, attrs = attrs) + # Overridded because we do not want to strip() here and remove '\r' def from_html_vars(self, varprefix): return html.var_utf8(varprefix, "").replace('\r', '') diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8dd325a..d819da5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8329,22 +8329,25 @@ def filter_hidden_users(users): return users -# Dropdown for choosing a multisite user -class UserSelection(ElementSelection): - def __init__(self, **kwargs): - ElementSelection.__init__(self, **kwargs) - self._none = kwargs.get("none") - - def get_elements(self): +def generate_wato_users_elements_function(none_value): + def get_wato_users(nv): users = filter_hidden_users(userdb.load_users()) - elements = dict([ (name, "%s - %s" % (name, us.get("alias", name))) for (name, us) in users.items() ]) - if self._none: - elements[None] = self._none + elements = [ (name, "%s - %s" % (name, us.get("alias", name))) for (name, us) in users.items() ] + if nv != None: + elements = [ (None, none_value) ] + elements return elements + return lambda: get_wato_users(none_value) + +# Dropdown for choosing a multisite user +class UserSelection(DropdownChoice): + def __init__(self, **kwargs): + kwargs["choices"] = generate_wato_users_elements_function(kwargs.get("none")) + DropdownChoice.__init__(self, **kwargs) def value_to_text(self, value): - self.load_elements() - return self._elements.get(value, value).split(" - ")[-1] + text = DropdownChoice.value_to_text(self, value) + return text.split(" - ")[-1] + #. # .-Roles----------------------------------------------------------------.

11 years, 3 months

Check_MK Git: check_mk: New draft for check template generator

by Mathias Kettner

Module: check_mk Branch: master Commit: 9b0220612e7db0ea3ca834fcf373c84a3470a360 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b0220612e7db0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 16 18:45:53 2013 +0100 New draft for check template generator --- doc/drafts/LIESMICH.checkgenerator | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/doc/drafts/LIESMICH.checkgenerator b/doc/drafts/LIESMICH.checkgenerator new file mode 100644 index 0000000..4f98cbb --- /dev/null +++ b/doc/drafts/LIESMICH.checkgenerator @@ -0,0 +1,36 @@ +Idee: Ein WATO-gesteuerter Generator für Checks, der Templates +von Checks erzeugt. + +Eine Art Wizard oder ValueSpec, in dem man ausfüllt: + +Name des Checks (intern): [______________] +Service-Description: [____________] +Check hat Items: [X] +Features des Checks: + Check hat Parameter: [X] + Check verarbeitet Counter: [X] + Schwellwerte mit Prediction: [X] + Mittelung: [X] + Parse-Funktion: [X] + +Titel für Manpage: [__________________________________________] +Type: [v SNMP] +OID-Bäume: + Basis-OID: 1.3.6.1._________________ + Subbäume: 1.3 1.5 OIDEND +Perfdaten: [X] +Checkgruppe für WATO: [_________] +Include-Dateien: [_______________] + +Beispielausgabe von Agent: TEXTAREA + +--> Als Ergebnis kommt heraus: + - Ein Check + - Eine Check-Manpage + - Ein PNP-Template + - Ein Perf-O-Meter-Template + - Evtl. ein WATO-Template + +Die Einstellungen von oben werden persistiert, damit man weitere +Checks einfach generieren kann. +

11 years, 3 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: e94191bc99ce2b691436933485b1652736ee501c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e94191bc99ce2b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 16 18:46:12 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: FIX: EC: make hostname matching field optional.

by Mathias Kettner

Module: check_mk Branch: master Commit: beae4280174be1717cc9aac6dc88c886cd2309a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=beae4280174be1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 15 11:41:41 2013 +0100 FIX: EC: make hostname matching field optional. Conflicts: ChangeLog --- ChangeLog | 3 +++ mkeventd/web/plugins/wato/mkeventd.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbcab31..4eb3415 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,9 @@ * FIX: speedup for single host tables joined by hostname (BI-Boxes) * FIX: avoid closing BI subtree while tree is being loaded + Event Console: + * FIX: make hostname matching field optional. Otherwise a .* was + neccessary for the rule in order to match 1.2.2b4: Core: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 2776738..cd7fb7c 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -610,7 +610,8 @@ vs_mkeventd_rule = Dictionary( ), ], optional_keys = [ "delay", "livetime", "count", "expect", "match_priority", "match_priority", - "match_facility", "match_sl", "set_text", "set_host", "set_application", "set_comment", + "match_facility", "match_sl", "match_host", "match_application", + "set_text", "set_host", "set_application", "set_comment", "set_contact", "cancel_priority", "match_ok" ], headers = [ ( _("General Properties"), [ "id", "description", "disabled" ] ),

11 years, 3 months

Check_MK Git: check_mk: notify.py: unique spoolfiles name no longer created with uuid

by Andreas Boesl

Module: check_mk Branch: master Commit: 2a2f9ebbb85b3788d118dac94c7f967eb1045382 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a2f9ebbb85b37… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 15 11:14:58 2013 +0100 notify.py: unique spoolfiles name no longer created with uuid --- ChangeLog | 3 +++ modules/notify.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04de6e9..fbcab31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,9 @@ * mem.include: Linux memory check now includes size of page tables. This can be important e.g. on ORACLE systems with a lot of memory + Notifications: + * notify.py: unique spoolfiles name no longer created with uuid + Livestatus: * Table statehist: Improved detection of vanished hosts and services. Now able to detect and remove nonsense check plugin output diff --git a/modules/notify.py b/modules/notify.py index 28c100c..8dc5b80 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -34,7 +34,7 @@ # hostname, servicedesc, hoststate, servicestate, output in # the form %(variable)s -import pprint, uuid +import pprint # Default settings notification_logdir = var_dir + "/notify" @@ -201,7 +201,7 @@ def create_spoolfile(data): target_dir = "%s/%s" % (notification_spooldir, contactname) if not os.path.exists(target_dir): os.makedirs(target_dir) - file_path = "%s/%0.2f_%s" % (target_dir, time.time(), uuid.uuid1()) + file_path = "%s/%0.8f" % (target_dir, time.time()) notify_log("Creating spoolfile: %s" % file_path) file(file_path,"w").write(pprint.pformat(data))

11 years, 3 months

Check_MK Git: check_mk: mem.include: Linux memory check now includes size of page tables.

by Mathias Kettner

Module: check_mk Branch: master Commit: 06097a430383ffa10039194d0e1da91c6ff53e52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06097a430383ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 11:34:54 2013 +0100 mem.include: Linux memory check now includes size of page tables. --- ChangeLog | 2 + checks/mem.include | 37 +++++++----- pnp-templates/check_mk-mem.used.php | 110 +++++++++++++++++++++------------- 3 files changed, 92 insertions(+), 57 deletions(-) diff --git a/ChangeLog b/ChangeLog index 163230d..bb510cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,8 @@ when processing of current lines needs more time than max execution time * mounts: ignore multiple occurrances of the same device * Linux agent: allow cached local/plugins checks (see docu) + * mem.include: Linux memory check now includes size of page tables. This + can be important e.g. on ORACLE systems with a lot of memory Livestatus: * Table statehist: Improved detection of vanished hosts and services. diff --git a/checks/mem.include b/checks/mem.include index f260a0a..ca361b7 100644 --- a/checks/mem.include +++ b/checks/mem.include @@ -28,13 +28,15 @@ memused_default_levels = (150.0, 200.0) mem_extended_perfdata = False def check_memory(params, meminfo): - try: - swapused = meminfo['SwapTotal'] - meminfo['SwapFree'] - memused = meminfo['MemTotal'] - meminfo['MemFree'] - # Buffers and Cached are optional (not supported on Windows yet) - caches = meminfo.get('Buffers', 0) + meminfo.get('Cached', 0) - except: - return (3, "invalid output from plugin") + swapused = meminfo['SwapTotal'] - meminfo['SwapFree'] + memused = meminfo['MemTotal'] - meminfo['MemFree'] + # Buffers and Cached are optional (not supported on Windows yet) + caches = meminfo.get('Buffers', 0) + meminfo.get('Cached', 0) + # Size of Pagetable on Linux can be relevant e.g. on ORACLE + # servers with much memory, that do not use HugeTables. We account + # that for used + pagetables = meminfo.get('PageTables', 0) + pagetables_mb = pagetables / 1024.0 # Add extended memory performance data, if this is # enabled and the agent provides that information. @@ -50,18 +52,19 @@ def check_memory(params, meminfo): else: committed_as = 0 extended_perf = [ - ('mapped', str(mapped_mb) + 'MB', '', '', 0, ''), - ('committed_as', str(committed_as_mb) + 'MB', '', '', 0, ''), + ('mapped', str(mapped_mb) + 'MB'), + ('committed_as', str(committed_as_mb) + 'MB'), + ('pagetables', str(pagetables_mb) + 'MB'), ] extrainfo = ", %.1f GB mapped, %.1f GB committed" % \ (mapped_mb / 1024.0, committed_as_mb / 1024.0) - totalused_kb = (swapused + memused - caches) - totalused_mb = totalused_kb / 1024 + totalused_kb = (swapused + memused - caches + pagetables) + totalused_mb = totalused_kb / 1024.0 totalmem_kb = meminfo['MemTotal'] - totalmem_mb = totalmem_kb / 1024 + totalmem_mb = totalmem_kb / 1024.0 totalused_perc = 100 * (float(totalused_kb) / float(totalmem_kb)) - totalvirt_mb = (meminfo['SwapTotal'] + meminfo['MemTotal']) / 1024 + totalvirt_mb = (meminfo['SwapTotal'] + meminfo['MemTotal']) / 1024.0 warn, crit = params perfdata = [ @@ -70,9 +73,13 @@ def check_memory(params, meminfo): # levels may be given either in int -> MB or in float -> percentages - infotext = ("%.2f GB used (%.2f GB RAM + %.2f GB SWAP, this is %.1f%% of %.2f GB RAM)" % \ + if pagetables > 0: + pgtext = " + %.2f GB Pagetables" % (pagetables_mb / 1024.0) + else: + pgtext = "" + infotext = ("%.2f GB used (%.2f GB RAM + %.2f GB SWAP%s, this is %.1f%% of %.2f GB RAM)" % \ (totalused_mb / 1024.0, (memused-caches) / 1024.0 / 1024, swapused / 1024.0 / 1024, - totalused_perc, totalmem_mb / 1024.0)) \ + pgtext, totalused_perc, totalmem_mb / 1024.0)) \ + extrainfo if type(warn) == float: diff --git a/pnp-templates/check_mk-mem.used.php b/pnp-templates/check_mk-mem.used.php index 4a28ba5..5432603 100644 --- a/pnp-templates/check_mk-mem.used.php +++ b/pnp-templates/check_mk-mem.used.php @@ -27,52 +27,78 @@ $opt[1] = "--vertical-label 'MEMORY(MB)' -X0 --upper-limit " . ($MAX[1] * 120 / $maxgb = sprintf("%.1f", $MAX[1] / 1024.0); -$def[1] = "DEF:ram=$RRDFILE[1]:$DS[1]:MAX " ; -$def[1] .= "DEF:swap=$RRDFILE[2]:$DS[2]:MAX " ; -$def[1] .= "DEF:virt=$RRDFILE[3]:$DS[3]:MAX " ; -$def[1] .= "HRULE:$MAX[3]#000080:\"RAM+SWAP installed\" "; -$def[1] .= "HRULE:$MAX[1]#2040d0:\"$maxgb GB RAM installed\" "; -$def[1] .= "HRULE:$WARN[3]#FFFF00:\"Warning\" "; -$def[1] .= "HRULE:$CRIT[3]#FF0000:\"Critical\" "; +# For the rest of the data we rather work with names instead +# of numbers +$RRD = array(); +foreach ($NAME as $i => $n) { + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $WARN[$n] = $WARN[$i]; + $CRIT[$n] = $CRIT[$i]; + $MIN[$n] = $MIN[$i]; + $MAX[$n] = $MAX[$i]; +} -$def[1] .= "'COMMENT:\\n' "; -$def[1] .= "AREA:ram#80ff40:\"RAM used \" " ; -$def[1] .= "GPRINT:ram:LAST:\"%6.0lf MB last\" " ; -$def[1] .= "GPRINT:ram:AVERAGE:\"%6.0lf MB avg\" " ; -$def[1] .= "GPRINT:ram:MAX:\"%6.0lf MB max\\n\" "; +$def[1] = "DEF:virt=$RRDFILE[3]:$DS[3]:MAX " + . "DEF:ramx=$RRD[ramused] " + . "DEF:swap=$RRDFILE[2]:$DS[2]:MAX " + . "CDEF:ram=virt,swap,- " + ; -$def[1] .= "AREA:swap#008030:\"SWAP used \":STACK " ; -$def[1] .= "GPRINT:swap:LAST:\"%6.0lf MB last\" " ; -$def[1] .= "GPRINT:swap:AVERAGE:\"%6.0lf MB avg\" " ; -$def[1] .= "GPRINT:swap:MAX:\"%6.0lf MB max\\n\" " ; -$def[1] .= "LINE:virt#000000:\"RAM+SWAP used\" " ; -$def[1] .= "GPRINT:virt:LAST:\"%6.0lf MB last\" " ; -$def[1] .= "GPRINT:virt:AVERAGE:\"%6.0lf MB avg\" " ; -$def[1] .= "GPRINT:virt:MAX:\"%6.0lf MB max\\n\" " ; +$def[1] .= "" + . "HRULE:$MAX[3]#000080:\"RAM+SWAP installed\" " + . "HRULE:$MAX[1]#2040d0:\"$maxgb GB RAM installed\" " + . "HRULE:$WARN[3]#FFFF00:\"Warning\" " + . "HRULE:$CRIT[3]#FF0000:\"Critical\" " + + . "'COMMENT:\\n' " + . "AREA:ram#80ff40:\"RAM used \" " + . "GPRINT:ram:LAST:\"%6.0lf MB last\" " + . "GPRINT:ram:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:ram:MAX:\"%6.0lf MB max\\n\" " + + . "AREA:swap#008030:\"SWAP used \":STACK " + . "GPRINT:swap:LAST:\"%6.0lf MB last\" " + . "GPRINT:swap:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:swap:MAX:\"%6.0lf MB max\\n\" " + ; + -/* HACK: Avoid error if RRD does not contain two data - sources which .XML file *does*. F..ck. This does not - work with multiple RRDs... */ -$retval = -1; -system("rrdtool info $RRDFILE[1] | fgrep -q 'ds[5]'", $retval); -if ($retval == 0) -{ - if (count($NAME) >= 4 and $NAME[4] == "mapped") { - $def[1] .= "DEF:mapped=$RRDFILE[4]:$DS[4]:MAX " ; - $def[1] .= "LINE2:mapped#8822ff:\"Memory mapped\" " ; - $def[1] .= "GPRINT:mapped:LAST:\"%6.0lf MB last\" " ; - $def[1] .= "GPRINT:mapped:AVERAGE:\"%6.0lf MB avg\" " ; - $def[1] .= "GPRINT:mapped:MAX:\"%6.0lf MB max\\n\" " ; - } +if (isset($RRD['pagetables'])) { + $def[1] .= "DEF:pagetables=$RRD[pagetables] " + . "AREA:pagetables#ff8800:\"Page tables \":STACK " + . "GPRINT:pagetables:LAST:\"%6.0lf MB last\" " + . "GPRINT:pagetables:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:pagetables:MAX:\"%6.0lf MB max\\n\" " + . "LINE:virt#000000:\"RAM+SWAP+PT used\" " + . "GPRINT:virt:LAST:\"%6.0lf MB last\" " + . "GPRINT:virt:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:virt:MAX:\"%6.0lf MB max\\n\" " + ; +} - if (count($NAME) >= 5 and $NAME[5] == "committed_as") { - $def[1] .= "DEF:committed=$RRDFILE[5]:$DS[5]:MAX " ; - $def[1] .= "LINE2:committed#cc00dd:\"Committed \" " ; - $def[1] .= "GPRINT:committed:LAST:\"%6.0lf MB last\" " ; - $def[1] .= "GPRINT:committed:AVERAGE:\"%6.0lf MB avg\" " ; - $def[1] .= "GPRINT:committed:MAX:\"%6.0lf MB max\\n\" " ; - } - } +else { + $def[1] .= "LINE:virt#000000:\"RAM+SWAP used \" " + . "GPRINT:virt:LAST:\"%6.0lf MB last\" " + . "GPRINT:virt:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:virt:MAX:\"%6.0lf MB max\\n\" " + ; +} + +if (isset($RRD['mapped'])) { + $def[1] .= "DEF:mapped=$RRD[mapped] " + . "LINE2:mapped#8822ff:\"Memory mapped \" " + . "GPRINT:mapped:LAST:\"%6.0lf MB last\" " + . "GPRINT:mapped:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:mapped:MAX:\"%6.0lf MB max\\n\" " ; +} + +if (isset($RRD['committed_as'])) { + $def[1] .= "DEF:committed=$RRD[committed_as] " + . "LINE2:committed#cc00dd:\"Committed \" " + . "GPRINT:committed:LAST:\"%6.0lf MB last\" " + . "GPRINT:committed:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:committed:MAX:\"%6.0lf MB max\\n\" " ; +} ?>

11 years, 3 months

Check_MK Git: check_mk: Fix PNP template for memory usage

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c9c2f6953f9d592429c38072b9834cfec1cd959 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c9c2f6953f9d5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 13:01:25 2013 +0100 Fix PNP template for memory usage --- pnp-templates/check_mk-mem.used.php | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pnp-templates/check_mk-mem.used.php b/pnp-templates/check_mk-mem.used.php index 5432603..d0c6ca0 100644 --- a/pnp-templates/check_mk-mem.used.php +++ b/pnp-templates/check_mk-mem.used.php @@ -38,14 +38,20 @@ foreach ($NAME as $i => $n) { $MAX[$n] = $MAX[$i]; } -$def[1] = "DEF:virt=$RRDFILE[3]:$DS[3]:MAX " - . "DEF:ramx=$RRD[ramused] " - . "DEF:swap=$RRDFILE[2]:$DS[2]:MAX " - . "CDEF:ram=virt,swap,- " - ; +$def[1] = ""; +if (isset($RRD['pagetables'])) { + $def[1] .= "DEF:pagetables=$RRD[pagetables] " + . "DEF:ram=$RRD[ramused] "; +} +else { + $def[1] .= "CDEF:pagetables=0 " + . "DEF:ram=$RRD[ramused] "; +} + +$def[1] .= "DEF:virt=$RRDFILE[3]:$DS[3]:MAX " + . "DEF:swap=$RRDFILE[2]:$DS[2]:MAX " -$def[1] .= "" . "HRULE:$MAX[3]#000080:\"RAM+SWAP installed\" " . "HRULE:$MAX[1]#2040d0:\"$maxgb GB RAM installed\" " . "HRULE:$WARN[3]#FFFF00:\"Warning\" " @@ -65,7 +71,7 @@ $def[1] .= "" if (isset($RRD['pagetables'])) { - $def[1] .= "DEF:pagetables=$RRD[pagetables] " + $def[1] .= "" . "AREA:pagetables#ff8800:\"Page tables \":STACK " . "GPRINT:pagetables:LAST:\"%6.0lf MB last\" " . "GPRINT:pagetables:AVERAGE:\"%6.0lf MB avg\" "

11 years, 3 months

Check_MK Git: check_mk: Update Manpage of mem check

by Mathias Kettner

Module: check_mk Branch: master Commit: c8cbe8456c6764ed9d149192d583a8ad37d0267d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8cbe8456c6764… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 13:03:57 2013 +0100 Update Manpage of mem check --- checkman/mem.used | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/checkman/mem.used b/checkman/mem.used index d77810e..0421ef9 100644 --- a/checkman/mem.used +++ b/checkman/mem.used @@ -92,5 +92,6 @@ mem_extended_perfdata (boolean): If this variable is set to {True}, then the checks outputs additional performance data, if the agent provides that information. On Linux the amount of mapped and committed memory is output - (see {Mapped} and {Committed_AS} in {/proc/meminfo}). + (see {Mapped} and {Committed_AS} in {/proc/meminfo}) and + also the size used for page tables {Pagetables}.

11 years, 3 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: 25bddd7bece75d2acf3fc53ca5f4ff269c363d84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25bddd7bece75d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 17:33:32 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013