Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: solaris_multipath: Fixed indentation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e3643d1d68e2e0b8bb8e1bc11af5a5399b3d35c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3643d1d68e2e0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jun 25 14:04:17 2012 +0200 solaris_multipath: Fixed indentation --- checks/solaris_multipath | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/solaris_multipath b/checks/solaris_multipath index a23f737..b41cef8 100644 --- a/checks/solaris_multipath +++ b/checks/solaris_multipath @@ -38,7 +38,7 @@ def check_solaris_multipath(item, params, info): else: return(1, "WARN - only %d/%d paths up" % (ok, total)) - return(2, "UKN - Path not found") + return(2, "UKN - Path not found") check_info["solaris_multipath"] = { "check_function" : check_solaris_multipath,

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0778

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 267125ffd67fd3837233c2a0007548954ab295b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=267125ffd67fd3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 25 13:06:22 2012 +0200 Updated bug entries #0778 --- .bugs/778 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/778 b/.bugs/778 new file mode 100644 index 0000000..7cd0e9c --- /dev/null +++ b/.bugs/778 @@ -0,0 +1,10 @@ +Title: Button "Remove all" Downtimes not working +Component: multisite +State: open +Date: 2012-06-25 13:04:59 +Targetversion: 1.2.0 +Class: bug + +In the Multisite views of hosts and services one cannot remove +downtimes. The button is there, seems to work, but the downtimes +are not being removed.

12 years, 3 months

Check_MK Git: check_mk: ValueSpec AbsoluteDate: allow label

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5731ee08bffde0ebe6854933c730321a77c22fed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5731ee08bffde0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 24 11:35:10 2012 +0200 ValueSpec AbsoluteDate: allow label --- web/htdocs/valuespec.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index b577ff7..be1d031 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1217,6 +1217,7 @@ class AbsoluteDate(ValueSpec): ValueSpec.__init__(self, **kwargs) self._default_value = today() self._show_titles = kwargs.get("show_titles", True) + self._label = kwargs.get("label") def canonical_value(self): return self._default_value @@ -1226,6 +1227,9 @@ class AbsoluteDate(ValueSpec): return lt.tm_year, lt.tm_mon, lt.tm_mday def render_input(self, varprefix, value): + if self._label: + html.write("%s " % self._label) + html.write('<table class=vs_date>') if self._show_titles: html.write('<tr><th>%s</th><th>%s</th><th>%s</th></tr>' % (

12 years, 3 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: 8e2bec1f1f75031bf8c244a97126f59cc5ff6999 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e2bec1f1f7503… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 24 11:09:52 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: forms.edit_dictionary: use new form layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b0d189c7e1c93d595245568d6e3662419dde3de4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0d189c7e1c93d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 24 11:09:49 2012 +0200 forms.edit_dictionary: use new form layout --- web/htdocs/forms.py | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 677dc05..3e96ff1 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -41,7 +41,7 @@ def get_input(valuespec, varprefix): return value -def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, buttontext = None): +def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, buttontext = None, title = None): new_value = value.copy() if html.var("filled_in") == "form" and html.check_transaction(): messages = [] @@ -67,17 +67,11 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, return new_value html.begin_form("form") - html.write("<table class=form>\n") + header(title and title or _("Properties")) first = True for name, vs in entries: - - html.write("<tr><td ") - if vs.help() and hover_help: - html.write('title="%s" ' % vs.help().replace('"', """)) - html.write("class=legend>%s" % (vs.title() or "")) - if vs.help() and not hover_help: - html.write("<br><i>%s</i>" % vs.help()) - html.write("</td><td class=content>") + section(vs.title()) + html.help(vs.help()) if name in value: v = value[name] else: @@ -86,12 +80,11 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, if (not focus and first) or (name == focus): vs.set_focus(name) first = False - html.write("<tr><td class=buttons colspan=2>") + + end() if buttontext == None: buttontext = _("Save") html.button("save", buttontext) - html.write("</td></tr>\n") - html.write("</table>\n") html.hidden_fields() html.end_form()

12 years, 3 months

Check_MK Git: check_mk: ValueSpec AbsoluteDate: option to omit titles

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d05bee92c3c142bf36fd88275cb64982429a3205 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d05bee92c3c142… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 24 11:09:29 2012 +0200 ValueSpec AbsoluteDate: option to omit titles --- web/htdocs/valuespec.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index b516e98..b577ff7 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1216,6 +1216,7 @@ class AbsoluteDate(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._default_value = today() + self._show_titles = kwargs.get("show_titles", True) def canonical_value(self): return self._default_value @@ -1226,8 +1227,9 @@ class AbsoluteDate(ValueSpec): def render_input(self, varprefix, value): html.write('<table class=vs_date>') - html.write('<tr><th>%s</th><th>%s</th><th>%s</th></tr>' % ( - _("Year"), _("Month"), _("Day"))) + if self._show_titles: + html.write('<tr><th>%s</th><th>%s</th><th>%s</th></tr>' % ( + _("Year"), _("Month"), _("Day"))) html.write('<tr><td>') year, month, day = self.split_date(value) html.number_input(varprefix + "_year", year, size=4)

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 543a69b524a2688d9f0236801b1445c2f4101b99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=543a69b524a268… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 22 19:46:30 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Check wut_webio_io: Fixed and tuned SNMP scan function to correctly detect the W&T Web-IO. Rewrite inner workings to look much nicer.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f7e482b3983f7344bd9acc7b22d684ee7db8274a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7e482b3983f73… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 22 19:41:12 2012 +0200 Check wut_webio_io: Fixed and tuned SNMP scan function to correctly detect the W&T Web-IO. Rewrite inner workings to look much nicer. --- checks/wut_webio_io | 62 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 45 insertions(+), 17 deletions(-) diff --git a/checks/wut_webio_io b/checks/wut_webio_io index 5668dfc..a4a166d 100644 --- a/checks/wut_webio_io +++ b/checks/wut_webio_io @@ -8,31 +8,54 @@ webio_state_names = { } -def parse_webio_io_inputs(inputdesc): - if inputdesc.startswith("Input"): - inputdesc = inputdesc.split(" ")[1] - return inputdesc +# Parser for the snmp data, hands back a dict with fugded +# item name and the state of all ports. +def parse_webio_io_inputs(info): + wut_info = {} + for line in info: + input_index, input_desc, state = line + state = int(state) + # fix the port index. it is off by one. + input_index = str(int(input_index) - 1) + # Do padding with 0, this means we need to handle it as "str" + # tbh, there is a way in if.include but it is beyond me how that works. + if len(input_index) < 2: + input_index = "0" + input_index + + if input_desc.startswith("Input"): + input_desc = input_index + else: + input_desc = input_index + " " + input_desc + wut_info.update({ input_index : (input_desc, state) }) + + return wut_info def inventory_wut_webio_io_inputs(info): inventory = [] - for line in info: - inputdesc, state = line - inventory.append((parse_webio_io_inputs(inputdesc), int(state))) + wut_info = parse_webio_io_inputs(info) + # inventorize the err, things. + for index in wut_info.keys(): + inventory.append((wut_info[index][0], wut_info[index][1])) return inventory def check_wut_webio_io_inputs(item, params, info): - for line in info: - inputdesc, state = line - if parse_webio_io_inputs(inputdesc) == item: - state = saveint(state) + wut_info = parse_webio_io_inputs(info) + for index in wut_info.keys(): + descr = wut_info[index][0] + if wut_info[index][0] == item: + oldstate = params + state = wut_info[index][1] + + # Compare to the last state of the IO port. if state != params: - return (2, "CRITICAL - state should be %s but is %s (!!)" % (webio_state_names[params], webio_state_names[state])) + return (2, "CRITICAL - state should be %s but is %s (!!)" % ( + webio_state_names[params], + webio_state_names[state])) else: return (0, "OK - state is %s" % webio_state_names[state]) - return (3, "UNKNOWN - Check not implemented") return (3, "UNKNOWN - Item not found in agent output") @@ -40,12 +63,17 @@ def check_wut_webio_io_inputs(item, params, info): check_info['wut_webio_io.inputs'] = { "check_function" : check_wut_webio_io_inputs, "inventory_function" : inventory_wut_webio_io_inputs, - "service_description": "IO INPUT %s", + "service_description": "INPUT %s", "has_perfdata" : False, # "group" : "", # "default_levels_variable" : "services_default_levels", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.5040.1.2.4.3.3.5").lower().startswith("web-io"), + # first check we have a vendor mib from W&T, then check for the model in their MIB. + "snmp_scan_function" : lambda oid: \ + ".1.3.6.1.4.1.5040" in oid("1.3.6.1.2.1.1.2.0") and + oid(".1.3.6.1.4.1.5040.1.2.4.3.3.5.0").lower().startswith("web-io"), "snmp_info" : (".1.3.6.1.4.1.5040.1.2.4", [ - "3.2.1.1.1", - "1.3.1.4", ]), + "3.1.5.2.1.1", # io port index. (bugged) + "3.2.1.1.1", # user defined description. + "1.3.1.4", # the low/high state. + ]), }

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f784d4f37795fcd999e8cf0ea489922ff01e1a57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f784d4f37795fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 22 15:07:40 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Improved handling of mssql server instances

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b704f4c2fa515dbb1c551874ee344abd7fe0b406 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b704f4c2fa515d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 22 15:07:36 2012 +0200 Improved handling of mssql server instances --- agents/windows/plugins/mssql.vbs | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index f90261d..c2dc35c 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -61,7 +61,11 @@ CONN.Properties("Integrated Security").Value = "SSPI" ' Loop all found server instances and connect to them ' In my tests only the connect using the "named instance" string worked For Each instId In instIds.Keys - instName = Split(instId, "_")(1) + If InStr(instId, "_") <> 0 Then + instName = Split(instId, "_")(1) + Else + instName = instId + End If CONN.Properties("Data Source").Value = hostname & "\" & instName CONN.Open

12 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012