Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64106 discussions

Check_MK Git: check_mk: FIX: converted OIDS from 1.3.6 to .1.3. 6 in some checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eaed94a47a729aab5944af185b171cff121558c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaed94a47a729a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 19 10:22:37 2011 +0200 FIX: converted OIDS from 1.3.6 to .1.3.6 in some checks --- checks/canon_pages | 2 +- checks/hp_blade | 10 +++++----- checks/hp_blade_blades | 26 +++++++++++++------------- checks/hp_blade_fan | 10 +++++----- checks/hp_blade_manager | 14 +++++++------- checks/hp_blade_psu | 18 +++++++++--------- checks/mbg_lantime_refclock | 2 +- checks/mbg_lantime_state | 2 +- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/checks/canon_pages b/checks/canon_pages index 48d2cec..a472f21 100644 --- a/checks/canon_pages +++ b/checks/canon_pages @@ -68,4 +68,4 @@ snmp_info['canon_pages'] = [ ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 501 ]), # scan ] -snmp_scan_functions['canon_pages'] = lambda oid: oid("1.3.6.1.4.1.1602.1.1.1.1.0") != None +snmp_scan_functions['canon_pages'] = lambda oid: oid(".1.3.6.1.4.1.1602.1.1.1.1.0") != None diff --git a/checks/hp_blade b/checks/hp_blade index b392308..d939091 100644 --- a/checks/hp_blade +++ b/checks/hp_blade @@ -27,11 +27,11 @@ # Author: Lars Michelsen <lm(a)mathias-kettner.de> # General Status: -# '1.3.6.1.4.1.232.22.2.3.1.1.1.5' => 'cpqRackCommonEnclosurePartNumber', -# '1.3.6.1.4.1.232.22.2.3.1.1.1.6' => 'cpqRackCommonEnclosureSparePartNumber', -# '1.3.6.1.4.1.232.22.2.3.1.1.1.7' => 'cpqRackCommonEnclosureSerialNum', -# '1.3.6.1.4.1.232.22.2.3.1.1.1.8' => 'cpqRackCommonEnclosureFWRev', -# '1.3.6.1.4.1.232.22.2.3.1.1.1.16' => 'cpqRackCommonEnclosureCondition', +# '.1.3.6.1.4.1.232.22.2.3.1.1.1.5' => 'cpqRackCommonEnclosurePartNumber', +# '.1.3.6.1.4.1.232.22.2.3.1.1.1.6' => 'cpqRackCommonEnclosureSparePartNumber', +# '.1.3.6.1.4.1.232.22.2.3.1.1.1.7' => 'cpqRackCommonEnclosureSerialNum', +# '.1.3.6.1.4.1.232.22.2.3.1.1.1.8' => 'cpqRackCommonEnclosureFWRev', +# '.1.3.6.1.4.1.232.22.2.3.1.1.1.16' => 'cpqRackCommonEnclosureCondition', # GENERAL MAPS: diff --git a/checks/hp_blade_blades b/checks/hp_blade_blades index 77ecabd..3aaade0 100644 --- a/checks/hp_blade_blades +++ b/checks/hp_blade_blades @@ -27,20 +27,20 @@ # Author: Lars Michelsen <lm(a)mathias-kettner.de> # Blades: -# '1.3.6.1.4.1.232.22.2.4.1.1.1.3' => 'cpqRackServerBladeIndex', -# '1.3.6.1.4.1.232.22.2.4.1.1.1.4' => 'cpqRackServerBladeName', -# '1.3.6.1.4.1.232.22.2.4.1.1.1.6' => 'cpqRackServerBladePartNumber', -# '1.3.6.1.4.1.232.22.2.4.1.1.1.7' => 'cpqRackServerBladeSparePartNumber', -# '1.3.6.1.4.1.232.22.2.4.1.1.1.8' => 'cpqRackServerBladePosition', -# '1.3.6.1.4.1.232.22.2.4.1.1.1.12' => 'cpqRackServerBladePresent', -# '1.3.6.1.4.1.232.22.2.4.1.1.1.16' => 'cpqRackServerBladeSerialNum', -# '1.3.6.1.4.1.232.22.2.4.1.1.1.17' => 'cpqRackServerBladeProductId', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.3' => 'cpqRackServerBladeIndex', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.4' => 'cpqRackServerBladeName', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.6' => 'cpqRackServerBladePartNumber', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.7' => 'cpqRackServerBladeSparePartNumber', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.8' => 'cpqRackServerBladePosition', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.12' => 'cpqRackServerBladePresent', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.16' => 'cpqRackServerBladeSerialNum', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.17' => 'cpqRackServerBladeProductId', # Seems not to be implemented: -# '1.3.6.1.4.1.232.22.2.4.1.1.1.21' => 'cpqRackServerBladeStatus', -# '1.3.6.1.4.1.232.22.2.4.1.1.1.22' => 'cpqRackServerBladeFaultMajor', -# '1.3.6.1.4.1.232.22.2.4.1.1.1.23' => 'cpqRackServerBladeFaultMinor', -# '1.3.6.1.4.1.232.22.2.4.1.1.1.24' => 'cpqRackServerBladeFaultDiagnosticString', -# '1.3.6.1.4.1.232.22.2.4.1.1.1.25' => 'cpqRackServerBladePowered', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.21' => 'cpqRackServerBladeStatus', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.22' => 'cpqRackServerBladeFaultMajor', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.23' => 'cpqRackServerBladeFaultMinor', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.24' => 'cpqRackServerBladeFaultDiagnosticString', +# '.1.3.6.1.4.1.232.22.2.4.1.1.1.25' => 'cpqRackServerBladePowered', # GENERAL MAPS: diff --git a/checks/hp_blade_fan b/checks/hp_blade_fan index c817760..eb22bb2 100644 --- a/checks/hp_blade_fan +++ b/checks/hp_blade_fan @@ -27,11 +27,11 @@ # Author: Lars Michelsen <lm(a)mathias-kettner.de> # FAN: -# '1.3.6.1.4.1.232.22.2.3.1.3.1.3' => 'cpqRackCommonEnclosureFanIndex', -# '1.3.6.1.4.1.232.22.2.3.1.3.1.6' => 'cpqRackCommonEnclosureFanPartNumber', -# '1.3.6.1.4.1.232.22.2.3.1.3.1.7' => 'cpqRackCommonEnclosureFanSparePartNumber', -# '1.3.6.1.4.1.232.22.2.3.1.3.1.8' => 'cpqRackCommonEnclosureFanPresent', -# '1.3.6.1.4.1.232.22.2.3.1.3.1.11' => 'cpqRackCommonEnclosureFanCondition', +# '.1.3.6.1.4.1.232.22.2.3.1.3.1.3' => 'cpqRackCommonEnclosureFanIndex', +# '.1.3.6.1.4.1.232.22.2.3.1.3.1.6' => 'cpqRackCommonEnclosureFanPartNumber', +# '.1.3.6.1.4.1.232.22.2.3.1.3.1.7' => 'cpqRackCommonEnclosureFanSparePartNumber', +# '.1.3.6.1.4.1.232.22.2.3.1.3.1.8' => 'cpqRackCommonEnclosureFanPresent', +# '.1.3.6.1.4.1.232.22.2.3.1.3.1.11' => 'cpqRackCommonEnclosureFanCondition', # GENERAL MAPS: diff --git a/checks/hp_blade_manager b/checks/hp_blade_manager index 35b072c..f8d49fe 100644 --- a/checks/hp_blade_manager +++ b/checks/hp_blade_manager @@ -27,13 +27,13 @@ # Author: Lars Michelsen <lm(a)mathias-kettner.de> # Manager: -# '1.3.6.1.4.1.232.22.2.3.1.6.1.3' => 'cpqRackCommonEnclosureManagerIndex', -# '1.3.6.1.4.1.232.22.2.3.1.6.1.6' => 'cpqRackCommonEnclosureManagerPartNumber', -# '1.3.6.1.4.1.232.22.2.3.1.6.1.7' => 'cpqRackCommonEnclosureManagerSparePartNumber', -# '1.3.6.1.4.1.232.22.2.3.1.6.1.8' => 'cpqRackCommonEnclosureManagerSerialNum', -# '1.3.6.1.4.1.232.22.2.3.1.6.1.9' => 'cpqRackCommonEnclosureManagerRole', -# '1.3.6.1.4.1.232.22.2.3.1.6.1.10' => 'cpqRackCommonEnclosureManagerPresent', -# '1.3.6.1.4.1.232.22.2.3.1.6.1.12' => 'cpqRackCommonEnclosureManagerCondition', +# '.1.3.6.1.4.1.232.22.2.3.1.6.1.3' => 'cpqRackCommonEnclosureManagerIndex', +# '.1.3.6.1.4.1.232.22.2.3.1.6.1.6' => 'cpqRackCommonEnclosureManagerPartNumber', +# '.1.3.6.1.4.1.232.22.2.3.1.6.1.7' => 'cpqRackCommonEnclosureManagerSparePartNumber', +# '.1.3.6.1.4.1.232.22.2.3.1.6.1.8' => 'cpqRackCommonEnclosureManagerSerialNum', +# '.1.3.6.1.4.1.232.22.2.3.1.6.1.9' => 'cpqRackCommonEnclosureManagerRole', +# '.1.3.6.1.4.1.232.22.2.3.1.6.1.10' => 'cpqRackCommonEnclosureManagerPresent', +# '.1.3.6.1.4.1.232.22.2.3.1.6.1.12' => 'cpqRackCommonEnclosureManagerCondition', # GENERAL MAPS: diff --git a/checks/hp_blade_psu b/checks/hp_blade_psu index b73f379..7ddc2b6 100644 --- a/checks/hp_blade_psu +++ b/checks/hp_blade_psu @@ -27,15 +27,15 @@ # Author: Lars Michelsen <lm(a)mathias-kettner.de> # PSU: -# '1.3.6.1.4.1.232.22.2.5.1.1.1.3' => 'cpqRackPowerSupplyIndex', -# '1.3.6.1.4.1.232.22.2.5.1.1.1.5' => 'cpqRackPowerSupplySerialNum', -# '1.3.6.1.4.1.232.22.2.5.1.1.1.6' => 'cpqRackPowerSupplyPartNumber', -# '1.3.6.1.4.1.232.22.2.5.1.1.1.7' => 'cpqRackPowerSupplySparePartNumber', -# '1.3.6.1.4.1.232.22.2.5.1.1.1.10' => 'cpqRackPowerSupplyCurPwrOutput', -# '1.3.6.1.4.1.232.22.2.5.1.1.1.14' => 'cpqRackPowerSupplyStatus', -# '1.3.6.1.4.1.232.22.2.5.1.1.1.15' => 'cpqRackPowerSupplyInputLineStatus', -# '1.3.6.1.4.1.232.22.2.5.1.1.1.16' => 'cpqRackPowerSupplyPresent', -# '1.3.6.1.4.1.232.22.2.5.1.1.1.17' => 'cpqRackPowerSupplyCondition', +# '.1.3.6.1.4.1.232.22.2.5.1.1.1.3' => 'cpqRackPowerSupplyIndex', +# '.1.3.6.1.4.1.232.22.2.5.1.1.1.5' => 'cpqRackPowerSupplySerialNum', +# '.1.3.6.1.4.1.232.22.2.5.1.1.1.6' => 'cpqRackPowerSupplyPartNumber', +# '.1.3.6.1.4.1.232.22.2.5.1.1.1.7' => 'cpqRackPowerSupplySparePartNumber', +# '.1.3.6.1.4.1.232.22.2.5.1.1.1.10' => 'cpqRackPowerSupplyCurPwrOutput', +# '.1.3.6.1.4.1.232.22.2.5.1.1.1.14' => 'cpqRackPowerSupplyStatus', +# '.1.3.6.1.4.1.232.22.2.5.1.1.1.15' => 'cpqRackPowerSupplyInputLineStatus', +# '.1.3.6.1.4.1.232.22.2.5.1.1.1.16' => 'cpqRackPowerSupplyPresent', +# '.1.3.6.1.4.1.232.22.2.5.1.1.1.17' => 'cpqRackPowerSupplyCondition', # GENERAL MAPS: diff --git a/checks/mbg_lantime_refclock b/checks/mbg_lantime_refclock index 640aee8..2e399bf 100644 --- a/checks/mbg_lantime_refclock +++ b/checks/mbg_lantime_refclock @@ -94,7 +94,7 @@ def check_mbg_lantime_refclock(item, params, info): check_info['mbg_lantime_refclock'] = ( check_mbg_lantime_refclock, "LANTIME Refclock", 1, inventory_mbg_lantime_refclock ) -snmp_info['mbg_lantime_refclock'] = ( "1.3.6.1.4.1.5597.3.2", [ +snmp_info['mbg_lantime_refclock'] = ( ".1.3.6.1.4.1.5597.3.2", [ 4, # MBG-SNMP-MIB::mbgLtRefClockModeVal 6, # MBG-SNMP-MIB::mbgLtRefGpsStateVal 7, # MBG-SNMP-MIB::mbgLtRefGpsPosition diff --git a/checks/mbg_lantime_state b/checks/mbg_lantime_state index c25b92a..4430a67 100644 --- a/checks/mbg_lantime_state +++ b/checks/mbg_lantime_state @@ -85,7 +85,7 @@ def check_mbg_lantime_state(item, params, info): check_info['mbg_lantime_state'] = ( check_mbg_lantime_state, "LANTIME State", 1, inventory_mbg_lantime_state ) -snmp_info['mbg_lantime_state'] = ( "1.3.6.1.4.1.5597.3.1", [ +snmp_info['mbg_lantime_state'] = ( ".1.3.6.1.4.1.5597.3.1", [ 2, # MBG-SNMP-MIB::mbgLtNtpCurrentStateVal 3, # MBG-SNMP-MIB::mbgLtNtpNtpStratum 4, # MBG-SNMP-MIB::mbgLtNtpActiveRefclockId

13 years, 4 months

Check_MK Git: check_mk: Fix help output concerning -I

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 92cc8d37e82e0b94bd5140cf4a9ba3290bf330ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92cc8d37e82e0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 19 08:46:53 2011 +0200 Fix help output concerning -I --- modules/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 589b69d..46efe5f 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3093,7 +3093,7 @@ OPTIONS: --checks A,.. restrict inventory to specified checks (tcp/snmp/check type) NOTES: - -I can be restricted to certain check types. Write '-I --checks df' if you + -I can be restricted to certain check types. Write '--checks df -I' if you just want to look for new filesystems. Use 'check_mk -L' for a list of all check types. Use 'tcp' for all TCP based checks and 'snmp' for all SNMP based checks.

13 years, 4 months

Check_MK Git: check_mk: FIX: apc_symmetra: fix remaining runtime calculation (by factor 100)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c87358257fd53c7292ef9c5b7b0e383a513d08ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c87358257fd53c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 18 08:45:50 2011 +0200 FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) --- ChangeLog | 1 + checks/apc_symmetra | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a599d89..289eaa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * FIX: sort output of cmk --list-hosts alphabetically Checks & Agents: + * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) diff --git a/checks/apc_symmetra b/checks/apc_symmetra index febd566..a50523f 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -44,7 +44,7 @@ def check_apc(item, params, info): BasicBatteryStatus, BasicOutputStatus, AdvBatteryCapacity, \ AdvBatteryTemperature, AdvBatteryCurrent, AdvOutputVoltage, \ AdvOutputCurrent = [ saveint(x) for x in info[0][:7] ] - RunTimeRemaining = info[0][7] + RunTimeRemaining = int(info[0][7]) / 100 crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params @@ -55,7 +55,7 @@ def check_apc(item, params, info): infotxt = "Battery status %s" % (status_text.get(BasicBatteryStatus)) if BasicBatteryStatus != 2: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, None) ) @@ -68,7 +68,7 @@ def check_apc(item, params, info): infotxt = "output status %s" % (status_text.get(BasicOutputStatus)) if BasicOutputStatus not in [2, 4, 12]: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, None) ) @@ -77,7 +77,7 @@ def check_apc(item, params, info): infotxt = "capacity %d%%" % AdvBatteryCapacity if AdvBatteryCapacity <= crit_capacity: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, ("capacity", AdvBatteryCapacity, "", crit_capacity, 0, 100)) ) @@ -86,7 +86,7 @@ def check_apc(item, params, info): infotxt = "bat. temp. %dC" % AdvBatteryTemperature if AdvBatteryTemperature >= crit_batt_temp: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, ("battemp", AdvBatteryTemperature, "", crit_batt_temp) ) ) @@ -95,7 +95,7 @@ def check_apc(item, params, info): infotxt = "bat. curr. %dA" % AdvBatteryCurrent if AdvBatteryCurrent >= crit_batt_curr: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, ("batcurr", AdvBatteryCurrent, "", crit_batt_curr, 0) ) ) @@ -104,7 +104,7 @@ def check_apc(item, params, info): infotxt = "output voltage %dV" % AdvOutputVoltage if AdvOutputVoltage <= crit_voltage: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, ("voltage", AdvOutputVoltage, "", crit_voltage, 0) ) ) @@ -127,7 +127,7 @@ def check_apc(item, params, info): def inventory_apc(checkname, info): if len(info) > 0: - return [(None, "", "apc_default_levels")] + return [(None, "apc_default_levels")] check_info['apc_symmetra'] = ( check_apc, "APC Symmetra status", 1, inventory_apc )

13 years, 4 months

Check_MK Git: check_mk: FIX: make non-Ascii characters in services names work again

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f475aea5a112f6ad27c1d0f9d07aa7b448c2946b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f475aea5a112f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 17 18:11:37 2011 +0200 FIX: make non-Ascii characters in services names work again --- ChangeLog | 1 + web/htdocs/htmllib.py | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47ef037..a599d89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Multisite: * Introduced basic infrastructure for multilanguage support in Multisite + * FIX: make non-Ascii characters in services names work again WATO: * Configration files can now be administered via the WEB UI diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 7d91826..ea26276 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -70,6 +70,10 @@ def attrencode(value): return cgi.escape(str(value), True) # This function returns a str object, never unicode! +# Beware: this code is crucial for the performance of Multisite! +# Changing from the self coded urlencode to urllib.quote +# is saving more then 90% of the total HTML generating time +# on more complex pages! def urlencode_vars(vars): output = "" for varname, value in vars: @@ -78,12 +82,17 @@ def urlencode_vars(vars): if type(value) == int: value = str(value) - if type(value) == str: - value = unicode(value, 'utf-8') + elif type(value) == unicode: + value = value.encode("utf-8") output += varname output += "=" - output += urllib.quote(value) + try: + # urllib is not able to encode non-Ascii characters. Yurks + output += urllib.quote(value) + except: + output += urlencode(value) # slow but working + return output def urlencode(value): @@ -406,7 +415,9 @@ class html: <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>''') - self.req.write(title.encode("utf-8")) + # Ich versteh mit dem drecks UTF-8 bald garnix mehr... + # self.req.write(title.encode("utf-8")) + self.req.write(title) self.req.write('''</title> <link rel="stylesheet" type="text/css" href="check_mk.css">''') if config.custom_style_sheet:

13 years, 4 months

Check_MK Git: check_mk: Added README for internationalization (README.i18n)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a8f230caa85c8f2470a2802dc9c98b446f4da363 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8f230caa85c8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 17:36:19 2011 +0200 Added README for internationalization (README.i18n) --- doc/README.i18n | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/doc/README.i18n b/doc/README.i18n new file mode 100644 index 0000000..a52dc3d --- /dev/null +++ b/doc/README.i18n @@ -0,0 +1,27 @@ +Multisite ist beginning to support internationalization (i18n) and +localization (l10n) via GNU Gettext. + +The code is not yet i18n'ed completely yet, but might be in near +future. + +Current the project is not planning to ship any actual translations, +as of our current planning. But you can do your own ones. This tutorial +tells you how to create your own translations: + +1. Work with OMD (omdistro.org), create a site if you don't have one. +2. Install GNU gettext (should come prepackaged for you distro). +3. Choose your target language, e.g. "de" +4. Get site user and call: + OMD[yousite]:~$ cmk --localize update de + -> this will create local/share/check_mk/locale/de/LC_MESSAGES/multisite.po +5. Edit this file with a text editor and add translations +6. Install your translations: + OMD[yousite]:~$ cmk --localize compile de + -> this will create local/share/check_mk/locale/de/LC_MESSAGES/multisite.mo +7. Set "de" as default language in multisite.mk: + multisite.mk: + default_language = "de" + +Currently users cannot switch the language themselves. This will come. +Please be patient... +

13 years, 4 months

Check_MK Git: check_mk: Multisite: unlocalized empty strings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 00bf270743ce28af2a039e570896a420b9235265 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00bf270743ce28… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 17:17:31 2011 +0200 Multisite: unlocalized empty strings --- web/plugins/views/painters.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 91b4a0f..7633fe2 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -407,7 +407,7 @@ def paint_host_state_short(row): multisite_painters["service_nagios_link"] = { "title" : _("Icon with link to service in Nagios GUI"), - "short" : _(""), + "short" : "", "columns" : [ "site", "host_name", "service_description" ], "paint" : paint_nagios_link } @@ -421,7 +421,7 @@ multisite_painters["service_state"] = { multisite_painters["site_icon"] = { "title" : _("Icon showing the site"), - "short" : _(""), + "short" : "", "columns" : ["site"], "paint" : paint_site_icon } @@ -989,7 +989,7 @@ multisite_painters["host_black_nagios"] = { multisite_painters["host_nagios_link"] = { "title" : _("Icon with link to host to Nagios GUI"), - "short" : _(""), + "short" : "", "columns" : [ "site", "host_name" ], "paint" : paint_nagios_link } @@ -1047,7 +1047,7 @@ def paint_host_count(id, count): multisite_painters["num_services"] = { "title" : _("Number of services"), - "short" : _(""), + "short" : "", "columns" : [ "host_num_services" ], "paint" : lambda row: (None, str(row["host_num_services"])), } @@ -1240,7 +1240,7 @@ multisite_painters["hostgroup_hosts"] = { multisite_painters["hg_num_services"] = { "title" : _("Number of services"), - "short" : _(""), + "short" : "", "columns" : [ "hostgroup_num_services" ], "paint" : lambda row: (None, str(row["hostgroup_num_services"])), } @@ -1332,7 +1332,7 @@ multisite_painters["sg_services"] = { multisite_painters["sg_num_services"] = { "title" : _("Number of services"), - "short" : _(""), + "short" : "", "columns" : [ "servicegroup_num_services" ], "paint" : lambda row: (None, str(row["servicegroup_num_services"])), } @@ -1613,7 +1613,7 @@ def paint_log_icon(row): multisite_painters["log_icon"] = { "title" : _("Log: event icon"), - "short" : _(""), + "short" : "", "columns" : ["log_type", "log_state", "log_state_type"], "paint" : paint_log_icon, }

13 years, 4 months

Check_MK Git: check_mk: Restructure TimeFilter internally

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e3f8e7649b65837925a3f98c0962c18664451386 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3f8e7649b6583… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 17:07:24 2011 +0200 Restructure TimeFilter internally --- web/plugins/views/filters.py | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index ab0c318..3213b94 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -388,6 +388,21 @@ class FilterTime(Filter): html.write(" ") def filter(self, infoname): + range = self.get_time_range() + if range == None: + return "" + + timestamp, negate = range + if negate: + neg = "!" + else: + neg = "" + + return "Filter: %s %s>= %d\n" % (self.column, neg, timestamp) + + + # Extract timerange user has selected from HTML variables + def get_time_range(self): secs = 0 for s, n in self.ranges: htmlvar = self.name + "_" + n @@ -400,13 +415,10 @@ class FilterTime(Filter): if secs > 0: timestamp = int(time.time()) - secs - if html.var(self.name, "since") != "since": - neg = "!" - else: - neg = "" - return "Filter: %s %s>= %d\n" % (self.column, neg, timestamp) + neg = html.var(self.name, "since") != "since" + return timestamp, neg else: - return "" + return None # I'm not sure if this function is useful or ever been called. # Problem is, that it is not clear wether to use "since" or "before"

13 years, 4 months

Check_MK Git: check_mk: Multisite: avoid warning in apache log

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ad81f67e81ea922aad6eb5e5ed85e10a36adfbd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad81f67e81ea92… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 16:03:57 2011 +0200 Multisite: avoid warning in apache log --- web/htdocs/sidebar.py | 3 +-- web/htdocs/views.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 45e1f16..24efa14 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -36,10 +36,9 @@ loaded_with_language = False sidebar_snapins = {} def load_plugins(): + global loaded_with_language if loaded_with_language == current_language: return - - global loaded_with_language loaded_with_language = current_language # Load all snapins diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d1685fe..ffa2a19 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -51,10 +51,9 @@ multisite_painter_options = {} # Load all view plugins def load_plugins(): + global loaded_with_language if loaded_with_language == current_language: return - - global loaded_with_language loaded_with_language = current_language config.declare_permission_section("action", "Commands on Objects")

13 years, 4 months

Check_MK Git: check_mk: Multisite: improve layout of filters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2925a1f533cc178f90780d0002fcaebd33c462a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2925a1f533cc17… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 16:03:02 2011 +0200 Multisite: improve layout of filters --- web/plugins/views/filters.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 6bb8060..ab0c318 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -380,7 +380,8 @@ class FilterTime(Filter): html.write("<nobr>") html.number_input(htmlvar, 0, 2) html.write(" %s</nobr> " % n) - html.write("<br>\n") + if config.filter_columns > 1: + html.write("<br>\n") current = html.var(self.name, "since") for t in [ "before", "since" ]: html.radiobutton(self.name, t, current == t, t + "   ") @@ -457,6 +458,10 @@ class FilterLogClass(Filter): else: defval = "on" html.write("<table cellspacing=0 cellpadding=0>") + if config.filter_columns == 1: + num_cols = 4 + else: + num_cols = 2 col = 1 for l, c in self.log_classes: if col == 1: @@ -465,12 +470,12 @@ class FilterLogClass(Filter): html.checkbox("logclass%d" % l, defval) html.write(c) html.write("</td>") - if col == 2: + if col == num_cols: html.write("</tr>\n") col = 1 else: col += 1 - if col == 1: + if col < num_cols: html.write("<td></td></tr>") html.write("</table>\n")

13 years, 4 months

Check_MK Git: check_mk: Multisite painters for perfdata: keep unit intact

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ad0692e6652ac6bc75289a90a7dc4f743404da7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad0692e6652ac6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 13:51:43 2011 +0200 Multisite painters for perfdata: keep unit intact --- web/plugins/views/painters.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 57c13ef..91b4a0f 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -453,8 +453,9 @@ def paint_perfdata_nth_value(row, n): return "", "" # too few values in perfdata varname, rest = parts[n].split("=") number = rest.split(';')[0] - while len(number) > 0 and not number[-1].isdigit(): - number = number[:-1] + # Remove unit. Why should we? + # while len(number) > 0 and not number[-1].isdigit(): + # number = number[:-1] return "", number except Exception, e: return "", str(e)

13 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits