Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 8dc7baadde11d0d8d07dc641a5f6366e58621359 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dc7baadde11d0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 27 11:56:22 2017 +0200 Use iterators for, well, iterating... Going via lists is needlessly slow. Change-Id: Ic50d797d184318681b9a1e9e3855d4cf57d5d999 --- bin/mkeventd | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 3798793..6fd3052 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -345,7 +345,7 @@ def match_ipv4_network(pattern, ipaddress_text): # first network_bits of network and ipaddress must be # identical. Create a bitmask. bitmask = 0 - for n in range(32): + for n in xrange(32): bitmask = bitmask << 1 if n < network_bits: bit = 1 @@ -1179,7 +1179,7 @@ class Perfcounters(object): duration = now - self._last_statistics else: duration = 0 - for name, value in self._counters.items(): + for name, value in self._counters.iteritems(): if duration: delta = value - self._old_counters[name] rate = delta / duration @@ -1212,7 +1212,7 @@ class Perfcounters(object): with self._lock: headers = [] row = [] - for name, value in self._counters.items(): + for name, value in self._counters.iteritems(): rate_name = name.rstrip("s") + "_rate" average_rate_name = "average_" + name.rstrip("s") + "_rate" headers.append("status_" + name) @@ -1222,7 +1222,7 @@ class Perfcounters(object): row.append(self._rates.get(name, 0.0)) row.append(self._average_rates.get(name, 0.0)) - for name in self._weights.keys(): + for name in self._weights.iterkeys(): headers.append("status_average_%s_time" % name) row.append(self._times.get(name, 0.0)) @@ -1261,7 +1261,7 @@ class EventServer(object): self._rules = [] self._hash_stats = [] - for _unused_facility in range(32): + for _unused_facility in xrange(32): self._hash_stats.append([ 0 ] * 8 ) self.host_config = HostConfig() @@ -1695,7 +1695,7 @@ class EventServer(object): client_sockets[client_socket.fileno()] = (client_socket, address, "") # Read data from existing event unix socket connections - for fd, (cs, address, previous_data) in client_sockets.items(): + for fd, (cs, address, previous_data) in client_sockets.iteritems(): if fd in readable: # Receive next part of data try: @@ -2179,10 +2179,10 @@ class EventServer(object): if g_config["rule_optimizer"]: self.logger.info("Rule hash: %d rules - %d hashed, %d unspecific" % (len(self._rules), len(self._rules) - count_unspecific, count_unspecific)) - for facility in range(32): + for facility in xrange(32): if facility in self._rule_hash: stats = [] - for prio, entries in self._rule_hash[facility].items(): + for prio, entries in self._rule_hash[facility].iteritems(): stats.append("%s(%d)" % (syslog_priorities[prio], len(entries))) if syslog_facilities[facility]: self.logger.info(" %-12s: %s" % (syslog_facilities[facility], " ".join(stats))) @@ -2194,7 +2194,7 @@ class EventServer(object): if facility and not rule.get("invert_matching"): self.hash_rule_facility(rule, facility) else: - for facility in range(32): # all syslog facilities + for facility in xrange(32): # all syslog facilities self.hash_rule_facility(rule, facility) @@ -2204,7 +2204,7 @@ class EventServer(object): if key in rule: prio_from, prio_to = rule[key] # Beware: from > to! - for p in range(prio_to, prio_from + 1): + for p in xrange(prio_to, prio_from + 1): needed_prios[p] = True elif key == "match_priority": # all priorities match needed_prios = [True] * 8 # needed to check this rule for all event priorities @@ -2223,8 +2223,8 @@ class EventServer(object): self.logger.info("Top 20 of facility/priority:") entries = [] total_count = 0 - for facility in range(32): - for priority in range(8): + for facility in xrange(32): + for priority in xrange(8): count = self._hash_stats[facility][priority] if count: total_count += count @@ -2877,7 +2877,7 @@ class EventServer(object): if g_config["debug_rules"]: self.logger.info('Parsed message:\n' + ("".join([ " %-15s %s\n" % (k+":", v) for (k, v) in - sorted(event.items())])).rstrip()) + sorted(event.iteritems())])).rstrip()) return event @@ -2899,7 +2899,7 @@ class EventServer(object): def get_hosts_with_active_event_limit(self): hosts = [] - for hostname, num_existing_events in g_event_status.num_existing_events_by_host.items(): + for hostname, num_existing_events in g_event_status.num_existing_events_by_host.iteritems(): if num_existing_events >= g_config["event_limit"]["by_host"]["limit"]: hosts.append(hostname) return hosts @@ -2907,7 +2907,7 @@ class EventServer(object): def get_rules_with_active_event_limit(self): rule_ids = [] - for rule_id, num_existing_events in g_event_status.num_existing_events_by_rule.items(): + for rule_id, num_existing_events in g_event_status.num_existing_events_by_rule.iteritems(): if rule_id == None: continue # Ignore rule unrelated overflow events. They have no rule id associated. if num_existing_events >= g_config["event_limit"]["by_rule"]["limit"]: @@ -4046,7 +4046,7 @@ class EventStatus(object): def get_rule_stats(self): - return [ e[0] for e in rule_columns ], sorted(self._rule_stats.items(), key=lambda x: x[0]) + return [ e[0] for e in rule_columns ], sorted(self._rule_stats.iteritems(), key=lambda x: x[0]) #. # .--Actions-------------------------------------------------------------. @@ -4100,7 +4100,7 @@ def do_event_actions(actions, event, is_cancelling): def get_quoted_event(event): new_event = {} fields_to_quote = [ "application", "match_groups", "text", "comment", "contact" ] - for key, value in event.items(): + for key, value in event.iteritems(): if key not in fields_to_quote: new_event[key] = value else: @@ -4175,7 +4175,7 @@ def get_event_tags(event): def substitute_event_tags(text, event): - for key, value in get_event_tags(event).items(): + for key, value in get_event_tags(event).iteritems(): text = text.replace('$%s$' % key.upper(), value) return text @@ -4213,7 +4213,7 @@ def send_email(to, subject, body): def execute_script(body, event): script_env = os.environ.copy() - for key, value in get_event_tags(event).items(): + for key, value in get_event_tags(event).iteritems(): if type(key) == unicode: key = key.encode("utf-8") if type(value) == unicode: @@ -4264,7 +4264,7 @@ def do_notify(event, username=None, is_cancelling=False): if logger.is_verbose(): logger.verbose("Sending notification via Check_MK with the following context:") - for varname, value in sorted(context.items()): + for varname, value in sorted(context.iteritems()): logger.verbose(" %-25s: %s" % (varname, value)) if context["HOSTDOWNTIME"] != "0": @@ -4277,8 +4277,7 @@ def do_notify(event, username=None, is_cancelling=False): # Send notification context via stdin. context_string = to_utf8("".join([ "%s=%s\n" % (varname, value.replace("\n", "\\n")) - for (varname, value) - in context.items() ])) + for (varname, value) in context.iteritems() ])) p = subprocess.Popen(["cmk", "--notify", "stdin"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, @@ -4345,7 +4344,7 @@ def add_infos_from_monitoring_host(context, event): }) # Add custom variables to the notification context - for key, val in host_config["custom_variables"].items(): + for key, val in host_config["custom_variables"].iteritems(): context["HOST_%s" % key] = val context["HOSTDOWNTIME"] = "1" if event["host_in_downtime"] else "0"

6 years, 11 months

2to3 (except fix): Use modern exception target separator.

by Sven Panne

Module: check_mk Branch: master Commit: a436adc5f54eb42c9286ee834ee1f13847b8c01d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a436adc5f54eb4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 27 10:39:50 2017 +0200 2to3 (except fix): Use modern exception target separator. Syntax history: * Only ",": Up to and including Python 2.6 (Oct 2008) * Both "," and "as": From 2.6.1 (Dec 2008) up to current 2.7.13 * Only "as": From 3.0 (Dec 2008) onwards We choose "as", it works on everything from Dec 2008 onwards. Change-Id: I5e71cb8874c14b34fd738a3f2f0a52a6328db062 --- bin/mkeventd | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a436adc5f5…

6 years, 11 months

2to3 (numliterals fix): Use modern octal numeric literals.

by Sven Panne

Module: check_mk Branch: master Commit: 8e2527ef9e17d9e31e29d24050e75e7a4689b323 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e2527ef9e17d9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 27 10:46:23 2017 +0200 2to3 (numliterals fix): Use modern octal numeric literals. Syntax history: * Only "0" prefix: Up to and including Python 2.6 (Oct 2008) * Both "0" and "0o" prefix: From 2.6.1 (Dec 2008) up to current 2.7.13 * Only "0o": From 3.0 (Dec 2008) onwards We choose "0o", it works on everything from Dec 2008 onwards. Change-Id: I3731382c82c345a53ce52aca24b0cc6ca73cd31d --- bin/mkeventd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 9347fb0..f8c17cb 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1370,7 +1370,7 @@ class EventServer(object): os.mkfifo(g_pipe_path) # We want to be able to receive events from all users on the local system - os.chmod(g_pipe_path, 0666) # nosec + os.chmod(g_pipe_path, 0o666) # nosec self.logger.info("Created FIFO '%s' for receiving events" % g_pipe_path) @@ -1431,7 +1431,7 @@ class EventServer(object): os.remove(g_eventsocket_path) self._eventsocket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self._eventsocket.bind(g_eventsocket_path) - os.chmod(g_eventsocket_path, 0664) + os.chmod(g_eventsocket_path, 0o664) self._eventsocket.listen(g_config['eventsocket_queue_len']) self.logger.info("Opened UNIX socket '%s' for receiving events" % g_eventsocket_path) else: @@ -1449,7 +1449,7 @@ class EventServer(object): raise finally: file(profilefile + ".py", "w").write("#!/usr/bin/env python\nimport pstats\nstats = pstats.Stats(%r)\nstats.sort_stats('time').print_stats()\n" % profilefile) - os.chmod(profilefile + ".py", 0755) + os.chmod(profilefile + ".py", 0o755) self.logger.info("Created profile conversion script %s.py." % profilefile) else: @@ -3095,7 +3095,7 @@ class StatusServer(object): self._socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self._socket.bind(g_socket_path) # Make sure that socket is group writable - os.chmod(g_socket_path, 0664) + os.chmod(g_socket_path, 0o664) self._socket.listen(g_config['socket_queue_len']) self._unix_socket_queue_len = g_config['socket_queue_len'] # detect changes in config @@ -3162,7 +3162,7 @@ class StatusServer(object): self.logger.info("Writing profile of status thread to %s." % profilefile) cProfile.run("g_status_server.serve()", profilefile) file(profilefile + ".py", "w").write("#!/usr/bin/env python\nimport pstats\nstats = pstats.Stats(%r)\nstats.sort_stats('time').print_stats()\n" % profilefile) - os.chmod(profilefile + ".py", 0755) + os.chmod(profilefile + ".py", 0o755) else: self.serve() except Exception:

6 years, 11 months

Added a TODO.

by Sven Panne

Module: check_mk Branch: master Commit: 6b39629ee405c1b23529b53aa57239d2e4adb9d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b39629ee405c1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 27 13:17:40 2017 +0200 Added a TODO. Change-Id: I69fab477abeefab6c5832834502f51cfa63bfd99 --- bin/mkeventd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/mkeventd b/bin/mkeventd index 6fd3052..ba03ada 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3508,6 +3508,9 @@ class StatusServer(object): return rows def filter_row(self, headers, filters, list_row): + # TODO(sp) This is a real performance killer: We should just calculate + # the column indices for column names *once*, not doing some dict/list + # Kung Fu for every row... row = dict(zip(headers, list_row)) for column, opfunc, argument in filters: if not opfunc(row[column], argument):

6 years, 11 months

2to3 (idioms fix): Directly use 'sorted'.

by Sven Panne

Module: check_mk Branch: master Commit: 30b44903f06cb4cd9e26c537362bc43650c10d1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30b44903f06cb4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 27 15:06:00 2017 +0200 2to3 (idioms fix): Directly use 'sorted'. Change-Id: I59dcf94a8b66ee1054e11a728883912b56457a4b --- bin/mkeventd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index b7f28a9..2467f42 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -940,9 +940,9 @@ def get_logfile(basename): if active_history_period == None or timestamp > active_history_period: # Look if newer files exist - timestamps = [ int(f[:-4]) for f in os.listdir(log_dir) \ - if f.endswith(".log") ] - timestamps.sort() + timestamps = sorted(int(f[:-4]) + for f in os.listdir(log_dir) + if f.endswith(".log")) if len(timestamps) > 0: timestamp = max(timestamps[-1], timestamp) @@ -1032,9 +1032,6 @@ def get_event_history_from_file(filters, limit): # the first entry and modification time of the file. Only # if at least one of both timestamps is accepted then we # take that file into account. - timestamps = [ int(fn[:-4]) for fn in os.listdir(log_dir) - if fn.endswith(".log") ] - timestamps.sort() # Use the later logfiles first, to get the newer log entries # first. When a limit is reached, the newer entries should # be processed in most cases. We assume that now. @@ -1043,7 +1040,10 @@ def get_event_history_from_file(filters, limit): # already be done by the GUI, so we don't do that twice. Skipping # this # will lead into some lines of a single file to be limited in # wrong order. But this should be better than before. - timestamps.reverse() + timestamps = sorted((int(fn[:-4]) + for fn in os.listdir(log_dir) + if fn.endswith(".log")), + reverse=True) for ts in timestamps: if limit != None and limit <= 0: break

6 years, 11 months

Removed dead code.

by Sven Panne

Module: check_mk Branch: master Commit: 9bfc76c0c239c893f0c70208420c7efbb48a13fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bfc76c0c239c8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 27 13:52:30 2017 +0200 Removed dead code. Change-Id: Ie370ae13b492422982d770c32741becf33ae7a2e --- bin/mkeventd | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index ba03ada..b7f28a9 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -380,14 +380,6 @@ def replace_groups(text, origtext, groups): return text -def format_exception(): - import StringIO - txt = StringIO.StringIO() - t, v, tb = sys.exc_info() - traceback.print_exception(t, v, tb, None, txt) - return txt.getvalue() - - # Class for debugging locking. Beware: This does not really # implement a true locking! It's just for detecting deadlocks! class VerboseLock(object): @@ -3124,10 +3116,6 @@ class StatusServer(object): self._tcp_allow_commands = False self._tcp_access_list = None - def close_sockets(self): - self.close_tcp_socket() - self.close_unix_socket() - def close_unix_socket(self): if self._socket: self._socket.close() @@ -4449,23 +4437,6 @@ def core_has_notifications_disabled(event): return False -def fetch_contacts_of_group_from_livestatus(group_name): - try: - contacts = livestatus.LocalConnection().query_value( - "GET contactgroups\nFilter: name = %s\nColumns: members" % group_name) - if "check-mk-notify" in contacts: # Remove artifical contact used for rule based notifications - contacts.remove("check-mk-notify") - return contacts - - except Exception as e: - logger.exception("Cannot determine contacts of group %s: %s" % (group_name, e)) - if opt_debug: - raise - - return None # No group match or other failure - - - #. # .--Replication---------------------------------------------------------. # | ____ _ _ _ _ |

6 years, 11 months

2to3 (ws_comma fix).

by Sven Panne

Module: check_mk Branch: master Commit: 1146ee8c9072d47a7dd147d0bee8bbbd09b43518 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1146ee8c9072d4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 27 11:08:53 2017 +0200 2to3 (ws_comma fix). Nothing spectacular, just whitespace changes. Change-Id: I3cea53b1a45114d96296f49ac47c6be4b709fc1a --- bin/mkeventd | 310 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 155 insertions(+), 155 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1146ee8c90…

6 years, 11 months

Fixed "new" bakery tests

by Lars Michelsen

Module: check_mk Branch: master Commit: b4edc6abaf670c1d0f0a84dbcc572b395c962e07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4edc6abaf670c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 27 15:00:10 2017 +0200 Fixed "new" bakery tests Change-Id: Id002d42ed044e4a02df35f7257c408224cecb5cf --- tests/testlib/__init__.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 6d46076..9e84cf5 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -275,56 +275,60 @@ class Site(object): return subprocess.call(cmd) + def path(self, rel_path): + return os.path.join(self.root, rel_path) + + def read_file(self, rel_path): if not self._is_running_as_site_user(): - p = self.execute(["cat", "%s/%s" % (self.root, rel_path)], stdout=subprocess.PIPE) + p = self.execute(["cat", self.path(rel_path)], stdout=subprocess.PIPE) if p.wait() != 0: raise Exception("Failed to read file %s. Exit-Code: %d" % (rel_path, p.wait())) return p.stdout.read() else: - return open("%s/%s" % (self.root, rel_path)).read() + return open(self.path(rel_path)).read() def delete_file(self, rel_path): if not self._is_running_as_site_user(): - p = self.execute(["rm", "-f", "%s/%s" % (self.root, rel_path)]) + p = self.execute(["rm", "-f", self.path(rel_path)]) if p.wait() != 0: raise Exception("Failed to delete file %s. Exit-Code: %d" % (rel_path, p.wait())) else: - os.unlink("%s/%s" % (self.root, rel_path)) + os.unlink(self.path(rel_path)) def delete_dir(self, rel_path): if not self._is_running_as_site_user(): - p = self.execute(["rm", "-rf", "%s/%s" % (self.root, rel_path)]) + p = self.execute(["rm", "-rf", self.path(rel_path)]) if p.wait() != 0: raise Exception("Failed to delete directory %s. Exit-Code: %d" % (rel_path, p.wait())) else: - shutil.rmtree("%s/%s" % (self.root, rel_path)) + shutil.rmtree(self.path(rel_path)) def write_file(self, rel_path, content): if not self._is_running_as_site_user(): - p = self.execute(["tee", "%s/%s" % (self.root, rel_path)], + p = self.execute(["tee", self.path(rel_path)], stdin=subprocess.PIPE, stdout=open(os.devnull, "w")) p.communicate(content) p.stdin.close() if p.wait() != 0: raise Exception("Failed to write file %s. Exit-Code: %d" % (rel_path, p.wait())) else: - return open("%s/%s" % (self.root, rel_path), "w").write(content) + return open(self.path(rel_path), "w").write(content) def file_exists(self, rel_path): if not self._is_running_as_site_user(): - p = self.execute(["test", "-e", "%s/%s" % (self.root, rel_path)], stdout=subprocess.PIPE) + p = self.execute(["test", "-e", self.path(rel_path)], stdout=subprocess.PIPE) return p.wait() == 0 else: - return os.path.exists("%s/%s" % (self.root, rel_path)) + return os.path.exists(self.path(rel_path)) def makedirs(self, rel_path): - p = self.execute(["mkdir", "-p", "%s/%s" % (self.root, rel_path)]) + p = self.execute(["mkdir", "-p", self.path(rel_path)]) return p.wait() == 0

6 years, 11 months

Fixed bug in recursive inventory functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 0da9d310e115a689638e690aba4742aa28d99ed0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0da9d310e115a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 27 14:32:04 2017 +0200 Fixed bug in recursive inventory functions Change-Id: I7bc0dfc376ec4f956f81f53327695a0a933f861e --- cmk_base/inventory.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 96246c7..a721db6 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -109,7 +109,7 @@ def do_inv_check(options, hostname): try: inv_tree, old_timestamp = do_inv_for(hostname) - num_entries = _count_nodes() + num_entries = _count_nodes(g_inv_tree) if not num_entries: console.output("OK - Found no data\n") sys.exit(0) @@ -164,11 +164,11 @@ def do_inv_for(hostname): _do_inv_for_realhost(hostname) # Remove empty paths - _cleanup_inventory_tree() + _cleanup_inventory_tree(g_inv_tree) old_timestamp = _save_inventory_tree(hostname) console.verbose("..%s%s%d%s entries" % - (tty.bold, tty.yellow, _count_nodes(), tty.normal)) + (tty.bold, tty.yellow, _count_nodes(g_inv_tree), tty.normal)) _run_inventory_export_hooks(hostname) return _get_inventory_tree(), old_timestamp @@ -330,10 +330,7 @@ def inv_tree(path, default_value=None): # Removes empty nodes from a (sub)-tree. Returns # True if the tree itself is empty -def _cleanup_inventory_tree(tree=None): - if tree == None: - tree = g_inv_tree - +def _cleanup_inventory_tree(tree): if type(tree) == dict: for key, value in tree.items(): if _cleanup_inventory_tree(value): @@ -353,10 +350,7 @@ def _cleanup_inventory_tree(tree=None): return False # cannot clean non-container nodes -def _count_nodes(tree=None): - if tree == None: - tree = g_inv_tree - +def _count_nodes(tree): if type(tree) == dict: return len(tree) + sum([_count_nodes(v) for v in tree.values()]) elif type(tree) == list:

6 years, 11 months

make dist also builds livestatus tgz

by Lars Michelsen

Module: check_mk Branch: master Commit: 31ab4037f24274599aa91399a627daff3ec8ccf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31ab4037f24274… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 27 13:49:53 2017 +0200 make dist also builds livestatus tgz Change-Id: Ic9b143a8c30e7b442130f3862a1639f3eb5aca0a --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 44d12d6..002ec10 100644 --- a/Makefile +++ b/Makefile @@ -144,7 +144,7 @@ PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs help: @echo "setup --> Prepare system for development and building" - @echo "make dist --> Create source tgz for later building of rpm/deb" + @echo "make dist --> Create source tgz for later building of rpm/deb and livestatus tgz" @echo "make rpm --> Create rpm package" @echo "make deb --> Create deb package" @echo "make cma --> Create cma package" @@ -188,7 +188,7 @@ check-version: # Would use --exclude-vcs-ignores but that's available from tar 1.29 which # is currently not used by most distros -dist: +dist: mk-livestatus-$(VERSION).tar.gz @EXCLUDES= ; \ if [ -d .git ]; then \ git rev-parse --short HEAD > COMMIT ; \

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017