Checkmk git commits December 2010

checkmk-commits@lists.checkmk.com

3 participants
155 discussions

Check_MK Git: check_mk: Start converting LIESMICH.zutun to .bugs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 082e28df7b1f22b20721236cbc0513b7893dc291 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=082e28df7b1f22… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 21 11:03:02 2010 +0100 Start converting LIESMICH.zutun to .bugs --- .bugs/1 | 9 +++++++++ .bugs/10 | 10 ++++++++++ .bugs/2 | 10 ++++++++++ .bugs/3 | 9 +++++++++ .bugs/4 | 11 +++++++++++ .bugs/5 | 10 ++++++++++ .bugs/6 | 12 ++++++++++++ .bugs/7 | 14 ++++++++++++++ .bugs/8 | 16 ++++++++++++++++ .bugs/9 | 14 ++++++++++++++ .bugs/config | 22 ++++++++++++++++++++++ LIESMICH.zutun | 34 ---------------------------------- gb | 35 ++++++++++++++++++++--------------- 13 files changed, 157 insertions(+), 49 deletions(-) diff --git a/.bugs/1 b/.bugs/1 new file mode 100644 index 0000000..718b17b --- /dev/null +++ b/.bugs/1 @@ -0,0 +1,9 @@ +Title: Describe StatsGroupBy +Component: doku +Benefit: 1 +State: open +Cost: 1 +Date: 2010-12-21 10:45:58 +Class: todo + +multiple columns are allowed now. Columns: used. diff --git a/.bugs/10 b/.bugs/10 new file mode 100644 index 0000000..3306b0b --- /dev/null +++ b/.bugs/10 @@ -0,0 +1,10 @@ +Title: Multisite mit Chrome kompatible machen +Component: multisite +Benefit: 1 +State: open +Cost: 2 +Date: 2010-12-21 11:01:49 +Class: bug + +Bekannte Probleme: +* reschedule Knopf wird nicht animiert diff --git a/.bugs/2 b/.bugs/2 new file mode 100644 index 0000000..c542023 --- /dev/null +++ b/.bugs/2 @@ -0,0 +1,10 @@ +Title: Hostnamen in ipaddresses +Component: doku +Benefit: 1 +State: open +Cost: 1 +Date: 2010-12-21 10:50:11 +Class: todo + +Dokumentieren, wie man dyndns-Hosts in den Griff bekommen, +indem man den Hostnamen in ipaddresses einträgt. diff --git a/.bugs/3 b/.bugs/3 new file mode 100644 index 0000000..90a9924 --- /dev/null +++ b/.bugs/3 @@ -0,0 +1,9 @@ +Title: Manpages zu Netapp-checks fehlen +Component: doku +Benefit: 2 +State: open +Cost: 2 +Date: 2010-12-21 10:51:29 +Class: todo + +df_netapp und df_netapp32 haben noch keine man-Page diff --git a/.bugs/4 b/.bugs/4 new file mode 100644 index 0000000..55cee59 --- /dev/null +++ b/.bugs/4 @@ -0,0 +1,11 @@ +Title: Doku zu local-Hierarchie und MKPs in OMD +Component: doku +Benefit: 2 +State: open +Cost: 3 +Date: 2010-12-21 10:52:57 +Class: todo + +In der Check_MK-Doku sollte beschrieben werden, wie Check_MK +in OMD funktioniert im allgemeinen und die local/-Hierarchie +im besonderen. Auch wie man MKPs unter OMD verwendet. diff --git a/.bugs/5 b/.bugs/5 new file mode 100644 index 0000000..5fdf8d9 --- /dev/null +++ b/.bugs/5 @@ -0,0 +1,10 @@ +Title: ALL_SERVICES anstelle von [""] verwenden +Component: doku +Benefit: 1 +State: open +Cost: 1 +Date: 2010-12-21 10:54:20 +Class: todo + +Sobald ALL_SERVICES in der aktuelle stabilen Version verfügbar ist, +in der Doku überall [""] entfernen und dadurch ersetzten. diff --git a/.bugs/6 b/.bugs/6 new file mode 100644 index 0000000..08f6291 --- /dev/null +++ b/.bugs/6 @@ -0,0 +1,12 @@ +Title: is_contact_member_of_contactgroup selbst programmieren +Component: livestatus +Benefit: 5 +State: open +Cost: 2 +Date: 2010-12-21 10:55:19 +Class: todo + +Diese Funktion ist im CVS schon weg und sehr leicht +selbst zu programmieren. Sollte man bald mal machen, +damit ein stabiles Livestatus schon bereit ist, wenn +das neue Nagios kommt. diff --git a/.bugs/7 b/.bugs/7 new file mode 100644 index 0000000..030a6bf --- /dev/null +++ b/.bugs/7 @@ -0,0 +1,14 @@ +Title: Timeperiod-Übergänge ins Nagios-Log schreiben +Component: livestatus +Benefit: 3 +State: open +Cost: 1 +Date: 2010-12-21 10:56:28 +Class: feature + +Livestatus hält ja ohnehin einen Cache der Timeperiods. Immer +wenn eine umschaltet, sollte ein Logeintrag gemacht werden. +Auch initial beim Starten des Systems. Anhand dieser Einträge +ist es später viel einfacher, die Verfügbarkeiten zu berechnen. +Das sollte man recht bald programmieren, damit die Leute +schon Gelegenheit haben, Daten zu sammeln. diff --git a/.bugs/8 b/.bugs/8 new file mode 100644 index 0000000..3ec8b2f --- /dev/null +++ b/.bugs/8 @@ -0,0 +1,16 @@ +Title: Inventurcheck: retry-interval konfigurieren +Component: core +Benefit: 2 +State: open +Cost: 2 +Date: 2010-12-21 10:59:01 +Class: feature + +Eigentlich könnte der Inventurcheck doch - wenn er nicht OK ist - +öfters laufen. Auf diese Art wird er schneller von selbst wieder grün, +wenn man das Problem behebt. Da der Inventurcheck sowieso die Cachefiles +verwendet, sollte es auch kein Performanceproblem sein, wenn man +es oft macht (gilt das auch für den SNMP-Scan?). + +Lösung könnte sein: in main.mk inventory_check_retry = 5. Und diesen +Wert per Default auf 5 setzen (5 Minuten). diff --git a/.bugs/9 b/.bugs/9 new file mode 100644 index 0000000..d621c0c --- /dev/null +++ b/.bugs/9 @@ -0,0 +1,14 @@ +Title: Multisite mit IE kompatibel machen +Component: multisite +Benefit: 4 +State: open +Cost: 3 +Date: 2010-12-21 11:01:09 +Class: bug + +Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: +* reschedule Knopf geht irgendwie garnicht. Weder Animation noch reschedule. + Nur das reload macht er +* Bug mit Verschieben der Sidebar wo das Tabellengerüst stehen bleibt +* Snapin "Views": Die Spiegelpunkt sind zu weit links, die Einrückung + klappt nicht. diff --git a/.bugs/config b/.bugs/config new file mode 100644 index 0000000..fa2ff10 --- /dev/null +++ b/.bugs/config @@ -0,0 +1,22 @@ +states = { + "open" : tty_blue, + "done" : tty_green, + "closed" : tty_normal, +} + +components = [ + "core", + "checks", + "multisite", + "livestatus", + "wato", + "doku" +] + +classes = [ + "cleanup", + "bug", + "todo", + "phantasm", + "feature", +] diff --git a/LIESMICH.zutun b/LIESMICH.zutun index b8cd8af..b5b5064 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -1,37 +1,3 @@ -DOKU: --------------------------------------------------------------------------------- -Hostnamen in ipaddresses eintragen: Das sollte man dokumentieren -(wegen dynamischen Hosts.) - -Man-Pages zu df_netapp und df_netapp32 fehlen (df_netapp geht nur mit bulkwalk_hosts!!) - -Doku: Check_MK und OMD: Installieren von MKPs, local-Hierarchie - -[""] deprecaten, aus der Doku raus und durch ALL_SERVICES ersetzen. Das geht -aber erst, wenn eine stabile Version das ALL_SERVICES erlaubt! - --------------------------------------------------------------------------------- - -Livestatus: is_contact_member_of_contactgroup selbst programmieren, - da diese Funktion in Nagios rausfliegen wird. - -Inventurcheck: retry_interval evt. anders (kuerzer) einstellbar machen. -Das geht aber auch mit extra_service_conf. Evtl. reicht hier die Doku. -Ein sinnvoller Default-Wert wäre aber schon gut. - --------------------------------------------------------------------------------- -BUGS beheben ab 1.1.9i1 --------------------------------------------------------------------------------- -Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: -* reschedule Knopf geht irgendwie garnicht. Weder Animation noch reschedule. - Nur das reload macht er -* Bug mit Verschieben der Sidebar wo das Tabellengerüst stehen bleibt -* Snapin "Views": Die Spiegelpunkt sind zu weit links, die Einrückung - klappt nicht. - -Multsite: Kompatible mit Chrome machen. Probleme: -* reschedule Knopf wird nicht animiert - WATO: Wenn ein Agent einen rauswirft (leere Ausgabe, Connection closed), kommt im WATO bei der Inventur keine sinnvolle Fehlermeldung. diff --git a/gb b/gb index 1cadd90..01f9721 100755 --- a/gb +++ b/gb @@ -32,14 +32,6 @@ else: tty_normal = '' tty_ok = 'OK' -state_colors = { - "open" : tty_blue, - "done" : tty_green, - "closed" : tty_normal, -} - -components = [ "core", "checks", "multisite", "livestatus", "wato" ] - def bail_out(text): sys.stderr.write(text + "\n") sys.exit(1) @@ -56,6 +48,9 @@ def goto_bugsdir(): sys.stderr.write("Cannot find directory .bugs\n") sys.exit(1) +def load_config(): + execfile("config", globals(), globals()) + def load_bugs(): global g_bugs g_bugs = {} @@ -108,7 +103,10 @@ def save_bug(bug): os.system("git add %d" % bug["id"]) def next_bug_id(): - return max(g_bugs.keys()) + 1 + if len(g_bugs) == 0: + return 1 + else: + return max(g_bugs.keys()) + 1 def add_comment(bug, title, comment): bug["description"] += """ @@ -133,11 +131,11 @@ where COMMAND is one of: def bug_state(bug): state = bug["state"] - return "%s%-7s%s" % (tty_bold + state_colors.get(state, ""), state, tty_normal) + return "%s%-7s%s" % (tty_bold + states.get(state, ""), state, tty_normal) def list_bug(bug): - sys.stdout.write("#%04d %-7s %-60s\n" % - (int(bug["id"]), bug_state(bug), bug["title"])) + sys.stdout.write("#%04d %-6s %-7s %-10s %-60s\n" % + (int(bug["id"]), bug_state(bug), bug["class"], bug["component"], bug["title"])) def show_bug(bug): list_bug(bug) @@ -206,7 +204,11 @@ def input_choice(what, choices): sys.stdout.flush() c = getch() if c in ctc: + sys.stdout.write(" %s%s%s\n" % ( + tty_bold, ctc[c], tty_normal)) return ctc[c] + else: + sys.stdout.write("\n") def main_new(args): bug = {} @@ -217,8 +219,10 @@ def main_new(args): if bug["title"] == "": sys.stderr.write("Cancelled.\n") sys.exit(0) - bug["cost"] = int(get_input("Cost", 1)) - bug["benefit"] = int(get_input("Benefit", 1)) + bug["class"] = input_choice("Class", classes) + bug["component"] = input_choice("Component", components) + bug["cost"] = input_choice("Cost", "123456789") + bug["benefit"] = input_choice("Benefit", "123456789") bug["description"] = get_long_input("description") g_bugs[bug["id"]] = bug @@ -234,7 +238,7 @@ def main_resolve(args): bail_out("No such bug.\n") list_bug(bug) - state = input_choice("State", state_colors.keys()) + state = input_choice("State", states.keys()) comment = get_long_input("comment") add_comment(bug, "changed state %s -> %s" % (bug["state"], state), comment) @@ -256,6 +260,7 @@ def main_delete(args): # goto_bugsdir() +load_config() load_bugs() if len(sys.argv) < 2:

13 years, 8 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7c9da4723030d2a120caa6a5c77851738e49bc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7c9da4723030d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 20:32:51 2010 +0100 Updated internal doku --- LIESMICH.zutun | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index dab0a6a..b8cd8af 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -22,6 +22,16 @@ Ein sinnvoller Default-Wert wäre aber schon gut. -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- +Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: +* reschedule Knopf geht irgendwie garnicht. Weder Animation noch reschedule. + Nur das reload macht er +* Bug mit Verschieben der Sidebar wo das Tabellengerüst stehen bleibt +* Snapin "Views": Die Spiegelpunkt sind zu weit links, die Einrückung + klappt nicht. + +Multsite: Kompatible mit Chrome machen. Probleme: +* reschedule Knopf wird nicht animiert + WATO: Wenn ein Agent einen rauswirft (leere Ausgabe, Connection closed), kommt im WATO bei der Inventur keine sinnvolle Fehlermeldung.

13 years, 9 months

Check_MK Git: check_mk: Multisite: fixed perf-o-meter in Google Chrome

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f41d4bddfe993c1a2bdd349acbd59c65a9c6d1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f41d4bddfe993… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 20:30:03 2010 +0100 Multisite: fixed perf-o-meter in Google Chrome --- web/htdocs/check_mk.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 7ee958c..6d3eef3 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -817,6 +817,7 @@ table.services tr.data td.perfometer table td { padding: 0px; margin: 0px; border: none; + height: 22px; } table.services tr.data td.perfometer a {

13 years, 9 months

Check_MK Git: check_mk: Multisite: fix layout of host names with state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 67f3d3cd39abb0cf0857563eaae8a3b749feb486 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67f3d3cd39abb0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 20:12:01 2010 +0100 Multisite: fix layout of host names with state --- web/htdocs/check_mk.css | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 712aadc..7ee958c 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -840,6 +840,9 @@ td.statex { /* zero count */ background-color: #0b3; color: #fff; } +.hstate { + white-space: nowrap; +} /* WARN */ .state1, .state1 a { background-color: #ff0; color: #000;

13 years, 9 months

Check_MK Git: check_mk: Makefile: ship missing .js files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 66c9418cb97e266a6513d53f0f165a7779e086d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66c9418cb97e26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 19:43:46 2010 +0100 Makefile: ship missing .js files --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 09931eb..9ad879c 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ dist: mk-livestatus mkdir -p $(DISTNAME) tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) - tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web $$(cd web ; ls htdocs/*/*.{wav,jpg,png,gif,ico} htdocs/*.{py,css,js} plugins/*/*.py) + tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web $$(cd web ; ls htdocs/*/*.{wav,jpg,png,gif,ico,js} htdocs/*.{py,css} plugins/*/*.py) tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) tar czf $(DISTNAME)/pnp-templates.tar.gz $(TAROPTS) -C pnp-templates $$(cd pnp-templates ; ls *.php) tar czf $(DISTNAME)/pnp-rraconf.tar.gz $(TAROPTS) -C pnp-rraconf $$(cd pnp-rraconf ; ls *.rra.cfg README.rra)

13 years, 9 months

Check_MK Git: check_mk: printer_supply: handle case where no current available

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c035d82729704e2b2e3cad430e92c736f7bd203d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c035d82729704e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 17:13:08 2010 +0100 printer_supply: handle case where no current available --- ChangeLog | 1 + checks/printer_supply | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6df57d9..f47fa0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) * cups_queues: fixed plugin error due to invalid import of datetime, converted other checks from 'from datetime import...' to 'import datetime'. + * printer_supply: handle the case where the current value is missing Livestatus: * new column pnpgraph_present in table host and service. In order for this diff --git a/checks/printer_supply b/checks/printer_supply index a6df030..ed387fc 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -79,7 +79,7 @@ def check_printer_supply(item, params, info): for line in printer_supply_fix_infos(info): if line[0] == item: maxlevel = float(line[1]) - current = float(line[2]) + current = savefloat(line[2]) leftperc = 100.0 * current / maxlevel warn, crit = params # in percent infotext = "%.0f%% (levels at %.0f%% / %.0f%%)" % (leftperc, warn, crit)

13 years, 9 months

Check_MK Git: check_mk: Multisite: new view "Alert Statistics"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8027244d5931624a49a76748c8b3baca6eb040f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8027244d593162… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 17:06:48 2010 +0100 Multisite: new view "Alert Statistics" --- ChangeLog | 3 ++ LIESMICH.zutun | 11 +++++-- web/htdocs/views.py | 27 +++++++++++----- web/plugins/views/builtin.py | 61 ++++++++++++++++++++++++++++++++++++- web/plugins/views/datasources.py | 9 +++++ web/plugins/views/painters.py | 35 +++++++++++++++++++++ web/plugins/views/sorters.py | 8 +++++ 7 files changed, 140 insertions(+), 14 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8027244d59…

13 years, 9 months

Check_MK Git: check_mk: Livestatus: use Columns: instead of StatsGroupBy:

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5be217725b7c213cc1a3c975b928a12027d4d23e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5be217725b7c21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 16:12:00 2010 +0100 Livestatus: use Columns: instead of StatsGroupBy: StatsGroupBy: is now deprecated. Columns: does the same thing for you. --- ChangeLog | 3 +++ livestatus/src/Query.cc | 31 ++++++++----------------------- livestatus/src/Query.h | 3 --- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15fe292..ccef56e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ * Multisite: removed (undocumented) view parameters show_buttons and show_controls. Please use display_options instead. * Finally removed deprecated filesystem_levels. Please use check_parameters instead. + * Livestatus: The StatsGroupBy: header is still working but now deprecated. + Please simply use Columns: instead. If your query contains at least one Stats: + header than Columns: has the meaning of the old StatsGroupBy: header Core, Setup, etc.: * Create alias 'cmk' for check_mk in bin/ (easier typing) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index c9a3542..877b765 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -177,12 +177,12 @@ Column *Query::createDummyColumn(const char *name) } - void Query::addColumn(Column *column) { _columns.push_back(column); } + bool Query::hasNoColumns() { return _columns.size() == 0 && !doStats(); @@ -419,23 +419,8 @@ void Query::parseAuthUserHeader(char *line) void Query::parseStatsGroupLine(char *line) { - if (!_table) - return; - - char *column_name; - while (column_name = next_field(&line)) { - Column *column = _table->column(column_name); - if (!column) { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "StatsGroupBy: unknown column '%s'", column_name); - return; - } - _stats_group_columns.push_back(column); - } - - if (_stats_group_columns.size() == 0) { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "StatsGroupBy: missing an argument"); - return; - } + logger(LOG_WARNING, "Warning: StatsGroupBy is deprecated. Please use Columns instead."); + parseColumnsLine(line); } @@ -645,7 +630,7 @@ void Query::start() // if we have no StatsGroupBy: column, we allocate one only row of Aggregators, // directly in _stats_aggregators. When grouping the rows of aggregators // will be created each time a new group is found. - if (_stats_group_columns.size() == 0) + if (_columns.size() == 0) { _stats_aggregators = new Aggregator *[_stats_columns.size()]; for (unsigned i=0; i<_stats_columns.size(); i++) @@ -691,7 +676,7 @@ bool Query::processDataset(void *data) Aggregator **aggr; // When doing grouped stats, we need to fetch/create a row // of aggregators for the current group - if (_stats_group_columns.size() > 0) { + if (_columns.size() > 0) { _stats_group_spec_t groupspec; computeStatsGroupSpec(groupspec, data); aggr = getStatsGroup(groupspec); @@ -732,7 +717,7 @@ bool Query::processDataset(void *data) void Query::finish() { // grouped stats - if (doStats() && _stats_group_columns.size() > 0) + if (doStats() && _columns.size() > 0) { // output values of all stats groups (output has been post poned until now) for (_stats_groups_t::iterator it = _stats_groups.begin(); @@ -984,8 +969,8 @@ Aggregator **Query::getStatsGroup(Query::_stats_group_spec_t &groupspec) void Query::computeStatsGroupSpec(Query::_stats_group_spec_t &groupspec, void *data) { - for (_stats_group_columns_t::iterator it = _stats_group_columns.begin(); - it != _stats_group_columns.end(); + for (_columns_t::iterator it = _columns.begin(); + it != _columns.end(); ++it) { Column *column = *it; diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 5cc1955..1a85b63 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -87,9 +87,6 @@ class Query _stats_columns_t _stats_columns; // must also delete Aggregator **_stats_aggregators; - typedef vector <Column *> _stats_group_columns_t; - _stats_group_columns_t _stats_group_columns; - typedef vector<string> _stats_group_spec_t; typedef map<_stats_group_spec_t, Aggregator **> _stats_groups_t; _stats_groups_t _stats_groups;

13 years, 9 months

Check_MK Git: check_mk: Livestatus: StatsGroupBy: allows more than one columns

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1822486a776386bff491ba50644d5b5e3effe9c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1822486a776386… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 15:57:27 2010 +0100 Livestatus: StatsGroupBy: allows more than one columns --- ChangeLog | 1 + LIESMICH.zutun | 9 +--- livestatus/src/Query.cc | 110 ++++++++++++++++++++++++++++++---------------- livestatus/src/Query.h | 11 +++- 4 files changed, 82 insertions(+), 49 deletions(-) diff --git a/ChangeLog b/ChangeLog index d60c93d..15fe292 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * new column pnpgraph_present in table host and service. In order for this column to work you need to specify the base directory of the PNP graphs with the module option pnp_path=, e.g. pnp_path=/omd/sites/wato/var/pnp4nagios/perfdata + * Allow more than one column for StatsGroupBy: 1.1.9i2: Checks & Agents: diff --git a/LIESMICH.zutun b/LIESMICH.zutun index ecbbb5d..b749764 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -71,10 +71,6 @@ inventurisiert werden, und darf dann die betroffenen Services wegwerfen. Cluster-Inventur(2): Wenn ein Service auf der Node sitzt und man die Regeln zu Clustered services ändert, entfernt ein -II das nicht von der node. -Livestatus: wenn man mehrere StatsGroupBy macht, wird der Speicher von den -alten nicht freigegeben (ist momentan eh nicht erlaubt. Fehlermeldung ausgeben). -In neuer Version sollte man irgendwann mehrere Group-Header erlauben. - Multisite: Table log: Hier wird nur der erste Site angezeigt, bzw. die Chronologie Reihenfolge stimmt nicht. Sortieren nach Sekunden plus Zeilennummer. @@ -462,12 +458,9 @@ mit dem Windows-Check erstellen (wo ein Graph eh fehlt). Multisite: Quicksearch evtl. case-insensitive machen? -Livestatus: StatsGroupBy: mehrere Spalten erlauben - Multisite: Die TOP-25 Alerts: Welche Dinge hosts/services hatten in einem Zeitraum die meisten Alerts. Das geht mit log und StatsGroupBy: host_name -service_description. Dazu muss ich allerdings zuerst eine Gruppierung nach -mehr als einem Feld einbauen. +service_description. Multisite: Filter, der Hosts zeigt, die entweder selbst Summary hosts sind oder keinen haben. diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 6e7a130..c9a3542 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -62,8 +62,7 @@ Query::Query(InputBuffer *input, OutputBuffer *output, Table *table) : _output_format(OUTPUT_FORMAT_CSV), _limit(-1), _current_line(0), - _timezone_offset(0), - _stats_group_column(0) + _timezone_offset(0) { while (input->moreLines()) { @@ -151,6 +150,8 @@ Query::Query(InputBuffer *input, OutputBuffer *output, Table *table) : Query::~Query() { + return; + // delete dummy-columns for (_columns_t::iterator it = _dummy_columns.begin(); it != _dummy_columns.end(); @@ -418,22 +419,23 @@ void Query::parseAuthUserHeader(char *line) void Query::parseStatsGroupLine(char *line) { - if (!_table) - return; - - char *column_name = next_field(&line); - if (!column_name) { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "StatsGroupBy: missing an argument"); - return; - } + if (!_table) + return; - Column *column = _table->column(column_name); - if (!column) { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "StatsGroupBy: unknown column '%s'", column_name); - return; - } + char *column_name; + while (column_name = next_field(&line)) { + Column *column = _table->column(column_name); + if (!column) { + _output->setError(RESPONSE_CODE_INVALID_HEADER, "StatsGroupBy: unknown column '%s'", column_name); + return; + } + _stats_group_columns.push_back(column); + } - _stats_group_column = column; + if (_stats_group_columns.size() == 0) { + _output->setError(RESPONSE_CODE_INVALID_HEADER, "StatsGroupBy: missing an argument"); + return; + } } @@ -628,6 +630,7 @@ bool Query::doStats() return _stats_columns.size() > 0; } + void Query::start() { doWait(); @@ -642,7 +645,7 @@ void Query::start() // if we have no StatsGroupBy: column, we allocate one only row of Aggregators, // directly in _stats_aggregators. When grouping the rows of aggregators // will be created each time a new group is found. - if (!_stats_group_column) + if (_stats_group_columns.size() == 0) { _stats_aggregators = new Aggregator *[_stats_columns.size()]; for (unsigned i=0; i<_stats_columns.size(); i++) @@ -685,21 +688,22 @@ bool Query::processDataset(void *data) if (doStats()) { - Aggregator **aggr; - // When doing grouped stats, we need to fetch/create a row - // of aggregators for the current group - if (_stats_group_column) { - string groupname = _stats_group_column->valueAsString(data, this); - aggr = getStatsGroup(groupname); - } - else - aggr = _stats_aggregators; - - for (unsigned i=0; i<_stats_columns.size(); i++) - aggr[i]->consume(data, this); - - // No output is done while processing the data, we only - // collect stats. + Aggregator **aggr; + // When doing grouped stats, we need to fetch/create a row + // of aggregators for the current group + if (_stats_group_columns.size() > 0) { + _stats_group_spec_t groupspec; + computeStatsGroupSpec(groupspec, data); + aggr = getStatsGroup(groupspec); + } + else + aggr = _stats_aggregators; + + for (unsigned i=0; i<_stats_columns.size(); i++) + aggr[i]->consume(data, this); + + // No output is done while processing the data, we only + // collect stats. } else { @@ -728,16 +732,32 @@ bool Query::processDataset(void *data) void Query::finish() { // grouped stats - if (doStats() && _stats_group_column) + if (doStats() && _stats_group_columns.size() > 0) { + // output values of all stats groups (output has been post poned until now) for (_stats_groups_t::iterator it = _stats_groups.begin(); it != _stats_groups.end(); ++it) { + // dataset separator after first group if (it != _stats_groups.begin() && _output_format != OUTPUT_FORMAT_CSV) _output->addBuffer(",\n", 2); + outputDatasetBegin(); - outputString(it->first.c_str()); + + // output group columns first + _stats_group_spec_t groupspec = it->first; + bool first = true; + for (_stats_group_spec_t::iterator iit = groupspec.begin(); + iit != groupspec.end(); + ++iit) + { + if (!first) + outputFieldSeparator(); + else + first = false; + outputString((*iit).c_str()); + } Aggregator **aggr = it->second; for (unsigned i=0; i<_stats_columns.size(); i++) { @@ -818,7 +838,7 @@ void Query::outputInteger(int32_t value) void Query::outputInteger64(int64_t value) { char buf[32]; - int l = snprintf(buf, 32, "%lld", value); + int l = snprintf(buf, 32, "%lld", (long long int )value); _output->addBuffer(buf, l); } @@ -948,20 +968,32 @@ void Query::outputEndSublist() _output->addChar(']'); } -Aggregator **Query::getStatsGroup(string name) +Aggregator **Query::getStatsGroup(Query::_stats_group_spec_t &groupspec) { - _stats_groups_t::iterator it = _stats_groups.find(name); + _stats_groups_t::iterator it = _stats_groups.find(groupspec); if (it == _stats_groups.end()) { Aggregator **aggr = new Aggregator *[_stats_columns.size()]; for (unsigned i=0; i<_stats_columns.size(); i++) aggr[i] = _stats_columns[i]->createAggregator(); - _stats_groups.insert(make_pair(string(name), aggr)); + _stats_groups.insert(make_pair(groupspec, aggr)); return aggr; } else return it->second; } +void Query::computeStatsGroupSpec(Query::_stats_group_spec_t &groupspec, void *data) +{ + for (_stats_group_columns_t::iterator it = _stats_group_columns.begin(); + it != _stats_group_columns.end(); + ++it) + { + Column *column = *it; + groupspec.push_back(column->valueAsString(data, this)); + } +} + + void Query::doWait() { // If no wait condition and no trigger is set, @@ -1016,3 +1048,5 @@ void Query::doWait() } } while (!_wait_condition.accepts(_wait_object)); } + + diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 49520e2..5cc1955 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -86,8 +86,12 @@ class Query typedef vector<StatsColumn *> _stats_columns_t; _stats_columns_t _stats_columns; // must also delete Aggregator **_stats_aggregators; - Column *_stats_group_column; - typedef map<string, Aggregator **> _stats_groups_t; + + typedef vector <Column *> _stats_group_columns_t; + _stats_group_columns_t _stats_group_columns; + + typedef vector<string> _stats_group_spec_t; + typedef map<_stats_group_spec_t, Aggregator **> _stats_groups_t; _stats_groups_t _stats_groups; public: @@ -128,7 +132,8 @@ public: private: bool doStats(); void doWait(); - Aggregator **getStatsGroup(string name); + Aggregator **getStatsGroup(_stats_group_spec_t &groupspec); + void computeStatsGroupSpec(_stats_group_spec_t &groupspec, void *data); Filter *createFilter(Column *column, int operator_id, char *value); void parseFilterLine(char *line, bool filter /* and not cond */); void parseStatsLine(char *line);

13 years, 9 months

Check_MK Git: check_mk: Multisite: new column host_tags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4e0d775041baeac2a41545172861349f07c6be4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e0d775041baea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 13:32:08 2010 +0100 Multisite: new column host_tags --- ChangeLog | 3 ++- web/plugins/views/painters.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b657dd1..d60c93d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,8 +21,9 @@ * new HTML parameter display_options, which allows to switch off several parts of the output (e.g. the HTML header, external links, etc). * View hoststatus: show PNP graph of host (usually ping stats) - * Multisite: new tab "Display": here the user can choose time stamp + * new tab "Display": here the user can choose time stamp display format and PNP graph ranges + * new column "host_tags", showing the Check_MK host tags of a host Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index fab7163..a60fea5 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1000,6 +1000,19 @@ multisite_painters["host_custom_notes"] = { "paint" : paint_custom_notes } +def paint_host_tags(row): + for name, val in zip(row["host_custom_variable_names"], + row["host_custom_variable_values"]): + if name == "TAGS": + return "", val + return "","" + +multisite_painters["host_tags"] = { + "title" : "Host Tags (Check_MK)", + "short" : "Tags", + "columns" : [ "host_custom_variable_names", "host_custom_variable_values" ], + "paint" : paint_host_tags +} # _ _ _ # | | | | ___ ___| |_ __ _ _ __ ___ _ _ _ __ ___

13 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2010