Checkmk git commits May 2011

checkmk-commits@lists.checkmk.com

2 participants
134 discussions

Check_MK Git: check_mk: Column aggregation (Stats) now also works for perf_data

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf3659a1d5508204efd18e907f5f10ee9d4ae969 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf3659a1d55082… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 20 18:10:06 2011 +0200 Column aggregation (Stats) now also works for perf_data --- ChangeLog | 3 + livestatus/src/.f12 | 5 - livestatus/src/Makefile.am | 2 +- livestatus/src/PerfdataAggregator.cc | 137 ++++++++++++++++++++++++++++++++++ livestatus/src/PerfdataAggregator.h | 56 ++++++++++++++ livestatus/src/StatsColumn.cc | 7 ++- livestatus/src/strutil.cc | 6 ++ livestatus/src/strutil.h | 1 + 8 files changed, 210 insertions(+), 7 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bf3659a1d5…

13 years, 1 month

Check_MK Git: check_mk: Slight layout change

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a66c7050fa6f5849ad2b83159b6792f447bacd65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a66c7050fa6f58… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 19 16:49:40 2011 +0200 Slight layout change --- web/htdocs/check_mk.css | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index afc93bc..5a703e5 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -589,9 +589,12 @@ tr.odd3 { background-color: #fdc; } tr.even3 { background-color: #fea; } /* HACK */ + table.data tr.data td { border: 1px solid #bbb; padding: 2px 4px; + height: 22px; + vertical-align: middle; } table.data td.host { @@ -663,7 +666,6 @@ table.data td.age { text-align: right; color: #666; white-space: nowrap; - width: 40px; } table.data td.age.recent {

13 years, 1 month

Check_MK Git: check_mk: Multisite: move helper functions, avoid dependency problems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ef7ebb3e37004a4807a36d737abc4e1b9defbde4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef7ebb3e37004a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 19 11:08:29 2011 +0200 Multisite: move helper functions, avoid dependency problems --- web/htdocs/views.py | 22 ++++++++++++++++++++++ web/plugins/views/sorters.py | 33 +++------------------------------ 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ffa2a19..41d7498 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2132,5 +2132,27 @@ def get_painter_option(name): return opt.get("value", opt["default"]) +# Sorting +def cmp_simple_string(column, r1, r2): + v1, v2 = r1[column], r2[column] + c = cmp(v1.lower(), v2.lower()) + # force a strict order in case of equal spelling but different + # case! + if c == 0: + return cmp(v1, v2) + else: + return c + +def cmp_simple_number(column, r1, r2): + return cmp(r1[column], r2[column]) + +def declare_simple_sorter(name, title, column, func): + multisite_sorters[name] = { + "title" : title, + "columns" : [ column ], + "cmp" : lambda r1, r2: func(column, r1, r2) + } + + load_plugins() diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 4644d95..1edffd6 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -57,15 +57,6 @@ # one service, etc. # =================================================================== # -# Helper functions -# return -1, if r1 < r2, 0 if they are equal, 1 otherwise -def cmp_atoms(s1, s2): - if s1 < s2: - return -1 - elif s1 == s2: - return 0 - else: - return 1 def cmp_state_equiv(r): if r["service_has_been_checked"] == 0: @@ -86,23 +77,11 @@ def cmp_host_state_equiv(r): return 2 - s # swap down und unreachable def cmp_svc_states(r1, r2): - return cmp_atoms(cmp_state_equiv(r1), cmp_state_equiv(r2)) + return cmp(cmp_state_equiv(r1), cmp_state_equiv(r2)) def cmp_hst_states(r1, r2): - return cmp_atoms(cmp_host_state_equiv(r1), cmp_host_state_equiv(r2)) - -def cmp_simple_string(column, r1, r2): - v1, v2 = r1[column], r2[column] - c = cmp_atoms(v1.lower(), v2.lower()) - # force a strict order in case of equal spelling but different - # case! - if c == 0: - return cmp_atoms(v1, v2) - else: - return c + return cmp(cmp_host_state_equiv(r1), cmp_host_state_equiv(r2)) -def cmp_simple_number(column, r1, r2): - return cmp_atoms(r1[column], r2[column]) multisite_sorters["svcstate"] = { "title" : _("Service state"), @@ -117,7 +96,7 @@ multisite_sorters["hoststate"] = { } def cmp_site_host(r1, r2): - c = cmp_atoms(r1["site"], r2["site"]) + c = cmp(r1["site"], r2["site"]) if c != 0: return c else: @@ -129,12 +108,6 @@ multisite_sorters["site_host"] = { "cmp" : cmp_site_host } -def declare_simple_sorter(name, title, column, func): - multisite_sorters[name] = { - "title" : title, - "columns" : [ column ], - "cmp" : lambda r1, r2: func(column, r1, r2) - } # name title column sortfunction declare_simple_sorter("svcdescr", _("Service description"), "service_description", cmp_simple_string)

13 years, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2011