Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64148 discussions

Check_MK Git: check_mk: Multisite: checkman honors OMD"s local hierarchy

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 536fd9cff793b20f62f23c1d5a1131f580957a4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=536fd9cff793b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 22:51:57 2011 +0200 Multisite: checkman honors OMD"s local hierarchy --- ChangeLog | 1 + web/plugins/views/painters.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68196b7..33d6157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ Multisite: * FIX: reschedule now works for host names containing spaces * Bookmarks snapin: save relative URLs whenever possible + * Man-Pages of Check_MK checks shown in Multisite honor OMD's local hierarchy 1.1.11i2: Core, Setup, etc.: diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 2e74f99..d126817 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -713,7 +713,14 @@ def paint_check_manpage(row): if not command.startswith("check_mk-"): return "", "" checktype = command[9:] - p = defaults.check_manpages_dir + "/" + checktype + # Honor man-pages in OMD's local structure + p = None + if defaults.omd_root: + p = defaults.omd_root + "/local/share/check_mk/checkman/" + checktype + if not os.path.isfile(p): + p = None + if not p: + p = defaults.check_manpages_dir + "/" + checktype if os.path.isfile(p): description = None for line in file(p):

13 years

Check_MK Git: check_mk: Improved inline doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2ef2e3524c5468efaf8e066e05e65b2fe8700094 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ef2e3524c5468… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 23:07:13 2011 +0200 Improved inline doku --- checks/services | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/services b/checks/services index 35fd279..53b9d65 100644 --- a/checks/services +++ b/checks/services @@ -48,8 +48,8 @@ inventory_services = [] # "HirnTest", # add service, if currently running # "TapiSrv running", # the same # "TermService auto", # add service, if start type is auto (regardless if running) -# "BackupSrv auto/running", # add, if start type is auto and it's running -# "~Backup.* auto/running", # same, but add all services matching a regex +# "BackupSrv running/auto", # add, if start type is auto and it's running +# "~Backup.* running/auto", # same, but add all services matching a regex # ( [ "termserver" ] , ALL_HOSTS, [ "HirnTest running", "Sppoller auto" ] ), # same with tags.. # ( ALL_HOSTS, [ "!Backup.*", "FooBar auto" ] ), # ]

13 years

Check_MK Git: check_mk: mem.win: new check for Windows memory and page file

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fc205ec29939ef632540fbddfd4ef16610cdd9ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc205ec29939ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 17:04:26 2011 +0200 mem.win: new check for Windows memory and page file --- .bugs/21 | 10 ++- ChangeLog | 1 + checkman/mem.used | 14 ++-- checkman/mem.win | 50 +++++++++++++++ checks/mem | 114 +++++++++++++++++++++++++++++---- pnp-rraconf/check_mk-mem.win.rra.cfg | 1 + pnp-templates/check_mk-mem.win.php | 62 ++++++++++++++++++ web/plugins/perfometer/check_mk.py | 18 +++++- 8 files changed, 245 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fc205ec299…

13 years

Check_MK Git: check_mk: FIX: hr_mem: take into account cache and buffers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8cacdfe83dd0c8ce0f96ea1af696a8aa52713aaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cacdfe83dd0c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 20:59:47 2011 +0200 FIX: hr_mem: take into account cache and buffers --- ChangeLog | 1 + checks/hr_mem | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 217a28d..45b7efd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Show datasource program on cmk -D Checks & Agents: + * FIX: hr_mem: take into account cache and buffers * FIX: printer_pages: workaround for trailing-zero bug in HP Jetdirect * mk_logwatch: allow to set limits in processing time and number of new log messages per log file diff --git a/checks/hr_mem b/checks/hr_mem index 7f7ad8a..d1470d5 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -45,18 +45,27 @@ def check_hr_mem(item, params, info): size = saveint(hrsize) * saveint(hrunits) / 1048576.0 used = saveint(hrused) * saveint(hrunits) / 1048576.0 usage[hrtype] = (size, used) + + # Account for cached memory (this works at least for systems using + # the UCD snmpd (such as Linux based applicances) + cached_mb = 0 + for hrtype, hrdescr, hrunits, hrsize, hrused in info: + if hrdescr in [ "Cached memory", "Memory buffers" ]: + cached_mb += saveint(hrused) * saveint(hrunits) / 1048576.0 + totalram_mb, ramused_mb = usage.get(".1.3.6.1.2.1.25.2.1.2", (0,0)) + ramused_mb -= cached_mb totalvirt_mb, virtused_mb = usage.get(".1.3.6.1.2.1.25.2.1.3", (0,0)) totalmem_mb, totalused_mb = totalram_mb + totalvirt_mb, ramused_mb + virtused_mb if totalmem_mb > 0: - totalused_perc = 100 * totalused_mb / totalmem_mb + totalused_perc = 100 * totalused_mb / totalram_mb perfdata = [ ('ramused', str(ramused_mb) + 'MB', None, None, 0, totalram_mb), ('swapused', str(virtused_mb) + 'MB', None, None, 0, totalvirt_mb) ] - infotext = "%.2f GB RAM+SWAP used (this is %.1f%% of RAM size)" % \ - (totalused_mb / 1024.0, totalused_perc) + infotext = "%.2f GB used (%.2f GB RAM + %.2f GB SWAP, this is %.1f%% of %.2f GB RAM)" % \ + (totalused_mb / 1024.0, ramused_mb / 1024, virtused_mb / 1024, totalused_perc, totalram_mb / 1024.0) warn, crit = params if type(warn) == float:

13 years

Check_MK Git: check_mk: mem.used: more verbatim checkout output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 716678bcbd9c6895d71228cef7aceb455f8614e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=716678bcbd9c68… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 20:58:59 2011 +0200 mem.used: more verbatim checkout output --- checks/mem | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/mem b/checks/mem index 3bb90a8..8d71a34 100644 --- a/checks/mem +++ b/checks/mem @@ -93,8 +93,9 @@ def check_mem_used(item, params, info): # levels may be given either in int -> MB or in float -> percentages - infotext = ("%.2f GB RAM+SWAP used (this is %.1f%% of RAM size)" % \ - (totalused_mb / 1024.0, totalused_perc)) \ + infotext = ("%.2f GB used (%.2f GB RAM + %.2f GB SWAP, 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)) \ + extrainfo if type(warn) == float:

13 years

Check_MK Git: check_mk: hr_mem: added Perf-O-Meter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f38faa017112b24780b4722f327d7ce7087f22f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f38faa017112b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 21:00:16 2011 +0200 hr_mem: added Perf-O-Meter --- ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45b7efd..e4ebf73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * printer_supply: support non-Ascii characters in items like "Resttonerbehälter". You need to define snmp_character_encodings in main.mk * mem.win: new dedicated memory check for Windows (see Migration notes) + * hr_mem: added Perf-O-Meter MK Livestatus: * WaitObject: allow to separate host name and service with a semicolon. diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index fa19a53..a836fff 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -114,6 +114,7 @@ def perfometer_check_mk_mem_used(row, check_command, perf_data): return "%d%%" % (100 * (virt_used / ram_total)), h perfometers["check_mk-mem.used"] = perfometer_check_mk_mem_used +perfometers["check_mk-hr_mem"] = perfometer_check_mk_mem_used def perfometer_check_mk_mem_win(row, check_command, perf_data): # only show mem usage, do omit page file

13 years

Check_MK Git: check_mk: Reindented hr_mem

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a6cbf9a6c7521163f8c41e8475415b5db7ef0b23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6cbf9a6c75211… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 21:01:08 2011 +0200 Reindented hr_mem --- checks/hr_mem | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/hr_mem b/checks/hr_mem index d1470d5..3f3ce81 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -69,7 +69,7 @@ def check_hr_mem(item, params, info): warn, crit = params if type(warn) == float: - perfdata.append(('memused', str(totalused_mb)+'MB', int(warn/100.0 * totalmem_mb), + perfdata.append(('memused', str(totalused_mb)+'MB', int(warn/100.0 * totalmem_mb), int(crit/100.0 * totalmem_mb), 0, totalvirt_mb)) if totalused_perc >= crit: return (2, 'CRIT - %s, critical at %.1f%%' % (infotext, crit), perfdata)

13 years

Check_MK Git: check_mk: Inventory functions now only take the single argument info

by git＠mathias-kettner.de

13 years

Check_MK Git: check_mk: Show datasource program on cmk -D

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1995244cc9824bca5642a50899633ce0963e217d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1995244cc9824b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 21:45:15 2011 +0200 Show datasource program on cmk -D --- .bugs/210 | 10 +++++++--- ChangeLog | 1 + modules/check_mk.py | 8 +++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.bugs/210 b/.bugs/210 index 6a31f23..f412880 100644 --- a/.bugs/210 +++ b/.bugs/210 @@ -1,10 +1,14 @@ Title: check_mk -D HOST does not display datasource_programs Component: core +State: done +Class: cleanup +Date: 2011-03-15 15:20:50 Benefit: 1 -State: open Cost: 1 -Date: 2011-03-15 15:20:50 -Class: cleanup +Fun: 0 It should rather display the command line of that host than (TCP port 6556). + +2011-08-19 21:44:58: changed state open -> done +Datasource program including IP adress is shown. diff --git a/ChangeLog b/ChangeLog index b97602a..545d4d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Please use OMD instead. * Inventory functions now only take the single argument 'info'. The old style FUNC(checkname, info) is still supported but deprecated. + * Show datasource program on cmk -D Checks & Agents: * FIX: printer_pages: workaround for trailing-zero bug in HP Jetdirect diff --git a/modules/check_mk.py b/modules/check_mk.py index 9da7873..0991fba 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3114,9 +3114,11 @@ def dump_host(hostname): else: color = tty_bgblue try: - add_txt = " (%s)" % lookup_ipaddress(hostname) + ipaddress = lookup_ipaddress(hostname) + add_txt = " (%s)" % ipaddress except: add_txt = " (no DNS, no entry in ipaddresses)" + ipaddress = "X.X.X.X" print "%s%s%s%-78s %s" % (color, tty_bold, tty_white, hostname + add_txt, tty_normal) tags = tags_of_host(hostname) @@ -3130,6 +3132,10 @@ def dump_host(hostname): print tty_yellow + "Host groups: " + tty_normal + ", ".join(hostgroups_of(hostname)) print tty_yellow + "Contact groups: " + tty_normal + ", ".join(host_contactgroups_of([hostname])) agenttype = "TCP (port: %d)" % agent_port_of(hostname) + dapg = get_datasource_program(hostname, ipaddress) + if dapg: + agenttype = "Datasource program: %s" % dapg + if is_snmp_host(hostname): if is_usewalk_host(hostname): agenttype = "SNMP (use stored walk)"

13 years

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8ac03b0a2dd449aa4e2805a5bf1418b0e4249465 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ac03b0a2dd449… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 22:33:30 2011 +0200 Updated bug entries --- .bugs/83 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/83 b/.bugs/83 index 10b405c..b0905fa 100644 --- a/.bugs/83 +++ b/.bugs/83 @@ -1,10 +1,11 @@ Title: if-Check: Bandbreite manuell festlegbar machen Component: checks +State: done +Class: feature +Date: 2010-12-22 11:23:13 Benefit: 1 -State: open Cost: 2 -Date: 2010-12-22 11:23:13 -Class: feature +Fun: 0 Der if-Check kann manchmal die Bandbreite nicht korrekt erkennen (z.B. Linux-SNMP-Agent, oder bei Drosselung durch den Provider). @@ -13,3 +14,6 @@ Fall selbst konfigurieren. Wenn man dann den Interface-Check von Linux kompatibel gemacht hat, könnte man das gleiche Spiel auch bei Linux machen. + +2011-08-19 22:14:15: changed state open -> done +Ist mittlerweile möglich.

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits