Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

Check_MK Git: check_mk: BI: FIX: top-down and bottom-up was broken in case of "only problems"

by Mathias Kettner

Module: check_mk Branch: master Commit: df885345b8e248e8e7a6d7e3ad9cdc5296f2c6ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df885345b8e248… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 1 12:20:57 2013 +0100 BI: FIX: top-down and bottom-up was broken in case of "only problems" --- ChangeLog | 1 + web/plugins/views/bi.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e04ed6..d9f3ade 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ * FIX: fix style of mouse pointer over BI boxes * FIX: list of BI aggregates was incomplete in some cases * FIX: single host aggregations didn't work for aggregations += [...] + * FIX: top-down and bottom-up was broken in case of "only problems" * Make titles of non-leaf tree nodes klickable WATO: diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 1afe686..d4ad8e6 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -232,7 +232,7 @@ def paint_aggr_tree_ltr(row, mirror): tree = row["aggr_treestate"] if get_painter_option("aggr_onlyproblems") == "1": - tree = filter_tree_only_problems(tree) + tree = bi.filter_tree_only_problems(tree) depth = bi.status_tree_depth(tree) leaves = gen_table(tree, depth, row["aggr_hosts"] > 1) h = '<table class="aggrtree ltr">'

11 years, 7 months

Check_MK Git: check_mk: if.include now with assumed_speed_in/out support -> checkman update

by Andreas Boesl

Module: check_mk Branch: master Commit: 2fa34ee9ccdac6f53b20ec62f1e177e0eb9cdab2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fa34ee9ccdac6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 1 10:55:56 2013 +0100 if.include now with assumed_speed_in/out support -> checkman update --- checkman/hpux_if | 8 ++++++++ checkman/if | 8 ++++++++ checkman/if64 | 8 ++++++++ checkman/if_lancom | 8 ++++++++ checkman/lnx_if | 8 ++++++++ checkman/mcdata_fcport | 8 ++++++++ 6 files changed, 48 insertions(+), 0 deletions(-) diff --git a/checkman/hpux_if b/checkman/hpux_if index 8b69ebf..4d1bb2d 100644 --- a/checkman/hpux_if +++ b/checkman/hpux_if @@ -81,6 +81,14 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as are weighted higher than older values and that even values out of the configured time range are - to a low degree - represented in the average. If you configure an average, then the traffic levels are applied to the averaged values. + + {"assumed_speed_in"} - the assumed port input speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed + + {"assumed_speed_out"} - the assumed port output speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed {"state"} - the expected operational status of the interface (as string or list of strings. If this is {None} then the state is not checked. Possible values for the diff --git a/checkman/if b/checkman/if index 5d24dd3..8a6cd51 100644 --- a/checkman/if +++ b/checkman/if @@ -127,6 +127,14 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as {"speed"} - the expected port speed as an integer of the bits per second (not the bytes!). If you set this to {None}, then the port speed is not checked. The default is to remember and enforce the port speed found during inventory. + + {"assumed_speed_in"} - the assumed port input speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed + + {"assumed_speed_out"} - the assumed port output speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed {"unit"} - the measurement unit which can be set to "bit" or "byte". Depending on this choice the limits set in the {"traffic"} parameter are regarded diff --git a/checkman/if64 b/checkman/if64 index 37232b1..b315470 100644 --- a/checkman/if64 +++ b/checkman/if64 @@ -127,6 +127,14 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as {"speed"} - the expected port speed as an integer of the bits per second (not the bytes!). If you set this to {None}, then the port speed is not checked. The default is to remember and enforce the port speed found during inventory. + + {"assumed_speed_in"} - the assumed port input speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed + + {"assumed_speed_out"} - the assumed port output speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed {"unit"} - the measurement unit which can be set to "bit" or "byte". Depending on this choice the limits set in the {"traffic"} parameter are regarded diff --git a/checkman/if_lancom b/checkman/if_lancom index 9ce6d99..5c1ce57 100644 --- a/checkman/if_lancom +++ b/checkman/if_lancom @@ -130,6 +130,14 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as the bytes!). If you set this to {None}, then the port speed is not checked. The default is to remember and enforce the port speed found during inventory. + {"assumed_speed_in"} - the assumed port input speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed + + {"assumed_speed_out"} - the assumed port output speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed + {"unit"} - the measurement unit which can be set to "bit" or "byte". Depending on this choice the limits set in the {"traffic"} parameter are regarded as bits or bytes, too. When this parameter is set to "bit" any traffic related plugin output diff --git a/checkman/lnx_if b/checkman/lnx_if index edc1e11..e264277 100644 --- a/checkman/lnx_if +++ b/checkman/lnx_if @@ -128,6 +128,14 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as {"speed"} - the expected port speed as an integer of the bits per second (not the bytes!). If you set this to {None}, then the port speed is not checked. The default is to remember and enforce the port speed found during inventory. + + {"assumed_speed_in"} - the assumed port input speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed + + {"assumed_speed_out"} - the assumed port output speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed [configuration] if_inventory_porttypes (list of strings): List of interface types the inventory should create checks for. diff --git a/checkman/mcdata_fcport b/checkman/mcdata_fcport index e8ebd8f..cea5354 100644 --- a/checkman/mcdata_fcport +++ b/checkman/mcdata_fcport @@ -123,6 +123,14 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as {"speed"} - the expected port speed as an integer of the bits per second (not the bytes!). If you set this to {None}, then the port speed is not checked. The default is to remember and enforce the port speed found during inventory. + + {"assumed_speed_in"} - the assumed port input speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed + + {"assumed_speed_out"} - the assumed port output speed as an integer of the bits per second (not + the bytes!). If this value is not set the check takes the value configured in {speed} + before using the automatically detected port speed [configuration] if_inventory_porttypes (list of strings): List of interface types the inventory should create checks for.

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 9f060ea6726eb78731535b93dc1cf0666a8b5d4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f060ea6726eb7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 1 10:48:05 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: checks: cisco qos, averaging post bytes percentage and unit support

by Andreas Boesl

Module: check_mk Branch: master Commit: 07b88f281261f8e93fc2ea055bf28fab3af6e5ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07b88f281261f8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 1 10:47:57 2013 +0100 checks: cisco qos, averaging post bytes percentage and unit support --- ChangeLog | 5 ++ checkman/cisco_qos | 37 +++++++++++--- checks/cisco_qos | 90 +++++++++++++++++++++++++++++----- pnp-templates/check_mk-cisco_qos.php | 60 ++++++++++++++-------- web/plugins/wato/check_parameters.py | 4 +- 5 files changed, 150 insertions(+), 46 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=07b88f2812…

11 years, 7 months

Check_MK Git: check_mk: FIX: mssql: Agent plugin now supports MSSQL Server 2012

by Lars Michelsen

Module: check_mk Branch: master Commit: 45160a65bef3ffa4beb60b594ec7ca0f099081d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45160a65bef3ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 1 10:24:17 2013 +0100 FIX: mssql: Agent plugin now supports MSSQL Server 2012 --- ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7bca96..8724e0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ * FIX: megaraid_bbu: deal with broken output ("Adpater") * FIX: check_ldap: added missing host address (check didn't work at all) * FIX: check_ldap: added missing version option -2, -3, -3 -T (TLS) + * FIX: mssql: Agent plugin now supports MSSQL Server 2012 * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index b143457..d990591 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -30,19 +30,26 @@ Set instIds = CreateObject("Scripting.Dictionary") ' Try different trees to handle different versions of MSSQL On Error Resume Next ' MSSQL >= 10 -Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement10") -If Err.Number <> 0 Then +' try SQL Server 2012: +Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement11") +If Err.Number 0 Then Err.Clear() - - ' MSSQL < 10 - Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") - If Err.Number <> 0 Then - wscript.echo "Error: " & Err.Number & " " & Err.Description + + ' try SQL Server 2008 + Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement10") + If Err.Number 0 Then Err.Clear() - wscript.quit() + + ' try MSSQL < 10 + Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") + If Err.Number 0 Then + wscript.echo "Error: " & Err.Number & " " & Err.Description + Err.Clear() + wscript.quit() + End If End If End If -On Error Goto 0 +On Error Goto 0 For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE " & _ "SQLServiceType = 1 AND PropertyName = 'VERSION'")

11 years, 7 months

Check_MK Git: check_mk: FIX: Fixed exception when editing contactgroups without alias

by Lars Michelsen

Module: check_mk Branch: master Commit: 7aaf3425a23f7549e040a23b86dc981ed8333a77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aaf3425a23f75… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 1 10:18:22 2013 +0100 FIX: Fixed exception when editing contactgroups without alias --- ChangeLog | 1 + web/htdocs/wato.py | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8062d53..d7bca96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * FIX: flexible notification valuespec is now localizable * FIX: Alias values of host/service/contact groups need to be set and unique within the group + * FIX: Fixed exception when editing contactgroups without alias * Suggest use default value for filesystem levels that make sense * Valuespec: CascadingDropdown now able to process choice values from functions * Freshness checking for classical passive Nagios checks (custom_checks) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 27a3b7e..4e6c116 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5820,16 +5820,18 @@ def mode_edit_group(phase, what): html.text_input("name", clone_group or "") html.set_focus("name") else: + clone_group = None html.write(name) html.set_focus("alias") forms.section(_("Alias")) html.help(_("An Alias or description of this group.")) alias = groups.get(name, "") - if not alias and clone_group: - alias = groups.get(clone_group, "") if not alias: - alias = name + if clone_group: + alias = groups.get(clone_group, "") + else: + alias = name html.text_input("alias", alias) forms.end() html.button("save", _("Save"))

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0885

by Mathias Kettner

Module: check_mk Branch: master Commit: 6d98d723128bce479c310580a3f4d0d76e37ecba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d98d723128bce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 1 10:04:30 2013 +0100 Updated bug entries #0885 --- .bugs/885 | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.bugs/885 b/.bugs/885 index 4cd4848..1b0baf3 100644 --- a/.bugs/885 +++ b/.bugs/885 @@ -1,13 +1,13 @@ -Title: Password field in personal settings must not be prefilled by browser +Title: Fewer mouseclicks in commands and actions Component: multisite -Class: bug -State: done -Date: 2013-01-21 15:55:44 -Targetversion: 1.2.2 +State: open +Date: 2013-03-01 10:02:56 +Targetversion: 1.2.3 +Class: feature -If the browser enters a possible previous password then after saving -(because of changes to the notifications) the user password gets -changed and the user logged out - forever. +Two ideas in order to ease the user actions: -2013-02-05 15:36:48: changed state open -> done -Just implemented. Added "autocomplete=off" attribute to input fields. +1. Make a user setting the completely disabled all confirms in Multisite and WATO. +2. When a user has done an action on hosts/services, do not display a separate +result page, but directly to back to the view. The result of the action is then +displayed in a floating div, that goes away if you hover over.

11 years, 7 months

Check_MK Git: check_mk: Fix configuration of vSphere special agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 58381527df7121e4461ce98fd2cf4501e9cc24e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58381527df7121… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 28 11:05:06 2013 +0100 Fix configuration of vSphere special agent --- web/plugins/wato/datasource_programs.py | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index ed0b4d1..b8c1194 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -61,21 +61,13 @@ register_rule(group, title = _("Retrieve information about..."), choices = [ ( "hostsystem", _("Host Systems") ), - ( "virtualmachine", _("'Virtual Machines") ), + ( "virtualmachine", _("Virtual Machines") ), + ( "storage", _("Storage") ), ], default_value = [ "hostsystem", "virtualmachine" ], allow_empty = False, ) ), - ( "lower", - Checkbox( - title = _("Change case of names to lower"), - help = _("Check_MK tries to provide the collected information to " - "the other Hosts in the monitoring. The Name of the vSphere " - "Objects need to be the same as the host name ."), - allow_empty = True, - ) - ), ], optional_keys = [ "tcp_port", ], ),

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: aa96197823896f36c5265e6c5070005332354e52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa96197823896f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 1 09:39:24 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013