Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: Remove trailing spaces from more codelines

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b1ed14249c67066c82402581096d31324397dd7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1ed14249c6706… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 21:43:16 2011 +0100 Remove trailing spaces from more codelines --- Makefile | 2 +- web/htdocs/check_mk.css | 14 +++--- web/htdocs/dashboard.css | 20 ++++---- web/htdocs/js/bi.js | 6 +- web/htdocs/js/check_mk.js | 58 ++++++++++---------- web/htdocs/js/dashboard.js | 6 +- web/htdocs/js/hover.js | 2 +- web/htdocs/js/search.js | 34 ++++++------ web/htdocs/js/sidebar.js | 64 ++++++++++++------------ web/htdocs/js/wato.js | 48 +++++++++--------- web/htdocs/mobile.css | 6 +- web/htdocs/pages.css | 52 +++++++++--------- web/htdocs/sidebar.css | 16 +++--- web/htdocs/status.css | 122 ++++++++++++++++++++++---------------------- web/htdocs/views.css | 2 +- web/htdocs/wato.css | 62 +++++++++++----------- 16 files changed, 257 insertions(+), 257 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b1ed14249c…

12 years, 6 months

Check_MK Git: check_mk: Remove trailing spaces from even more codelines

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 614ecc07c1ce98d7683ef7860eca8606da207dbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=614ecc07c1ce98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 21:45:38 2011 +0100 Remove trailing spaces from even more codelines --- Makefile | 3 ++- doc/helpers/df_magic_number.py | 2 +- doc/helpers/headrify | 2 +- doc/helpers/listtar | 6 +++--- doc/helpers/wato-migrate-1.2.0.sh | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a490ee4..f850053 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,8 @@ check: healspaces: @echo "Removing trailing spaces from code lines..." @sed -ri 's/[ ]+$$//g' checkman/* modules/* checks/* $$(find -name Makefile) \ - livestatus/src/*{cc,c,h} web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py + livestatus/src/*{cc,c,h} web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ + doc/helpers/* $(find -type f pnp-templates/*.php) setup: $(MAKE) dist diff --git a/doc/helpers/df_magic_number.py b/doc/helpers/df_magic_number.py index c13aba2..b290dbc 100755 --- a/doc/helpers/df_magic_number.py +++ b/doc/helpers/df_magic_number.py @@ -47,6 +47,6 @@ for level in [ .80, .85, .90, .95 ]: print_levels(exp) sys.stdout.write("-" * 80) sys.stdout.write("\n") - + diff --git a/doc/helpers/headrify b/doc/helpers/headrify index 350d44f..4690902 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -73,7 +73,7 @@ headrify () thirdline="$(sed -n 3p < $file)" shouldbe="$comment+---------------------------------------------------" endline='.*Boston, MA 02110-1301 USA.' - + if [ -n "$lastline" ] ; then endline="${lastline//\//\/}" ; fi if [ "${firstline:0:20}" = "${shouldbe:0:20}" \ -o "${secondline:0:20}" = "${shouldbe:0:20}" \ diff --git a/doc/helpers/listtar b/doc/helpers/listtar index 8b85371..dc1cd3e 100755 --- a/doc/helpers/listtar +++ b/doc/helpers/listtar @@ -3,7 +3,7 @@ VERSION=$(sed -n '/^VERSION.*= *$.*$/s//\1/p' < Makefile) TAR=${1:-check_mk-$VERSION.tar.gz} -if [ ! -e "$TAR" ] ; then +if [ ! -e "$TAR" ] ; then echo "Usage: $0 check_mk-...tar.gz" >&2 exit 1 fi @@ -14,11 +14,11 @@ do echo -n "$filename" if [ "${filename:(-7)}" = ".tar.gz" ] ; then echo : - tar xzf $TAR --to-stdout "$filename" | tar tzvf - + tar xzf $TAR --to-stdout "$filename" | tar tzvf - echo elif [ "${filename:(-4)}" = ".tar" ] ; then echo : - tar xzf $TAR --to-stdout "$filename" | tar tvf - + tar xzf $TAR --to-stdout "$filename" | tar tvf - echo else echo diff --git a/doc/helpers/wato-migrate-1.2.0.sh b/doc/helpers/wato-migrate-1.2.0.sh index 4578a80..8bb937a 100755 --- a/doc/helpers/wato-migrate-1.2.0.sh +++ b/doc/helpers/wato-migrate-1.2.0.sh @@ -78,7 +78,7 @@ do rmdir -v "$thedir" 2>/dev/null || true done - + if which tree > /dev/null then echo "-----------------------------------------"

12 years, 6 months

Check_MK Git: check_mk: Removed test code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0765e75ee71a0aa8e287b4ab3c569d23d5517fa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0765e75ee71a0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 21:51:58 2011 +0100 Removed test code --- livestatus/src/Column.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index 054cace..004847d 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -53,8 +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 *) = 0; - // { return "invalid"; } + virtual string valueAsString(void *data __attribute__ ((__unused__)), Query *) + { 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; }

12 years, 6 months

Check_MK Git: check_mk: Internal file cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6a858e36f7b92bfa732339cea1f6aadeb495560f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a858e36f7b92b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 21:07:06 2011 +0100 Internal file cleanup --- LIESMICH.benutzer | 25 ------------------------- TODO | 31 ------------------------------- listtar => doc/helpers/listtar | 0 3 files changed, 0 insertions(+), 56 deletions(-) diff --git a/LIESMICH.benutzer b/LIESMICH.benutzer deleted file mode 100644 index b1152fe..0000000 --- a/LIESMICH.benutzer +++ /dev/null @@ -1,25 +0,0 @@ -Konzept für Verwaltung von Benutzern und Rollen ------------------------------------------------ -Was jetzt noch fehlt: -MS5: Beim Löschen von Objekten Bezüge sicherstellen. Im config-Dialog - könnte man darauf hinweisen, dass es Bezüge gibt und diese - automatisch entfernen. Oder soll man eher sperren? Das wäre einfacher. - * Das Löschen von Rollen ist schon entsprechend Umgesetzt - * Löschen von Kontaktgruppen. Diese haben Bezüge zu Hosts, Services - Foldern und Usern. An allen vier Stellen muss gelöscht werden. - * Löschen von Timeperiods. Entsprechende Regeln müssen bearbeitet werden. -MS6: Login-Maske für Multisite - diese optional machen (Default is - HTTP-Auth). In OMD per Config einen Schalter dafür einbauen. -MS6: NagVis und PNP so erweitern, dass eine zentral Auth funktioniert. -MS6: Spracheinstellung pro Benutzer -MS5: custom_links Snapin muss evtl. repariert werden. -MS5/6: Email-Notifikation einrichten. Da sollte ein Befehl in die - Standardtemplates von Check_MK rein. Am besten wäre wahrscheinlich - ein cmk --notify, das als Argument Service und Host und Contact bekommt und - evtl. noch ein paar Variablen und dann den Rest per Livestatus rauszieht? - Eigentlich sollte das gehen, da ja der Notifizieren auch in einer Multisite- - Umgebung immer lokal erfolgt. Die Rechte hat man auch immer, weil man ja - von Nagios aufgerufen wird. - cmk --notify zieht sich dann alles per Livestatus raus und packt nach - Belieben alles in die Mail rein, bis zu Auszügen aus Logwatch und PNP-Graphen. - diff --git a/TODO b/TODO deleted file mode 100644 index 777913c..0000000 --- a/TODO +++ /dev/null @@ -1,31 +0,0 @@ -Zu tun bei wato-ng: - -[modules] -* checkgroup ausgeben bei cmk -L, cmk -M. -* cmk -M soll Check-Parameterbeschreibungen automatisch auslesen - -[web] -* Diagnosefunktion: wenn man eine Regelkette sieht kann man diese - per Knopfdruck durchrechnen lassen und sieht dann, welche - hosts von welcher Regel erfasst werden. -* Verlinkung von Service zu Regelkette, Knopf für "Ausnahme für diesen - Service erstellen" -* class Alternative: Die Radiobuttons sollen <div>s unsichtbar werden - lassen von den nicht genutzten Alternativen. -* Konfiguration von Timeperiods -* Value-Editor für die Auswahl einer Timeperiod. -* Wie bekomme ich es hin, dass man keine TP löschen kann, die noch in - einer Regel benannt wird? - -[decl] -* Alle Checkgruppen deklarieren, die für LC-Checks gebraucht werden. - -[optional] -* Auch multisite.mk-Variablen steuerbar machen -* (nur OMD): auch ausgewählte Nagios-Variablen configurierbar machen - -Ganz ferne Zukunft (Brauch LC und DK nicht): -=================== -- Explizite Checks (checks += ) -- Cluster -- Host Tags diff --git a/listtar b/doc/helpers/listtar similarity index 100% rename from listtar rename to doc/helpers/listtar

12 years, 6 months

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, 6 months

Check_MK Git: check_mk: Remove trailing spaces from many codelines

by git＠mathias-kettner.de

12 years, 6 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, 6 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, 6 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, 6 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, 6 months

← Newer
1
...
7
8
9
10
11
12
13
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011