Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

4297 FIX oracle_instance: fixed discovery function

by Simon Betz

Module: check_mk Branch: master Commit: b59de29a9ba49a4647f707851755ea879b52ad05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b59de29a9ba49a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 25 10:50:30 2017 +0100 4297 FIX oracle_instance: fixed discovery function Some old {{mk_oracle}} plugin outputs are wrong formatted such that discovery function detects wrong items. Change-Id: I2c57f266cb2e6806a5f51e9ee1f1d19c4cd75c4e --- .werks/4297 | 11 +++++++++++ ChangeLog | 1 + checks/oracle_instance | 9 +++++++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/4297 b/.werks/4297 new file mode 100644 index 0000000..d18cb9e --- /dev/null +++ b/.werks/4297 @@ -0,0 +1,11 @@ +Title: oracle_instance: fixed discovery function +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485337707 + +Some old {{mk_oracle}} plugin outputs are wrong formatted +such that discovery function detects wrong items. diff --git a/ChangeLog b/ChangeLog index cd0ace3..57e939a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * 4012 FIX: Fixed broken windows MSI packages (Installer error 2725)... * 4014 FIX: Windows Agent / Eventlogs with vista_api: Fixed numerous bugs and memory leaks... * 4283 FIX: check_mail_loop: Now using "mail to" address in To header + * 4297 FIX: oracle_instance: fixed discovery function... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/oracle_instance b/checks/oracle_instance index 5871164..8665ea5 100644 --- a/checks/oracle_instance +++ b/checks/oracle_instance @@ -30,6 +30,12 @@ # TUX2|12.1.0.1.0|OPEN|ALLOWED|STARTED|6735|1297771692|ARCHIVELOG|PRIMARY|NO|TUX2 # TUX5|12.1.0.1.1|MOUNTED|ALLOWED|STARTED|82883|1297771692|NOARCHIVELOG|PRIMARY|NO|0|TUX5 +# <<<oracle_instance:sep(124)>>>$ +# +ASM|FAILURE|ORA-99999 tnsping failed for +ASM $ +# ERROR:$ +# ORA-28002: the password will expire within 1 days$ + + factory_settings["oracle_instance_defaults"] = { "logins" : 2, "noforcelogging" : 1, @@ -44,11 +50,10 @@ def inventory_oracle_instance(info): # ORA-99999 tnsping failed for +ASM1 return [ (line[0], {} ) for line in info if not (line[0].startswith('ORA-') and line[0][4].isdigit()) - and len(line[0]) < 20 ] + and len(line[0]) < 20 and len(line) >= 6 ] def check_oracle_instance(item, params, info): - def state_marker(state, infotext, param, column, data): value = params.get(param) if value != None and column == data:

7 years, 5 months

4285 FIX Availability: Timeline tables can now not be sorted and searched anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 347747db05d2aa44e75175c5eb890beec4dbc55b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=347747db05d2aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 09:45:16 2017 +0100 4285 FIX Availability: Timeline tables can now not be sorted and searched anymore Change-Id: Ia4daf79d4d425d43c8060730de91c74e495d9875 --- .werks/4285 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4285 b/.werks/4285 new file mode 100644 index 0000000..00a291c --- /dev/null +++ b/.werks/4285 @@ -0,0 +1,9 @@ +Title: Availability: Timeline tables can now not be sorted and searched anymore +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1485333899 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 258700f..cd0ace3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * 4280 FIX: Interactive login is now denied for automation users... * 4307 FIX: Fixed wrong filters in Eventviews linked by Tactical Overview * 4282 FIX: Fixed rendering of perfometers when no RRDs exist yet + * 4285 FIX: Availability: Timeline tables can now not be sorted and searched anymore WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index a79f0a7..4334b15 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -330,7 +330,7 @@ def render_availability_timeline(what, av_entry, avoptions): # render_timewarp( # Table with detailed events - table.begin("av_timeline", "", css="timelineevents") + table.begin("av_timeline", "", css="timelineevents", sortable=False, searchable=False) for row_nr, row in enumerate(timeline_layout["table"]): table.row() table.cell(_("Links"), css="buttons")

7 years, 5 months

Fixed two missing/wrong shebang entries

by Lars Michelsen

Module: check_mk Branch: master Commit: bd2ba2161229e6c677497fad49e49facf1dac1e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd2ba2161229e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 08:48:43 2017 +0100 Fixed two missing/wrong shebang entries Change-Id: I815e5414cf7fb5ee9fe9b805936817e2e127e578 --- checks/fortigate_ipsecvpn | 2 +- checks/msexch_database | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/fortigate_ipsecvpn b/checks/fortigate_ipsecvpn index 7803b78..81baaf8 100644 --- a/checks/fortigate_ipsecvpn +++ b/checks/fortigate_ipsecvpn @@ -1,4 +1,4 @@ -#!usr/bin/python +#!/usr/bin/env python # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | diff --git a/checks/msexch_database b/checks/msexch_database index 7251d38..85571e3 100644 --- a/checks/msexch_database +++ b/checks/msexch_database @@ -1,3 +1,4 @@ +#!/usr/bin/env python # -*- encoding: utf-8; py-indent-offset: 4 vim: set ft=python:-*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ |

7 years, 5 months

WATO quicksearch not using transid anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 00f9aaeb55f8991b0a9955cc94f81f7c7d4fad8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00f9aaeb55f899… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 08:45:12 2017 +0100 WATO quicksearch not using transid anymore Change-Id: Ie67aff5765841e7b211c045940a5a61ddb6af242 --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 29d5b3c..ca4299f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11733,7 +11733,7 @@ class ModeRuleEditor(WatoMode): # TODO: Cleanup all calls using title and remove the argument def search_form(title=None, mode=None, default_value=""): - html.begin_form("search") + html.begin_form("search", add_transid=False) if title: html.write_text(title+' ') html.text_input("search", size=32, default_value=default_value)

7 years, 5 months

4284 FIX Nagios: Added missing variable MICROTIME to notification contexts

by Lars Michelsen

Module: check_mk Branch: master Commit: 25a983bf03027fbf0b8c32c869289752d151b8a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25a983bf03027f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 09:11:53 2017 +0100 4284 FIX Nagios: Added missing variable MICROTIME to notification contexts When using the CMC, the MICROTIME context variable is always present. This fixes an error when using the pushover notification plugin with the Nagios core. Change-Id: I94db106bf2ed0da6f19a9b1a27f361d8ee478ff6 --- .werks/4284 | 11 +++++++++++ ChangeLog | 1 + modules/events.py | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/.werks/4284 b/.werks/4284 new file mode 100644 index 0000000..165ea85 --- /dev/null +++ b/.werks/4284 @@ -0,0 +1,11 @@ +Title: Nagios: Added missing variable MICROTIME to notification contexts +Level: 1 +Component: notifications +Compatible: compat +Version: 1.4.0i4 +Date: 1485331748 +Class: fix + +When using the CMC, the MICROTIME context variable is always present. +This fixes an error when using the pushover notification plugin with the +Nagios core. diff --git a/ChangeLog b/ChangeLog index 7991e97..258700f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ Notifications: * 4197 FIX: Fix sending notification to global fallback email address + * 4284 FIX: Nagios: Added missing variable MICROTIME to notification contexts... BI: * 4202 FIX: Availability now avoids pending states for times before new hosts or services were added... diff --git a/modules/events.py b/modules/events.py index 1bddd32..5c617d8 100644 --- a/modules/events.py +++ b/modules/events.py @@ -261,6 +261,11 @@ def complete_raw_context(raw_context, with_dump, event_log): raw_context["DATE"] = time.strftime("%Y-%m-%d", broken) raw_context["SHORTDATETIME"] = time.strftime("%Y-%m-%d %H:%M:%S", broken) raw_context["LONGDATETIME"] = time.strftime("%a %b %d %H:%M:%S %Z %Y", broken) + elif "MICROTIME" not in raw_context: + # In case the microtime is not provided, e.g. when using Nagios, then set it here + # from the current time. We could look for "LONGDATETIME" and calculate the timestamp + # from that one, but we try to keep this simple here. + raw_context["MICROTIME"] = "%d" % (time.time()*1000000) raw_context['HOSTURL'] = '/check_mk/index.py?start_url=%s' % \ urlencode('view.py?view_name=hoststatus&host=%s' % raw_context['HOSTNAME'])

7 years, 5 months

4283 FIX check_mail_loop: Now using "mail to" address in To header

by Lars Michelsen

Module: check_mk Branch: master Commit: b383f685a20c8a798eaa90c0de6b325f43236994 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b383f685a20c8a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 08:31:32 2017 +0100 4283 FIX check_mail_loop: Now using "mail to" address in To header Change-Id: I9a35651e9a38ddd22844546967329af4342946c1 --- .werks/4283 | 10 ++++++++++ ChangeLog | 1 + active_checks/check_mail_loop | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4283 b/.werks/4283 new file mode 100644 index 0000000..8a18f36 --- /dev/null +++ b/.werks/4283 @@ -0,0 +1,10 @@ +Title: check_mail_loop: Now using "mail to" address in To header +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485329415 + + diff --git a/ChangeLog b/ChangeLog index 32534f8..7991e97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ * 4292 FIX: oracle_asm_diskgroup: fixed handling if disk status is DISMOUNTED * 4012 FIX: Fixed broken windows MSI packages (Installer error 2725)... * 4014 FIX: Windows Agent / Eventlogs with vista_api: Fixed numerous bugs and memory leaks... + * 4283 FIX: check_mail_loop: Now using "mail to" address in To header Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/active_checks/check_mail_loop b/active_checks/check_mail_loop index e2fb400..5b707ee 100755 --- a/active_checks/check_mail_loop +++ b/active_checks/check_mail_loop @@ -326,7 +326,7 @@ def send_mail(): mail = email.mime.text.MIMEText("") mail['From'] = mail_from - mail['To'] = mail_from + mail['To'] = mail_to mail['Subject'] = '%s %d %d' % (subject, now, key) mail['Date'] = email.utils.formatdate(localtime=True)

7 years, 5 months

Updated bug entries #2476

by Lars Michelsen

Module: check_mk Branch: master Commit: ea005c6003cf82d078d67b78282a2502846f3304 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea005c6003cf82… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 24 20:01:30 2017 +0100 Updated bug entries #2476 Change-Id: Ide1a36c1c15f2779236259a03672c2d7efc240cc --- .bugs/2476 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.bugs/2476 b/.bugs/2476 new file mode 100644 index 0000000..f4bc772 --- /dev/null +++ b/.bugs/2476 @@ -0,0 +1,29 @@ +Title: omd diff: Changes after setting up site without config changes +Component: core +State: open +Date: 2017-01-24 19:59:51 +Targetversion: future +Class: nastiness + +Right after creating a site and accessing WATO for the first time, the command +"omd diff" already shows changes. It should only display modifications to the +default files that were made by the user. These have been found: + +* var/check_mk/wato/auth/auth.php: + Ist im Skel leer. Könnte sein, dass PHP einen Fehler wirft, wenn die Datei am Anfang ganz fehlt. + oder kann man da evtl. ein "include if exists" einbauen? + +* etc/htpasswd: + Liegt am Automationuser, was korrekt ist. Frage ist, ob man "omdadmin" wirklich + durch skel anlegen muss + +* permissions etc/htpasswd: + wird scheinbar von uns auf 660 gesetzt. Im Skel aber scheinbar anders. Muss man + wohl skel reparieren? + +* etc/diskspace.conf: + Hier erzeugt WATO eine Defaultkonfig, die abweicht von skel. Einfach skel anpassen + auf WATO-Default? + +* etc/auth.secret: + Muss hier wirklich eine leere Datei nach skel/?

7 years, 5 months

Fixed rule sorting bug since ruleset recode

by Lars Michelsen

Module: check_mk Branch: master Commit: d0d02ee145512cd79a6b56fc9f8b4b02ac1a520a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0d02ee145512c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 24 16:04:11 2017 +0100 Fixed rule sorting bug since ruleset recode Change-Id: I802f7483b8bad798cb76c78f66f2c4b86a6aba20 --- web/htdocs/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 331cdd5..f7fdf4c 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6259,7 +6259,7 @@ class Ruleset(object): for _folder_path, folder_rules in self._rules.items(): for rule_index, rule in enumerate(folder_rules): rules.append((rule.folder, rule_index, rule)) - return sorted(rules, key=lambda x: (x[0].path().split("/"), x[1]), reverse=True) + return sorted(rules, key=lambda x: (x[0].path().split("/"), len(rules)-x[1]), reverse=True) def get_folder_rules(self, folder):

7 years, 5 months

Updated bug entries #2552

by Mathias Kettner

Module: check_mk Branch: master Commit: bc49d53c045adb8b1fd41df95ab5e1187db3c89f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc49d53c045adb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 24 12:06:57 2017 +0100 Updated bug entries #2552 Change-Id: Ic7530206759f026b7353a1208c248402d1e7942e --- .bugs/2552 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/2552 b/.bugs/2552 new file mode 100644 index 0000000..09eeb26 --- /dev/null +++ b/.bugs/2552 @@ -0,0 +1,14 @@ +Title: WATO Backup not working in distributed environments +Component: wato +State: open +Date: 2017-01-24 12:05:22 +Targetversion: future +Class: nastiness + +Neither is the backup configuration distributed via D-WATO nor +is the Backup module usable in the slave sites. Anyway the +restore of a slave wouldn't work. + +The only possible solution seems to delcare the Backup module +als "always local" and allow access to that module even if +using WATO on slave sites is disabled.

7 years, 5 months

Updated bug entries #2551

by Mathias Kettner

Module: check_mk Branch: master Commit: 64cddf1ebb3b28842a53a0d6770a9463f6db0211 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64cddf1ebb3b28… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 24 12:04:25 2017 +0100 Updated bug entries #2551 Change-Id: I5ac5fa7a9fea43a7c3d578435d77aa3bc4809151 --- .bugs/2551 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2551 b/.bugs/2551 new file mode 100644 index 0000000..f99028d --- /dev/null +++ b/.bugs/2551 @@ -0,0 +1,13 @@ +Title: Option -N on omd backup (and om cp) disregards various historic data +Component: core +State: open +Date: 2017-01-24 12:01:59 +Targetversion: future +Class: bug + +It seems that <tt>-N</tt> just skips the monitoring history and the RRDs. +Several possible large files are still handled, e.g. +the EC archive and the HW/SW-Inventory history. Also we could +arguably consider var/log/*.log as historic data and drop +that. Maybe also a git Konfiguration history, WATO snapshots +and other stuff.

7 years, 5 months

← Newer
1
...
6
7
8
9
10
11
12
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017