Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

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: 9d67fdac04942f83093d778f11a03cb9ed3397b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d67fdac04942f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 24 20:18:56 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: WATO: fixed bug in host validation. crashed on creating a new

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7e66e16d348fe411db1a07a31ff331a10b4f6c17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e66e16d348fe4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 24 20:15:39 2012 +0100 WATO: fixed bug in host validation. crashed on creating a new host when a validate-host hook was registered --- web/htdocs/wato.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0bb819f..2c06b50 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1745,11 +1745,13 @@ def mode_edithost(phase, new): return go_to_services and "inventory" or "folder" else: + # Show outcome of host validation. Do not validate new hosts + errors = None if new: render_folder_path() + else: + errors = validate_host(host) - # Show outcome of host validation - errors = validate_host(host) if errors: html.write("<div class=info>") html.write('<table class=validationerror border=0 cellspacing=0 cellpadding=0><tr><td class=img>')

12 years, 5 months

Check_MK Git: check_mk: Add: Megaraid_pdisks now supports multiple controllers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a5abb820085ae1765ac90be01e93fc9e3e0d463b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5abb820085ae1… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jan 24 15:48:39 2012 +0100 Add: Megaraid_pdisks now supports multiple controllers --- agents/check_mk_agent.linux | 5 ++- checks/megaraid_pdisks | 73 +++++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 35 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 649d6fc..916bcee 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -269,12 +269,13 @@ fi if which MegaCli >/dev/null ; then echo '<<<megaraid_pdisks>>>' for part in $(MegaCli -EncInfo -aALL -NoLog < /dev/null \ - | sed -rn 's/:/ /g; s/[[:space:]]+/ /g; s/^ //; s/ $//; /^(Enclosure|Device ID) [0-9]+$/ p'); do + | sed -rn 's/:/ /g; s/[[:space:]]+/ /g; s/^ //; s/ $//; s/Number of enclosures on adapter ([0-9]+).*/adapter \1/g; /^(Enclosure|Device ID|adapter) [0-9]+$/ p'); do + [ $part = adapter ] && echo "" [ $part = 'Enclosure' ] && echo -ne "\ndev2enc" echo -n " $part" done echo - MegaCli -PDList -aALL -NoLog < /dev/null | egrep 'Enclosure|Raw Size|Slot Number|Device Id|Firmware state|Inquiry' + MegaCli -PDList -aALL -NoLog < /dev/null | egrep 'Enclosure|Raw Size|Slot Number|Device Id|Firmware state|Inquiry|Adapter' echo '<<<megaraid_ldisks>>>' MegaCli -LDInfo -Lall -aALL -NoLog < /dev/null | egrep 'Size|State|Number|Adapter|Virtual' echo '<<<megaraid_bbu>>>' diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index 74b52b7..be14bf8 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -46,46 +46,53 @@ # # On new inventory runs the enclosure number is used as # index and item part. +megaraid_pdisks_legacy_mode = False +megaraid_pdisks_adapterstr = ['e','f','g','h','i','j','k','l'] -def inventory_megaraid_pdisks(info): - inventory = [] - dev2enc = {} - for line in info: - if line[0] == "dev2enc": - dev2enc[line[5]] = 'e'+line[2] +def megaraid_pdisks_parse(info): + adapters = { 0: {} } + current_adapter = adapters[0] + return_var = [] + adapter = 0 + for line in info: + if line[0] == 'adapter': + current_adapter = {} + adapters[int(line[1])] = current_adapter + elif line[0] == 'dev2enc': + current_adapter[int(line[5])] = int(line[2]) + elif line[0] == 'Adapter' and len(line) == 2: + current_adapter = adapters[int(line[1][1:])] # Raute weglassen + adapter = int(line[1][1:]) elif line[0] == "Enclosure" and line[1] == "Device": - enclosure = dev2enc.get(line[-1], line[-1]) + enclosure_devid = int(line[-1]) elif line[0] == "Slot": slot = int(line[-1]) elif line[0] == "Firmware" and line[1] == "state:": - inventory.append(( "%s/%d" % (enclosure, slot), "", repr(line[2]) )) + state = line[2] + elif line[0] == "Inquiry" and line[1] == "Data:": + name = " ".join(line[2:]) + #Adapter, Enclosure, Encolsure Device ID, Slot, State, Name + return_var.append((megaraid_pdisks_adapterstr[adapter], adapters[adapter][enclosure_devid], enclosure_devid, slot, state, name)) + return return_var + + +def inventory_megaraid_pdisks(info): + + info = megaraid_pdisks_parse(info) + inventory = [] + for adapter, enclosure, enc_dev_id, slot, state, name in info: + inventory.append(("%s%s/%s" % (adapter,enclosure ,slot) ,"",repr(state))) return inventory def check_megaraid_pdisks(item, target_state, info): - # item is "$ENCLOSURE/$SLOT" - # param is the target state - dev2enc = {} - found = None - for line in info: - if line[0] == "dev2enc": - dev2enc[line[5]] = 'e'+line[2] - elif line[0] == "Enclosure" and line[1] == "Device": - if item.startswith('e') and line[-1] in dev2enc: - enclosure = dev2enc[line[-1]] - else: - enclosure = line[-1] - elif line[0] == "Slot": - slot = int(line[-1]) - found = "%s/%d" % (enclosure, slot) == item - elif found and line[0] == "Firmware" and line[1] == "state:": - state = line[2] - elif found and line[0] == "Inquiry" and line[1] == "Data:": - name = " ".join(line[2:]) - infotext = " - %s (%s)" % (state, name) - if state == target_state: - return (0, "OK" + infotext) - else: - return (2, "CRIT" + infotext) + info = megaraid_pdisks_parse(info) + for adapter, enclosure, enc_dev_id, slot, state, name in info: + if "%s%s/%s" % (adapter,enclosure, slot) == item: + infotext = " - %s (%s)" % (state, name) + if state == target_state: + return (0, "OK" + infotext) + else: + return (2, "CRIT" + infotext) return (3, "UNKNOWN - No disk in encl/slot %s found" % item) -check_info['megaraid_pdisks'] = (check_megaraid_pdisks, "RAID PDisk Enc/Sl %s", 1, inventory_megaraid_pdisks) +check_info['megaraid_pdisks'] = (check_megaraid_pdisks, "RAID PDisk Adapt/Enc/Sl %s", 1, inventory_megaraid_pdisks)

12 years, 5 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: 7701471c165d6bdf40100ef952ab8c7741713f04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7701471c165d6b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jan 24 15:48:52 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 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: a8e6dc2a5354978f6cb8e12595151e306a60a3e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8e6dc2a535497… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 23 17:32:54 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0625

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6220a734267cb21017f09b14bb8ad585227061b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6220a734267cb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 23 17:19:52 2012 +0100 Updated bug entries #0625 --- .bugs/625 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/.bugs/625 b/.bugs/625 new file mode 100644 index 0000000..a7f8848 --- /dev/null +++ b/.bugs/625 @@ -0,0 +1,60 @@ +Title: OMD: Probleme im Shared-Mode +Component: wato +State: open +Date: 2012-01-23 17:19:31 +Targetversion: 1.2.0 +Class: bug + +Hallo Lars, + + + + wir haben noch ein Problem auf unserem SuSE10SP2 basierten + +System mit OMD festgestellt: wir konnten ueber die check_MK + +Web-Oberflaeche keine User/Roles anlegen oder modifizieren. + + + +Grund sind File-Permissions Probleme zwischen omd + +(user/group = "gt1" = site-name) und httpd + +(user=wwwrun, group=www). Wegen Einschraenkungen + +auf Suse10 wird ja der System-httpd genutzt und nicht ein + +eigener pro OMD Site. + + + +Betroffen sind mindestens die folgenden Files: + + +drwxr-xr-x 2 gt1 gt1 4096 2012-01-19 15:28 /omd/sites/gt1/etc/check_mk/multisite.d/ +-rw-r--r-- 1 gt1 gt1 69 2012-01-19 15:33 /omd/sites/gt1/etc/htpasswd + + +Ich habe mich jetzt mit "chmod 777/666" beholfen, aber das ist + +nicht schoen. Was ist das Konzept bei OMD fuer dieses Problem? + +Group-Write Acccess und dann ein chown wwwrun, also: + + + +drwxrwxr-x 2 wwwrun gt1 4096 2012-01-19 15:28 /omd/sites/gt1/etc/check_mk/multisite.d/ +-rw-rw-r-- 1 wwwrun gt1 69 2012-01-19 15:33 /omd/sites/gt1/etc/htpasswd + + + +Welche Files waeren noch betroffen? + + + +Danke fuer eine kurze Antwort. + +Gruesse, + +Andreas

12 years, 5 months

Check_MK Git: check_mk: MobileUI: Moved Logout button down

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c1f337d050a45920c130509bdb5d95096708cd11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1f337d050a459… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 23 15:01:54 2012 +0100 MobileUI: Moved Logout button down --- web/htdocs/mobile.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index a5345e5..647e2de 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -69,8 +69,8 @@ def mobile_html_head(title, ready_code=""): def mobile_html_foot(): html.write("</body></html>\n") -def jqm_header_button(url, title, icon=""): - html.write('<a href="%s" data-direction="reverse" data-icon="%s" data-iconpos="notext" title="%s" ></a>' % (url, icon, title )) +def jqm_header_button(pos, url, title, icon=""): + html.write('<a href="%s" class="ui-btn-%s" data-direction="reverse" data-icon="%s" data-iconpos="notext" title="%s" ></a>' % (url, pos, icon, title )) def jqm_page_header(title, id=None, left_button=None, right_button=None): idtxt = id and (' id="%s"' % id) or '' @@ -78,10 +78,10 @@ def jqm_page_header(title, id=None, left_button=None, right_button=None): '<div data-role="page"%s>\n' '<div data-role="header" data-position="fixed">\n' % idtxt) if left_button: - jqm_header_button(*left_button) + jqm_header_button("left", *left_button) html.write('<h1>%s</h1>\n' % title) if right_button: - jqm_header_button(*right_button) + jqm_header_button("right",*right_button) html.write('</div>') html.write('<div data-role="content">\n') @@ -178,7 +178,7 @@ def page_login(): def page_index(): title = "Check_MK Mobile" mobile_html_head(title) - jqm_page_header(title, left_button=("logout.py", "Logout", "delete"),right_button=("javascript:document.location.reload();", _("Reload"), "refresh"),id="data") + jqm_page_header(title, right_button=("javascript:document.location.reload();", _("Reload"), "refresh"),id="data") views.load_views() items = [] for view_name, view in html.available_views.items(): @@ -196,6 +196,10 @@ def page_index(): html.write('<ul data-role="listview" data-theme="b" data-inset="true">\n') html.write('<li><a data-ajax="false" data-transition="fade" href="%s">%s</a></li>\n' % ("index.py?mobile=", _("Classical web GUI"))) html.write('</ul>\n') + + html.write('<ul data-role="listview" data-theme="f" data-inset="true">\n') + html.write('<li><a data-ajax="false" data-transition="fade" href="%s">%s</a></li>\n' % ("logout.py", _("Logout"))) + html.write('</ul>\n') mobile_html_foot() def page_view():

12 years, 5 months

Check_MK Git: check_mk: MobileUI: Improved header length

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ebdc5ae5169b29930b2e07a28f915f39c17113fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebdc5ae5169b29… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 23 14:11:13 2012 +0100 MobileUI: Improved header length --- web/htdocs/mobile.css | 3 +++ web/htdocs/mobile.py | 4 ++-- web/plugins/views/mobile.py | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css index 4d87b2f..2668776 100644 --- a/web/htdocs/mobile.css +++ b/web/htdocs/mobile.css @@ -147,6 +147,9 @@ body.mobile table.data td.perfometer td.inner { height: 14px; } +.ui-header .ui-title, .ui-footer .ui-title { + margin: .6em 46px .8em; +} /*-------------------------------------------------------------------------. | ____ _ _ | diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 81f825d..a5345e5 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -70,7 +70,7 @@ def mobile_html_foot(): html.write("</body></html>\n") def jqm_header_button(url, title, icon=""): - html.write('<a href="%s" data-direction="reverse" data-icon="%s" title="%s" >%s</a>' % (url, icon, title, title )) + html.write('<a href="%s" data-direction="reverse" data-icon="%s" data-iconpos="notext" title="%s" ></a>' % (url, icon, title )) def jqm_page_header(title, id=None, left_button=None, right_button=None): idtxt = id and (' id="%s"' % id) or '' @@ -188,7 +188,7 @@ def page_index(): if not view.get("mustsearch"): count = views.show_view(view, only_count = True) count = '<span class="ui-li-count">%d</span>' % count - items.append((view.get("topic"), url, '%s %s' % (view["title"], count))) + items.append((view.get("topic"), url, '%s %s' % (view.get("linktitle", view["title"]), count))) jqm_page_index(_("Check_MK Mobile"), items) # Link to non-mobile GUI diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index 17075f5..4faf057 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -215,6 +215,7 @@ multisite_builtin_views.update({ ('stateage', False), ('svcdescr', False) ], + 'linktitle': _('Problems (unhandled)'), 'title': _('Problems (unhandled)'), 'topic': _('Services'), }), @@ -337,7 +338,7 @@ multisite_builtin_views.update({ 'show_filters': [], 'sorters': [], 'linktitle': _('Host status'), - 'title': _('Status of Host'), + 'title': '', }), # Search hosts

12 years, 5 months

Check_MK Git: check_mk: MobileUI: Fixed problems with Android Back Button

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 862687f0933bc5cc968be298f6660e05a0769f1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=862687f0933bc5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 23 11:20:32 2012 +0100 MobileUI: Fixed problems with Android Back Button --- web/htdocs/js/mobile.js | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/js/mobile.js b/web/htdocs/js/mobile.js index c74c53e..23639af 100644 --- a/web/htdocs/js/mobile.js +++ b/web/htdocs/js/mobile.js @@ -37,4 +37,6 @@ $(document).ready(function() { $(document).bind("mobileinit", function(){ $.mobile.ajaxEnabled = false; + $.mobile.hashListeningEnabled = false; + });

12 years, 5 months

Check_MK Git: check_mk: Mobile UI: Changed Link handling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b08c4f1760471e6e8f6c879e77a5c0c4cf4a166a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b08c4f1760471e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 23 11:00:19 2012 +0100 Mobile UI: Changed Link handling --- web/htdocs/js/mobile.js | 5 +++++ web/htdocs/mobile.py | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/mobile.js b/web/htdocs/js/mobile.js index 377e5f6..c74c53e 100644 --- a/web/htdocs/js/mobile.js +++ b/web/htdocs/js/mobile.js @@ -33,3 +33,8 @@ $(document).ready(function() { $("div.really").addClass("ui-shadow"); $("div.warning").addClass("ui-shadow"); }); + + +$(document).bind("mobileinit", function(){ + $.mobile.ajaxEnabled = false; +}); diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index a5bdfd2..81f825d 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -55,8 +55,8 @@ def mobile_html_head(title, ready_code=""): <link rel="stylesheet" type="text/css" href="status.css"> <link rel="stylesheet" type="text/css" href="mobile.css"> <script type='text/javascript' src='jquery/jquery-1.6.4.min.js'></script> - <script type='text/javascript' src='jquery/jquery.mobile-1.0.min.js'></script> <script type='text/javascript' src='js/mobile.js'></script> + <script type='text/javascript' src='jquery/jquery.mobile-1.0.min.js'></script> <script type='text/javascript' src='js/checkmk.js'></script> <script type='text/javascript'> $(document).ready(function() { %s });

12 years, 5 months

← Newer
1
...
8
9
10
11
12
13
14
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012