Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: Added example for new feature in sample check_mk. ini

by Mathias Kettner

Module: check_mk Branch: master Commit: b10e52fc95af1022e7595bff36934094745fc94c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b10e52fc95af10… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 18 11:48:16 2013 +0200 Added example for new feature in sample check_mk.ini --- agents/windows/check_mk.example.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 84eb9bf..0a1a15a 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -65,3 +65,8 @@ [fileinfo] # path = C:\Programs\Foo\*.log # path = M:\Bar Test\*.* + +[plugins] + timeout windows_updates.vbs = 20 + timeout *.txt = 10 + timeout * = 30

11 years, 2 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: 9388f6d0de72391487483d9ebe58078a96748403 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9388f6d0de7239… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 18 11:10:26 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: agent_vsphere: added docu link

by Mathias Kettner

Module: check_mk Branch: master Commit: 1eb01d60b032a888fbc2eb7fd7a99636d9c2d437 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eb01d60b032a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 18 11:10:25 2013 +0200 agent_vsphere: added docu link --- agents/special/agent_vsphere | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 962fc19..ccf2eda 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -24,6 +24,9 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Useful resources: +# http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/ + import sys import getopt import socket

11 years, 2 months

Check_MK Git: check_mk: cisco_hsrp: fixed problem when HSRP groups had same ip address

by Andreas Boesl

Module: check_mk Branch: master Commit: d1c34e1304471d1c63dbaaf62fea1425136235d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1c34e1304471d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 18 10:54:43 2013 +0200 cisco_hsrp: fixed problem when HSRP groups had same ip address --- ChangeLog | 1 + checks/cisco_hsrp | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a390aad..9047e85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * cpu_util.include: fixed bug when params are set to None * predictive levels: fixed bug when existing predictive levels get new options * windows_plugin mssql.vbs: No longer queries stopped mssql instances + * cisco_hsrp: fixed problem when HSRP groups had same ip address Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/checks/cisco_hsrp b/checks/cisco_hsrp index 11d9c90..aa4aff1 100644 --- a/checks/cisco_hsrp +++ b/checks/cisco_hsrp @@ -75,7 +75,6 @@ hsrp_states = { 1: "initial", 2: "learn", 3: "listen", 4: "speak", 5: "standby", def inventory_cisco_hsrp(info): - inventory = [] for line in info: hsrp_grp_entry, vip, actrouter, sbrouter, hsrp_state, vmac = line @@ -84,7 +83,8 @@ def inventory_cisco_hsrp(info): # if the group is in a working state (both routers see and talk to each other), # inventorize HSRP group name+IP and the standby state as seen from "this" box. if hsrp_state in [ 5, 6 ]: - inventory.append( (vip, (hsrp_grp, hsrp_state)) ) + vip_grp = "%s-%s" % ( vip, hsrp_grp ) + inventory.append( (vip_grp, (hsrp_grp, hsrp_state)) ) return inventory @@ -98,17 +98,22 @@ def check_cisco_hsrp(item, params, info): interface_index, hsrp_grp = hsrp_grp_entry.split(".") hsrp_state = int(hsrp_state) - if vip == item: + if "-" in item: + vip_grp = "%s-%s" % ( vip, hsrp_grp ) + else: + vip_grp = vip + + if vip_grp == item: # FIXME: This should be shorter. # Validate that we the inventorized state is a "good one" # if it's also the one we have now, then we're fine. if hsrp_state_wanted == 5 and hsrp_state == hsrp_state_wanted: state = 0 - msgtxt = "Redundancy Group %s is OK" % hsrp_grp + msgtxt = "Redundancy Group %s is OK" % vip_grp elif hsrp_state_wanted == 6 and hsrp_state == hsrp_state_wanted: state = 0 - msgtxt = "Redundancy Group %s is OK" % hsrp_grp + msgtxt = "Redundancy Group %s is OK" % vip_grp # otherwise if it's a good one, but flipped, then we are in a failover elif hsrp_state == 5 or hsrp_state == 6: state = 1 @@ -120,7 +125,7 @@ def check_cisco_hsrp(item, params, info): return (state, msgtxt) - return (3, "HSRP Group %s not found in Agent output" % hsrp_grp_wanted ) + return (3, "HSRP Group not found in Agent output" )

11 years, 2 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: 35c53ae790bd47048f2c43abab1aab0b99ad21b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35c53ae790bd47… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 18 10:55:42 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 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: e32698d40239e6875d92bbc817b17bdada51d319 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e32698d40239e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 18 10:27:49 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: OptionalDropdownChoice: fix rendering of explicit value

by Mathias Kettner

Module: check_mk Branch: master Commit: 60039cf96455efe9c9bbda3e585b8c70c3b1cb08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60039cf96455ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 18 10:27:47 2013 +0200 OptionalDropdownChoice: fix rendering of explicit value --- web/htdocs/valuespec.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index daf92f5..1b66856 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1296,7 +1296,12 @@ class OptionalDropdownChoice(ValueSpec): html.write('<span id="%s_ex" style="white-space: nowrap; %s">' % ( varprefix, not div_is_open and "display: none;" or "")) html.write(" ") - self._explicit.render_input(varprefix + "_ex", value) + + if defval == "other": + input_value = value + else: + input_value = self._explicit.default_value() + self._explicit.render_input(varprefix + "_ex", input_value) html.write("</span>") def value_to_text(self, value):

11 years, 2 months

Check_MK Git: check_mk: Fixed problem with check_interval parsing after snmp_check_interval implementation

by Lars Michelsen

Module: check_mk Branch: master Commit: 1cdecc4e4420cde9f2e7ea0e20ffa4685805e8cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cdecc4e4420cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 18 08:41:59 2013 +0200 Fixed problem with check_interval parsing after snmp_check_interval implementation --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index cde68c5..6ea6d97 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1780,7 +1780,7 @@ def create_nagios_servicedefs(outfile, hostname): # Customized interval of Check_MK service values = service_extra_conf(hostname, "Check_MK", extra_service_conf.get('check_interval', [])) if values: - check_interval = values[0] * 60 + check_interval = int(values[0]) * 60 value = check_interval_of(hostname, checkname) if value is not None: check_interval = value

11 years, 2 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 6ab86ef319cf1e7d0da922a7f029c105f07c9525 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ab86ef319cf1e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 18 09:03:26 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: FIX: fix bug where certain settings where not saved on IE.

by Mathias Kettner

Module: check_mk Branch: master Commit: 074d8381581a894e2e527dd2160ca3e11569365d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=074d8381581a89… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 17 16:15:27 2013 +0200 FIX: fix bug where certain settings where not saved on IE. --- ChangeLog | 4 ++++ web/htdocs/js/checkmk.js | 1 + 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index deeb54a..a390aad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,10 @@ WATO: * Improved handling of valuespec validations in WATO rule editor. Displaying a warning message when going to throw away the current settings. + * FIX: fix bug where certain settings where not saved on IE. This was mainly + on IE7, but also IE8,9,10 in IE7 mode (which is often active). Affected + was e.g. the nodes of a cluster or the list of services for service + inventory 1.2.2: Core: diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 46d5cae..5d03edf 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1568,6 +1568,7 @@ function list_of_strings_extend(oInput, j) { oNewDiv.innerHTML = oDiv.innerHTML.replace('"' + oldName + '"', '"' + newName + '"'); // IE7 does not have quotes in innerHTML, trying to workaround this here. oNewDiv.innerHTML = oNewDiv.innerHTML.replace('=' + oldName + ' ', '=' + newName + ' '); + oNewDiv.innerHTML = oNewDiv.innerHTML.replace('=' + oldName + '>', '=' + newName + '>'); oContainer.appendChild(oNewDiv); /* Move focus function from old last to new last input field */

11 years, 2 months

← Newer
1
...
6
7
8
9
10
11
12
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013