Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64357 discussions

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

Check_MK Git: check_mk: Removed unused include statements

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 09fc44c6eba0e49106d0823145a4965b649c5180 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09fc44c6eba0e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 22 14:57:50 2012 +0200 Removed unused include statements --- checks/mssql_counters | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/checks/mssql_counters b/checks/mssql_counters index 80e7e00..49f86d2 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -108,7 +108,6 @@ check_info['mssql_counters.cache_hits'] = { ['cache_hit_ratio', 'log_cache_hit_ratio', 'buffer_cache_hit_ratio'], True, True), 'service_description': "%s", 'has_perfdata': True, - 'includes': [ 'mssql.include' ], } # @@ -143,7 +142,6 @@ check_info['mssql_counters.transactions'] = { [ 'transactions/sec', 'write_transactions/sec', 'tracked_transactions/sec' ], False, False), 'service_description': "%s Transactions", 'has_perfdata': True, - 'includes': [ 'mssql.include' ], } # @@ -185,5 +183,4 @@ check_info['mssql_counters.file_sizes'] = { [ 'data_file(s)_size_(kb)', 'log_file(s)_size_(kb)', 'log_file(s)_used_size_(kb)' ], False, False), 'service_description': "%s File Sizes", 'has_perfdata': True, - 'includes': [ 'mssql.include' ], }

12 years, 3 months

Check_MK Git: check_mk: Fixed output of fileinfo check in case of unknown

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: db96081500c854dd93e88a5435b476b1748b070b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db96081500c854… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 22 14:01:37 2012 +0200 Fixed output of fileinfo check in case of unknown --- checks/fileinfo | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/fileinfo b/checks/fileinfo index 645b0d0..9fb3e57 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -81,7 +81,7 @@ def check_fileinfo(item, params, info): for line in info[1:]: if item == line[0]: if line[1] == "missing": - return (3, "File is missing") + return (3, "UNKNOWN - File is missing") state = 0 size = int(line[1]) age = reftime - int(line[2]) @@ -90,7 +90,7 @@ def check_fileinfo(item, params, info): ("size", size, get_filesize_human_readable), ("age", age, get_age_human_readable) ] if check_definition == False: - return (3, "File not found"); + return (3, "UNKNOWN - File not found") return fileinfo_check_function(check_definition, params) def check_fileinfogroups(item, params, info):

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: 23c31d78b7606fb6461771b01f0379af6a73ce34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23c31d78b7606f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 22 14:01:39 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a599b8595ce4f5fbfdc4c7501c4e82fb5fbb8c80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a599b8595ce4f5… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jun 19 12:04:55 2012 +0200 Add new bug entry --- .bugs/713 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/713 b/.bugs/713 new file mode 100644 index 0000000..1a0c403 --- /dev/null +++ b/.bugs/713 @@ -0,0 +1,9 @@ +Title: IE 9.0.8.112... 64bit doesnt autoadd textboxes (i.e. for parents on folder) +Component: wato +State: open +Date: 2012-06-19 12:03:32 +Targetversion: 1.2.0 +Class: bug + +IE 9 seems to have problems with auto-adding new textboxes once you filled one. +Same thing works on Chrome / FF

12 years, 3 months

Check_MK Git: check_mk: New check: W&T Web IO 12Port Digital IO module (mod . 57630)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1cb1502e883ae72c9b2f602d938ddb0b30bca714 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cb1502e883ae7… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 22 11:41:10 2012 +0200 New check: W&T Web IO 12Port Digital IO module (mod. 57630) --- checks/wut_webio_io | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/checks/wut_webio_io b/checks/wut_webio_io new file mode 100644 index 0000000..a5ee87f --- /dev/null +++ b/checks/wut_webio_io @@ -0,0 +1,51 @@ +#!/usr/bin/python + +# snmpwalk fehlt + +webio_state_names = { + 0 : "Off", + 1 : "On", +} + + +def parse_webio_io_inputs(inputdesc): + if inputdesc.startswith("Input"): + inputdesc = inputdesc.split(" ")[1] + return inputdesc + + +def inventory_wut_webio_io_inputs(info): + inventory = [] + for line in info: + inputdesc, state = line + inventory.append((parse_webio_io_inputs(inputdesc), int(state))) + 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) + if state != params: + 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") + + +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", + "has_perfdata" : True, + # "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"), + "snmp_info" : (".1.3.6.1.4.1.5040.1.2.4", [ + "3.2.1.1.1", + "1.3.1.4", ]), +}

12 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits