Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: hpux_cpu handles missing cpu line in agent outpu now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 06bce78f7bf0e32a3127cc24e533a35c724e51a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06bce78f7bf0e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 20 10:29:51 2012 +0100 hpux_cpu handles missing cpu line in agent outpu now --- checks/hpux_cpu | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/checks/hpux_cpu b/checks/hpux_cpu index badd63c..726e25d 100644 --- a/checks/hpux_cpu +++ b/checks/hpux_cpu @@ -31,12 +31,16 @@ cpuload_default_levels = (5, 10) def inventory_hpux_cpu_load(info): - if len(info) == 2 and 'load' in info[0]: + if len(info) >= 1 and 'load' in info[0]: return [(None, "cpuload_default_levels")] def check_hpux_cpu_load(item, params, info): load = [ float(l.strip(',')) for l in info[0][-3:] ] - num_cpus = int(info[1][0]) + # Assuming 1 cpu when none can be found in the agent output + try: + num_cpus = int(info[1][0]) + except: + num_cpus = 1 warn, crit = params # apply on 15min average, relative to number of CPUs warn = warn * num_cpus

12 years, 5 months

Check_MK Git: check_mk: Improved wato replication

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9b143f63ecfa8ab8b47435d39ab68bdd8a5583e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b143f63ecfa8a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 20 11:29:47 2012 +0100 Improved wato replication * Replication: Can now handle replication sites which use the form based auth * Replication: Added option to ignore problems with the ssl certificates used in ssl secured replications --- ChangeLog | 3 +++ web/htdocs/login.py | 1 + web/htdocs/wato.py | 17 ++++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4dcb6e0..3f17220 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,9 @@ * Snapshot/Factory Reset is possible even with a broken config * Added error messages to user edit dialog to prevent notification problems caused by incomplete configuration + * Replication: Can now handle replication sites which use the form based auth + * Replication: Added option to ignore problems with the ssl certificates + used in ssl secured replications * FIX: Fixed missing folders in "move to" dropdown fields * FIX: Fixed "move to target folders" after CSV import * FIX: Fixed problem with duplicate extra_buttons when using the i18n of multiisite diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 0f74f53..774418a 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -146,6 +146,7 @@ def do_login(): # handle the sent login form err = None if html.var('_login'): + html.write('xxxxx') try: username = html.var('_username', '') if username == '': diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c7a2c33..86f835b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5486,6 +5486,8 @@ def mode_edit_site(phase): # Persist new_site["persist"] = html.get_checkbox("persist") + # Handle the insecure replication flag + new_site["insecure"] = html.get_checkbox("insecure") # Status host sh_site = html.var("sh_site") @@ -5641,7 +5643,7 @@ def mode_edit_site(phase): # Persistent connections html.write("<tr><td class=legend>") - html.write(_("If you enable persistent connections then Multisite will try to keep open " + html.write(_("Persistent Connection If you enable persistent connections then Multisite will try to keep open " "the connection to the remote sites. This brings a great speed up in high-latency " "situations but locks a number of threads in the Livestatus module of the target site. ")) html.write("</td><td class=content>") @@ -5711,6 +5713,10 @@ def mode_edit_site(phase): "that URL will be fetched by the Apache server of the local " "site itself, whilst the URL-Prefix is used by your local Browser."))) html.text_input("multisiteurl", site.get("multisiteurl", ""), size=60) + html.checkbox("insecure", site.get("insecure", False)) + html.write(_('Ignore SSL certificate errors ' + 'This might be needed to make the synchronization accept problems with ' + 'SSL certificates when using an SSL secured connection.')) html.write("</td></tr>") html.write("<tr><td colspan=2 class=buttons>") html.button("save", _("Save")) @@ -5785,7 +5791,10 @@ def do_site_login(site_id, name, password): raise MKUserError("_passwd", _("Please specify your password.")) - o = open_url(site["multisiteurl"] + "automation_login.py", name, password) + # Trying basic auth AND form based auth to ensure the site login works + o = open_url(site["multisiteurl"] + 'automation_login.py?_login=1' + '&_username=%s&_password=%s&_origtarget=automation_login.py' % + (name, password), name, password) response = o.read() try: return eval(response) @@ -6086,7 +6095,9 @@ def push_snapshot_to_site(site, do_restart): # you know a better method for uploading, without the use of external # programs... # -s -S: Disable progress meter but enable error messages - response_text = os.popen("curl -s -S -F snapshot=@%s '%s'" % (sync_snapshot_file, url)).read() + insecure = site.get('insecure', False) and ' --insecure' or '' + response_text = os.popen("curl -s -S%s -F snapshot=@%s '%s' 2>&1" % + (insecure, sync_snapshot_file, url)).read() try: response = eval(response_text) return response

12 years, 5 months

Check_MK Git: check_mk: Checkboxes visualize user input errors now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 118f15eabd93792e033a2e2fef30aff0b8d77d04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=118f15eabd9379… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 20 10:04:49 2012 +0100 Checkboxes visualize user input errors now --- web/htdocs/htmllib.py | 4 ++-- web/htdocs/pages.css | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d6b78d5..58399cd 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -517,7 +517,7 @@ class html: add_attr = [] # do not use [] as default element, it will be a global variable! error = self.user_errors.get(varname) if error: - html = "<x class=inputerror>" + self.write("<x class=inputerror>") # Problem with checkboxes: The browser will add the variable # only to the URL if the box is checked. So in order to detect # wether we should add the default value, we need to detect @@ -541,7 +541,7 @@ class html: if label: self.write('<label for="%s">%s</label>\n' % (id, label)) if error: - html += "</x>" + self.write("</x>") # Get value of checkbox. Return True, False or None. None means # that no form has been submitted. The problem here is the distintion diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 81dc880..cec1284 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -475,10 +475,21 @@ input.date, input.time { font-family: monospace; } -.inputerror input, .inputerror textarea { +.inputerror input, .inputerror textarea, span.checkbox { background-color: #f84; } +.inputerror span.checkbox { + display: block; + float: left; + height: 17px; + margin-right: 2px; +} + +.inputerror span.checkbox input { + margin: 1px; +} + /*-------------------------------------------------------------------------. | _ _ _ | | / \ ___| |_(_) ___ _ __ ___ |

12 years, 5 months

Check_MK Git: check_mk: Added error messages to user edit dialog to prevent notification

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 895ba4a007d29a64947733608e661e69d0b78864 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=895ba4a007d29a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 20 10:06:38 2012 +0100 Added error messages to user edit dialog to prevent notification problems caused by incomplete configuration --- ChangeLog | 2 ++ web/htdocs/wato.py | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08d4744..4dcb6e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,8 @@ * Supporting localized tag titles * Using Username as default value for full names when editing users * Snapshot/Factory Reset is possible even with a broken config + * Added error messages to user edit dialog to prevent notification problems + caused by incomplete configuration * FIX: Fixed missing folders in "move to" dropdown fields * FIX: Fixed "move to target folders" after CSV import * FIX: Fixed problem with duplicate extra_buttons when using the i18n of multiisite diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e177317..c7a2c33 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6597,6 +6597,22 @@ def mode_edit_user(phase): # Notifications new_user["notifications_enabled"] = html.get_checkbox("notifications_enabled") + + # Check if user can receive notifications + if new_user["notifications_enabled"]: + if not new_user["email"]: + raise MKUserError("email", + _('You have enabled the notifications but missed to configure a ' + 'Email address. You need to configure your mail address in order ' + 'to be able to receive emails.')) + + if not new_user["contactgroups"]: + raise MKUserError("notifications_enabled", + _('You have enabled the notifications but missed to make the ' + 'user member of at least one contact group. You need to make ' + 'the user member of a contact group which has hosts assigned ' + 'in order to be able to receive emails.')) + ntp = html.var("notification_period") if ntp not in timeperiods: ntp = "24X7"

12 years, 5 months

Check_MK Git: check_mk: if64: Fetching and displaying MAC address information now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2bd37776d6336a88efaaace98606f3a9fa56b4ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bd37776d6336a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 12:15:05 2012 +0100 if64: Fetching and displaying MAC address information now --- checks/if.include | 14 ++++++++++---- checks/if64 | 1 + modules/snmp.py | 11 +++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/checks/if.include b/checks/if.include index 1c96cbc..a003d2a 100644 --- a/checks/if.include +++ b/checks/if.include @@ -85,15 +85,17 @@ def if_pad_with_zeroes(info, ifIndex): def inventory_if_common(info): - if len(info) == 0 or len(info[0]) != 19: + if len(info) == 0 or len(info[0]) != 20: return [] pre_inventory = [] seen_items = set([]) duplicate = set([]) - for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, \ - ifInErrors, ifOutOctets, outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias in info: + for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ + inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ + outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ + ifOutQLen, ifAlias, ifPhysAddress in info: ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) @@ -156,7 +158,7 @@ def check_if_common(item, params, info): for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ - ifOutQLen, ifAlias in info: + ifOutQLen, ifAlias, ifPhysAddress in info: ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) @@ -202,6 +204,10 @@ def check_if_common(item, params, info): else: ref_speed = None + if ifPhysAddress: + ifPhysAddress = ':'.join(convert_to_hex(ifPhysAddress).strip().split(' ')) + infotext += 'MAC: %s, ' % ifPhysAddress + # Check speed settings of interface, but only if speed information # is available. This is not always the case. if speed: diff --git a/checks/if64 b/checks/if64 index b1ea658..175d98b 100644 --- a/checks/if64 +++ b/checks/if64 @@ -56,6 +56,7 @@ snmp_info['if64'] = \ "2.2.1.20", # ifOutErrors 16 "2.2.1.21", # ifOutQLen 17 "31.1.1.1.18", # ifAlias 18 + "2.2.1.6", # ifPhysAddress 19 ] ) # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 diff --git a/modules/snmp.py b/modules/snmp.py index 73e9d36..8e17c11 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -66,6 +66,17 @@ def convert_from_hex(value): r += chr(int(hx, 16)) return r +# Converts back the values converted by the snmp code of Check_MK. +# e.g. In case of MAC addresses it is not ok to convert the value. +# Though we need the original value back. +def convert_to_hex(value): + r = '' + for c in value: + h = hex(ord(c)).replace('0x', '') + if len(h) == 1: + h = '0' + h + r += h + ' ' + return r + ' ' def oid_to_bin(oid): return u"".join([ unichr(int(p)) for p in oid.strip(".").split(".") ])

12 years, 5 months

Check_MK Git: check_mk: Made if check aware of new MAC address handling

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3ff1a471f8e3a2fedbd428ab12d8a7607f67ade2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ff1a471f8e3a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 12:18:30 2012 +0100 Made if check aware of new MAC address handling --- checks/if | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/checks/if b/checks/if index 3938941..1691f6b 100644 --- a/checks/if +++ b/checks/if @@ -33,7 +33,7 @@ def check_if(item, params, info): def if_convert_to_if64(info): newinfo = [] for line in info: - newinfo.append(line[0:8] + ['0'] + line[8:12] + ['0'] + line[12:16] + line[1:2]) + newinfo.append(line[0:8] + ['0'] + line[8:12] + ['0'] + line[12:16] + line[1:2] + line[16:17]) return newinfo check_info['if'] = (check_if, "Interface %s", 1, inventory_if) @@ -59,6 +59,7 @@ snmp_info['if'] = \ 19, # ifOutDiscards 13 20, # ifOutErrors 14 21, # ifOutQLen 15 + 6, # ifPhysAddress 16 ] ) # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2

12 years, 5 months

Check_MK Git: check_mk: hpux_if returns correct number of items ( needed for new mac address value)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0ce5d0e069a147a351a172592f3f9e5ea023b5fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ce5d0e069a147… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 12:22:51 2012 +0100 hpux_if returns correct number of items (needed for new mac address value) --- checks/hpux_if | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/hpux_if b/checks/hpux_if index f7fe6a6..00429ee 100644 --- a/checks/hpux_if +++ b/checks/hpux_if @@ -63,7 +63,7 @@ def hpux_convert_to_if64(info): for line in info: if '***' in line: nicname = line[1] - nic = ['0'] * 19 + nic = ['0'] * 20 nics.append(nic) nic[2] = '6' # fake port type Ethernet elif '=' in line:

12 years, 5 months

Check_MK Git: check_mk: lnx_if check returns an empty mac all the time

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 25d8ee3e81c32cf0938a03c11e0d3e5567486276 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25d8ee3e81c32c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 12:26:29 2012 +0100 lnx_if check returns an empty mac all the time --- checks/lnx_if | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/checks/lnx_if b/checks/lnx_if index 773f927..8940bdc 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -128,11 +128,14 @@ def if_lnx_convert_to_if64(info): else: ifOperStatus = 4 # unknown (NIC has never been used) + # There is no mac adress data available for the moment + ifPhysAddress = '' + if_table.append(map(str, [ ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, outucast, outmcast, outbcast, - ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias ])) + ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias, ifPhysAddress ])) return if_table

12 years, 5 months

Check_MK Git: check_mk: Merge branch 'ifmac'

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 549cc1aa1ac0552d446cc410a4569b5875ca1408 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=549cc1aa1ac055… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 20 09:17:11 2012 +0100 Merge branch 'ifmac' ---

12 years, 5 months

Check_MK Git: check_mk: mcdata_fcport returns always empty mac address for interfaces

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: eeaee7537a27fb7e5ddfd996d7ab904e9fe6e3e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eeaee7537a27fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 12:27:35 2012 +0100 mcdata_fcport returns always empty mac address for interfaces --- checks/mcdata_fcport | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/checks/mcdata_fcport b/checks/mcdata_fcport index 75d06f0..23e16b5 100644 --- a/checks/mcdata_fcport +++ b/checks/mcdata_fcport @@ -69,6 +69,7 @@ def mcdata_fcport_convert_line_to_if64(line): '0', # ifOutErrors 16 '0', # ifOutQLen 17 index, # ifAlias 18 + '', # ifPhysAddress 19 ]

12 years, 5 months

← Newer
1
...
12
13
14
15
16
17
18
...
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