Checkmk git commits August 2011

checkmk-commits@lists.checkmk.com

3 participants
272 discussions

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8ac03b0a2dd449aa4e2805a5bf1418b0e4249465 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ac03b0a2dd449… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 22:33:30 2011 +0200 Updated bug entries --- .bugs/83 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/83 b/.bugs/83 index 10b405c..b0905fa 100644 --- a/.bugs/83 +++ b/.bugs/83 @@ -1,10 +1,11 @@ Title: if-Check: Bandbreite manuell festlegbar machen Component: checks +State: done +Class: feature +Date: 2010-12-22 11:23:13 Benefit: 1 -State: open Cost: 2 -Date: 2010-12-22 11:23:13 -Class: feature +Fun: 0 Der if-Check kann manchmal die Bandbreite nicht korrekt erkennen (z.B. Linux-SNMP-Agent, oder bei Drosselung durch den Provider). @@ -13,3 +14,6 @@ Fall selbst konfigurieren. Wenn man dann den Interface-Check von Linux kompatibel gemacht hat, könnte man das gleiche Spiel auch bei Linux machen. + +2011-08-19 22:14:15: changed state open -> done +Ist mittlerweile möglich.

12 years, 10 months

Check_MK Git: check_mk: support non-Ascii characters in SNMP strings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 48a17f5ed4a696d3c490a3aabb656d878e292534 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48a17f5ed4a696… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 22:34:56 2011 +0200 support non-Ascii characters in SNMP strings --- .bugs/13 | 15 ++++++++++++--- ChangeLog | 2 ++ checks/printer_supply | 13 ++++++++----- modules/check_mk.py | 12 +++++++++++- modules/snmp.py | 11 +++++++++++ 5 files changed, 44 insertions(+), 9 deletions(-) diff --git a/.bugs/13 b/.bugs/13 index 69b2283..0c30b25 100644 --- a/.bugs/13 +++ b/.bugs/13 @@ -1,10 +1,11 @@ Title: Umlaute in SNMP-Daten und Servicedescription Component: checks +State: done +Class: bug +Date: 2010-12-21 12:12:02 Benefit: 1 -State: open Cost: 4 -Date: 2010-12-21 12:12:02 -Class: bug +Fun: 0 Ein Drucker sendet per SNMP Latin1 kodierte Wert, z.B. Resttonerbehälter. Daraus baut Check_MK eine @@ -18,3 +19,11 @@ im Falle vom Datentyp String, automatisch konvertiert. Oder man macht das explizit im Check, der weiß, dass die Daten evtl. kodiert daher kommen. + +2011-08-19 22:34:40: changed state open -> done +snmp_character_encodings muss definiert werden. Aktuell wird +das nur in printer_supply verwendet. Ob andere Checks aktuell +betroffen sind, ist nicht klar. +Evtl. kann man einst auch Windows-Eventlogs auf diese +Art machen. Obwohl ich eher finde, dass man das auf dem Agent +lösen sollte. diff --git a/ChangeLog b/ChangeLog index 545d4d2..68196b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ * Windows Agent: Now supports direct execution of powershell scripts * local: PNP template now supports multiple performance values * lnx_if: make lnx_if the default interface check for Linux + * printer_supply: support non-Ascii characters in items like + "Resttonerbehälter". You need to define snmp_character_encodings in main.mk MK Livestatus: * WaitObject: allow to separate host name and service with a semicolon. diff --git a/checks/printer_supply b/checks/printer_supply index fe64faf..81cf105 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -61,16 +61,19 @@ printer_supply_some_remaining_status = 1 # Add the color description to that item def printer_supply_fix_infos(info): colors = [] - for index, line in enumerate(info): - if line[0].startswith('Toner Cartridge') \ - or line[0].startswith('Image Drum Unit'): + new_info = [] + for line in info: + line_0 = snmp_decode_string(line[0]) # give chance for latin1->utf8 decoding + if line_0.startswith('Toner Cartridge') \ + or line_0.startswith('Image Drum Unit'): if line[3]: colors += [ line[3] ] color = line[3] elif line[3] == '': color = colors[index - len(colors)] - info[index][0] = '%s %s' % (color.title(), line[0]) - return info + line_0 = '%s %s' % (color.title(), line_0) + new_info.append([line_0] + line[1:]) + return new_info def inventory_printer_supply(info): # Ignore devices which show -2 for current value and -2 for max value -> useless diff --git a/modules/check_mk.py b/modules/check_mk.py index 0991fba..f7d6d3d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -225,9 +225,10 @@ debug_log = None monitoring_host = "localhost" # your Nagios host max_num_processes = 50 -# SNMP communities +# SNMP communities and encoding snmp_default_community = 'public' snmp_communities = [] +snmp_character_encodings = [] # Inventory and inventory checks inventory_check_interval = None # Nagios intervals (4h = 240) @@ -604,6 +605,11 @@ def snmp_credentials_of(hostname): # nothing configured for this host -> use default return snmp_default_community +def get_snmp_character_encoding(hostname): + entries = host_extra_conf(hostname, snmp_character_encodings) + if len(entries) > 0: + return entries[0] + def check_uses_snmp(check_type): check_name = check_type.split(".")[0] return snmp_info.has_key(check_name) or snmp_info_single.has_key(check_name) @@ -2320,6 +2326,10 @@ no_inventory_possible = None output.write("def agent_port_of(hostname):\n return %d\n\n" % agent_port_of(hostname)) output.write("def snmp_port_spec(hostname):\n return %r\n\n" % snmp_port_spec(hostname)) + # SNMP character encoding + output.write("def get_snmp_character_encoding(hostname):\n return %r\n\n" + % get_snmp_character_encoding(hostname)) + # Parameters for checks: Default values are defined in checks/*. The # variables might be overridden by the user in main.mk. We need # to set the actual values of those variables here. Otherwise the users' diff --git a/modules/snmp.py b/modules/snmp.py index 198f143..4d5450e 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -66,6 +66,7 @@ def convert_from_hex(value): r += chr(int(hx, 16)) return r + def oid_to_bin(oid): return u"".join([ unichr(int(p)) for p in oid.strip(".").split(".") ]) @@ -484,3 +485,13 @@ def get_stored_snmpwalk(hostname, oid): break # import pprint ; pprint.pprint(rowinfo) return rowinfo + +# Helper function to be used in checks. It applies a user-specified +# character encoding in order to tranlate e.g. latin1 to utf8 +def snmp_decode_string(text): + encoding = get_snmp_character_encoding(g_hostname) + if encoding: + return text.decode(encoding).encode("utf-8") + else: + return text +

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 740d494a28cd073b1df0bdfd773257e4419c8a05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=740d494a28cd07… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 21:38:48 2011 +0200 Updated bug entries --- .bugs/152 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/152 b/.bugs/152 index 6730f8b..4effca1 100644 --- a/.bugs/152 +++ b/.bugs/152 @@ -1,10 +1,11 @@ Title: Windows inventory - make service inventory more flexible Component: checks +State: done +Class: feature +Date: 2011-02-18 10:52:33 Benefit: 2 -State: open Cost: 2 -Date: 2011-02-18 10:52:33 -Class: feature +Fun: 0 Example for possible configuration: @@ -18,3 +19,6 @@ inventory_services = [ ( [ "backup" ], ALL_HOSTS, [ "Backup.*" ] ), ] + +2011-08-19 21:38:46: changed state open -> done +Implemented and documented. Very similar to this bug description.

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9312c9955b6c3f774119ad9ccb1c75c6c0e42e8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9312c9955b6c3f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 21:09:16 2011 +0200 Updated bug entries --- .bugs/231 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/231 b/.bugs/231 index e7f443a..5c4905b 100644 --- a/.bugs/231 +++ b/.bugs/231 @@ -1,10 +1,11 @@ Title: remove do_rrd_update completely Component: core +State: done +Class: nastiness +Date: 2011-04-11 16:37:13 Benefit: 1 -State: open Cost: 3 -Date: 2011-04-11 16:37:13 -Class: nastiness +Fun: 0 ich hatte sehr lange gesucht, warum bei mir die perfdata fuer nagvis und perf-o-meter kaputt war. Es gab keine fehlermeldungen, an denen es nachvollziehbar war. ursache war do_rrd_update, @@ -20,3 +21,6 @@ auch das Perf-O-Meter nicht. => Auch in den Migration-Notes vermerken und in der Doku anpassen. + +2011-08-19 21:09:14: changed state open -> done +Ist erledigt.

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 81fded7e6d405fb525530480a4f0a6941d6a87b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81fded7e6d405f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 21:37:57 2011 +0200 Updated bug entries --- .bugs/133 | 9 ++++++--- .bugs/162 | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.bugs/133 b/.bugs/133 index 98dae2c..d2320f3 100644 --- a/.bugs/133 +++ b/.bugs/133 @@ -1,10 +1,13 @@ Title: remove direct RRD updates from code and docu Component: core +State: done +Class: cleanup +Date: 2011-02-13 18:59:18 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-13 18:59:18 -Class: cleanup +Fun: 0 They are not longer neccessary since we have rrdcached. And they break perf-o-meters and other nice things. + +2011-08-19 21:12:18: changed state open -> done diff --git a/.bugs/162 b/.bugs/162 index 8fd6afe..4f3fd45 100644 --- a/.bugs/162 +++ b/.bugs/162 @@ -1,10 +1,13 @@ Title: Drop direct RRD updates Component: core +State: done +Class: cleanup +Date: 2011-02-27 14:24:50 Benefit: 1 -State: open Cost: 2 -Date: 2011-02-27 14:24:50 -Class: cleanup +Fun: 0 That feature should be completely removed from the code and documentation as soon as we open the 1.1.11 series. + +2011-08-19 21:12:30: changed state open -> done

12 years, 10 months

Check_MK Git: check_mk: Removed obsolete install_nagios.sh

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3af507380edb014a9a503e402bb6d114d298be18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3af507380edb01… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 21:11:10 2011 +0200 Removed obsolete install_nagios.sh --- ChangeLog | 2 + Makefile | 1 - Makefile.private | 1 - scripts/install_nagios.sh | 1127 --------------------------------------------- scripts/remove_nagios.sh | 69 --- 5 files changed, 2 insertions(+), 1198 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3af507380e…

12 years, 10 months

Check_MK Git: check_mk: Livestatus: reindented source to 4 columns

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d088fa1e3d81848bdfdf1fe000f6772b39ce930b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d088fa1e3d8184… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 20:17:30 2011 +0200 Livestatus: reindented source to 4 columns --- livestatus/src/AndingFilter.cc | 116 +- livestatus/src/AttributelistColumn.cc | 68 +- livestatus/src/AttributelistColumn.h | 4 +- livestatus/src/AttributelistFilter.cc | 26 +- livestatus/src/AttributelistFilter.h | 2 +- livestatus/src/ClientQueue.cc | 52 +- livestatus/src/ClientQueue.h | 20 +- livestatus/src/Column.cc | 22 +- livestatus/src/ColumnsColumn.cc | 4 +- livestatus/src/ColumnsColumn.h | 10 +- livestatus/src/ContactgroupsColumn.cc | 74 +- livestatus/src/ContactgroupsColumn.h | 18 +- livestatus/src/ContactgroupsMemberColumn.h | 2 +- livestatus/src/ContactsColumn.cc | 50 +- livestatus/src/ContactsColumn.h | 12 +- livestatus/src/CountAggregator.cc | 2 +- livestatus/src/CustomVarsColumn.cc | 92 +- livestatus/src/CustomVarsColumn.h | 20 +- livestatus/src/CustomVarsExplicitColumn.cc | 20 +- livestatus/src/CustomVarsExplicitColumn.h | 10 +- livestatus/src/CustomVarsFilter.cc | 90 +- livestatus/src/CustomVarsFilter.h | 22 +- livestatus/src/DoubleAggregator.cc | 80 +- livestatus/src/DoubleAggregator.h | 2 +- livestatus/src/DoubleColumn.cc | 4 +- livestatus/src/DoubleColumn.h | 2 +- livestatus/src/DoubleColumnFilter.cc | 38 +- livestatus/src/DoubleColumnFilter.h | 12 +- livestatus/src/DownCommColumn.cc | 76 +- livestatus/src/DownCommColumn.h | 18 +- livestatus/src/DowntimeOrComment.cc | 60 +- livestatus/src/DowntimeOrComment.h | 134 ++-- livestatus/src/EmptyColumn.cc | 2 +- livestatus/src/EmptyColumn.h | 8 +- livestatus/src/GlobalCountersColumn.cc | 8 +- livestatus/src/GlobalCountersColumn.h | 14 +- livestatus/src/HostContactsColumn.cc | 4 +- livestatus/src/HostContactsColumn.h | 8 +- livestatus/src/HostSpecialIntColumn.cc | 30 +- livestatus/src/HostSpecialIntColumn.h | 8 +- livestatus/src/HostgroupsColumn.cc | 74 +- livestatus/src/HostgroupsColumn.h | 18 +- livestatus/src/HostlistColumn.cc | 38 +- livestatus/src/HostlistColumn.h | 16 +- livestatus/src/HostlistColumnFilter.cc | 54 +- livestatus/src/HostlistColumnFilter.h | 12 +- livestatus/src/HostlistStateColumn.cc | 72 +- livestatus/src/HostlistStateColumn.h | 12 +- livestatus/src/InputBuffer.cc | 318 +++--- livestatus/src/InputBuffer.h | 32 +- livestatus/src/IntAggregator.cc | 88 +- livestatus/src/IntAggregator.h | 2 +- livestatus/src/IntColumn.cc | 10 +- livestatus/src/IntColumn.h | 2 +- livestatus/src/IntColumnFilter.cc | 182 ++-- livestatus/src/IntPointerColumn.h | 2 +- livestatus/src/ListColumn.cc | 2 +- livestatus/src/ListColumn.h | 14 +- livestatus/src/ListColumnFilter.cc | 36 +- livestatus/src/ListColumnFilter.h | 14 +- livestatus/src/LogEntry.cc | 274 +++--- livestatus/src/LogEntry.h | 2 +- livestatus/src/Logfile.cc | 160 ++-- livestatus/src/OffsetDoubleColumn.cc | 14 +- livestatus/src/OffsetDoubleColumn.h | 2 +- livestatus/src/OffsetIntColumn.cc | 14 +- livestatus/src/OffsetIntColumn.h | 2 +- livestatus/src/OffsetStringColumn.cc | 14 +- livestatus/src/OffsetStringColumn.h | 2 +- livestatus/src/OffsetStringHostMacroColumn.h | 2 +- livestatus/src/OffsetStringMacroColumn.cc | 98 +- livestatus/src/OffsetStringMacroColumn.h | 2 +- livestatus/src/OffsetStringServiceMacroColumn.cc | 4 +- livestatus/src/OffsetStringServiceMacroColumn.h | 2 +- livestatus/src/OffsetTimeColumn.cc | 2 +- livestatus/src/OffsetTimeColumn.h | 2 +- livestatus/src/OffsetTimeperiodColumn.cc | 12 +- livestatus/src/OringFilter.cc | 44 +- livestatus/src/OutputBuffer.cc | 174 ++-- livestatus/src/OutputBuffer.h | 50 +- livestatus/src/PerfdataAggregator.cc | 44 +- livestatus/src/Query.cc | 1210 +++++++++++----------- livestatus/src/Query.h | 190 ++-- livestatus/src/ServiceContactsColumn.cc | 2 +- livestatus/src/ServiceContactsColumn.h | 8 +- livestatus/src/ServiceSpecialIntColumn.cc | 16 +- livestatus/src/ServiceSpecialIntColumn.h | 8 +- livestatus/src/ServicegroupsColumn.cc | 64 +- livestatus/src/ServicegroupsColumn.h | 18 +- livestatus/src/ServicelistColumn.cc | 66 +- livestatus/src/ServicelistColumn.h | 18 +- livestatus/src/ServicelistColumnFilter.cc | 4 +- livestatus/src/ServicelistColumnFilter.h | 12 +- livestatus/src/ServicelistStateColumn.cc | 60 +- livestatus/src/ServicelistStateColumn.h | 16 +- livestatus/src/StatsColumn.cc | 10 +- livestatus/src/StatsColumn.h | 2 +- livestatus/src/Store.cc | 68 +- livestatus/src/Store.h | 52 +- livestatus/src/StringColumn.cc | 10 +- livestatus/src/StringColumn.h | 2 +- livestatus/src/StringColumnFilter.cc | 62 +- livestatus/src/StringColumnFilter.h | 18 +- livestatus/src/StringPointerColumn.h | 2 +- livestatus/src/TODO | 2 +- livestatus/src/Table.cc | 32 +- livestatus/src/TableColumns.cc | 92 +- livestatus/src/TableColumns.h | 16 +- livestatus/src/TableCommands.cc | 22 +- livestatus/src/TableCommands.h | 8 +- livestatus/src/TableContactgroups.cc | 10 +- livestatus/src/TableContacts.cc | 96 +- livestatus/src/TableContacts.h | 10 +- livestatus/src/TableDownComm.cc | 100 +- livestatus/src/TableDownComm.h | 28 +- livestatus/src/TableHostgroups.cc | 152 ++-- livestatus/src/TableHostgroups.h | 14 +- livestatus/src/TableHosts.cc | 268 +++--- livestatus/src/TableLog.cc | 216 ++-- livestatus/src/TableServicegroups.cc | 118 ++-- livestatus/src/TableServicegroups.h | 14 +- livestatus/src/TableServices.cc | 312 +++--- livestatus/src/TableServices.h | 2 +- livestatus/src/TableStatus.cc | 196 ++-- livestatus/src/TableStatus.h | 6 +- livestatus/src/TableTimeperiods.cc | 10 +- livestatus/src/TableTimeperiods.h | 8 +- livestatus/src/TimeColumnFilter.cc | 6 +- livestatus/src/TimeColumnFilter.h | 2 +- livestatus/src/TimePointerColumn.cc | 2 +- livestatus/src/TimePointerColumn.h | 2 +- livestatus/src/TimeperiodsCache.cc | 8 +- livestatus/src/global_counters.c | 60 +- livestatus/src/logger.c | 30 +- livestatus/src/logger.h | 2 +- livestatus/src/module.c | 408 ++++---- livestatus/src/store.cc | 56 +- livestatus/src/store.h | 30 +- livestatus/src/strutil.cc | 52 +- livestatus/src/unixcat.c | 192 ++-- 140 files changed, 3831 insertions(+), 3831 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d088fa1e3d…

12 years, 10 months

Check_MK Git: check_mk: Multisite: fixed background color of odd UNKNOWN lines

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ebf45b51dcc6bae5cd8237ebba9d9e4e703ae326 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebf45b51dcc6ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 20:23:44 2011 +0200 Multisite: fixed background color of odd UNKNOWN lines --- .bugs/25 | 10 +++++++--- web/htdocs/check_mk.css | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.bugs/25 b/.bugs/25 index b18576d..6163f39 100644 --- a/.bugs/25 +++ b/.bugs/25 @@ -1,9 +1,13 @@ Title: Zeilenhintergrund von UNKNOWN passt nicht Component: multisite +State: done +Class: nastiness +Date: 2010-12-21 16:30:14 Benefit: 1 -State: open Cost: 1 -Date: 2010-12-21 16:30:14 -Class: nastiness +Fun: 0 Sieht schon fast gelb aus. check_mk.css anpassen. + +2011-08-19 20:23:26: changed state open -> done +Farbe ist angepasst. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a5f38a7..4d7d1eb 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -632,7 +632,7 @@ tr.even1 { background-color: #ffa; } tr.odd2 { background-color: #fcc; } tr.even2 { background-color: #faa; } -tr.odd3 { background-color: #fdc; } +tr.odd3 { background-color: #fda; } tr.even3 { background-color: #fea; } /* HACK */

12 years, 10 months

Check_MK Git: check_mk: Bookmarks snapin: save relative URLs whenever possible

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb9d5fec38f1b49e408913026050065495c28153 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb9d5fec38f1b4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 20:49:29 2011 +0200 Bookmarks snapin: save relative URLs whenever possible --- .bugs/24 | 10 +++++++--- ChangeLog | 1 + web/plugins/sidebar/shipped.py | 10 ++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.bugs/24 b/.bugs/24 index 621161e..b24a332 100644 --- a/.bugs/24 +++ b/.bugs/24 @@ -1,12 +1,16 @@ Title: Multisite Bookmarks: relative (minimale) URLs speichern Component: multisite +State: done +Class: nastiness +Date: 2010-12-21 16:28:32 Benefit: 1 -State: open Cost: 1 -Date: 2010-12-21 16:28:32 -Class: nastiness +Fun: 0 Das Snapin speichert immer absolute URLs mit Hostnamen. Das ist aber doof, wenn man die Bookmarksdatei auf einen anderen Host kopiert oder mal mit IP-Adresse, mal mit Namen auf Nagios zugreift. Lösung: Beim Speichern der Bookmarks den gemeinsamen Pfad vorne wegschneiden. + +2011-08-19 20:50:03: changed state open -> done +Gemeinsamer Teil wird vorne weggesäbelt. diff --git a/ChangeLog b/ChangeLog index 9c816f9..8a73476 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ Multisite: * FIX: reschedule now works for host names containing spaces + * Bookmarks snapin: save relative URLs whenever possible 1.1.11i2: Core, Setup, etc.: diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 300ae22..233ada5 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -922,6 +922,16 @@ def ajax_add_bookmark(): href = html.var("href") if title and href: bookmarks = load_bookmarks() + # We try to remove http://hostname/some/path/check_mk from the + # URI. That keeps the configuration files (bookmarks) portable. + # Problem here: We have not access to our own URL, only to the + # path part. The trick: we use the Referrer-field from our + # request. That points to the sidebar. + referer = html.req.headers_in.get("Referer") + if referer: + while '/' in referer and referer.split('/')[0] == href.split('/')[0]: + referer = referer.split('/', 1)[1] + href = href.split('/', 1)[1] bookmarks.append((title, href)) save_bookmarks(bookmarks) render_bookmarks()

12 years, 10 months

Check_MK Git: check_mk: direct RRD updates have been removed completely

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7f5287f79ebe8873b4dce44c3bff8e8b05ce20be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f5287f79ebe88… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 21:06:12 2011 +0200 direct RRD updates have been removed completely --- .bugs/130 | 10 +++++++--- ChangeLog | 2 ++ modules/check_mk.py | 25 ++----------------------- modules/check_mk_base.py | 18 +----------------- scripts/setup.sh | 12 ------------ 5 files changed, 12 insertions(+), 55 deletions(-) diff --git a/.bugs/130 b/.bugs/130 index 83aeae7..5ebac9b 100644 --- a/.bugs/130 +++ b/.bugs/130 @@ -1,10 +1,14 @@ Title: Edit button and Add Bookmark button to much left Component: multisite +State: done +Class: cleanup +Date: 2011-02-11 09:45:12 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-11 09:45:12 -Class: cleanup +Fun: 0 The Buttons in the snapins are too left. This looks ugly. + +2011-08-19 20:50:53: changed state open -> done +Had been fixed a while ago already. diff --git a/ChangeLog b/ChangeLog index 8a73476..db6d107 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * FIX: allow host names to have spaces * --snmpwalk: fix missing space in case of HEX strings * cmk --restore: be aware of counters and cache being symbolic links + * do_rrd_update: direct RRD updates have completely been removed. + Please use rrdcached in case of performance problems. Checks & Agents: * FIX: printer_pages: workaround for trailing-zero bug in HP Jetdirect diff --git a/modules/check_mk.py b/modules/check_mk.py index 9b63256..c999f3c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -100,7 +100,6 @@ snmpwalks_dir = var_dir + '/snmpwalks' precompiled_hostchecks_dir = var_dir + '/precompiled' counters_directory = var_dir + '/counters' tcp_cache_dir = var_dir + '/cache' -rrd_path = var_dir + '/rrd' logwatch_dir = var_dir + '/logwatch' nagios_objects_file = var_dir + '/check_mk_objects.cfg' nagios_command_pipe_path = '/usr/local/nagios/var/rw/nagios.cmd' @@ -213,7 +212,6 @@ agent_port = 6556 agent_ports = [] snmp_ports = [] # UDP ports used for SNMP tcp_connect_timeout = 5.0 -do_rrd_update = False delay_precompile = False # delay Python compilation to Nagios execution check_submission = "pipe" # alternative: "file" aggr_summary_hostname = "%s-s" @@ -2259,14 +2257,6 @@ no_inventory_possible = None if opt_verbose: sys.stderr.write(" %s%s%s" % (tty_green, filename.split('/')[-1], tty_normal)) - # direct update of RRD databases by check_mk - if do_rrd_update: - output.write("do_rrd_update = True\n" + - "import rrdtool\n" + - "rrd_path = %r\n" % rrd_path) - else: - output.write("do_rrd_update = False\n") - # handling of clusters if is_cluster(hostname): output.write("clusters = { %r : %r }\n" % @@ -3061,7 +3051,6 @@ def show_paths(): ( tcp_cache_dir, dir, data, "Cached output from agents"), ( logwatch_dir, dir, data, "Unacknowledged logfiles of logwatch extension"), ( nagios_objects_file, fil, data, "File into which Nagios configuration is written"), - ( rrd_path, dir, data, "Base directory of round robin databases"), ( nagios_status_file, fil, data, "Path to Nagios status.dat"), ( nagios_command_pipe_path, fil, pipe, "Nagios' command pipe"), @@ -3820,16 +3809,6 @@ for hostname in strip_tags(all_hosts + clusters.keys()): sys.exit(4) seen_hostnames.add(hostname) -# Load python-rrd if available and not switched off. -if do_rrd_update: - try: - import rrdtool - except: - sys.stderr.write("ERROR: Cannot do direct rrd updates since the Python module\n"+ - "'rrdtool' could not be loaded. Please install python-rrdtool\n"+ - "or set do_rrd_update to False in main.mk.\n") - sys.exit(3) - # Load agent simulator if enabled if agent_simulator: execfile(modules_dir + "/agent_simulator.py") @@ -3901,8 +3880,8 @@ if __name__ == "__main__": checks = autochecks + checks vars_after_config = all_nonfunction_vars() -ignored_variables = set(['vars_before_config', 'rrdtool', 'autochecks', - 'parts' ,'hosttags' ,'seen_hostnames' ,'all_hosts_untagged' ,'taggedhost' ,'hostname']) +ignored_variables = set(['vars_before_config', 'autochecks', 'parts' ,'hosttags' ,'seen_hostnames', + 'all_hosts_untagged' ,'taggedhost' ,'hostname']) errors = 0 for name in vars_after_config: if name not in ignored_variables and name not in vars_before_config: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 22d5c76..c9e1059 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -909,7 +909,7 @@ def submit_check_result(host, servicedesc, result, sa): for p in perfdata: perftexts.append(convert_perf_data(p)) - if perftexts != [] and not direct_rrd_update(host, servicedesc, perfdata): + if perftexts != []: if check_command and perfdata_format == "pnp": perftexts.append("[%s]" % check_command) perftext = "|" + (" ".join(perftexts)) @@ -925,22 +925,6 @@ def submit_check_result(host, servicedesc, result, sa): color = { 0: tty_green, 1: tty_yellow, 2: tty_red, 3: tty_magenta }[result[0]] print "%-20s %s%s%-56s%s%s" % (servicedesc, tty_bold, color, result[1], tty_normal, p) -def direct_rrd_update(host, servicedesc, perfdata): - if do_rrd_update: - path = rrd_path + "/" + host.replace(":", "_") + "/" + servicedesc.replace("/", "_").replace(" ", "_") - # check existance and age of xml file - try: - xml_age = os.stat(path + ".xml").st_mtime - if time.time() - xml_age > (3600 + os.getpid() % 1800): - return False # XML file too old - numbers = [ str(p[1]).rstrip("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_ ") for p in perfdata ] - # sys.stderr.write("Schreibe rrdtool.update(" + path + ".rrd" + ", N:" + ":".join(numbers)) - rrdtool.update(path + ".rrd", "N:" + ":".join(numbers)) - except: - return False # Update not successfull or XML file missing or too old - return True - return False - def submit_to_nagios(host, service, state, output): if check_submission == "pipe": diff --git a/scripts/setup.sh b/scripts/setup.sh index 74ab21b..9ca8160 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -388,11 +388,6 @@ have to log in twice" ask_title "Integration with PNP4Nagios 0.6" # ------------------------------------------------------------------- -ask_dir rrddir $vardir/rrd $vardir/rrd $OMD_ROOT/var/pnp4nagios/perfdata "round robin databases" \ - "Base directory for round robin databases. If you use PNP4Nagios as -graphing tool check_mk can directly write into the exsting databases. -This saves CPU and disk IO" - ask_dir pnptemplates /usr/share/$NAME/pnp-templates $HOMEBASEDIR/pnp-templates $OMD_ROOT/local/share/check_mk/pnp-templates "PNP4Nagios templates" \ "Check_MK ships templates for PNP4Nagios for most of its checks. Those templates make the history graphs look nice. PNP4Nagios @@ -481,7 +476,6 @@ counters_directory = '$vardir/counters' tcp_cache_dir = '$vardir/cache' logwatch_dir = '$vardir/logwatch' nagios_objects_file = '$nagconfdir/check_mk_objects.cfg' -rrd_path = '$rrddir' nagios_command_pipe_path = '$nagpipe' check_result_path = '$check_result_path' nagios_status_file = '$nagios_status_file' @@ -689,12 +683,6 @@ do mkdir -p $DESTDIR$confdir/multisite.d && mkdir -p $DESTDIR$confdir/conf.d && echo 'All files in this directory that end with .mk will be read in after main.mk' > $DESTDIR$confdir/conf.d/README && - if [ ! -d $DESTDIR$rrddir ] ; then - mkdir -p $DESTDIR$rrddir && - if [ -z "$DESTDIR" ] && id "$nagiosuser" > /dev/null 2>&1 && [ $UID = 0 ] ; then - chown $nagiosuser $DESTDIR$rrddir - fi - fi && mkdir -p $DESTDIR$bindir && rm -f $DESTDIR$bindir/check_mk && echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py "'"$@"' > $DESTDIR$bindir/check_mk &&

12 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2011