Checkmk git commits November 2013

checkmk-commits@lists.checkmk.com

6 participants
274 discussions

Check_MK Git: check_mk: Fritz!Box Connection check handled "Connection" state now

by Lars Michelsen

Module: check_mk Branch: master Commit: 2465c53b34168af87726faaf980d25eeb5a42d0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2465c53b34168a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 22 13:15:20 2013 +0100 Fritz!Box Connection check handled "Connection" state now --- checks/fritz | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/fritz b/checks/fritz index 812d519..02ffc1d 100644 --- a/checks/fritz +++ b/checks/fritz @@ -42,6 +42,7 @@ def inventory_fritz_conn(info): fritz_conn_states = { 'Connected': 0, + 'Connecting': 1, 'Disconnected': 1, }

10 years, 10 months

Check_MK Git: check_mk: updated usage text - rewrite command was missing

by Andreas Boesl

Module: check_mk Branch: master Commit: 76d0c2c483e7807fec360708fb2ad5b03479dead URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76d0c2c483e780… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 22 12:54:41 2013 +0100 updated usage text - rewrite command was missing --- werk | 1 + 1 file changed, 1 insertion(+) diff --git a/werk b/werk index 38aaa65..8a27654 100755 --- a/werk +++ b/werk @@ -289,6 +289,7 @@ where COMMAND is one of: grep [-v] KW1 KW2... - show werks containing all of the given keywords (-v: verbose) edit [#] - open werk # in editor (or newest werk) blame [#] - show who worked on a werk + rewrite - rewrite changelog """) sys.exit(1)

10 years, 10 months

Check_MK Git: check_mk: table headers are now omitted if all fields are empty and no table action is set

by Andreas Boesl

Module: check_mk Branch: master Commit: 5ba5383ecd7fb899060a81fb307bd86db93df9be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ba5383ecd7fb8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 22 12:48:29 2013 +0100 table headers are now omitted if all fields are empty and no table action is set --- .werks/235 | 8 ++++++++ ChangeLog | 1 + web/htdocs/table.py | 51 +++++++++++++++++++++++++++------------------------ 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/.werks/235 b/.werks/235 new file mode 100644 index 0000000..547cd21 --- /dev/null +++ b/.werks/235 @@ -0,0 +1,8 @@ +Title: table headers are now omitted if all fields are empty and no table action is set +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1385120851 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f82cd94..e1dd50f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ WATO: * 0053 New rule for configuring the display_name of a service... * 0216 Supporting float values as SNMP timeout value now... + * 0235 table headers are now omitted if all fields are empty and no table action is set * 0048 FIX: Fixed locking issue on host diagnose page * 0033 FIX: Fixed problem when saving settings in WATOs host diagnostic page... * 0205 FIX: Allowing star chars in variable names to fix role/permission editing... diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 94dada3..e6aadae 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -172,30 +172,33 @@ def end(): html.write(" %s" % table["css"]) html.write('">\n') - html.write(" <tr>") - first_col = True - for header, help in table["headers"]: - if help: - header = '<span title="%s">%s</span>' % (html.attrencode(help), header) - html.write(" <th>") - - # Add the table action link - if first_col: - if actions_enabled: - if actions_visible: - state = '0' - help = _('Hide table actions') - img = 'table_actions_on' - else: - state = '1' - help = _('Display table actions') - img = 'table_actions_off' - html.icon_button(html.makeuri([('_%s_actions' % table_id, state)]), - help, img, cssclass = 'toggle_actions') - first_col = False - - html.write("%s</th>\n" % header) - html.write(" </tr>\n") + + use_headers = [ header for header in table["headers"] if header[0] != "" ] + if use_headers or actions_enabled: + html.write(" <tr>") + first_col = True + for header, help in table["headers"]: + if help: + header = '<span title="%s">%s</span>' % (html.attrencode(help), header) + html.write(" <th>") + + # Add the table action link + if first_col: + if actions_enabled: + if actions_visible: + state = '0' + help = _('Hide table actions') + img = 'table_actions_on' + else: + state = '1' + help = _('Display table actions') + img = 'table_actions_off' + html.icon_button(html.makeuri([('_%s_actions' % table_id, state)]), + help, img, cssclass = 'toggle_actions') + first_col = False + + html.write("%s</th>\n" % header) + html.write(" </tr>\n") if actions_enabled and actions_visible: html.write('<tr class="data even0 actions"><td colspan=%d>' % num_cols)

10 years, 10 months

Check_MK Git: check_mk: Updated werk descriptions/titles

by Lars Michelsen

Module: check_mk Branch: master Commit: f02e456b68794e3a5e406f1e077c45d289654c00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f02e456b68794e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 22 12:30:50 2013 +0100 Updated werk descriptions/titles --- .werks/204 | 7 +++++-- .werks/205 | 4 +++- .werks/206 | 9 ++++----- .werks/207 | 7 +++++-- .werks/209 | 8 -------- .werks/212 | 6 ++++-- .werks/213 | 3 ++- .werks/41 | 4 +++- .werks/43 | 2 +- .werks/44 | 2 +- .werks/45 | 3 ++- .werks/46 | 9 +++++++-- .werks/48 | 6 ++++-- .werks/49 | 3 ++- ChangeLog | 19 +++++++++---------- werk | 7 ++++--- 16 files changed, 56 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f02e456b68…

10 years, 10 months

Check_MK Git: check_mk: FIX Inventory problem with inventory_processes parameter

by Lars Michelsen

Module: check_mk Branch: master Commit: 6ae4c4bfb7b74437faa751327cf689b4a0deefd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ae4c4bfb7b744… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 22 10:57:27 2013 +0100 FIX Inventory problem with inventory_processes parameter --- web/htdocs/login.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 5cb2f23..3d65284 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -175,7 +175,10 @@ def do_login(): raise MKUserError('_password', _('No password given.')) origtarget = html.var('_origtarget') - if not origtarget or "logout.py" in origtarget: + # Disallow redirections to: + # - logout.py: Happens after login + # - Full qualified URLs (http://...) to prevent redirection attacks + if not origtarget or "logout.py" in origtarget or '://' in origtarget: origtarget = defaults.url_prefix + 'check_mk/' # None -> User unknown, means continue with other connectors

10 years, 10 months

Check_MK Git: check_mk: df manpage: Added more information about differences between the output of df and the df check

by Lars Michelsen

Module: check_mk Branch: master Commit: d43d8d15a688a24b15dfe66f2d67b891cc0e6c0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d43d8d15a688a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 22 11:49:29 2013 +0100 df manpage: Added more information about differences between the output of df and the df check --- checkman/df | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/checkman/df b/checkman/df index 241c07c..02c563d 100644 --- a/checkman/df +++ b/checkman/df @@ -6,11 +6,17 @@ distribution: check_mk description: This check measures the usage of filesystems. The usage is checked against a warning and a critical level, which - can be specified in numerous ways. Beware: on Linux and UNIX systems - the filesystem might reserve a certain amount for root (typical is 5%). - This checks considers that reserved space as used. This is consistent with - the percentage-column in the output of {df}. So your filesystem might - be at 100% in a situation where root still has 5% free space available. + can be specified in numerous ways. + + Beware: on Linux and UNIX systems the filesystem might reserve a certain amount for + root (typical is 5%). This checks considers that reserved space as used. This is + consistent with the percentage-column in the output of {df} on most distributions. + So your filesystem might be at 100% in a situation where root still has 5% free + space available. On some distributions, {df} seems to use the user allocatable space + instead of the total filesystem size as base for the percentage calculation, this might + result in differences between the percentage values shown by that {df} version and + the value shown in Check_MK. From our point of view, the calculation of Check_MK is + more accurate. {Trends:} This checks supports filesystem {trends}. This means that the {df} check is able to compute the {change} of the used space over the time and can

10 years, 10 months

Check_MK Git: check_mk: Fixed wrong named variable

by Lars Michelsen

Module: check_mk Branch: master Commit: 38cfca5adffe39d0abf121dc692128a60471b384 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38cfca5adffe39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 21 13:57:44 2013 +0100 Fixed wrong named variable --- web/plugins/userdb/ldap.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 23f899d..7e3beb6 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -220,12 +220,12 @@ def ldap_default_bind(conn): 'Please fix this in the ' '<a href="wato.py?mode=ldap_config">LDAP connection settings</a>.')) -def ldap_bind(username, password, catch = True, conn = None): +def ldap_bind(user_dn, password, catch = True, conn = None): if conn is None: conn = ldap_connection - ldap_log('LDAP_BIND %s' % username) + ldap_log('LDAP_BIND %s' % user_dn) try: - conn.simple_bind_s(username, password) + conn.simple_bind_s(user_dn, password) ldap_log(' SUCCESS') except ldap.LDAPError, e: ldap_log(' FAILED (%s)' % e)

10 years, 10 months

Check_MK Git: check_mk: casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa Cable Modem Termination Systems

by Andreas Boesl

Module: check_mk Branch: master Commit: f08c16b6f0367dab8ef833405f10b9ce5ae1e6b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f08c16b6f0367d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 22 11:31:32 2013 +0100 casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa Cable Modem Termination Systems These checks are for the 10G and 3K series of the casa Cable Modem Termination Systems (CMTS). --- .werks/38 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/38 b/.werks/38 index 6ee706c..18622bc 100644 --- a/.werks/38 +++ b/.werks/38 @@ -1,4 +1,4 @@ -Title: casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa +Title: casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa Cable Modem Termination Systems Level: 2 Component: checks Version: 1.2.3i7 diff --git a/ChangeLog b/ChangeLog index 3e70502..f82cd94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,7 +18,7 @@ * 0004 df: dynamic filesystem levels now reorder levels automatically... * 0069 veeam_client: limits for time since last backup introduced * 0214 Logwatch: context lines can now be disabled using nocontext=1... - * 0038 casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa... + * 0038 casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa Cable Modem Termination Systems... * 0097 arc_raid_status: New check for Areca RAID controllers * 0024 FIX: cisco_wlc: removed check configuration parameter ap_model... * 0065 FIX: veeam_client: check behaviour improved when backup is in progress

10 years, 10 months

Check_MK Git: check_mk: casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa

by Andreas Boesl

Module: check_mk Branch: master Commit: c7dbf0bb949a323ca4c3a2016b708a05d2d4ae26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7dbf0bb949a32… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 22 11:28:08 2013 +0100 casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa --- checkman/casa_cpu_mem | 5 +++-- checkman/casa_cpu_temp | 5 +++-- checkman/casa_cpu_util | 5 +++-- checkman/casa_fan | 5 +++-- checkman/casa_power | 3 ++- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/checkman/casa_cpu_mem b/checkman/casa_cpu_mem index a7c49c3..7be1017 100644 --- a/checkman/casa_cpu_mem +++ b/checkman/casa_cpu_mem @@ -1,10 +1,11 @@ -title: CASA module: CPU memory +title: casa module: CPU memory agents: snmp catalog: hw/network/casa license: GPL distribution: check_mk description: - This check shows the current and total cpu memory of module in a casa device + This check is used for the 10G and 3K series of the casa Cable Modem Termination Systems (CMTS). + It shows the current and total cpu memory of module in a casa device. item: The description of the cpu module as provided by the device. diff --git a/checkman/casa_cpu_temp b/checkman/casa_cpu_temp index cecdb2a..99b406a 100644 --- a/checkman/casa_cpu_temp +++ b/checkman/casa_cpu_temp @@ -1,10 +1,11 @@ -title: CASA module: CPU temperature +title: casa module: CPU temperature agents: snmp catalog: hw/network/casa license: GPL distribution: check_mk description: - This check monitors the cpu temperature of a casa module. + This check is used for the 10G and 3K series of the casa Cable Modem Termination Systems (CMTS). + It monitors the cpu temperature of a casa module. item: The description of the cpu as provided by the device. diff --git a/checkman/casa_cpu_util b/checkman/casa_cpu_util index d187a48..55e602b 100644 --- a/checkman/casa_cpu_util +++ b/checkman/casa_cpu_util @@ -1,10 +1,11 @@ -title: CASA module: CPU utilization +title: casa module: CPU utilization agents: snmp catalog: hw/network/casa license: GPL distribution: check_mk description: - This check shows the current cpu utilization of a casa module + This check is used for the 10G and 3K series of the casa Cable Modem Termination Systems (CMTS). + It shows the current cpu utilization of a casa module item: The description of the cpu module as provided by the device. diff --git a/checkman/casa_fan b/checkman/casa_fan index 7add5b1..634e2cb 100644 --- a/checkman/casa_fan +++ b/checkman/casa_fan @@ -1,10 +1,11 @@ -title: CASA: Fan health status +title: casa: Fan health status agents: snmp catalog: hw/network/casa license: GPL distribution: check_mk description: - This check monitors the state of fans on the casa device. + This check is used for the 10G and 3K series of the casa Cable Modem Termination Systems (CMTS). + It monitors the state of fans on the casa device. item: The description of the sensor as provided by the device. diff --git a/checkman/casa_power b/checkman/casa_power index b8ca3a0..17b4876 100644 --- a/checkman/casa_power +++ b/checkman/casa_power @@ -1,9 +1,10 @@ -title: CASA: Power module status +title: casa: Power module status agents: snmp catalog: hw/network/casa license: GPL distribution: check_mk description: + This check is used for the 10G and 3K series of the casa Cable Modem Termination Systems (CMTS). This check monitors the power module state of a casa device. item:

10 years, 10 months

Check_MK Git: check_mk: casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa

by Andreas Boesl

Module: check_mk Branch: master Commit: 0d8fe486a12e15008d34e028c99be6fd87773fad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d8fe486a12e15… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 22 11:29:12 2013 +0100 casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa These checks are for the 10G and 3K series of the casa Cable Modem Termination Systems (CMTS). --- .werks/38 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/38 b/.werks/38 index 68b7330..6ee706c 100644 --- a/.werks/38 +++ b/.werks/38 @@ -5,4 +5,4 @@ Version: 1.2.3i7 Date: 1384789903 Class: feature - +These checks are for the 10G and 3K series of the casa Cable Modem Termination Systems (CMTS). diff --git a/ChangeLog b/ChangeLog index 6fffa48..3e70502 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,7 +18,7 @@ * 0004 df: dynamic filesystem levels now reorder levels automatically... * 0069 veeam_client: limits for time since last backup introduced * 0214 Logwatch: context lines can now be disabled using nocontext=1... - * 0038 casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa + * 0038 casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa... * 0097 arc_raid_status: New check for Areca RAID controllers * 0024 FIX: cisco_wlc: removed check configuration parameter ap_model... * 0065 FIX: veeam_client: check behaviour improved when backup is in progress

10 years, 10 months

← Newer
1
...
5
6
7
8
9
10
11
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2013