Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64450 discussions

Check_MK Git: check_mk: setup. py now tries to setup Event Console even in non-OMD world

by Mathias Kettner

Module: check_mk Branch: master Commit: 5ea83856a22343f313505651f7c1506786cb5b6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ea83856a22343… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 1 20:43:04 2013 +0200 setup.py now tries to setup Event Console even in non-OMD world --- ChangeLog | 3 + Makefile | 3 +- mkeventd/bin/mkeventd | 12 ++- mkeventd/web/htdocs/mkeventd.py | 2 +- scripts/autodetect.py | 10 +- scripts/setup.sh | 286 +++++++++++++++++++++++++++++++++------ 6 files changed, 265 insertions(+), 51 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5ea83856a2…

11 years, 6 months

Check_MK Git: check_mk: FIX: Makefile: add missing files to healspaces

by Mathias Kettner

Module: check_mk Branch: master Commit: 631868bac0b9d8027065e7e20c9e95c8b7bcb8ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=631868bac0b9d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 1 20:40:54 2013 +0200 FIX: Makefile: add missing files to healspaces --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 55a333f..3d398e7 100644 --- a/Makefile +++ b/Makefile @@ -223,7 +223,7 @@ mrproper: SOURCE_FILES = checkman/* modules/* checks/* notifications/* $$(find -name Makefile) \ livestatus/src/*{cc,c,h} web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ - doc/helpers/* $(find -type f pnp-templates/*.php) + doc/helpers/* scripts/setup.sh scripts/autodetect.py $(find -type f pnp-templates/*.php) healspaces: @echo "Removing trailing spaces from code lines..."

11 years, 6 months

Check_MK Git: check_mk: FIX: setup.sh: create auth.serials, fix permissions of htpasswd

by Mathias Kettner

Module: check_mk Branch: master Commit: 2657b3ee592e80b0cb330812a726d0e87c59b0a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2657b3ee592e80… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 1 16:38:51 2013 +0200 FIX: setup.sh: create auth.serials, fix permissions of htpasswd Otherwise login to Multisite will fail in manual installation --- ChangeLog | 1 + scripts/setup.sh | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c6316f..b740a7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ Core: * FIX: setup: detect check_icmp also on 64-Bit CentOS (thanks to あきら) + * FIX: setup.sh: create auth.serials, fix permissions of htpasswd Checks & Agents: * FIX: apc_symmetra_power: resurrect garble PNP template for diff --git a/scripts/setup.sh b/scripts/setup.sh index 3f40561..9a62d00 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -821,6 +821,12 @@ EOF sed -i "s@$web_dir@$web_dir/htdocs@g" $d fi done && + # make htpasswd writable by apache, since we need this for + # WATO. Also create an empty and Apache-writable auth.serials + serials_file=${htpasswd_file%/*}/auth.serials && + touch "$serials_file" && + chown $wwwuser "$serials_file" && + chown $wwwuser "$htpasswd_file" && create_sudo_configuration && if [ -z "$YES" ] ; then echo -e "Installation completed successfully.\nPlease restart Nagios and Apache in order to update/active check_mk's web pages."

11 years, 6 months

Check_MK Git: check_mk: FIX: check_mk-mssql_counters.transactions: fix computation

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d3a34d5fa82f1e9756279c8fbb4592628fb3317 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d3a34d5fa82f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 1 12:19:03 2013 +0200 FIX: check_mk-mssql_counters.transactions: fix computation --- ChangeLog | 1 + checks/mssql_counters | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f246864..0c6316f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,7 @@ * FIX: check_mk_agent.freebsd: remove garble from output (Thanks to Mathias Decker) * FIX: check_mk-mssql_counters.locks: fix computation, was altogether wrong + * FIX: check_mk-mssql_counters.transactions: fix computation also * check_http: now support the option -L (urlizing the result) Multisite: diff --git a/checks/mssql_counters b/checks/mssql_counters index a50fe5c..0af5dda 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -119,6 +119,8 @@ check_info['mssql_counters.cache_hits'] = { def check_mssql_counters_transactions(item, params, info): output = [] perfdata = [] + now = time.time() + wrapped = False for line in info: if mssql_counters_item(line, False) != item: continue @@ -130,8 +132,14 @@ def check_mssql_counters_transactions(item, params, info): ]: if line[1] == counter: value = int(line[-1]) - output.append('%s: %d/s' % (label, value)) - perfdata.append((counter, value)) + countername = "mssql_counters.%s.%s" % (item, counter) + try: + timedif, persec = get_counter(countername, now, value) + except MKCounterWrapped: + wrapped = True + continue + output.append('%s: %.1f/s' % (label, persec)) + perfdata.append((counter, persec)) if output: return (0, '%s' % ', '.join(output), perfdata)

11 years, 6 months

Check_MK Git: check_mk: FIX: check_mk-mssql_counters.locks: fix computation , was altogether wrong

by Mathias Kettner

Module: check_mk Branch: master Commit: 5b757ea59a76f3aab8df697ccf1373c9aaab71b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b757ea59a76f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 1 12:13:58 2013 +0200 FIX: check_mk-mssql_counters.locks: fix computation, was altogether wrong --- ChangeLog | 1 + checks/mssql_counters | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b405865..f246864 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ * FIX: apc_symmetra_power: resurrect garble PNP template for * FIX: check_mk_agent.freebsd: remove garble from output (Thanks to Mathias Decker) + * FIX: check_mk-mssql_counters.locks: fix computation, was altogether wrong * check_http: now support the option -L (urlizing the result) Multisite: diff --git a/checks/mssql_counters b/checks/mssql_counters index 5414469..a50fe5c 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -150,6 +150,8 @@ def check_mssql_counters_locks(item, params, info): state = 0 output = [] perfdata = [] + now = time.time() + wrapped = False for line in info: if mssql_counters_item(line, False) != item: continue @@ -163,21 +165,31 @@ def check_mssql_counters_locks(item, params, info): if line[1] == counter: prob_txt = '' value = float(line[-1]) + # compute rate from counter value + countername = "mssql_counters.%s.%s" % (item, counter) + try: + timedif, persec = get_counter(countername, now, value) + except MKCounterWrapped: + wrapped = True + continue p = params.get(counter) if p: warn, crit = p - if value > crit: + if persec > crit: state = max(state, 1) - prob_txt = ' (!)' - elif value > warn: + prob_txt = '(!)' + elif persec > warn: state = max(state, 2) - prob_txt = ' (!!)' + prob_txt = '(!!)' else: warn, crit = None, None - output.append('%s: %d/s%s' % (label, value, prob_txt)) - perfdata.append((counter, value, warn, crit)) + output.append('%s: %.1f/s%s' % (label, persec, prob_txt)) + perfdata.append((counter, persec, warn, crit)) + + if wrapped: + raise MKCounterWrapped("", "Some counter wrapped, no data this time") if output: return (state, ', '.join(output), perfdata)

11 years, 6 months

Check_MK Git: check_mk: notify: FIX: handle case where type HOST/ SERVICE not correctly detected

by Mathias Kettner

Module: check_mk Branch: master Commit: b4bb7681bd46babcefd6eb8d14fb853b5f338044 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4bb7681bd46ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 1 11:55:12 2013 +0200 notify: FIX: handle case where type HOST/SERVICE not correctly detected --- ChangeLog | 1 + modules/notify.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fd96f0..b405865 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ Notifications: * FIX: fix event type for recoveries * FIX: fix custom notifications on older nagios versions + * FIX: handle case where type HOST/SERVICE not correctly detected Livestatus: * FIX: memory leak when removing downtime / comment diff --git a/modules/notify.py b/modules/notify.py index 7d19662..a2d6f94 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -334,7 +334,7 @@ def do_notify(args): context["OMD_ROOT"] = omd_root context["OMD_SITE"] = os.getenv("OMD_SITE", "") - context["WHAT"] = "SERVICEDESC" in context and "SERVICE" or "HOST" + context["WHAT"] = context.get("SERVICEDESC") and "SERVICE" or "HOST" context["MAIL_COMMAND"] = notification_mail_command # Handle interactive calls

11 years, 6 months

Check_MK Git: check_mk: Removed obsolete VMWare monitoring from Linux agent

by Mathias Kettner

Module: check_mk Branch: master Commit: c8940ec513f38559c1babbc90feb0a4982af9cfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8940ec513f385… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 1 11:44:04 2013 +0200 Removed obsolete VMWare monitoring from Linux agent --- agents/check_mk_agent.linux | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a5ee2d8..0260c0b 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -106,13 +106,6 @@ echo '<<<df>>>' excludefs="-x smbfs -x tmpfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs -x zfs" df -PTlk $excludefs | sed 1d -# VMWare shows its own filesystems with 'vdf'. Just one -# problem: it outputs not 7 but only 6 columns -if type vdf > /dev/null -then - vdf -P | grep ^/vmfs/volumes | sed 's/ / vmfs /' -fi - # Filesystem usage for ZFS if type zfs > /dev/null 2>&1 ; then echo '<<<zfsget>>>' @@ -336,11 +329,6 @@ if type tw_cli > /dev/null ; then done fi -if type vcbVmName > /dev/null 2>&1 ; then - echo '<<<vmware_state>>>' - vcbVmName -s any -fi - # VirtualBox Guests. Section must always been output. Otherwise the # check would not be executed in case no guest additions are installed. # And that is something the check wants to detect

11 years, 6 months

Check_MK Git: check_mk: FIX: hopefully fix computation of Speed-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b3efcfed868e13bba205be6202798de424e0fdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b3efcfed868e1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 31 12:46:23 2013 +0200 FIX: hopefully fix computation of Speed-O-Meter --- ChangeLog | 1 + web/htdocs/sidebar.py | 51 ++++++++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82a63b5..0fd96f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ Multisite: * FIX: fix localization in non-OMD environment (thanks to あきら) + * FIX: hopefully fix computation of Speed-O-Meter * Add $SERVICEOUTPUT$ and $HOSTOUTPUT$ to allowed macros for custom notes diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index fb990f5..7f5cbc5 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -414,39 +414,44 @@ def ajax_speedometer(): # That way we save CPU resources since the computation of the # scheduled checks rate needs to loop over all hosts and services. if last_program_start != program_start: - scheduled_rate = 0.0 - - # First get data of all active checks - for what in [ "host", "service" ]: - data = html.live.query_summed_stats( - "GET %ss\nStats: suminv check_interval\n" - "Filter: active_checks_enabled = 1" % what) - - scheduled_rate += data[0] / 60.0 - - # HACK: - # The Check_MK passive checks are always added to Nagios with - # a check interval of 1 minute. If one chancges the check interval - # of the Check_MK service, the intervals of the passive services - # change in fact. But this change is not added to the nagios config - # of these objects. Workaround here: Get interval of Check_MK service - # and add it as interval to the cmk passive checks + + # 1. First compute number of expected host checks per second + scheduled_rate = html.live.query_summed_stats( + "GET hosts\n" + "Stats: suminv check_interval\n")[0] / 60.0 + + # 2. Now get data of all active services and of passive/non-check_mk-services. + # For passive services we assume that they are scheduled with the rate the + # is configured via "check_interval". Nagios does not use this setting for i + # passive checks, but we have no other option. + scheduled_rate += html.live.query_summed_stats( + "GET services\n" + "Stats: suminv check_interval\n" + "Filter: active_checks_enabled = 1\n" + "Filter: check_command ~ ^check_mk-\n" + "Negate:\n" + "Filter: active_checks_enabled = 0\n" + "And: 2\n" + "Or: 2\n")[0] / 60.0 + + # 3. Acount for check_mk-checks. Here we need to check interval of the + # Check_MK services on the host. Its check rate applies to the passive + # checks. First get the check intervals of the check_mk checks: intervals = html.live.query_table( "GET services\n" "Columns: host_name check_interval\n" "Filter: description = Check_MK") + # Now get the number of passive check_mk checks for each host and convert + # it to a dict from host -> number of services num_svcs = dict(html.live.query_table( "GET services\n" - "Columns:host_name\n" + "Columns: host_name\n" "Stats: check_command ~ ^check_mk-")) - for line in intervals: - host_name, check_interval = line + for host_name, check_interval in intervals: num_services = num_svcs.get(host_name, 0) - - file('/tmp/3', 'a').write('%s %d %0.2f\n' % (host_name, num_services, 1.0 / (check_interval / 60.0) * num_services)) - scheduled_rate += 1.0 / ((check_interval / 60.0) * num_services) + scheduled_rate += float(num_services) / check_interval / 60.0 percentage = 100.0 * current_rate / scheduled_rate; title = _("Scheduled check rate: %.1f/s, current rate: %.1f/s, that is "

11 years, 6 months

Check_MK Git: check_mk: fixed typo in error message

by Mathias Kettner

Module: check_mk Branch: master Commit: 9ce6fe3cc303301f2e95ea87c1396ad01ff3eb12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ce6fe3cc30330… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 31 00:32:12 2013 +0100 fixed typo in error message --- web/plugins/userdb/ldap.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index db0b7bf..eeb94f2 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -108,7 +108,7 @@ def ldap_connect(): try: ldap except: - raise MKLDAPException(_("The python module python-ldap seem to be missing. You need to " + raise MKLDAPException(_("The python module python-ldap seems to be missing. You need to " "install this extension to make the LDAP user connector work.")) # Some major config var validations

11 years, 6 months

Check_MK Git: check_mk: Add $SERVICEOUTPUT$ and $HOSTOUTPUT$ to allowed macros for custom notes

by Mathias Kettner

Module: check_mk Branch: master Commit: e114a36d52814b2283175e98fa07f01b38fd0cec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e114a36d52814b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 30 18:19:42 2013 +0100 Add $SERVICEOUTPUT$ and $HOSTOUTPUT$ to allowed macros for custom notes --- ChangeLog | 2 ++ web/.f12 | 1 - web/plugins/views/painters.py | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3677f76..82a63b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,8 @@ Multisite: * FIX: fix localization in non-OMD environment (thanks to あきら) + * Add $SERVICEOUTPUT$ and $HOSTOUTPUT$ to allowed macros for + custom notes Notifications: * FIX: fix event type for recoveries diff --git a/web/.f12 b/web/.f12 index 8326daa..f8ea798 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,7 +1,6 @@ #!/bin/bash SITE=${SITE:-$(omd sites --bare | head -n 1)} C=$(sudo cp --preserve=mode -rv * /omd/sites/$SITE/share/check_mk/web/ | wc -l) -#C=$(sudo cp --preserve=mode -rv htdocs/*.{css,py} /omd/versions/default/share/check_mk/web/htdocs/ | wc -l) echo "$C files copied" if [ "$SITE" != - ] ; then sudo omd restart $SITE apache diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 5e5a8de..afa2242 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -744,7 +744,10 @@ def paint_custom_notes(row): .replace('$HOSTNAME_UPPER$', host.upper())\ .replace('$HOSTNAME_TITLE$', host[0].upper() + host[1:].lower())\ .replace('$HOSTADDRESS$', row["host_address"])\ + .replace('$SERVICEOUTPUT$', row.get("service_plugin_output", ""))\ + .replace('$HOSTOUTPUT$', row.get("host_plugin_output", ""))\ .replace('$SERVICEDESC$', row.get("service_description", "")) + for f in files: contents.append(replace_tags(unicode(file(f).read(), "utf-8").strip())) return "", "<hr>".join(contents) @@ -752,7 +755,7 @@ def paint_custom_notes(row): multisite_painters["svc_custom_notes"] = { "title" : _("Custom services notes"), "short" : _("Notes"), - "columns" : [ "host_name", "host_address", "service_description" ], + "columns" : [ "host_name", "host_address", "service_description", "service_plugin_output" ], "paint" : paint_custom_notes, } @@ -1152,7 +1155,7 @@ multisite_painters["host_contact_groups"] = { multisite_painters["host_custom_notes"] = { "title" : _("Custom host notes"), "short" : _("Notes"), - "columns" : [ "host_name", "host_address" ], + "columns" : [ "host_name", "host_address", "host_plugin_output" ], "paint" : paint_custom_notes, }

11 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits