Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: WATO: Fixed an exception when creating a user

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b95345f179ee41ebd962d704e86b2e0268ab02e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b95345f179ee4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 6 11:06:48 2015 +0200 WATO: Fixed an exception when creating a user --- web/plugins/userdb/htpasswd.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/web/plugins/userdb/htpasswd.py b/web/plugins/userdb/htpasswd.py index 122fe65..1a74fb1 100644 --- a/web/plugins/userdb/htpasswd.py +++ b/web/plugins/userdb/htpasswd.py @@ -27,6 +27,14 @@ import crypt import defaults + +def encrypt_password(password, salt = None): + import md5crypt + if not salt: + salt = "%06d" % (1000000 * (time.time() % 1.0)) + return md5crypt.md5crypt(password, salt, '$1$') + + class HtpasswdUserConnector(UserConnector): def __init__(self, config): super(HtpasswdUserConnector, self).__init__(config) @@ -75,13 +83,6 @@ class HtpasswdUserConnector(UserConnector): return creds - def encrypt_password(self, password, salt = None): - import md5crypt - if not salt: - salt = "%06d" % (1000000 * (time.time() % 1.0)) - return md5crypt.md5crypt(password, salt, '$1$') - - # Validate hashes taken from the htpasswd file. This method handles # crypt() and md5 hashes. This should be the common cases in the # used htpasswd files.

9 years, 2 months

Check_MK Git: check_mk: Made rule title localizable

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4fe042df44a06e92678262559e205a3e91ac1d5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fe042df44a06e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 6 11:06:04 2015 +0200 Made rule title localizable --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 53f59e7..33e3ea8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2371,7 +2371,7 @@ register_check_parameters( register_check_parameters( subgroup_networking, "tcp_conn_stats", - ("TCP connection stats (LINUX / UNIX)"), + _("TCP connection stats (LINUX / UNIX)"), Dictionary( elements = [ ( "ESTABLISHED",

9 years, 2 months

Check_MK Git: check_mk: #2399 agent_vsphere/esx_vsphere_counters.if: now also reports interface state, bandwidth and mac address

by Andreas Boesl

Module: check_mk Branch: master Commit: 97500168daacd92b92ac0fe42346acfcdc2ee17a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97500168daacd9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 6 09:45:21 2015 +0200 #2399 agent_vsphere/esx_vsphere_counters.if: now also reports interface state, bandwidth and mac address The agent_vsphere now queries more data from the esx host. In earlier versions the state was always set to up and the bandwidth and mac address to unknown. --- .werks/2399 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 33 +++++++++++++++++++++++++++++++++ checks/esx_vsphere_counters | 26 ++++++++++++++++++-------- 4 files changed, 62 insertions(+), 8 deletions(-) diff --git a/.werks/2399 b/.werks/2399 new file mode 100644 index 0000000..3572c3b --- /dev/null +++ b/.werks/2399 @@ -0,0 +1,10 @@ +Title: agent_vsphere/esx_vsphere_counters.if: now also reports interface state, bandwidth and mac address +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1436168510 +Class: feature + +The agent_vsphere now queries more data from the esx host. +In earlier versions the state was always set to up and the bandwidth and mac address to unknown. diff --git a/ChangeLog b/ChangeLog index 751f225..45f11fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 2371 appdynamics_memory, appdynamics_sessions, appdynamics_web_container: New checks for AppDynamic... * 2398 agent_vsphere: now able to opt-out of servers ssl certifcate check... * 2448 Various Checks for Citrix XenApp 7.x Farms... + * 2399 agent_vsphere/esx_vsphere_counters.if: now also reports interface state, bandwidth and mac address... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 803a5a8..a02a267 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -157,6 +157,14 @@ telegram_list = { '<ns1:querySpec><ns1:entity type="HostSystem">%(esxhost)s</ns1:entity><ns1:maxSample>1</ns1:maxSample>%(counters)s'\ '<ns1:intervalId>20</ns1:intervalId></ns1:querySpec></ns1:QueryPerf>', + "networksystem": + '<ns1:RetrievePropertiesEx xsi:type="ns1:RetrievePropertiesExRequestType">'\ + '<ns1:_this type="PropertyCollector">%(propertyCollector)s</ns1:_this><ns1:specSet>'\ + '<ns1:propSet><ns1:type>HostNetworkSystem</ns1:type><all>0</all>'\ + '<ns1:pathSet>networkInfo</ns1:pathSet></ns1:propSet>'\ + '<ns1:objectSet><ns1:obj type="HostNetworkSystem">networkSystem</ns1:obj>'\ + '</ns1:objectSet></ns1:specSet><ns1:options></ns1:options></ns1:RetrievePropertiesEx>', + "esxhostdetails": '<ns1:RetrievePropertiesEx xsi:type="ns1:RetrievePropertiesExRequestType">' '<ns1:_this type="PropertyCollector">%(propertyCollector)s</ns1:_this><ns1:specSet><ns1:propSet>'\ @@ -778,6 +786,26 @@ if not error: # Counters ########################### if "counters" in query_objects: + # Get additional interface counter info, this only works when querying ESX hosts + # TODO: get this info from the vcenter + net_extra_info = [] + if opt_direct: + reply_code, reply_msg, reply_headers, networksystem_response = query_server(telegram_list["networksystem"]) + nic_objects = get_pattern('<pnic><key>(.*?)</pnic>', networksystem_response) + for nic in nic_objects: + nic_if = get_pattern('(.*?)</key><device>(.*?)</device>(.*)<mac>(.*?)</mac>', nic) + try: + bandwidth_block = nic_if[0][2] + bandwidth = get_pattern('</driver><linkSpeed><speedMb>(.*?)</speedMb>', bandwidth_block) + net_extra_info.append("net.macaddress|%s|%s|mac" % (nic_if[0][1], nic_if[0][3])) + if bandwidth: + net_extra_info.append("net.bandwidth|%s|%s|bytes" % (nic_if[0][1], int(bandwidth[0]) * 1000000)) + net_extra_info.append("net.state|%s|1|state" % nic_if[0][1]) + else: + net_extra_info.append("net.state|%s|2|state" % nic_if[0][1]) + except Exception, e: + continue + # Get counter syntax counter_syntax_payload = telegram_list["perfcountersyntax"] needed_ids = get_counters(systeminfo["apiVersion"]) @@ -795,6 +823,7 @@ if not error: for key, nameInfo, groupInfo, unitInfo in elements: counters_syntax[key] = { "name": nameInfo, "group": groupInfo, "unit": unitInfo } + # We need to query each ESX host system separately.. hostnames = hostsystems.keys() counter_data_payload = telegram_list["perfcounterdata"] @@ -837,6 +866,9 @@ if not error: value = counters_output[key] print "%s.%s|%s|%s|%s" % (key + value) + for line in net_extra_info: + print line + if not opt_direct: print '<<<<>>>>' @@ -847,6 +879,7 @@ if not error: hostsystems_properties = {} hostsystems_sensors = {} + # Propsets reply_code, reply_msg, reply_headers, esxhostdetails_response = query_server(telegram_list["esxhostdetails"]) hostsystems_objects = get_pattern('<objects>(.*?)</objects>', esxhostdetails_response) diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index 753d667..54727da 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -133,7 +133,10 @@ def convert_esx_counters_if(info): if item and counter.startswith("net."): name = counter[4:] by_item.setdefault(item, {}) - by_item[item][name] = int(value) + if name != "macaddress": + by_item[item][name] = int(value) + else: + by_item[item][name] = value # Example of by_item: # { @@ -154,6 +157,9 @@ def convert_esx_counters_if(info): # 'transmitted': 134, # 'unknownProtos': 0, # 'usage': 4040, + # 'macaddress': 'AA:BB:CC:DD:EE:FF", + # 'state': 2, + # 'bandwidth': 10000000, # }, # } nics = by_item.keys() @@ -206,13 +212,17 @@ def convert_esx_counters_if(info): entry = ['0'] * 20 converted.append(entry) if name: # Skip summary entry without interface name - entry[0] = (str(index)) - entry[1] = (name) - entry[2] = ('6') # Ethernet - entry[3] = ('') # Speed not known - entry[4] = ('1') # Assume up - entry[18] = (name) # ifAlias - entry[19] = ('') # MAC address not known here + entry[0] = str(index) + entry[1] = name + entry[2] = '6' # Ethernet + entry[3] = str(by_item[name].get("bandwidth", "")) # Speed not known + entry[4] = str(by_item[name].get("state", "1")) + entry[18] = name # ifAlias + if by_item[name].get("macaddress"): + mac = "".join(map(lambda x: chr(int(x, 16)), by_item[name]["macaddress"].split(':'))) + entry[19] = mac + else: + entry[19] = '' # MAC address not known here for ctr_name, ti in tableindex.items(): ctr_value = by_item[name].get(ctr_name, 0) if ctr_name.startswith("bytes"):

9 years, 2 months

Check_MK Git: check_mk: #2448 Various Checks for Citrix XenApp 7.x Farms

by Konstantin Büttner

Module: check_mk Branch: master Commit: fe5b63caf7a7982cf23cbb1408b16f9fb56addfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe5b63caf7a798… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 3 19:07:56 2015 +0200 #2448 Various Checks for Citrix XenApp 7.x Farms Several new checks to gather information on Citrix VMs, hostsystems and controllers. <tt>citrix_state</tt> monitors various state variables of citrix instances, such as the power or registration state. <tt>citrix_controller</tt> checks whether the controller is active or not, <tt>citrix_controller.licensing</tt> monitors the licensing state, <tt>citrix_controller.session</tt> checks for the number of total, active and inactive sessions. Also included are a number of purely informative checks that are always OK. --- .werks/2448 | 14 ++++++ ChangeLog | 1 + agents/windows/plugins/citrix_farm.ps1 | 85 +++++++++++++++----------------- checkman/citrix_controller | 15 ++++++ checkman/citrix_controller.licensing | 18 +++++++ checkman/citrix_controller.sessions | 18 +++++++ checkman/citrix_hostsystem | 15 ++++++ checkman/citrix_hostsystem.vms | 16 ++++++ checkman/citrix_state | 15 ++++++ checkman/citrix_state.controller | 16 ++++++ checkman/citrix_state.hosting_server | 16 ++++++ checks/citrix_controller | 62 +++++++++++++---------- checks/citrix_hostsystem | 2 +- checks/citrix_state | 4 +- web/plugins/metrics/check_mk.py | 11 +++++ 15 files changed, 235 insertions(+), 73 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fe5b63caf7…

9 years, 2 months

Check_MK Git: check_mk: Revert " #2395 FIX Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages "

by Lars Michelsen

Module: check_mk Branch: master Commit: 323a9d8dd588669d611115a284fcbf9b2ac5d80b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=323a9d8dd58866… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 3 16:54:41 2015 +0200 Revert "#2395 FIX Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages" This reverts commit c586a74b5797647b4e138f2fb738d4c09b595ac9. --- .werks/2395 | 16 ---------------- ChangeLog | 1 - agents/check-mk-agent.spec | 2 +- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/.werks/2395 b/.werks/2395 deleted file mode 100644 index b1a188e..0000000 --- a/.werks/2395 +++ /dev/null @@ -1,16 +0,0 @@ -Title: Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages -Level: 1 -Component: checks -Compatible: compat -Version: 1.2.7i3 -Date: 1435925490 -Class: fix - -When you install the default Check_MK Agent RPM package it will trigger the removal of -the previously installed check-mk-agent, check_mk-agent and check_mk-agent-logwatch -RPM packages. Please note that this agent does not ship the mk_logwatch plugin, so -you will need to install the mk_logwatch plugin in your own. - -If you want to have the Check_MK Agent RPM package contain the plugins you need and -are a happy user with access to the Check_MK Enterprise Edition, you can use the -Agent Bakery to create your custom packed RPM packages. diff --git a/ChangeLog b/ChangeLog index 165d850..714396b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,7 +29,6 @@ * 2320 FIX: winperf_msx_queues: no longer crashes in service discovery if there are no msx queues available * 2321 FIX: process discovery: fixed exception during service discovery when no explicit process matching was set... * 2394 FIX: megaraid_ldisks: Is now supporting LSI CacheCade drives - * 2395 FIX: Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index 5403524..7b950b3 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -34,7 +34,7 @@ BuildRoot: %{_topdir}/buildroot AutoReq: off AutoProv: off BuildArch: noarch -Obsoletes: check_mk-agent check_mk-agent-logwatch +Obsoletes: check_mk-agent %description The Check_MK Agent uses xinetd to provide information about the system

9 years, 2 months

Check_MK Git: check_mk: Fixed broken check parameters after cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2b5b19edee8827a6dc0015622e468d5ab49bae4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b5b19edee8827… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 3 16:33:14 2015 +0200 Fixed broken check parameters after cleanup --- web/plugins/wato/check_parameters.py | 122 +++++++++++++++++----------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6b6c904..53f59e7 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -496,6 +496,63 @@ register_check_parameters( "first" ) +vs_license = Alternative( + title = _("Levels for Number of Licenses"), + style = "dropdown", + default_value = None, + elements = [ + Tuple( + title = _("Absolute levels for unused licenses"), + elements = [ + Integer(title = _("Warning below"), default_value = 5, unit = _("unused licenses")), + Integer(title = _("Critical below"), default_value = 0, unit = _("unused licenses")), + ] + ), + Tuple( + title = _("Percentual levels for unused licenses"), + elements = [ + Percentage(title = _("Warning below"), default_value = 10.0), + Percentage(title = _("Critical below"), default_value = 0), + ] + ), + FixedValue( + None, + totext = _("Critical when all licenses are used"), + title = _("Go critical if all licenses are used"), + ), + FixedValue( + False, + title = _("Always report OK"), + totext = _("Alerting depending on the number of used licenses is disabled"), + ) + ] + ) + +register_check_parameters( + subgroup_applications, + "esx_licenses", + _("Number of used VMware licenses"), + vs_license, + TextAscii( + title = _("Name of the license"), + help = _("For example <tt>VMware vSphere 5 Standard</tt>"), + allow_empty = False, + ), + "first" +) + +register_check_parameters( + subgroup_applications, + "ibmsvc_licenses", + _("Number of used IBM SVC licenses"), + vs_license, + TextAscii( + title = _("ID of the license, e.g. <tt>virtualization</tt>"), + allow_empty = False, + ), + "first" +) + register_check_parameters( subgroup_applications, "citrix_licenses", @@ -567,10 +624,10 @@ register_check_parameters( Dictionary( title = _("Interpretation of Registration States"), elements = [ - ( "Unregistered", MonitoringState(title = "Unregistered", default_value = 2) ), - ( "Initializing", MonitoringState(title = "Initializing", default_value = 1) ), - ( "Registered", MonitoringState(title = "Registered", default_value = 0) ), - ( "AgentError", MonitoringState(title = "AgentError", default_value = 2) ), + ( "Unregistered", MonitoringState(title = _("Unregistered"), default_value = 2) ), + ( "Initializing", MonitoringState(title = _("Initializing"), default_value = 1) ), + ( "Registered", MonitoringState(title = _("Registered"), default_value = 0) ), + ( "AgentError", MonitoringState(title = _("Agent Error"), default_value = 2) ), ], optional_keys = False, ), @@ -8328,63 +8385,6 @@ register_check_parameters( ) -vs_license = Alternative( - title = _("Levels for Number of Licenses"), - style = "dropdown", - default_value = None, - elements = [ - Tuple( - title = _("Absolute levels for unused licenses"), - elements = [ - Integer(title = _("Warning below"), default_value = 5, unit = _("unused licenses")), - Integer(title = _("Critical below"), default_value = 0, unit = _("unused licenses")), - ] - ), - Tuple( - title = _("Percentual levels for unused licenses"), - elements = [ - Percentage(title = _("Warning below"), default_value = 10.0), - Percentage(title = _("Critical below"), default_value = 0), - ] - ), - FixedValue( - None, - totext = _("Critical when all licenses are used"), - title = _("Go critical if all licenses are used"), - ), - FixedValue( - False, - title = _("Always report OK"), - totext = _("Alerting depending on the number of used licenses is disabled"), - ) - ] - ) - -register_check_parameters( - subgroup_applications, - "esx_licenses", - _("Number of used VMware licenses"), - vs_license, - TextAscii( - title = _("Name of the license"), - help = _("For example <tt>VMware vSphere 5 Standard</tt>"), - allow_empty = False, - ), - "first" -) - -register_check_parameters( - subgroup_applications, - "ibmsvc_licenses", - _("Number of used IBM SVC licenses"), - vs_license, - TextAscii( - title = _("ID of the license, e.g. <tt>virtualization</tt>"), - allow_empty = False, - ), - "first" -) - register_check_parameters( subgroup_networking, "adva_ifs",

9 years, 2 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: e67702194f8c66a7d7a30e800fcd4bc1d096b463 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e67702194f8c66… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 3 15:39:35 2015 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 167459e..0af87fa 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2448 +2458

9 years, 2 months

Check_MK Git: check_mk: Intermediate step for new Citrix Plugins

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7abbb67046cf1346e45582c3176d78286b57a92c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7abbb67046cf13… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 3 15:31:04 2015 +0200 Intermediate step for new Citrix Plugins --- agents/windows/plugins/citrix_farm.ps1 | 180 ++++++++++++++++++++++++++++++++ checks/citrix_controller | 171 ++++++++++++++++++++++++++++++ checks/citrix_hostsystem | 81 ++++++++++++++ checks/citrix_state | 173 ++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 22 ++++ 5 files changed, 627 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7abbb67046…

9 years, 2 months

Check_MK Git: check_mk: Sorted some rules into groups

by Konstantin Büttner

Module: check_mk Branch: master Commit: d24df75fd5883e5cbf58540956c6df3095c62498 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d24df75fd5883e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 3 15:19:56 2015 +0200 Sorted some rules into groups --- web/plugins/wato/check_parameters.py | 122 +++++++++++++++++----------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 0f801c2..35abeaf 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -496,6 +496,67 @@ register_check_parameters( "first" ) +register_check_parameters( + subgroup_applications, + "citrix_licenses", + _("Number of used Citrix licenses"), + vs_license, + TextAscii( + title = _("ID of the license, e.g. <tt>PVSD_STD_CCS</tt>"), + allow_empty = False, + ), + "first" +) + +register_check_parameters( + subgroup_applications, + "citrix_sessions", + _("Citrix Terminal Server Sessions"), + Dictionary( + elements = [ + ( "total", + Tuple( + title = _("Total number of Sessions"), + elements = [ + Integer(title = _("warning at"), unit = "Sessions" ), + Integer(title = _("critical at"), unit = "Session" ), + ]) + ), + ( "active", + Tuple( + title = _("Number of Active Sessions"), + elements = [ + Integer(title = _("warning at"), unit = "Sessions" ), + Integer(title = _("critical at"), unit = "Session" ), + ]) + ), + ( "inactive", + Tuple( + title = _("Number of Inactive Sessions"), + elements = [ + Integer(title = _("warning at"), unit = "Sessions" ), + Integer(title = _("critical at"), unit = "Session" ), + ]) + ), + ] + ), + None, "dict" +), + +register_check_parameters( + subgroup_applications, + "citrix_load", + _("Load of Citrix Server"), + Tuple( + title = _("Citrix Server load"), + elements = [ + Integer(title = _("warning at"), default_value = 8500), + Integer(title = _("critical at"), default_value = 9500), + ]), + None, + match_type = "first", +) + #. # .--Environment---------------------------------------------------------. @@ -8292,18 +8353,6 @@ register_check_parameters( register_check_parameters( subgroup_applications, - "citrix_licenses", - _("Number of used Citrix licenses"), - vs_license, - TextAscii( - title = _("ID of the license, e.g. <tt>PVSD_STD_CCS</tt>"), - allow_empty = False, - ), - "first" -) - -register_check_parameters( - subgroup_applications, "ibmsvc_licenses", _("Number of used IBM SVC licenses"), vs_license, @@ -8315,55 +8364,6 @@ register_check_parameters( ) register_check_parameters( - subgroup_applications, - "citrix_load", - _("Load of Citrix Server"), - Tuple( - title = _("Citrix Server load"), - elements = [ - Integer(title = _("warning at"), default_value = 8500), - Integer(title = _("critical at"), default_value = 9500), - ]), - None, - match_type = "first", -) - -register_check_parameters( - subgroup_applications, - "citrix_sessions", - _("Citrix Terminal Server Sessions"), - Dictionary( - elements = [ - ( "total", - Tuple( - title = _("Total number of Sessions"), - elements = [ - Integer(title = _("warning at"), unit = "Sessions" ), - Integer(title = _("critical at"), unit = "Session" ), - ]) - ), - ( "active", - Tuple( - title = _("Number of Active Sessions"), - elements = [ - Integer(title = _("warning at"), unit = "Sessions" ), - Integer(title = _("critical at"), unit = "Session" ), - ]) - ), - ( "inactive", - Tuple( - title = _("Number of Inactive Sessions"), - elements = [ - Integer(title = _("warning at"), unit = "Sessions" ), - Integer(title = _("critical at"), unit = "Session" ), - ]) - ), - ] - ), - None, "dict" -), - -register_check_parameters( subgroup_networking, "adva_ifs", _("Adva Optical Transport Laser Power"),

9 years, 2 months

Check_MK Git: check_mk: Fixed using cached agent data in keepalive mode

by Lars Michelsen

Module: check_mk Branch: master Commit: a7f56be3f62696846cb59210da330a50e147de34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7f56be3f62696… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 3 14:57:12 2015 +0200 Fixed using cached agent data in keepalive mode Conflicts: modules/check_mk.py --- modules/check_mk.py | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index f3ab241..4d23e3c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -608,6 +608,36 @@ def agent_target_version(hostname): return spec # return the whole spec in case of an "at least version" config +orig_check_max_cachefile_age = None +orig_cluster_max_cachefile_age = None +orig_inventory_max_cachefile_age = None + +# TODO: Why 1000000000? Can't we really clean this up to a global variable which can +# be toggled to enforce the cache usage (if available). This way we would not need +# to store the original values of the different caches and modify them etc. +def enforce_using_agent_cache(): + global check_max_cachefile_age, cluster_max_cachefile_age, inventory_max_cachefile_age + global orig_check_max_cachefile_age, orig_cluster_max_cachefile_age, \ + orig_inventory_max_cachefile_age + + if check_max_cachefile_age != 1000000000: + orig_check_max_cachefile_age = check_max_cachefile_age + orig_cluster_max_cachefile_age = cluster_max_cachefile_age + orig_inventory_max_cachefile_age = inventory_max_cachefile_age + + check_max_cachefile_age = 1000000000 + cluster_max_cachefile_age = 1000000000 + inventory_max_cachefile_age = 1000000000 + + +def restore_original_agent_caching_usage(): + global check_max_cachefile_age, cluster_max_cachefile_age, inventory_max_cachefile_age + if orig_check_max_cachefile_age != None: + check_max_cachefile_age = orig_check_max_cachefile_age + cluster_max_cachefile_age = orig_cluster_max_cachefile_age + inventory_max_cachefile_age = orig_inventory_max_cachefile_age + + #. # .--SNMP----------------------------------------------------------------. # | ____ _ _ __ __ ____ | @@ -5231,8 +5261,7 @@ def add_keepalive_check_result(service, state, output, cached_at=None, cache_int def do_check_keepalive(): - global g_initial_times, g_timeout, check_max_cachefile_age, inventory_max_cachefile_age - global g_total_check_output + global g_initial_times, g_timeout, g_total_check_output def check_timeout(signum, frame): raise MKCheckTimeout() @@ -5262,9 +5291,6 @@ def do_check_keepalive(): global vars_before_config vars_before_config = set([]) - orig_check_max_cachefile_age = check_max_cachefile_age - orig_inventory_max_cachefile_age = inventory_max_cachefile_age - g_total_check_output = "" if opt_verbose: @@ -5306,11 +5332,7 @@ def do_check_keepalive(): args = cmdline.split() if '--cache' in args: args.remove('--cache') - check_max_cachefile_age = 1000000000 - inventory_max_cachefile_age = 1000000000 - else: - check_max_cachefile_age = orig_check_max_cachefile_age - inventory_max_cachefile_age = orig_inventory_max_cachefile_age + enforce_using_agent_cache() # FIXME: remove obsolete check-inventory if '--check-inventory' in args: @@ -5373,6 +5395,7 @@ def do_check_keepalive(): sys.stderr.flush() cleanup_globals() # Prepare for next check + restore_original_agent_caching_usage() # Check if all global variables are clean, but only in verbose logging mode if opt_verbose: @@ -5785,8 +5808,7 @@ for o,a in opts: sys.exit(1) elif o == '--cache': opt_use_cachefile = True - check_max_cachefile_age = 1000000000 - inventory_max_cachefile_age = 1000000000 + enforce_agent_caching() elif o == '--no-tcp': opt_no_tcp = True elif o == '--no-cache':

9 years, 2 months

← Newer
1
...
20
21
22
23
24
25
26
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015