Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Livestatus: break some long lines in code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 57727810469626290e0f4afa5170626e3da44413 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57727810469626… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 21:34:21 2011 +0100 Livestatus: break some long lines in code --- livestatus/src/Column.h | 3 ++- livestatus/src/OffsetDoubleColumn.h | 3 ++- livestatus/src/Query.cc | 33 ++++++++++++++++++++++----------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index 822ef79..054cace 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -53,7 +53,8 @@ public: virtual ~Column() {} const char *name() const { return _name.c_str(); } const char *description() const { return _description.c_str(); } - virtual string valueAsString(void *data __attribute__ ((__unused__)), Query *) { return "invalid"; } + virtual string valueAsString(void *data __attribute__ ((__unused__)), Query *) = 0; + // { return "invalid"; } virtual int type() = 0; virtual void output(void *data, Query *) = 0; virtual Filter *createFilter(int opid __attribute__ ((__unused__)), char *value __attribute__ ((__unused__))) { return 0; } diff --git a/livestatus/src/OffsetDoubleColumn.h b/livestatus/src/OffsetDoubleColumn.h index fe833f2..0a73a73 100644 --- a/livestatus/src/OffsetDoubleColumn.h +++ b/livestatus/src/OffsetDoubleColumn.h @@ -34,7 +34,8 @@ class OffsetDoubleColumn : public DoubleColumn { int _offset; public: - OffsetDoubleColumn(string name, string description, int offset, int indirect_offset = -1) + OffsetDoubleColumn(string name, string description, + int offset, int indirect_offset = -1) : DoubleColumn(name, description, indirect_offset), _offset(offset) {} double getValue(void *data); protected: diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index fded693..7783272 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -489,7 +489,8 @@ void Query::parseAuthUserHeader(char *line) void Query::parseStatsGroupLine(char *line) { // Can be re-enabled from 1.2i1 - //logger(LOG_WARNING, "Warning: StatsGroupBy is deprecated. Please use Columns instead."); + logger(LOG_WARNING, "Warning: StatsGroupBy is deprecated. " + "Please use Columns instead."); parseColumnsLine(line); } @@ -504,7 +505,8 @@ void Query::parseColumnsLine(char *line) if (column) _columns.push_back(column); else { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Table '%s' has no column '%s'", _table->name(), column_name); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Table '%s' has no column '%s'", _table->name(), column_name); Column *col = createDummyColumn(column_name); _columns.push_back(col); } @@ -550,7 +552,8 @@ void Query::parseOutputFormatLine(char *line) else if (!strcmp(format, "python")) _output_format = OUTPUT_FORMAT_PYTHON; else - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid output format. Only 'csv' and 'json' are available."); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid output format. Only 'csv' and 'json' are available."); } void Query::parseColumnHeadersLine(char *line) @@ -561,7 +564,8 @@ void Query::parseColumnHeadersLine(char *line) else if (!strcmp(value, "off")) _show_column_headers = false; else - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value for ColumnHeaders: must be 'on' or 'off'"); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid value for ColumnHeaders: must be 'on' or 'off'"); } void Query::parseKeepAliveLine(char *line) @@ -572,7 +576,8 @@ void Query::parseKeepAliveLine(char *line) else if (!strcmp(value, "off")) _output->setDoKeepalive(false); else - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value for KeepAlive: must be 'on' or 'off'"); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid value for KeepAlive: must be 'on' or 'off'"); } void Query::parseResponseHeaderLine(char *line) @@ -583,7 +588,8 @@ void Query::parseResponseHeaderLine(char *line) else if (!strcmp(value, "fixed16")) _output->setResponseHeader(RESPONSE_HEADER_FIXED16); else - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value '%s' for ResponseHeader: must be 'off' or 'fixed16'", value); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid value '%s' for ResponseHeader: must be 'off' or 'fixed16'", value); } void Query::parseLimitLine(char *line) @@ -595,7 +601,8 @@ void Query::parseLimitLine(char *line) else { int limit = atoi(value); if (!isdigit(value[0]) || limit < 0) - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value for Limit: must be non-negative integer"); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid value for Limit: must be non-negative integer"); else _limit = limit; } @@ -610,7 +617,8 @@ void Query::parseWaitTimeoutLine(char *line) else { int timeout = atoi(value); if (!isdigit(value[0]) || timeout < 0) - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value for WaitTimeout: must be non-negative integer"); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid value for WaitTimeout: must be non-negative integer"); else _wait_timeout = timeout; } @@ -631,7 +639,8 @@ void Query::parseWaitTriggerLine(char *line) return; } } - _output->setError(RESPONSE_CODE_INVALID_HEADER, "WaitTrigger: invalid trigger '%s'. Allowed are %s.", value, WT_ALLNAMES); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "WaitTrigger: invalid trigger '%s'. Allowed are %s.", value, WT_ALLNAMES); } void Query::parseWaitObjectLine(char *line) @@ -642,7 +651,8 @@ void Query::parseWaitObjectLine(char *line) char *objectspec = lstrip(line); _wait_object = _table->findObject(objectspec); if (!_wait_object) { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "WaitObject: object '%s' not found or not supported by this table", objectspec); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "WaitObject: object '%s' not found or not supported by this table", objectspec); } } @@ -670,7 +680,8 @@ void Query::parseLocaltimeLine(char *line) else if (rem >= 900) full ++; if (full >= 48 || full <= -48) { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid Localtime header: timezone difference greater then 24 hours"); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid Localtime header: timezone difference greater then 24 hours"); return; } _timezone_offset = full * 1800;

12 years, 9 months

Check_MK Git: check_mk: Remove trailing spaces from many codelines

by git＠mathias-kettner.de

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0027, #0490, #0155

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50791ed352d60dc4214930996f46839f23001f60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50791ed352d60d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 19:58:19 2011 +0100 Updated bug entries #0027, #0490, #0155 --- .bugs/155 | 8 ++++++-- .bugs/27 | 8 ++++++-- .bugs/490 | 7 +++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.bugs/155 b/.bugs/155 index 85eac66..04bbf0b 100644 --- a/.bugs/155 +++ b/.bugs/155 @@ -1,11 +1,15 @@ Title: check_mk -I should accept tags Component: core +State: done +Class: feature Benefit: 2 -State: open Cost: 1 Date: 2011-02-21 17:42:12 -Class: feature +Targetversion: future When doing a cmk -I(I), one should be possible to specify tags instead of specific hosts. The same feature could be usefull for -N, -C, -D and maybe other commands as well. + +2011-12-19 19:58:09: changed state open -> done +Implemented for -I and -II. diff --git a/.bugs/27 b/.bugs/27 index f4321e4..d0c27f6 100644 --- a/.bugs/27 +++ b/.bugs/27 @@ -1,12 +1,16 @@ Title: windows agent: Startmodus von Dienstens ausgeben Component: checks +State: done +Class: feature Benefit: 2 -State: open Cost: 2 Date: 2010-12-21 16:40:20 -Class: feature +Targetversion: future So kann die Inventur z.B. automatisch alle Dienste überwachen, welche auf 'automatisch' stehen. Oder man macht nur einen einzigen Check für alle Dienste, der prüft, das alle auf automatisch stehenden Dinge auch gestartet sind. + +2011-12-19 19:56:44: changed state open -> done +Ist schon länger umgesetzt. diff --git a/.bugs/490 b/.bugs/490 index f586de8..0fafc7e 100644 --- a/.bugs/490 +++ b/.bugs/490 @@ -1,11 +1,14 @@ Title: cmk -I on cluster should work Component: core +State: done +Class: feature Benefit: 1 -State: open Cost: 1 Date: 2011-12-09 14:27:05 Targetversion: future -Class: feature When doing inventory on a cluster we could simply replace the cluster name by the node names. + +2011-12-19 19:57:02: changed state open -> done +Done in current GIT version

12 years, 9 months

Check_MK Git: check_mk: cmk -I: allow tag combinations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f849146331fe0dec4a90af9a8cee0fff0ff57796 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f849146331fe0d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 19:22:08 2011 +0100 cmk -I: allow tag combinations --- modules/check_mk.py | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 1b3d591..de2dc5e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1112,14 +1112,16 @@ def parse_hostname_list(args): else: if arg[0] == '@': arg = arg[1:] + tagspec = arg.split(',') + num_found = 0 - for host in valid_hosts: - if arg in hosttags[host]: - hostlist.append(host) + for hostname in valid_hosts: + if hosttags_match_taglist(tags_of_host(hostname), tagspec): + hostlist.append(hostname) num_found += 1 if num_found == 0: - sys.stderr.write("No host or tag with the name '%s' is defined in " - "all_hosts or clusters.\n" % (arg)) + sys.stderr.write("Hostname or tag specification '%s' does " + "not match any host.\n" % arg) sys.exit(1) return hostlist @@ -1934,8 +1936,6 @@ def do_snmp_scan(hostnamelist, check_only=False, include_state=False): result = [] for hostname in hostnamelist: if not is_snmp_host(hostname): - if opt_verbose: - sys.stdout.write("Skipping %s, not an snmp host\n" % hostname) continue try: ipaddress = lookup_ipaddress(hostname) @@ -4450,6 +4450,12 @@ if __name__ == "__main__": hostnames = list(set([ h for h in hostnames if not is_cluster(h) ])) hostnames.sort() + if opt_verbose: + if len(hostnames) > 0: + sys.stdout.write("Inventorizing %s.\n" % ", ".join(hostnames)) + else: + sys.stdout.write("Inventorizing all hosts.\n") + if inventory_checks: checknames = inventory_checks.split(",")

12 years, 9 months

Check_MK Git: check_mk: cmk -I: accept host tags and cluster names

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2676ae5fa08bfe3f5971e2e9d73131f4d1f61fde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2676ae5fa08bfe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 19:08:36 2011 +0100 cmk -I: accept host tags and cluster names Unknown hostnames are considered to be tags and will be replaced by all hosts with that tag. Prefixing @ forces interpretation as tag. Cluster names are also allowed now and will be replaced by the list of nodes. --- ChangeLog | 4 ++++ modules/check_mk.py | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87bcaf1..ac58691 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.1.13i2 + Core, Setup, etc.: + * cmk -I: accept host tags and cluster names + Checks & Agents: * linux agent - ipmi: Creating directory of cache file if not exists * dell_powerconnect_cpu: renamed service from CPU to "CPU utilization", in @@ -65,6 +68,7 @@ to set number of processes. Nagios will not fork() anymore for check exection. * New columns num_hosts and num_services in status table * New aggregation functions suminv and avginv (see Documentation) + Core, Setup, etc.: * New configuration variable static_checks[] (used by WATO) * New configuration variable checkgroup_parameters (mainly for WATO) diff --git a/modules/check_mk.py b/modules/check_mk.py index 1b8e426..1b3d591 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1103,6 +1103,25 @@ def host_is_member_of_site(hostname, site): # hosts without a site: tag belong to all sites return True +def parse_hostname_list(args): + valid_hosts = all_active_hosts() + all_active_clusters() + hostlist = [] + for arg in args: + if arg[0] != '@' and arg in valid_hosts: + hostlist.append(arg) + else: + if arg[0] == '@': + arg = arg[1:] + num_found = 0 + for host in valid_hosts: + if arg in hosttags[host]: + hostlist.append(host) + num_found += 1 + if num_found == 0: + sys.stderr.write("No host or tag with the name '%s' is defined in " + "all_hosts or clusters.\n" % (arg)) + sys.exit(1) + return hostlist def hostgroups_of(hostname): @@ -4419,7 +4438,18 @@ if __name__ == "__main__": if not done and seen_I > 0: - hostnames = args + hostnames = parse_hostname_list(args) + # For clusters add their nodes to the list + nodes = [] + for h in hostnames: + nodes = nodes_of(h) + if nodes: + hostnames += nodes + + # Then remove clusters and make list unique + hostnames = list(set([ h for h in hostnames if not is_cluster(h) ])) + hostnames.sort() + if inventory_checks: checknames = inventory_checks.split(",") @@ -4428,6 +4458,8 @@ if __name__ == "__main__": if inventory_checks == None: checknames = inventorable_checktypes("all") if len(hostnames) > 0: + # Entries in hostnames that are either prefixed with @ + # or are no valid hostnames are considered to be tags. for host in hostnames: remove_autochecks_of(host, checknames) clust = cluster_of(host)

12 years, 9 months

Check_MK Git: check_mk: FIX: lnx_if: remove debug output (left over from 1. 1.12p5)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c6e483b1a0e1295e6f1a5c63d0a9c59db58d1d2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6e483b1a0e129… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 15:29:12 2011 +0100 FIX: lnx_if: remove debug output (left over from 1.1.12p5) Conflicts: ChangeLog --- ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4957e10..87bcaf1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,10 @@ * printer_alerts: added further state codes (thanks to Matthew Stew) * Solaris agent: changed shell to /usr/bin/bash (fixes problems with LC_ALL=C) +1.1.12p6: + Checks & Agents: + * FIX: lnx_if: remove debug output (left over from 1.1.12p5) + 1.1.12p5: Multisite: * FIX: fix hitting enter in Quicksearch on IE 8

12 years, 9 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6076974782efbfeb09aeb2f5b2fdab13c16b3808 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6076974782efbf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 15:35:31 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: WATO: new api function clean_host_attributes(). Cleanup of redundant api initializations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 84e544258db1b90f93da36533cfd78a57ff59a42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84e544258db1b9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 19 13:15:54 2011 +0100 WATO: new api function clean_host_attributes(). Cleanup of redundant api initializations --- web/htdocs/wato.py | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d86b6ac..59af32a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9724,13 +9724,15 @@ class API: # of the given folder. If folder is None, returns all hosts from the root folder # Folder must be returned by get_folder() def get_all_hosts(self, folder=None): - load_all_folders() + if not folder: + self.prepare_folder_info() return collect_hosts(folder or g_root_folder) # Find a folder by its path. Raise an exception if it does # not exist. def get_folder(self, path): - load_all_folders() + self.prepare_folder_info() + folder = g_folders.get(path) if folder: load_hosts(folder) @@ -9738,35 +9740,42 @@ class API: else: raise MKGeneralException("No WATO folder %s." % path) - # Get the number of hosts recursive from the given folder + # Get the number of hosts recursive from the given folder. Folder must be returned by get_folder() def num_hosts_in_folder(self, folder): return num_hosts_in(folder, True) # Get all effective data of a host. Folder must be returned by get_folder() def get_host(self, folder, hostname): - declare_host_tag_attributes() host = folder[".hosts"][hostname] eff = effective_attributes(host, folder) eff["name"] = hostname return eff + # Clean the attributes of the given host and returns the resulting host attributes + # host must be returned by get_host() / get_all_hosts() + def clean_host_attributes(self, host, attr): + folder = g_folders.get(host["path"]) + load_hosts(folder) + for entry in attr: + try: + del folder[".hosts"][host["name"]][entry] + except: + continue + + save_folder_and_hosts(folder) + return folder[".hosts"][host["name"]] + # Update the attributes of the given host and returns the resulting host attributes - # which have been persisted + # host must be returned by get_host() / get_all_hosts() def update_host_attributes(self, host, attr): - # Initialize attributes and load all folders - declare_host_tag_attributes() - declare_site_attribute() - load_all_folders() - folder = g_folders.get(host["path"]) load_hosts(folder) folder[".hosts"][host["name"]].update(attr) save_folder_and_hosts(folder) return folder[".hosts"][host["name"]] - # Return displayable information about host (call with with result vom get_host()) + # Return displayable information about host (call with result of get_host()) def get_host_painted(self, host): - declare_host_tag_attributes() result = [] for attr, topic in host_attributes: attrname = attr.name() @@ -9833,6 +9842,12 @@ class API: return len(parse_audit_log("pending")) # BELOW ARE PRIVATE HELPER FUNCTIONS + def prepare_folder_info(self): + # Initialize attributes and load all folders + declare_host_tag_attributes() + declare_site_attribute() + load_all_folders() + def _cleanup_directory(self, thing): # drop 'parent' entry, recursively

12 years, 9 months

Check_MK Git: check_mk: FIX: volatile hidden topics finally hidden

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9300b49e255bf2ba45fdd06e3cd97212e70f61c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9300b49e255bf2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 19 13:12:54 2011 +0100 FIX: volatile hidden topics finally hidden --- web/htdocs/js/wato.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index d7de239..95d367d 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -136,9 +136,10 @@ function wato_fix_visibility() { } } for (var item in volatile_topics){ - var oTr = document.getElementById("topic_" + item); + var name = volatile_topics[item] + var oTr = document.getElementById("topic_" + name); if(oTr) { - if(hide_topics.indexOf(item) > -1 ) + if(hide_topics.indexOf(name) > -1 ) oTr.style.display = "none"; else oTr.style.display = "";

12 years, 9 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f5339caa9e6ca7f280c840171aa50b7bd350d93c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5339caa9e6ca7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 10:30:19 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits