Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

4200 FIX Fix computation of Event Console performance snapin in distributed mode

by Mathias Kettner

Module: check_mk Branch: master Commit: 827cd9ba2910673851da574a9f6a3e1a1075dd54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=827cd9ba291067… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 20 15:32:23 2016 +0100 4200 FIX Fix computation of Event Console performance snapin in distributed mode This contents of the sidebar snapin {{Event Console Performance}} showed invalid data in case of a multi-sited distributed Event Console: It only show data from one random instance. This has been fixed. Change-Id: I6738f97f6bbebebc9ba1130be4d2c0e155f33eee --- .werks/4200 | 11 +++++++ ChangeLog | 1 + web/htdocs/mkeventd.py | 64 +++++++++++++++++++++++++++++++++++------ web/plugins/sidebar/mkeventd.py | 11 +++++-- 4 files changed, 76 insertions(+), 11 deletions(-) diff --git a/.werks/4200 b/.werks/4200 new file mode 100644 index 0000000..be0c6fc --- /dev/null +++ b/.werks/4200 @@ -0,0 +1,11 @@ +Title: Fix computation of Event Console performance snapin in distributed mode +Level: 2 +Component: ec +Compatible: compat +Version: 1.4.0i4 +Date: 1482244286 +Class: fix + +This contents of the sidebar snapin {{Event Console Performance}} showed invalid +data in case of a multi-sited distributed Event Console: It only show data from +one random instance. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 9b465a8..666ffc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * 4155 FIX: Do not perform actions on events if overflow limit is active... * 4156 FIX: Fix off-by-one error in EC limit handling... * 4199 FIX: Fix detection of replication mode if EC is distributed... + * 4200 FIX: Fix computation of Event Console performance snapin in distributed mode... 1.4.0i3: diff --git a/web/htdocs/mkeventd.py b/web/htdocs/mkeventd.py index d74e5c7..e1cdebe 100644 --- a/web/htdocs/mkeventd.py +++ b/web/htdocs/mkeventd.py @@ -237,17 +237,63 @@ def execute_command(name, args=None, site=None): sites.live().command(query, site) -def get_status(): - response = sites.live().query("GET eventconsolestatus") - return dict(zip(response[0], response[1])) -def replication_mode(): - try: - status = get_status() - return status["status_replication_slavemode"] - except: - return None +def get_total_stats(): + stats_keys = [ + "status_average_message_rate", + "status_average_rule_trie_rate", + "status_average_rule_hit_rate", + "status_average_event_rate", + "status_average_connect_rate", + "status_average_overflow_rate", + "status_average_rule_trie_rate", + "status_average_rule_hit_rate", + "status_average_processing_time", + "status_average_request_time", + "status_average_sync_time", + ] + + stats_per_site = list(get_stats_per_site(stats_keys)) + + # First simply add rates. Times must then be averaged + # weighted by message rate or connect rate + total_stats = {} + for row in stats_per_site: + for key, value in row.items(): + if key.endswith("rate"): + total_stats.setdefault(key, 0.0) + total_stats[key] += value + if not total_stats: + return None # No site answered + + for row in stats_per_site: + for time_key, in_relation_to in [ + ( "status_average_processing_time", "status_average_message_rate" ), + ( "status_average_request_time", "status_average_connect_rate" ), + ]: + total_stats.setdefault(time_key, 0.0) + if total_stats[in_relation_to]: # avoid division by zero + my_weight = row[in_relation_to] / total_stats[in_relation_to] + total_stats[time_key] += my_weight * row[time_key] + + total_sync_time = 0.0 + count = 0 + for row in stats_per_site: + if row["status_average_sync_time"] > 0.0: + count += 1 + total_sync_time += row["status_average_sync_time"] + + if count > 0: + total_stats["status_average_sync_time"] = total_sync_time / count + + return total_stats + + +def get_stats_per_site(stats_keys): + for list_row in sites.live().query("GET eventconsolestatus\nColumns: %s" % " ".join(stats_keys)): + yield dict(zip(stats_keys, list_row)) + # Rule matching for simulation. Yes - there is some hateful code duplication diff --git a/web/plugins/sidebar/mkeventd.py b/web/plugins/sidebar/mkeventd.py index c992bf7..655f5c7 100644 --- a/web/plugins/sidebar/mkeventd.py +++ b/web/plugins/sidebar/mkeventd.py @@ -33,7 +33,7 @@ except: def mkeventd_performance_entries(): - status = mkeventd.get_status() + status = mkeventd.get_total_stats() # combination of several sites entries = [] # TODO: Reorder these values and create a useful order. @@ -84,8 +84,15 @@ def mkeventd_performance_entries(): def render_mkeventd_performance(): + try: + entries = mkeventd_performance_entries() + except Exception, e: + raise + html.show_error(e) + return + html.open_table(class_=["mkeventd_performance"]) - for index, left, right in mkeventd_performance_entries(): + for index, left, right in entries: html.tr( html.render_td("%s:" % left) + html.render_td(right))

7 years, 9 months

4174 FIX added missing perfometer for interface services

by Simon Betz

Module: check_mk Branch: master Commit: 23f3ff2d2b7b0e9a70200627cba652ee91d35fe8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23f3ff2d2b7b0e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 20 14:20:25 2016 +0100 4174 FIX added missing perfometer for interface services Change-Id: I9e80689744b82191bfef0a92095aaa6f233d6841 --- .werks/4174 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 15 +++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/.werks/4174 b/.werks/4174 new file mode 100644 index 0000000..f842d26 --- /dev/null +++ b/.werks/4174 @@ -0,0 +1,10 @@ +Title: added missing perfometer for interface services +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482239968 + + diff --git a/ChangeLog b/ChangeLog index b4dc714..df578dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 4207 FIX: mk_jolokia: Use configured port as default instance name... NOTE: Please refer to the migration notes! * 4208 FIX: mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash... + * 4174 FIX: added missing perfometer for interface services Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index bc8e858..76e51aa 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5202,6 +5202,21 @@ perfometer_info.append(("dual", [ perfometer_info.append(("dual", [ { "type" : "logarithmic", + "metric" : "if_in_octets", + "half_value" : 5000000, + "exponent" : 5, + }, + { + "type" : "logarithmic", + "metric" : "if_out_octets", + "half_value" : 5000000, + "exponent" : 5, + } +])) + +perfometer_info.append(("dual", [ + { + "type" : "logarithmic", "metric" : "if_out_unicast_octets,if_out_non_unicast_octets,+", "half_value" : 5000000, "exponent" : 5,

7 years, 9 months

4005 agent_activemq: now able to provide BasicAuth credentials

by Andreas Boesl

Module: check_mk Branch: master Commit: 503aeca1219aba489a6815464dd598bbffb9fd54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=503aeca1219aba… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 20 12:50:53 2016 +0100 4005 agent_activemq: now able to provide BasicAuth credentials You can now set the username and password if your ActiveMQ Server requires Basic-Authentication. Furthermore a typo has been fixed, which marks this werk as incompatible. The item name has changed from Actice_MQ to Active_MQ, so you need to start a new service discovery for these hosts. Change-Id: Id1ca93aed32dd6c941f4143bbffa378b9ee32e09 --- .werks/4005 | 14 ++++ ChangeLog | 2 + agents/special/agent_activemq | 113 +++++++++++++++++++++++++------- checks/agent_activemq | 25 +++++-- web/plugins/wato/datasource_programs.py | 41 ++++++++---- 5 files changed, 153 insertions(+), 42 deletions(-) diff --git a/.werks/4005 b/.werks/4005 new file mode 100644 index 0000000..a9f1235 --- /dev/null +++ b/.werks/4005 @@ -0,0 +1,14 @@ +Title: agent_activemq: now able to provide BasicAuth credentials +Level: 1 +Component: checks +Compatible: incomp +Version: 1.4.0i4 +Date: 1482234481 +Class: feature + +You can now set the username and password if your ActiveMQ Server requires Basic-Authentication. + +Furthermore a typo has been fixed, which marks this werk as incompatible. +The item name has changed from Actice_MQ to Active_MQ, so you need +to start a new service discovery for these hosts. + diff --git a/ChangeLog b/ChangeLog index 6bd394c..b4dc714 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Checks & Agents: * 4104 veeam_tapejobs: New check to monitor Veeam tape jobs * 4170 local: local check is now clusteraware. Best or worst state in cluster mode can be configured... + * 4005 agent_activemq: now able to provide BasicAuth credentials... + NOTE: Please refer to the migration notes! * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/agents/special/agent_activemq b/agents/special/agent_activemq index 36799bc..63bb3ff 100755 --- a/agents/special/agent_activemq +++ b/agents/special/agent_activemq @@ -24,37 +24,100 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -from lxml import etree +import getopt import sys +import requests +from requests.auth import HTTPBasicAuth +import xml.etree.ElementTree as ET + + +def usage(): + print "Usage:" + print "agent_activemq --servername {servername} --port {port} [--piggyback] [--username {username} --password {password}]\n" + +short_options = "" +long_options = [ "piggyback", "servername=", "port=", "username=", "password=" ] + +try: + opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) +except getopt.GetoptError, err: + usage() + sys.stderr.write("%s\n" % err) + sys.exit(1) + +opt_servername = None +opt_port = None +opt_username = None +opt_password = None +opt_piggyback_mode = False + + +for o,a in opts: + if o in [ '--piggyback' ]: + opt_piggyback_mode = True + elif o in [ '--servername' ]: + opt_servername = a + elif o in [ '--port' ]: + opt_port = a + elif o in [ '--username' ]: + opt_username = a + elif o in [ '--password' ]: + opt_password = a + +if not opt_servername or not opt_port: + usage() + sys.exit(1) + +url = "http://%s:%s/admin/xml/queues.jsp" % (opt_servername, opt_port) + +auth = None +if opt_username: + auth = HTTPBasicAuth(opt_username, opt_password) + +data = [] +try: + response = requests.get(url, auth = auth) + if response.status_code == 401: + raise Exception("Unauthorized") + + xml = response.text + data = ET.fromstring(xml) +except Exception, e: + sys.stderr.write("Unable to connect. Credentials might be incorrect: %s\n" % e) + sys.exit(1) -if len(sys.argv) > 3: - piggyback_mode = True -else: - piggyback_mode = False -address = "http://%s:%s/admin/xml/queues.jsp" % (sys.argv[1], sys.argv[2]) attributes = [ 'size', 'consumerCount', 'enqueueCount', 'dequeueCount' ] -data = etree.parse(address).getroot() count = 0 -if not piggyback_mode: - print "<<<mq_queues>>>" -for line in data: - count += 1 - if piggyback_mode: - print "<<<<%s>>>>" % line.get('name') - print "<<<mq_queues>>>" - print "[[%s]]" % line.get('name') - stats = line.findall('stats') - values = "" - for job in attributes: - values +="%s " % stats[0].get(job) - print values - -if piggyback_mode: - print "<<<<>>>>" - print "<<<local>>>" - print "0 Actice_MQ - Found %s Queues in total" % count +output_lines = [] +def add_output(line): + output_lines.append(line) + +try: + if not opt_piggyback_mode: + add_output("<<<mq_queues>>>") + + for line in data: + count += 1 + if opt_piggyback_mode: + add_output("<<<<%s>>>>" % line.get('name')) + add_output("<<<mq_queues>>>") + add_output("[[%s]]" % line.get('name')) + stats = line.findall('stats') + values = "" + for job in attributes: + values +="%s " % stats[0].get(job) + add_output(values) + + if opt_piggyback_mode: + add_output("<<<<>>>>") + add_output("<<<local>>>") + add_output("0 Active_MQ - Found %s Queues in total" % count) +except Exception, e: # Probably an IndexError + sys.stderr.write("Unable to process data. Returned data might be incorrect: %r" % e) + sys.exit(1) +print "\n".join(output_lines) diff --git a/checks/agent_activemq b/checks/agent_activemq index 6c8e2ce..d55299c 100644 --- a/checks/agent_activemq +++ b/checks/agent_activemq @@ -24,12 +24,27 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#( "Hostname", Port, PiggyMode) +# Legacy style +#( "Hostname", Port, [PiggyMode]) def agent_activemq_arguments(params, hostname, ipaddress): - if len(params[2]) == 0: - return "%s %s" % (params[0], params[1]) - else: - return "%s %s 1" % (params[0], params[1]) + if isinstance(params, tuple): + new_params = {} + new_params["servername"] = params[0] + new_params["port"] = params[1] + if params[2] and "piggybag" in params[2]: # yes, piggybag.. + new_params["use_piggyback"] = params[1] + params = new_params + + args = "--servername %s" % quote_shell_string(params["servername"]) + args += " --port %s" % quote_shell_string(str(params["port"])) + if params.get("use_piggyback"): + args += " --piggyback" + + if "basicauth" in params: + args += " --username %s" % quote_shell_string(params["basicauth"][0]) + args += " --password %s" % quote_shell_string(params["basicauth"][1]) + + return args special_agent_info['activemq'] = agent_activemq_arguments diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index ea39929..7d76904 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -320,25 +320,42 @@ register_rule(group, "<tt>~/share/check_mk/agents/special</tt>."), match = 'first') +def transform_activemq(value): + if not isinstance(value, tuple): + return value + + new_value = {} + new_value["servername"] = value[0] + new_value["port"] = value[1] + new_value["use_piggyback"] = "piggybag" in value[2] # piggybag... + return new_value + + register_rule(group, "special_agents:activemq", - Tuple( + Transform( + Dictionary( + elements = [ + ("servername", TextAscii(title=_("Server Name"))), + ("port", Integer(title=_("Port Number"), default_value=8161)), + ("use_piggyback", Checkbox(title=_("Use Piggyback"), label=_("Enable"))), + ("basicauth", Tuple(title=_("BasicAuth settings (optional)"), + elements = [ + TextAscii(title=_("Username")), + Password(title=_("Password")) + ] + ) + ) + ], + optional_keys = ["basicauth"] + ), title = _("Apache ActiveMQ queues"), - help = _( "Configure the Server Address and the Portnumber of the target server"), - elements = [ - TextAscii(title = _("Server Name")), - Integer( title = _("Port Number"), default_value=8161 ), - ListChoice( - choices = [ - ("piggybag", _("Run in piggyback mode")), - ], - allow_empty = True - ) - ] + forth = transform_activemq ), factory_default = Rulespec.FACTORY_DEFAULT_UNUSED, # No default, do not use setting if no rule matches match = "first") + register_rule(group, "special_agents:emcvnx", Dictionary(

7 years, 9 months

4004 FIX Fixed exception when viewing availability of BI aggregations

by Andreas Boesl

Module: check_mk Branch: master Commit: 5cafd417ca5f07c1a8f2fcd181915c730efc2c5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cafd417ca5f07… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 20 11:04:14 2016 +0100 4004 FIX Fixed exception when viewing availability of BI aggregations This fix simply makes an already existing hack less horribly broken... Change-Id: Ibf1a36c6c033eb45b16daae6cf6ce1477f526c6d --- .werks/4004 | 9 +++++++++ ChangeLog | 1 + web/htdocs/views.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4004 b/.werks/4004 new file mode 100644 index 0000000..dbbb6ec --- /dev/null +++ b/.werks/4004 @@ -0,0 +1,9 @@ +Title: Fixed exception when viewing availability of BI aggregations +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1482228061 +Class: fix + +This fix simply makes an already existing hack less horribly broken... diff --git a/ChangeLog b/ChangeLog index 951b023..6bd394c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... * 4143 FIX: Fixed possible log spam "MKAuthException: Invalid credentials" in web.log... + * 4004 FIX: Fixed exception when viewing availability of BI aggregations... WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index dc69805..f6ceeb8 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1666,7 +1666,7 @@ def get_needed_regular_columns(cells, sorters, datasource): # BI availability needs aggr_tree # TODO: wtf? a full reset of the list? Move this far away to a special place! if html.var("mode") == "availability" and "aggr" in datasource["infos"]: - return [ "aggr_tree", "aggr_name", "aggr_group" ], [] + return [ "aggr_tree", "aggr_name", "aggr_group" ] columns = columns_of_cells(cells)

7 years, 9 months

Fixed permissions

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9d662cb2ae838e132a2eff99d20dfedc1f031853 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d662cb2ae838e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 20 10:48:07 2016 +0100 Fixed permissions Change-Id: I25dc51f9dfc2d1a5f12cf2ca3296bb7642ec6664 --- agents/plugins/mk_jolokia | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia old mode 100644 new mode 100755

7 years, 9 months

4208 FIX mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash

by Konstantin Büttner

Module: check_mk Branch: master Commit: ee3a35c3174deb9d309321bb3ac07f5ff9332c19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee3a35c3174deb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 20 10:28:08 2016 +0100 4208 FIX mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash Previously, the plugin would not output any meaningful data for certain jolokia versions. This has been fixed. Change-Id: I4634b0936919c33d13b8ab0dc011f5923737c4a3 --- .werks/4208 | 11 +++++++++++ ChangeLog | 1 + agents/plugins/mk_jolokia | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4208 b/.werks/4208 new file mode 100644 index 0000000..8f0380b --- /dev/null +++ b/.werks/4208 @@ -0,0 +1,11 @@ +Title: mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482226014 + +Previously, the plugin would not output any meaningful data for certain jolokia versions. This has +been fixed. diff --git a/ChangeLog b/ChangeLog index a72dbea..951b023 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping * 4207 FIX: mk_jolokia: Use configured port as default instance name... NOTE: Please refer to the migration notes! + * 4208 FIX: mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia old mode 100755 new mode 100644 index 4359a1b..841cb6b --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -95,7 +95,7 @@ def fetch_url_get(base_url, path, function): if path: url = "%s/%s/%s" % (base_url, function, path) else: - url = base_url + url = base_url + "/" if opt_verbose: sys.stderr.write("DEBUG: Fetching: %s\n" % url)

7 years, 9 months

4207 FIX mk_jolokia: Use configured port as default instance name

by Konstantin Büttner

Module: check_mk Branch: master Commit: 85521f78719289ef4c7dca90d486c2acdc73b19e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85521f78719289… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 20 10:23:21 2016 +0100 4207 FIX mk_jolokia: Use configured port as default instance name Previously, the mk_jolokia plugin would default to the port as an instance name if no name was configured before reading the config file. This led to the default instance name always being 8080, regardless of which port was actually configured. If you have configured a nonstandard port in jolokia.cfg, but not an instance name, rediscovery is required, as well as adjusting rules relying on the instance name. Change-Id: I0ee9508971449b85ad5adb66c8b436c8b07a635e --- .werks/4207 | 17 +++++++++++++++++ ChangeLog | 2 ++ agents/plugins/mk_jolokia | 5 ++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/4207 b/.werks/4207 new file mode 100644 index 0000000..4b9534c --- /dev/null +++ b/.werks/4207 @@ -0,0 +1,17 @@ +Title: mk_jolokia: Use configured port as default instance name +Level: 1 +Component: checks +Class: fix +Compatible: incomp +State: unknown +Version: 1.4.0i4 +Date: 1482225291 + +Previously, the mk_jolokia plugin would default to the port as +an instance name if no name was configured before reading the +config file. This led to the default instance name always being +8080, regardless of which port was actually configured. + +If you have configured a nonstandard port in jolokia.cfg, +but not an instance name, rediscovery is required, as well as +adjusting rules relying on the instance name. diff --git a/ChangeLog b/ChangeLog index 3fbf3bf..a72dbea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping + * 4207 FIX: mk_jolokia: Use configured port as default instance name... + NOTE: Please refer to the migration notes! Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 22a8a50..4359a1b 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -439,12 +439,11 @@ instances = [{}] conffile = os.getenv("MK_CONFDIR", "/etc/check_mk") + "/jolokia.cfg" -if instance == None: - instance = str(port) - if os.path.exists(conffile): execfile(conffile) +if instance == None: + instance = str(port) # We have to deal with socket timeouts. Python > 2.6 # supports timeout parameter for the urllib2.urlopen method

7 years, 9 months

Reserved 10 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: 46b677e64294104f3488b023d98e80c579cf3a47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46b677e6429410… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 20 10:10:16 2016 +0100 Reserved 10 Werk IDS Change-Id: I135e9b60d0688816edbb81602ca3f8549c360038 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 1f0592c..dc2f5ce 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4207 +4217

7 years, 9 months

4173 FIX if.include: ignore some more keys in ' Network interfaces and switch ports' rule which are only used for interface grouping

by Simon Betz

Module: check_mk Branch: master Commit: 2912cd1097c694a3585ed3651038c4b472bd657d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2912cd1097c694… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 20 09:40:28 2016 +0100 4173 FIX if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping Change-Id: I8d55574ce0c25fbd48cc2935b96d54917252b5d7 --- .werks/4173 | 10 ++++++++++ ChangeLog | 3 +++ web/plugins/wato/check_parameters.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4173 b/.werks/4173 new file mode 100644 index 0000000..f55a014 --- /dev/null +++ b/.werks/4173 @@ -0,0 +1,10 @@ +Title: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping +Level: 1 +Component: check +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482223101 + + diff --git a/ChangeLog b/ChangeLog index fc25104..f4ec358 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ * 4155 FIX: Do not perform actions on events if overflow limit is active... * 4156 FIX: Fix off-by-one error in EC limit handling... + check: + * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping + 1.4.0i3: Core & Setup: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 92a622e..0df53e0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6189,7 +6189,7 @@ register_check_parameters( # Transform old traffic related levels which used "traffic" and "traffic_minimum" # keys where each was configured with an Alternative valuespec Transform(Dictionary( - ignored_keys = [ "aggr_member_item", "aggregate" ], # Created by discovery when using interface grouping + ignored_keys = [ "include_items", "iftype", "aggr_member_item", "aggregate" ], # Created by discovery when using interface grouping elements = [ ( "errors", Alternative(

7 years, 9 months

updated werk

by Simon Betz

Module: check_mk Branch: master Commit: 273170812afe25fa0f965cb0c14c03f82357c9c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=273170812afe25… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 20 09:45:29 2016 +0100 updated werk Change-Id: I3aec8a81c43a92ef47109f66592d9d89d54bf8b9 --- .werks/4173 | 2 +- ChangeLog | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.werks/4173 b/.werks/4173 index f55a014..aba5f55 100644 --- a/.werks/4173 +++ b/.werks/4173 @@ -1,6 +1,6 @@ Title: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping Level: 1 -Component: check +Component: checks Class: fix Compatible: compat State: unknown diff --git a/ChangeLog b/ChangeLog index f4ec358..3fbf3bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 4170 local: local check is now clusteraware. Best or worst state in cluster mode can be configured... * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... + * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... @@ -25,9 +26,6 @@ * 4155 FIX: Do not perform actions on events if overflow limit is active... * 4156 FIX: Fix off-by-one error in EC limit handling... - check: - * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping - 1.4.0i3: Core & Setup:

7 years, 9 months

← Newer
1
...
9
10
11
12
13
14
15
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016