Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64138 discussions

Check_MK Git: check_mk: Added perf-o-meter for if/if64 :-)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7e41e0572d81bb4b25114311f63510909c8c6d4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e41e0572d81bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 14 16:43:16 2010 +0100 Added perf-o-meter for if/if64 :-) --- ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 31 ++++++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1395a16..e94d0db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * j4p_performance: Added experimental agent plugin fetching data via jmx4perl agent (does not need jmx4perl on Nagios) * j4p_performance.mem: added new experimental check for memory usage via JMX. + * if/if64: added Perf-O-Meter for Multisite Multisite: * The custom open/close states of custom links are now stored for each diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 28cdc71..1d659c5 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -109,11 +109,6 @@ def perfometer_check_mk_mem_used(row, check_command, perf_data): perfometers["check_mk-mem.used"] = perfometer_check_mk_mem_used -# def perfometer_check_mk_kernel(row, check_command, perf_data): -# return "%d/s" % int(perf_data[0][1]), perfometer_logarithmic(perf_data[0][1], 1000, 10, "#f2a") -# -# perfometers["check_mk-kernel"] = perfometer_check_mk_kernel - def perfometer_check_mk_cpu_threads(row, check_command, perf_data): color = { 0: "#a4f", 1: "#ff2", 2: "#f22", 3: "#fa2" }[row["service_state"]] return "%d" % int(perf_data[0][1]), perfometer_logarithmic(perf_data[0][1], 400, 2, color) @@ -188,3 +183,29 @@ def perfometer_check_mk_ipmi_sensors(row, check_command, perf_data): # Also all checks dealing with temperature can use this perfometer perfometers["check_mk-ipmi_sensors"] = perfometer_check_mk_ipmi_sensors perfometers["check_mk-nvidia.temp"] = perfometer_check_mk_ipmi_sensors + +def performeter_check_mk_if(row, check_command, perf_data): + # return str(perf_data), "" + txt = [] + h = '<table><tr>' + for name, perf, color in [ + ("in", perf_data[0], "#0e6"), + ("out", perf_data[5], "#2af") ]: + bytes = float(perf[1]) + bw = float(perf[6]) + rrate = bytes / bw + drate = max(0.02, rrate ** 0.5 ** 0.5) + rperc = 100 * rrate + dperc = 100 * drate + a = perfometer_td(dperc / 2, color) + b = perfometer_td(50 - dperc/2, "#fff") + if name == "in": + h += b + a # white left, color right + else: + h += a + b # color right, white left + txt.append("%.1f%%" % rperc) + h += '</tr></table>' + return "   ".join(txt), h + +perfometers["check_mk-if"] = performeter_check_mk_if +perfometers["check_mk-if64"] = performeter_check_mk_if

13 years, 10 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 849634dacffc35220918d8ae23aab56217076368 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=849634dacffc35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 14 15:14:07 2010 +0100 Updated internal doku --- LIESMICH.zutun | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index ec0ce27..109a927 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -1,5 +1,13 @@ Doku: Check_MK und OMD: Installieren von MKPs, local-Hierarchie +Multisite: Kontextknöpfe Services: OK, Services: Crit usw. unsichtbar +machen. Dazu einen neue View-Option einbauen (hide context button). + +Multisite: Bei jedem aktiven Service soll ein Knopf angezeigt werden +zum Reschedulen. Dieser soll dann per WaitCondition: so lange warten, +bis der Check auch wirklich ausgeführt wurde! + +Inventurcheck: retry_interval evt. anders (kuerzer) einstellbar machen. -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1

13 years, 10 months

Check_MK Git: check_mk: Changed layout style of Perf-O-Meters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5e370f63b99e0bdaa4a0fdd84336aa6138a52925 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e370f63b99e0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 14 16:53:06 2010 +0100 Changed layout style of Perf-O-Meters --- web/htdocs/check_mk.css | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 463c8d6..9daf326 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -783,11 +783,10 @@ td.count { } table.services tr.data td.perfometer { - padding: 2px 2px; + padding: 1px 2px; width: 120px; height: 22px; vertical-align: middle; - background-color: #888; } td.perfometer div.title { height: 0px; @@ -805,7 +804,8 @@ td.perfometer table { border-spacing: 0px; padding: 0px; margin: 0px; - border: none; + border: 1px solid #aaa; + height: 100%; } table.services tr.data td.perfometer table td {

13 years, 10 months

Check_MK Git: check_mk: Multisite: New view for all services of a site

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb0df7b6ced7d5f4284a3c2901e091997137e6f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb0df7b6ced7d5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 13 14:02:54 2010 +0100 Multisite: New view for all services of a site --- ChangeLog | 1 + web/plugins/views/builtin.py | 51 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f425ab5..0ad7a4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * Fixed repositioning the sidebar scroll state after refreshing the page * Fixed mousewheel scrolling in opera/chrome * Fixed resize bug on refresh in chrome + * New view for all services of a site 1.1.8: Core, Setup, etc.: diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index b6caca1..ae262aa 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1125,7 +1125,7 @@ multisite_builtin_views = { 'column_headers': 'off', 'datasource': 'hosts', 'description': 'Link view showing all\r\nhosts of one site', - 'group_painters': [('site_icon', None), ('sitealias', None)], + 'group_painters': [('site_icon', None), ('sitealias', 'sitesvcs')], 'hard_filters': ['summary_host'], 'hard_filtervars': [ ('is_summary_host', '0'),], @@ -1688,5 +1688,52 @@ multisite_builtin_views = { 'logtime'], 'sorters': [], 'title': 'Search Global Logfile', - 'topic': 'Other'} + 'topic': 'Other'}, + + 'sitesvcs': {'browser_reload': 60, + 'column_headers': 'pergroup', + 'datasource': 'services', + 'description': 'All services of a given site.', + 'group_painters': [('host_with_state', 'hoststatus')], + 'hard_filters': [], + 'hard_filtervars': [('optservicegroup', ''), + ('neg_optservicegroup', ''), + ('host', ''), + ('service', ''), + ('st0', 'on'), + ('st1', 'on'), + ('st2', 'on'), + ('st3', 'on'), + ('stp', 'on'), + ('opthostgroup', ''), + ('neg_opthostgroup', ''), + ('host_check_command', ''), + ('service_output', '')], + 'hidden': True, + 'hide_filters': ['site'], + 'layout': 'table', + 'linktitle': 'Services of Site', + 'mustsearch': False, + 'name': 'sitesvcs', + 'num_columns': 2, + 'owner': 'maintenance', + 'painters': [('service_state', None), + ('service_description', 'service'), + ('svc_plugin_output', None), + ('svc_state_age', None), + ('svc_check_age', None), + ('service_icons', None), + ('perfometer', None)], + 'play_sounds': False, + 'public': True, + 'show_filters': ['optservicegroup', + 'host', + 'serviceregex', + 'svcstate', + 'opthostgroup', + 'host_check_command', + 'output'], + 'sorters': [('site_host', False), ('svcdescr', False)], + 'title': 'Services of Site', + 'topic': 'Services'} }

13 years, 10 months

Check_MK Git: check_mk: Fixed host filter for new view

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e8d9234aa6b7a71643176ef7c712963837124f3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8d9234aa6b7a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 13 14:09:43 2010 +0100 Fixed host filter for new view --- web/plugins/views/builtin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index ae262aa..2d3987f 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1727,7 +1727,7 @@ multisite_builtin_views = { 'play_sounds': False, 'public': True, 'show_filters': ['optservicegroup', - 'host', + 'hostregex', 'serviceregex', 'svcstate', 'opthostgroup',

13 years, 10 months

Check_MK Git: check_mk: Sidebar snapin site_status: make link target configurable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4433f628f41a1f6d2614a16e43ae8af9528c8b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4433f628f41a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 13 14:19:30 2010 +0100 Sidebar snapin site_status: make link target configurable --- ChangeLog | 1 + web/plugins/sidebar/shipped.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ad7a4c..7c18255 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * Fixed mousewheel scrolling in opera/chrome * Fixed resize bug on refresh in chrome * New view for all services of a site + * Sidebar snapin site_status: make link target configurable 1.1.8: Core, Setup, etc.: diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index e87fe63..5a892a5 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -368,7 +368,11 @@ def render_sitestatus(): title = "Site %s is switched off" % site["alias"] else: switch = "off" - text = link(site["alias"], "view.py?view_name=sitehosts&site=%s" % sitename) + try: + linkview = config.sitestatus_link_view + except: + linkview = "sitehosts" + text = link(site["alias"], "view.py?view_name=%s&site=%s" % (linkview, sitename)) ex = html.site_status[sitename].get("exception") shs = html.site_status[sitename].get("status_host_state")

13 years, 10 months

Check_MK Git: check_mk: fixed global_vars check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff1bf227a194d15c60719a59d2a56cca9e95dc97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff1bf227a194d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 12 22:26:08 2010 +0100 fixed global_vars check --- doc/helpers/validate_checks | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index d6cd425..5850bd0 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -169,8 +169,6 @@ def verify_global_vars(check): # Documented configuration vars can be skipped if not invalid and grep_manpage(check, "^%s" % var, 'configuration'): continue - elif check == 'aironet_clients': - print 'found' # Check unknown vars for correct prefix if not var.startswith('%s_' % check_file): @@ -182,7 +180,7 @@ def verify_global_vars(check): else: invalid_global_vars[check_file] += [ var ] - return check_file in invalid_global_vars + return not check_file in invalid_global_vars # Reindent code: # - Is there some code to be reindented?

13 years, 10 months

Check_MK Git: check_mk: if/if64: targetspeed can now be None to disable target speed check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f983aea3e62c7517bf98bebc1e04f9f1f50f7fa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f983aea3e62c75… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 11 18:05:29 2010 +0100 if/if64: targetspeed can now be None to disable target speed check --- ChangeLog | 1 + checkman/if | 3 ++- checks/if | 6 +++--- checks/if64 | 4 +++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b83d75d..3efcf45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now * if/if64: Added expected interface speed to warning output + * if/if64: Expected speed can also be None to disable interface speed checking * wut_webtherm: handle more variants of WuT Webtherms (thanks to Lefty) * cisco_fan: Does not inventorize 'notPresent' sensors anymore. Improved output * cisco_power: Not using power source as threshold anymore. Improved output diff --git a/checkman/if b/checkman/if index 271b9ee..34134e6 100644 --- a/checkman/if +++ b/checkman/if @@ -42,7 +42,8 @@ err_warn (float): The percentage of errors + discards at which a warning should triggered. Default is {0.01} percent (one of 10.000). err_crit (float): The percentage of errors + discards at which a critical state is reached. Default is {0.1} percent (one of 1.000). -targetspeed (int): The target speed in bits per second of the interface. +targetspeed (int): The target speed in bits per second of the interface. Can be {None} to disable the + interface speed check. bw_warn (float): Optional: The in/out rate to raise a WARNING state. Defaults to {None}. bw_crit (float): Optional: The in/out rate to raise a CRITICAL state. Defaults to {None}. allowed_operstates (tuple): Optional: A list of allowed operstates. All other states diff --git a/checks/if b/checks/if index e08c247..2f15977 100644 --- a/checks/if +++ b/checks/if @@ -37,7 +37,7 @@ if_default_levels = (0.01, 0.1, None, None, ('1', 'up',)) # Stupid fix: Remove all 0 bytes. Hope this causes no problems. def cleanup_if_strings(s): if s and s != '': - return "".join([ c for c in s if c not in nagios_illegal_chars+chr(0) ]).strip() + return "".join([ c for c in s if c not in nagios_illegal_chars+chr(0) ]).strip() else: return s @@ -87,7 +87,7 @@ def check_if(item, params, info): for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, ifInUcastPkts, ifInNUcastPkts, ifInDiscards, \ ifInErrors, ifOutOctets, ifOutUcastPkts, ifOutNUcastPkts, ifOutDiscards, ifOutErrors, ifOutQLen in info: ifDescr = cleanup_if_strings(ifDescr) - + if item == ifIndex or item == ifDescr: # Display port number or alias in infotext if that is not part @@ -109,7 +109,7 @@ def check_if(item, params, info): # Check speed speed = saveint(ifSpeed) bandwidth = speed / 8.0 # in Bytes / sec - if speed != targetspeed: + if not targetspeed is None and speed != targetspeed: infotext += "%s (wrong speed! expected: %s)" % (speed, get_nic_speed_human_readable(targetspeed)) state = 1 else: diff --git a/checks/if64 b/checks/if64 index 897787b..0f91652 100644 --- a/checks/if64 +++ b/checks/if64 @@ -122,9 +122,11 @@ def check_if64(item, params, info): speed = saveint(ifSpeed) infotext += get_nic_speed_human_readable(speed) bandwidth = speed / 8.0 # in Bytes / sec - if speed != targetspeed: + if not targetspeed is None and speed != targetspeed: infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) state = 1 + else: + infotext += get_bytes_human_readable(speed, 1000)+'it/s' # Performance counters this_time = time.time()

13 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bb17f3b0cc09534dfb078861b6df82ee0375f3ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb17f3b0cc0953… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 12 18:39:43 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 10 months

Check_MK Git: check_mk: j4p_performance: Added experimental agent plugin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4fbc6c21eccd14caa9bd0cc13619227d7904c9e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fbc6c21eccd14… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 8 15:46:21 2010 +0100 j4p_performance: Added experimental agent plugin --- ChangeLog | 2 ++ agents/plugins/j4p_performance | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 815e857..ae06146 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,8 @@ * heartbeat_rscstatus: Catching empty output from agent correctly * win_dhcp_pools agent plugin: Filtering additional error message on systems without dhcp server + * j4p_performance: Added experimental agent plugin fetching data via + jmx4perl agent (does not need jmx4perl on Nagios) Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/plugins/j4p_performance b/agents/plugins/j4p_performance new file mode 100755 index 0000000..2af3363 --- /dev/null +++ b/agents/plugins/j4p_performance @@ -0,0 +1,40 @@ +#!/usr/bin/python + +import urllib, sys, os + +server = "localhost" +port = 8080 +vars = [ + ( "java.lang:type=Memory/NonHeapMemoryUsage/used", "NoneHeapMemoryUsage" ), + ( "java.lang:type=Memory/HeapMemoryUsage/used", "HeapMemoryUsage" ), + ( "java.lang:type=Threading/ThreadCount", "ThreadCount" ), + ( "java.lang:type=Threading/DaemonhreadCount", "DeamonThreadCount" ), + ( "java.lang:type=Threading/PeakThreadCount", "PeakThreadCount" ), + ( "java.lang:type=Threading/TotalStartedThreadCount", "TotalStartedThreadCount" ), + ( "java.lang:type=Runtime/Uptime", "Uptime" ), + +] + +conffile = os.getenv("MK_CONFDIR", "/etc/check_mk") + "/j4p.conf" + +if os.path.exists(conffile): + execfile(conffile) + +def fetch_var(server, port, path): + url = "http://%s:%d/j4p/read/%s" % (server, port, path) + json = urllib.urlopen(url).read() + return eval(json)["value"] + + +first = True +for path, title in vars: + try: + value = fetch_var(server, port, path) + if first: + first = False + sys.stdout.write("<<<j4p_performance>>>\n") + sys.stdout.write("%-30s %s\n" % (title, value)) + except IOError: + sys.exit(1) + except: + pass

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits