Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: da16bcf879ba1a734b5e3bf835cb0022d8239742 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da16bcf879ba1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 17:47:57 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: login form: Added internal helper code

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 36449fbefc8aeeac757a75e065096fc72e1210a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36449fbefc8aee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 17:47:52 2011 +0100 login form: Added internal helper code --- web/htdocs/login.py | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index c87a5a4..c476d28 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -32,8 +32,17 @@ import os, md5, md5crypt, crypt, time class MKAuthException(MKGeneralException): pass -def site_cookie_name(): - name = os.path.dirname(defaults.url_prefix).replace('/', '_') +def site_cookie_name(site_id = None): + if not site_id: + url_prefix = defaults.url_prefix + else: + url_prefix = config.site(site_id)['url_prefix'] + + # Strip of eventual present "http://<host>". DIRTY! + if url_prefix.startswith('http:'): + url_prefix = url_prefix[url_prefix[7:].find('/') + 7:] + + name = os.path.dirname(url_prefix).replace('/', '_') return 'auth%s' % name # Validate hashes taken from the htpasswd file. This method handles @@ -81,11 +90,15 @@ def del_auth_cookie(): if html.has_cookie(name): html.del_cookie(name) -def set_auth_cookie(username, pwhash): +def auth_cookie_value(username, pwhash): now = str(time.time()) - html.set_cookie(site_cookie_name(), username - + ':' + now - + ':' + generate_hash(username, now, pwhash)) + return username + ':' + now + ':' + generate_hash(username, now, pwhash) + +def set_auth_cookie(username, pwhash): + html.set_cookie(site_cookie_name(), auth_cookie_value(username, pwhash)) + +def get_cookie_value(): + return auth_cookie_value(config.user_id, load_htpasswd()[config.user_id]) def check_auth_cookie(cookie_name): username, issue_time, cookie_hash = html.cookie(cookie_name, '::').split(':', 2)

12 years, 9 months

Check_MK Git: check_mk: printer_alerts: added further state codes ( thanks to Matthew Stew)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6703c36ab91d3581f64df555d03bfb278f16cb51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6703c36ab91d35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 17:11:57 2011 +0100 printer_alerts: added further state codes (thanks to Matthew Stew) --- ChangeLog | 1 + checks/printer_alerts | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a26808f..3a514bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,7 @@ * heartbeat_crm: apply patches from Václav Ovsík, so that the check should work on Debian now. * fsc_*: added missing scan functions + * printer_alerts: added further state codes (thanks to Matthew Stew) 1.1.12p5: Multisite: diff --git a/checks/printer_alerts b/checks/printer_alerts index 0d31e78..9c86234 100644 --- a/checks/printer_alerts +++ b/checks/printer_alerts @@ -62,11 +62,11 @@ printer_alerts_group_map = { printer_alerts_state_map = { 2: [ 8, 1101, 1102, 1112, 1114, 1115 ], - 1: [ 1104 ], - 0: [ 4, 6, 7, 19, 20, 23, 24, 25, 27, 35, 36, 37, 38, - 502, 503, 504, 505, 506, 507, 802, 803, 804, 805, - 806, 807, 808, 809, 810, 1001, 1002, 1005, 1106, - 1107, 1108, 1111, 1113, 1302, 1304, 1501, 1502, + 1: [ 2, 9, 12, 13, 801, 1104 ], + 0: [ 1, 4, 6, 7, 19, 20, 22, 23, 24, 25, 27, 35, 36, 37, 38, + 502, 503, 504, 505, 506, 507, 802, 803, 804, 805, + 806, 807, 808, 809, 810, 1001, 1002, 1005, 1106, + 1107, 1108, 1111, 1113, 1302, 1304, 1501, 1502, 1503, 1504, 1505, 1506, 1509 ], }

12 years, 9 months

Check_MK Git: check_mk: Fixed creation of RPM file

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd621de6caba77c8cc5115dd8b9650e624be7936 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd621de6caba77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 17:03:58 2011 +0100 Fixed creation of RPM file --- check_mk.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/check_mk.spec b/check_mk.spec index 0aa4de6..989884d 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -158,7 +158,7 @@ rm -rf $RPM_BUILD_ROOT # Spaeter Subpaket draus machen /usr/bin/unixcat /usr/lib/check_mk/livestatus.o - +/usr/lib/check_mk/livecheck %files agent %config(noreplace) /etc/xinetd.d/check_mk

12 years, 9 months

Check_MK Git: check_mk: fsc_*: added missing scan functions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7c4c317b72de7612259c140a63694461acb01dc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c4c317b72de76… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 17:03:36 2011 +0100 fsc_*: added missing scan functions --- ChangeLog | 1 + checks/fsc_fans | 2 ++ checks/fsc_subsystems | 2 ++ checks/fsc_temp | 2 ++ 4 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7045d1a..a26808f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ * fileinfo: new check for monitoring age and size of files * heartbeat_crm: apply patches from Václav Ovsík, so that the check should work on Debian now. + * fsc_*: added missing scan functions 1.1.12p5: Multisite: diff --git a/checks/fsc_fans b/checks/fsc_fans index d0f7a2b..3812117 100644 --- a/checks/fsc_fans +++ b/checks/fsc_fans @@ -48,3 +48,5 @@ def check_fsc_fans(item, params, info): check_info['fsc_fans'] = (check_fsc_fans, "FSC %s", 1, inventory_fsc_fans) snmp_info['fsc_fans'] = ( ".1.3.6.1.4.1.231.2.10.2.2.5.2.2.1", [ 16, 8 ]) # , 9, 10 ] ) +snmp_scan_functions['fsc_fans'] = lambda oid: \ + oid(".1.3.6.1.4.1.231.2.10.2.1.1.0") diff --git a/checks/fsc_subsystems b/checks/fsc_subsystems index d8527f9..81d7c6d 100644 --- a/checks/fsc_subsystems +++ b/checks/fsc_subsystems @@ -46,3 +46,5 @@ def check_fsc_subsystems(item, params, info): check_info['fsc_subsystems'] = (check_fsc_subsystems, "FSC %s", 0, inventory_fsc_subsystems) snmp_info['fsc_subsystems'] = ( ".1.3.6.1.4.1.231.2.10.2.11.3.1.1", [ 2, 3 ]) +snmp_scan_functions['fsc_subsystems'] = lambda oid: \ + oid(".1.3.6.1.4.1.231.2.10.2.1.1.0") diff --git a/checks/fsc_temp b/checks/fsc_temp index 789cacb..de376a4 100644 --- a/checks/fsc_temp +++ b/checks/fsc_temp @@ -48,3 +48,5 @@ def check_fsc_temp(item, no_params, info): check_info['fsc_temp'] = (check_fsc_temp, "Temperature %s", 1, inventory_fsc_temp) snmp_info['fsc_temp'] = ( ".1.3.6.1.4.1.231.2.10.2.2.5.2.1.1", [ 13, 11, 6, 8 ] ) +snmp_scan_functions['fsc_temp'] = lambda oid: \ + oid(".1.3.6.1.4.1.231.2.10.2.1.1.0")

12 years, 9 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2e0b965050bbc4ae58658dcc21466cad02d468f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e0b965050bbc4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 17:04:01 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 62ecc1e9a6c3a8b8574a920e7553c691de976ded URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62ecc1e9a6c3a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 16:05:16 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0401, #0436

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 38fc0d2271296c9e6ccfc146213a810d9c809e82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38fc0d2271296c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 16:00:02 2011 +0100 Updated bug entries #0401, #0436 --- .bugs/401 | 7 +++++-- .bugs/436 | 10 ++++++++-- .bugs/config | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.bugs/401 b/.bugs/401 index 37ecb08..c751e75 100644 --- a/.bugs/401 +++ b/.bugs/401 @@ -1,12 +1,15 @@ Title: IE8: Hiliting of rows in checkbox mode is broken Component: multisite +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-10-27 18:51:44 Targetversion: 1.1.12 -Class: bug When in a view in Checkbox mode hovering over the rows should hilite those rows. In IE8 this does not work. The red background of the CRIT is destroyed, too. + +2011-12-15 15:12:05: changed state open -> done +Has just been fixed. diff --git a/.bugs/436 b/.bugs/436 index f3813c4..3e65aac 100644 --- a/.bugs/436 +++ b/.bugs/436 @@ -1,11 +1,11 @@ Title: sounds/ URL create Popup on Windows 7 Component: multisite +State: worksforme +Class: bug Benefit: 1 -State: open Cost: 2 Date: 2011-11-15 09:09:22 Targetversion: 1.1.12 -Class: bug In Windows 7 when you Multisite plays a sound file (e.g. due to a problem shown in the dashboard), a HTTP @@ -13,3 +13,9 @@ auth window pops up. The reason seems to be that the sounds URL is excluded from Auth via the apache config of Multisite. IE seems to think that it can log out. + +2011-12-15 15:59:59: changed state open -> worksforme +I can not reproduce this using Windows 7 + IE9. The problem may be strongly related +to the handler for the wav files. I had quicktime installed which could not play +these files. Then I uninstalled quicktime. After that the IE used the windows media +player to play the wav files and this worked with the current apache config / code. diff --git a/.bugs/config b/.bugs/config index 9f9c59d..0425a80 100644 --- a/.bugs/config +++ b/.bugs/config @@ -3,6 +3,7 @@ states = { "done" : tty_green, "closed" : tty_normal, "wontfix" : tty_magenta, + "worksforme" : tty_white, "discuss" : tty_red, }

12 years, 9 months

Check_MK Git: check_mk: gb: Added works4me solution

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d275a5768918322d6e8995aa5cbb665741bf503a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d275a576891832… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 16:05:05 2011 +0100 gb: Added works4me solution --- .bugs/436 | 2 +- .bugs/config | 2 +- gb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.bugs/436 b/.bugs/436 index 3e65aac..413c530 100644 --- a/.bugs/436 +++ b/.bugs/436 @@ -1,6 +1,6 @@ Title: sounds/ URL create Popup on Windows 7 Component: multisite -State: worksforme +State: works4me Class: bug Benefit: 1 Cost: 2 diff --git a/.bugs/config b/.bugs/config index 0425a80..9bbb6eb 100644 --- a/.bugs/config +++ b/.bugs/config @@ -3,7 +3,7 @@ states = { "done" : tty_green, "closed" : tty_normal, "wontfix" : tty_magenta, - "worksforme" : tty_white, + "works4me" : tty_white, "discuss" : tty_red, } diff --git a/gb b/gb index 2ca5703..aca9782 100755 --- a/gb +++ b/gb @@ -180,7 +180,7 @@ where COMMAND is one of: def bug_state(bug): state = bug["state"] - return "%s%-7s%s" % (tty_bold + states.get(state, ""), state, tty_normal) + return "%s%-8s%s" % (tty_bold + states.get(state, ""), state, tty_normal) def num_color(n, colors, inverse): if inverse: @@ -196,9 +196,9 @@ def list_bug(bug): bold = tty_bold + tty_cyan + "(*) " else: bold = "" - sys.stdout.write("#%04d %-6s %-9s %-10s %s%-6s%s %s%-60s%s\n" % + sys.stdout.write("#%04d %-8s %-9s %-10s %s%-6s%s %s%-60s%s\n" % (int(bug["id"]), - bug_state(bug), + bug_state(bug), bug["class"], bug["component"], tty_bold, bug["targetversion"], tty_normal, bold, bug["title"], tty_normal))

12 years, 9 months

Check_MK Git: check_mk: fix error in setup.sh

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e4a90961fb93980e0e01af67ed65a4ba9be2d88d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4a90961fb9398… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 15:13:57 2011 +0100 fix error in setup.sh --- scripts/setup.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index f021b63..62589ba 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -543,7 +543,7 @@ EOF make -j 8 2>&1 && strip src/livestatus.o && mkdir -p $DESTDIR$libdir && - install -m 755 src/livecheck src/livestatus.o $DESTDIR$libdir/livestatus.o && + install -m 755 src/livecheck src/livestatus.o $DESTDIR$libdir && mkdir -p $DESTDIR$bindir && install -m 755 src/unixcat $DESTDIR$bindir && popd

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits