Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: WATO: Make sure tag ids are unique

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bea52dbae57f6e7fa3738853fb2da1dbfccff0b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bea52dbae57f6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 09:31:39 2011 +0100 WATO: Make sure tag ids are unique --- .bugs/479 | 7 +++++-- .bugs/480 | 7 +++++-- web/htdocs/wato.py | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.bugs/479 b/.bugs/479 index ba51093..4ee00a5 100644 --- a/.bugs/479 +++ b/.bugs/479 @@ -1,11 +1,14 @@ Title: Host tags reorder works only partially Component: wato +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-12-06 12:11:21 Targetversion: 1.2.0 -Class: bug Changing the order of host tags in WATO does not work with the down arrow on the first tag group. + +2011-12-16 09:28:03: changed state open -> done +Already fixed. diff --git a/.bugs/480 b/.bugs/480 index 1f1c46d..da1895a 100644 --- a/.bugs/480 +++ b/.bugs/480 @@ -1,11 +1,14 @@ Title: Check for duplicate host tags values Component: wato +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-12-06 12:18:18 Targetversion: 1.2.0 -Class: bug When editing host tags make sure that within one tag group each tag is unique. + +2011-12-16 09:31:23: changed state open -> done +Is now checked. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 55a4a1b..10bc735 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8130,6 +8130,10 @@ def mode_edit_hosttag(phase): if have_none_tag: raise MKUserError("id_%d" % nr, _("Only on tag may be empty.")) have_none_tag = True + # Make sure tag ID is unique within this group + if id in [ x[0] for x in new_choices ]: + raise MKUserError("id_%d" % nr, _("Tags IDs must be unique. You've used <b>%s</b> twice.") % id) + new_choices.append((id, descr)) if id: # Make sure this ID is not used elsewhere

12 years, 9 months

Check_MK Git: check_mk: Repair layout of Perf-O-Meter in single dataset layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 58b91ab4ff1a40632f34e6ad54ef68d580b70b09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58b91ab4ff1a40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 09:26:22 2011 +0100 Repair layout of Perf-O-Meter in single dataset layout --- .bugs/493 | 7 +++++-- ChangeLog | 1 + web/htdocs/status.css | 15 +++++++++------ web/htdocs/views.css | 31 ++++++++++++++++++++++++------- web/plugins/views/builtin.py | 1 + web/plugins/views/layouts.py | 10 +++++++--- 6 files changed, 47 insertions(+), 18 deletions(-) diff --git a/.bugs/493 b/.bugs/493 index 9a418a6..13baa49 100644 --- a/.bugs/493 +++ b/.bugs/493 @@ -1,10 +1,13 @@ Title: Repair Perf-O-Meter in single dataset view Component: multisite +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-12-13 16:47:27 Targetversion: 1.1.13i1 -Class: bug Should look like in table view. + +2011-12-16 09:25:56: changed state open -> done +Looks good now. diff --git a/ChangeLog b/ChangeLog index bf300e7..31488f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * New (hidden) button for reloading a snapin (left to the close button) * Automatically falling back to hardcoded default language if configured language is not available + * Repair layout of Perf-O-Meter in single dataset layout BI: * Host/Service elements are now iterable via FOREACH_HOST, e.g. diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 09ed6b8..6469c1d 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -136,8 +136,8 @@ b.stmark { } /* Performeter styling */ -td.perfometer { - padding: 1px 1px 1px 0px; +table.data tr.data td.perfometer { + padding: 1px 2px 2px 1px; width: 120px; height: 22px; vertical-align: middle; @@ -147,7 +147,7 @@ td.perfometer div.content { position: relative; top: 0px; left: 1px; - width: 119px; + width: 120px; height: 0px; float: left; z-index: 20; @@ -169,7 +169,7 @@ td.perfometer img.glass { position: relative; top: 1px; left: 2px; - width: 118px; + width: 120px; height: 22px; margin-bottom: 1px; z-index: 30; @@ -177,13 +177,13 @@ td.perfometer img.glass { td.perfometer table { - width: 120px; + width: 100%; height: 22px; border-spacing: 0px; padding: 0; margin: 0; border: 1px solid #aaa; - height: 100%; + height: 24px; } table.data td.perfometer td.inner { @@ -224,6 +224,9 @@ tr.even2 { background-color: #faa; } tr.odd3 { background-color: #fda; } tr.even3 { background-color: #fea; } +/* Row headers in single dataset layout */ + + /*-------------------------------------------------------------------------. | ____ _ _ | | | _ \ __ _(_)_ __ | |_ ___ _ __ ___ | diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 56dc248..27ce157 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -253,30 +253,32 @@ table.tiled td { about a single host/service on a page. e.g. the "host defails" page uses thislayout */ -table.dataset { +table.data.single { + margin-top: 5px; border-spacing: 1px; padding: 0; border-collapse: collapse; empty-cells: show; - width: 100%; + width: 200px; + box-shadow: 1px 1px 3px #000000; } -table.dataset tr.data { +table.data.single tr.data { background-color: #eee; } -table.dataset tr.gap { +table.data.single tr.gap { background-color: transparent; } -table.dataset td { +table.data.single td { padding-bottom: 4px; padding: 1px 10px 5px 10px; text-align: left; vertical-align: middle; border: 1px solid #bbb; } -table.dataset td.left { +table.data.single td.left { padding-right: 10px; color: #fff; background-color: #888; @@ -284,11 +286,26 @@ table.dataset td.left { white-space: nowrap; vertical-align: top; } -table.dataset td.gap { +table.data.single td.gap { background-color: transparent; border-left-style: none; border-right-style: none; } +table.data.single td.age, +table.data.single td.number, +table.data.single td.count { + text-align: left; +} + +table.data.single td.perfometer div.content { + width: 100%; +} +table.data.single td.perfometer img.glass { + width: 100%; +} +table.data.single td.perfometer div.title { + width: 100%; +} /*-------------------------------------------------------------------------. | _____ _ _ _ _ | diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 63dabe5..d244785 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1048,6 +1048,7 @@ multisite_builtin_views.update({ ('svc_plugin_output', None), ('svc_long_plugin_output', None), ('svc_perf_data', None), + ('perfometer', None), ('svc_check_command', None), ('svc_attempt', None), ('svc_check_type', None), diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 064165e..ead5f49 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -67,8 +67,10 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig for row in rows: register_events(row) # needed for playing sounds - html.write('<div class="tableshadow left"><table class=dataset>\n') + # html.write('<div class="tableshadow left">\n') + html.write('<table class="data single">\n') rownum = 0 + odd = "odd" while rownum < len(rows): if rownum > 0: html.write("<tr class=gap><td class=gap colspan=%d></td></tr>\n" % (1 + num_columns)) @@ -80,7 +82,8 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig else: title = painter["title"] - html.write("<tr class=data>") + odd = odd == "odd" and "even" or "odd" + html.write('<tr class="data %s0">' % odd) if view.get("column_headers") != "off": html.write("<td class=left>%s</td>" % title) for row in thispart: @@ -89,7 +92,8 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig html.write("<td class=gap style=\"border-style: none;\" colspan=%d></td>" % (1 + num_columns - len(thispart))) html.write("</tr>\n") rownum += num_columns - html.write("</table></div>\n") + html.write("</table>\n") + html.write("</div>\n") multisite_layouts["dataset"] = { "title" : _("Single dataset"),

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0494

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96d66721c56b5fcef16bce2afd9032e4d87e8125 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96d66721c56b5f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 08:36:41 2011 +0100 Updated bug entries #0494 --- .bugs/494 | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/494 b/.bugs/494 index 0b8bc40..a81cecc 100644 --- a/.bugs/494 +++ b/.bugs/494 @@ -1,11 +1,13 @@ Title: Single dataset layout does not honor column-headers-off Component: multisite +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-12-13 16:47:59 Targetversion: 1.1.13i1 -Class: bug If you switch off column headers in a single dataset view, the headers do not vanish. + +2011-12-16 08:36:31: changed state open -> done

12 years, 9 months

Check_MK Git: check_mk: FIX: single dataset layout honors column header settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 67872ab8d7807566106a79ab3d11210f6b09e90d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67872ab8d78075… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 08:37:03 2011 +0100 FIX: single dataset layout honors column header settings --- ChangeLog | 1 + web/plugins/views/layouts.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a514bc..bf300e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ * FIX: fix dashboard dashlet background on IE * FIX: fix row highlight in status GUI on IE 7/8 * FIX: fix row highlight after status page reload + * FIX: single dataset layout honors column header settings Checks & Agents: * FIX: lnx_if: assume interfaces as up if ethtool is missing or diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 3fd6b63..064165e 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -80,7 +80,9 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig else: title = painter["title"] - html.write("<tr class=data><td class=left>%s</td>" % title) + html.write("<tr class=data>") + if view.get("column_headers") != "off": + html.write("<td class=left>%s</td>" % title) for row in thispart: paint(p, row) if len(thispart) < num_columns:

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: 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

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011