Checkmk git commits January 2013

checkmk-commits@lists.checkmk.com

3 participants
210 discussions

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

by Lars Michelsen

Module: check_mk Branch: master Commit: e398d4cf2a994ac526ffd869aeba08a3bbb34a4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e398d4cf2a994a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 10 11:31:02 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

11 years, 8 months

Check_MK Git: check_mk: FIX: Fixed rendering of dashboard globes in opera

by Lars Michelsen

Module: check_mk Branch: master Commit: eaf92f6f3fc0e0a0bce3ecc9efb5516f925f5598 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaf92f6f3fc0e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 9 16:10:49 2013 +0100 FIX: Fixed rendering of dashboard globes in opera --- .bugs/594 | 7 +++++-- .bugs/679 | 7 +++++-- .bugs/715 | 8 +++++++- ChangeLog | 1 + web/htdocs/dashboard.py | 12 +++++++----- web/htdocs/default_permissions.py | 4 ++-- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.bugs/594 b/.bugs/594 index d5aba64..d296360 100644 --- a/.bugs/594 +++ b/.bugs/594 @@ -1,9 +1,9 @@ Title: CPU Utilization immer auf 100% bei -nv (Windows) Component: core -State: open +Class: nastiness +State: done Date: 2012-01-10 17:58:52 Targetversion: 1.2.2 -Class: nastiness Windows Hosts zeigen bei einem cmk -nv immer eine CPU Utilization von 100% an. Der Normale Check funktioniert. Tritt hier bei 1.1.13i2 auf. @@ -11,3 +11,6 @@ Der Normale Check funktioniert. Tritt hier bei 1.1.13i2 auf. Grund: der Check arbeitet mit Countern. Sollte aber trotzdem machbar sein, dass er funktioniert, wenn schon von früher Werte da sind. Bei erstenmal sollte der Check pending sein (analog zu disk IO). + +2013-01-09 15:32:54: changed state open -> done +Correct percentage calciulation for this situation has been added. diff --git a/.bugs/679 b/.bugs/679 index c885493..4cff354 100644 --- a/.bugs/679 +++ b/.bugs/679 @@ -1,9 +1,9 @@ Title: Logwatch ruleeditor (or ValueSpec ListOf) breaks on Iceweasel on Debian 6.0 Component: multisite -State: open +Class: bug +State: done Date: 2012-04-24 12:07:14 Targetversion: 1.2.2 -Class: bug On Iceweasel 3.5.16 the rule editor breaks while editing ListOf() in the logwatch pattern editor. When adding a line, the layout @@ -28,3 +28,6 @@ Traceback (most recent call last): ValueError: invalid literal for int() with base 10: '' It also looks that the pickling does not work on this browser. + +2013-01-09 15:35:31: changed state open -> done +This has already been fixed in the past diff --git a/.bugs/715 b/.bugs/715 index 2e00d94..83ad1ee 100644 --- a/.bugs/715 +++ b/.bugs/715 @@ -1,6 +1,6 @@ Title: WATO permission "edit views" = False disables display of custom views Component: wato -State: open +State: done Date: 2012-07-06 14:16:42 Targetversion: 1.2.2 Class: bug @@ -11,3 +11,9 @@ possible to still use that were "installed" on setup. Resolution: we simply rename the permission into "Allow creating and using own customized views" + +2013-01-09 15:38:55: changed state open -> done +Has just been renamed. + +2013-01-09 16:10:01: changed state done -> done +Changed calculation algorithm. diff --git a/ChangeLog b/ChangeLog index 778c06e..132fab0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ * FIX: Dashboard: Fixed wrong display options in links after data reloads * FIX: Fixed "remove all downtimes" button in views when no downtimes to be deleted * FIX: Services in hosttables now use the service name as header (if no custom title set) + * FIX: Fixed rendering of dashboard globes in opera * New filter for host_contact and service_contact WATO: diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 7587ccf..eeadd49 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -605,8 +605,8 @@ def render_statistics(pie_id, what, table, filter): # compute radius of this sphere *including all inner spheres!* The first # sphere always gets a radius of 1.0, of course. radius = remaining_separatorspace + remaining_radius * (remaining_part ** (1/3.0)) - pie_parts.append('chart_pie("%s", %f, %f, %r);' % (pie_id, pie_right_aspect, radius, color)) - pie_parts.append('chart_pie("%s", -%f, %f, %r);' % (pie_id, pie_left_aspect, radius, color)) + pie_parts.append('chart_pie("%s", %f, %f, %r, true);' % (pie_id, pie_right_aspect, radius, color)) + pie_parts.append('chart_pie("%s", %f, %f, %r, false);' % (pie_id, pie_left_aspect, radius, color)) # compute relative part of this class part = float(value) / total # ranges from 0 to 1 @@ -616,7 +616,7 @@ def render_statistics(pie_id, what, table, filter): html.write("</div>") html.javascript(""" -function chart_pie(pie_id, x_scale, radius, color) { +function chart_pie(pie_id, x_scale, radius, color, right_side) { var context = document.getElementById(pie_id + "_stats").getContext('2d'); if (!context) return; @@ -628,8 +628,10 @@ function chart_pie(pie_id, x_scale, radius, color) { context.translate(pie_x, pie_y); context.scale(x_scale, 1); context.beginPath(); - context.moveTo(0, 0); - context.arc(0, 0, (pie_d / 2) * radius, 1.5 * Math.PI, 0.5 * Math.PI, false); + if(right_side) + context.arc(0, 0, (pie_d / 2) * radius, 1.5 * Math.PI, 0.5 * Math.PI, false); + else + context.arc(0, 0, (pie_d / 2) * radius, 0.5 * Math.PI, 1.5 * Math.PI, false); context.closePath(); context.fill(); context.restore(); diff --git a/web/htdocs/default_permissions.py b/web/htdocs/default_permissions.py index c4a49b2..33f4587 100644 --- a/web/htdocs/default_permissions.py +++ b/web/htdocs/default_permissions.py @@ -58,8 +58,8 @@ def load(): [ "admin", "guest" ]) config.declare_permission("general.edit_views", - _("Edit views"), - _("Create own views and customize builtin views"), + _("Customize views and use them"), + _("Allows to create own views, customize builtin views and use them."), [ "admin", "user" ]) config.declare_permission("general.publish_views",

11 years, 8 months

Check_MK Git: check_mk: FIX: winperf_processor: Showing 0% on "cmk -nv" now instead of 100%

by Lars Michelsen

Module: check_mk Branch: master Commit: b651154d13dff03c7f24be105de8325a9d3ff9a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b651154d13dff0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 9 15:32:34 2013 +0100 FIX: winperf_processor: Showing 0% on "cmk -nv" now instead of 100% --- ChangeLog | 1 + checks/winperf_processor | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8aa6373..778c06e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * FIX: zpool_status: fixed crash when spare devices were available * FIX: hr_fs: handle negative values in order to larger disks (thanks to Christof Musik) * FIX: mssql_backup: Fixed wrong calculation of backup age in seconds + * FIX: winperf_processor: Showing 0% on "cmk -nv" now instead of 100% * New script multisite_to_mrpe for exporting services from a remote system diff --git a/checks/winperf_processor b/checks/winperf_processor index d2e7d5b..b9ffb27 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -50,8 +50,11 @@ def check_winperf_util(item, params, info): ticks = int(line[-2]) num_cpus = len(line) - 3 timedif, ticks_per_sec = get_counter("winperf_util", this_time, ticks) - secs_per_sec = ticks_per_sec / 10000000.0; - used_perc = 100 * (1 - secs_per_sec) + if ticks_per_sec == 0.0: + used_perc = 0.0 + else: + cpusecs_per_sec = ticks_per_sec / 10000000.0 + used_perc = 100 * (1 - cpusecs_per_sec) if used_perc < 0: used_perc = 0

11 years, 8 months

Check_MK Git: check_mk: Linux Agent, diskstat: Now supporting /dev/ emcpower* devices (Thanks to Claas Rockmann-Buchterkirche)

by Lars Michelsen

Module: check_mk Branch: master Commit: 2530c0525fed2ec5941b99d30e778bc67f2ad2bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2530c0525fed2e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 10 09:20:11 2013 +0100 Linux Agent, diskstat: Now supporting /dev/emcpower* devices (Thanks to Claas Rockmann-Buchterkirche) --- ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3caf204..c847459 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * Linux Agent, mk_postgres: Supporting pgsql and postgres as user * Linux Agent, mk_postgres: Fixed database stats query to be compatible with more versions of postgres + * Linux Agent, diskstat: Now supporting /dev/emcpower* devices (Thanks to Claas Rockmann-Buchterkirche) * apache_status: Modified to be usable on python < 2.6 (eg RHEL 5.x) * apache_status: Fixed handling of PIDs with more than 4 numbers * FIX: postgres_sessions: handle case of no active/no idle sessions diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 18ce53c..d611f8a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -184,7 +184,7 @@ cat /proc/mdstat # Performancecounter Platten echo '<<<diskstat>>>' date +%s -egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|dm-[0-9]+|VxVM.*) ' < /proc/diskstats +egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*) ' < /proc/diskstats if type dmsetup >/dev/null ; then echo '[dmsetup_info]' dmsetup info -c --noheadings --separator ' ' -o name,devno,vg_name,lv_name

11 years, 8 months

Check_MK Git: check_mk: FIX: win_dhcp_pools: removed faulty output on non-german windows 2003 servers with no dhcp server installed (Thanks to Mathias Decker)

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ceeb8edaa3aea56be1bbae91c5a27508d9abe96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ceeb8edaa3aea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 10 08:56:51 2013 +0100 FIX: win_dhcp_pools: removed faulty output on non-german windows 2003 servers with no dhcp server installed (Thanks to Mathias Decker) --- ChangeLog | 2 ++ agents/windows/plugins/win_dhcp_pools.bat | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 132fab0..3caf204 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,8 @@ * FIX: hr_fs: handle negative values in order to larger disks (thanks to Christof Musik) * FIX: mssql_backup: Fixed wrong calculation of backup age in seconds * FIX: winperf_processor: Showing 0% on "cmk -nv" now instead of 100% + * FIX: win_dhcp_pools: removed faulty output on non-german windows 2003 servers + with no dhcp server installed (Thanks to Mathias Decker) * New script multisite_to_mrpe for exporting services from a remote system diff --git a/agents/windows/plugins/win_dhcp_pools.bat b/agents/windows/plugins/win_dhcp_pools.bat index f90093a..45b6074 100644 --- a/agents/windows/plugins/win_dhcp_pools.bat +++ b/agents/windows/plugins/win_dhcp_pools.bat @@ -1,3 +1,3 @@ @echo off echo ^<^<^<win_dhcp_pools^>^>^> -netsh dhcp server show mibinfo | find /V ": dhcp." | find /V "DHCP-Serverversion wurde" | find /V "nicht richtig funktionieren." | find /V ": dhcp server show mibinfo." +netsh dhcp server show mibinfo | find /V ": dhcp." | find /v "Server may not function properly." | find /v "Unable to determine the DHCP Server version for the Server" | find /V "DHCP-Serverversion wurde" | find /V "nicht richtig funktionieren." | find /V ": dhcp server show mibinfo."

11 years, 8 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: 65888461a97b652856d71cf16c5235e28a64193c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65888461a97b65… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 9 16:30:00 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 8 months

Check_MK Git: check_mk: gb: save bug id on blame command

by Mathias Kettner

Module: check_mk Branch: master Commit: 32f487818cf3a88572a9f21fde7df2cbf42b63b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32f487818cf3a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 9 16:29:58 2013 +0100 gb: save bug id on blame command --- gb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/gb b/gb index 923b232..3607f70 100755 --- a/gb +++ b/gb @@ -427,6 +427,7 @@ def main_blame(args): bug = g_bugs.get(id) if not bug: bail_out("No such bug.\n") + save_last_bugid(id) os.system("git blame %d" % id)

11 years, 8 months

Check_MK Git: check_mk: multisite_to_mrpe: allow basic auth,

by Mathias Kettner

quote secret correctly Message-ID: <50ed8cfe.m0+ZuJSOdjrU3GRc%mk(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: 48d486c850332488d886c433f75387577b80e4a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48d486c8503324… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 9 16:29:49 2013 +0100 multisite_to_mrpe: allow basic auth, quote secret correctly --- doc/treasures/multisite_to_mrpe | 84 +++++++++++++++++++++++++-------------- 1 files changed, 54 insertions(+), 30 deletions(-) diff --git a/doc/treasures/multisite_to_mrpe b/doc/treasures/multisite_to_mrpe index 9274880..4289bee 100755 --- a/doc/treasures/multisite_to_mrpe +++ b/doc/treasures/multisite_to_mrpe @@ -32,7 +32,7 @@ # "$OMD_ROOT/local/lib/multisite_to_mrpe --secret dasistgeheim --url http://localhost/remote/check_mk/ <HOST>" # -import os, sys, getopt, time, urllib +import os, sys, getopt, time, urllib, subprocess omd_site = os.getenv("OMD_SITE") omd_root = os.getenv("OMD_ROOT") @@ -50,7 +50,7 @@ def verbose(text): sys.stdout.write(text + "\n") def usage(): - sys.stdout.write("""Usage: multisite_to_mrpe [OPTIONS] HOST + sys.stdout.write("""Usage: multisite_to_mrpe -U URL {-P PASSWORD|-S SECRET} [OPTIONS] HOST This program is intended to be used as a datasource program. It fetches the current state of all services of a host @@ -62,21 +62,24 @@ URL is the /check_mk/ e.g. http://someserver.abc/prod/check_mk/ Options: - -h, --help Show this help and exit - -v, --verbose Show what's going on - -u, --user U Name of automation user (default: "automation") - -U, --url U Multisite URL of the remote server including - -S, --secret S Automation secret (default: public) - --debug Let Python exceptions come through + -h, --help Show this help and exit + -v, --verbose Show what's going on + -u, --user U Name of automation user (default: "automation") + -U, --url U Multisite URL of the remote server including + -S, --secret S Automation secret (default: public) + -P, --password P Use HTTP password P (when using BasicAuth, no Cookies) + --debug Let Python exceptions come through + """) -short_options = 'hvu:U:S:' -long_options = [ "help", "verbose", "user=", "url=", "secret=", "debug" ] +short_options = 'hvu:U:S:P:' +long_options = [ "help", "verbose", "user=", "url=", "secret=", "debug", "password=" ] opt_verbose = False opt_user = "automation" opt_secret = None +opt_password = None opt_url = None opt_debug = False @@ -105,18 +108,13 @@ for o,a in opts: opt_user = a elif o in [ '-S', '--secret']: opt_secret = a + elif o in [ '-P', '--password']: + opt_password = a elif o in [ '-U', '--url']: opt_url = a -if omd_site and not opt_secret: - try: - opt_secret = file(omd_root + "/var/check_mk/web/" + opt_user - + "/automation.secret").read().strip() - except Exception, e: - if opt_debug: - raise - bail_out("Cannot read automation secret from user %s: %s" % - (opt_user, e)) +if not opt_secret and not opt_password: + bail_out("You must specify either -P or -S.") if not opt_url: bail_out("Please specify the URL to Check_MK Multisite with -U.") @@ -129,31 +127,57 @@ if not args: arg_host = args[0] -verbose("Host: " + arg_host) -verbose("Multisite-URL: " + opt_url) -verbose("User: " + opt_user) -verbose("Secret: " + opt_secret) +verbose("Host: " + arg_host) +verbose("Multisite-URL: " + opt_url) +verbose("User: " + opt_user) +if opt_secret: + verbose("Authentication: Cookies") + verbose("Secret: " + opt_secret) +else: + verbose("Authentication: HTTP BasicAuth") + verbose("Password: " + opt_password) + def make_url(base, variables): - vartext = "&".join([ "%s=%s" % e for e in variables ]) - return base + "?" + vartext + return base + "?" + urllib.urlencode(variables) variables = [ - ( "_username", opt_user ), - ( "_secret", opt_secret ), ( "host", arg_host ), ( "view_name", "host_export" ), ( "output_format", "python" ), ] +if opt_secret: + variables += [ + ( "_username", opt_user ), + ( "_secret", opt_secret ) + ] url = make_url(opt_url + "view.py", variables) -verbose("URL: " + url) +verbose("URL: " + url) + try: - pipe = urllib.urlopen(url) - answer = pipe.read() + arguments = [ 'curl', '--silent', '--insecure', ] + if opt_password: + arguments.append('--user') + arguments.append("%s:%s" % (opt_user, opt_password)) + else: + arguments.append(opt_user) + arguments.append(url) + verbose("Calling: " + " ".join(arguments)) + + + process = subprocess.Popen(arguments, executable='curl', stdout=subprocess.PIPE) + answer, stderrdata = process.communicate() + result = process.wait() + print result if answer.startswith("ERROR:"): bail_out("Error response from remote Multisite: %s" % answer[7:]) + try: + parsed = eval(answer) + except: + bail_out("Invalid response from Multisite: %s\n" % answer) + services = convert_from_multisite(eval(answer)) except Exception, e: if opt_debug:

11 years, 8 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: 37935495edc4177ceddead393c86c8c2c2d996db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37935495edc417… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 9 15:05:28 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0784, #0785, #0786, #0787, #0788, #0789, #0798, #0800, #0804, #0806, #0679, #0808, #0810, #0812, #0882, #0817, #0818, #0821, #0438, #0706, #0709, #0715, #0594, #0725, #0726, #0868, #0741, #0871, #0873, #0874, #0879, #0752, #0881, #0626, #0627, #0757, #0759, #0760, #0763, #0765

by Mathias Kettner

11 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2013