Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

Check_MK Git: check_mk: Internal code cleanup of zfsget

by Mathias Kettner

Module: check_mk Branch: master Commit: 4f479a30649329e75a9e3e028f82b4b37c08edd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f479a30649329… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 23 16:12:58 2014 +0200 Internal code cleanup of zfsget --- checks/zfsget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/zfsget b/checks/zfsget index c57609b..5ec0d93 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -94,7 +94,7 @@ def parse_zfsget(info): parsed = {} for entry in entries: if entry["mountpoint"].startswith("/"): - entry["is_pool"] = '/' not in name + entry["is_pool"] = '/' not in entry["name"] parsed[entry["mountpoint"]] = entry if start_of_df != None:

10 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0843

by Mathias Kettner

Module: check_mk Branch: master Commit: db63f2b174eef5a72af4bb3522b5488fdd3cd144 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db63f2b174eef5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 23 15:49:42 2014 +0200 Updated bug entries #0843 --- .bugs/843 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/843 b/.bugs/843 index dd133dd..5b73b6c 100644 --- a/.bugs/843 +++ b/.bugs/843 @@ -1,9 +1,12 @@ Title: Wato service parametr icon Component: wato -State: open +Class: bug +State: wontfix Date: 2014-04-16 09:39:19 Targetversion: 1.2.5i1 -Class: bug If you reenter the service view in wato and you have missing services, they allready have the icon with the link to the parameter information page. But the link only works after activating the new services. + +2014-04-23 15:49:40: changed state open -> wontfix +Duplicate of #2153

10 years, 4 months

Check_MK Git: check_mk: Updated bug entries #2153

by Mathias Kettner

Module: check_mk Branch: master Commit: 3d02cf1e707d6fd36078650dc3597c3a6d169bc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d02cf1e707d6f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 23 15:33:24 2014 +0200 Updated bug entries #2153 --- .bugs/2153 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2153 b/.bugs/2153 new file mode 100644 index 0000000..0bacf3d --- /dev/null +++ b/.bugs/2153 @@ -0,0 +1,11 @@ +Title: Service parameters: check parameters are not shown for missing services +Component: wato +State: open +Date: 2014-04-23 15:32:07 +Targetversion: 1.2.5i1 +Class: nastiness + +If you go to WATO service list of a host and one service is new/missing and you click +on the icon for the parameters, then all settings are shown - except for the +check paramters. These are available as soon as the check is inventorized. Either +make sure that the parameters are also shown or remove the icon.

10 years, 4 months

Check_MK Git: check_mk: BI availability: fix two exceptions

by Mathias Kettner

Module: check_mk Branch: master Commit: 3effcd547e70642ef601c606d970b696cd080d50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3effcd547e7064… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 23 15:11:22 2014 +0200 BI availability: fix two exceptions --- web/plugins/views/availability.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 601d313..badd942 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1440,7 +1440,8 @@ def get_bi_timeline(tree, aggr_group, avoptions, timewarp): data = html.live.query(query) if not data: - raise MKGeneralException(_("No historical data available for this aggregation. Query was: <pre>%s</pre>") % query) + return [], None + # raise MKGeneralException(_("No historical data available for this aggregation. Query was: <pre>%s</pre>") % query) html.live.set_prepend_site(False) html.live.set_only_sites(None) @@ -1549,7 +1550,7 @@ def compute_tree_state(tree, status): state_output[1], state_output[2], # in_downtime False, # acknowledged - services_by_host[site_host] + services_by_host.get(site_host,[]) ]

10 years, 4 months

Check_MK Git: check_mk: WATO: Fixed exception in host parameter overview

by Andreas Boesl

Module: check_mk Branch: master Commit: 69bda360d72c8f34e197d622eb7fcf1e2118c2ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69bda360d72c8f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 23 13:35:57 2014 +0200 WATO: Fixed exception in host parameter overview --- .werks/904 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 11 +++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/904 b/.werks/904 new file mode 100644 index 0000000..b11a6d7 --- /dev/null +++ b/.werks/904 @@ -0,0 +1,10 @@ +Title: Fixed exception in host parameter overview +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1398252687 + +The host parameter overview raised an exception when the check in question +had a rulegroup defined which was unknown in the WATO-GUI. diff --git a/ChangeLog b/ChangeLog index 415f31b..f58de74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * 0880 Added support for 389 Directory Server to LDAP connector * 0607 online help text for host creation in WATO now also explains hostname caching * 0781 FIX: host diag page: fixed problem with update of diagnose subwindows... + * 0904 FIX: Fixed exception in host parameter overview... Notifications: * 0754 Allow users to disable their notifications completely... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 81370ad..7520eef 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2290,10 +2290,13 @@ def mode_object_parameters(phase): # but we need to address it anyway. grouprule = "checkgroup_parameters:" + checkgroup if grouprule not in g_rulespecs: - rulespec = g_rulespecs["static_checks:" + checkgroup] - url = make_link([('mode', 'edit_ruleset'), ('varname', "static_checks:" + checkgroup), ('host', hostname)]) - render_rule_reason(_("Parameters"), url, _("Determined by inventory"), None, False, - rulespec["valuespec"]._elements[2].value_to_text(serviceinfo["parameters"])) + rulespec = g_rulespecs.get("static_checks:" + checkgroup) + if rulespec: + url = make_link([('mode', 'edit_ruleset'), ('varname', "static_checks:" + checkgroup), ('host', hostname)]) + render_rule_reason(_("Parameters"), url, _("Determined by inventory"), None, False, + rulespec["valuespec"]._elements[2].value_to_text(serviceinfo["parameters"])) + else: + render_rule_reason(_("Parameters"), None, "", "", True, _("This check is not configurable via WATO")) else: rulespec = g_rulespecs[grouprule]

10 years, 4 months

Check_MK Git: check_mk: online help text for host creation in WATO now also explains hostname caching

by Götz Golla

Module: check_mk Branch: master Commit: b2049a8d2fadda3241928c8f648400e6bea6f74e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2049a8d2fadda… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Apr 23 11:56:31 2014 +0200 online help text for host creation in WATO now also explains hostname caching --- .werks/607 | 8 ++++++++ ChangeLog | 1 + web/plugins/wato/builtin_attributes.py | 16 +++++++++++----- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.werks/607 b/.werks/607 new file mode 100644 index 0000000..4a4e281 --- /dev/null +++ b/.werks/607 @@ -0,0 +1,8 @@ +Title: online help text for host creation in WATO now also explains hostname caching +Level: 1 +Component: wato +Version: 1.2.5i3 +Date: 1398246911 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index c7c2262..21b06c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids * 0880 Added support for 389 Directory Server to LDAP connector + * 0607 online help text for host creation in WATO now also explains hostname caching * 0781 FIX: host diag page: fixed problem with update of diagnose subwindows... Notifications: diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index ea3c261..05876b2 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -37,11 +37,17 @@ declare_host_attribute(NagiosTextAttribute("alias", "alias", _("Alias"), declare_host_attribute(TextAttribute("ipaddress", _("IP address"), _("In case the name of the host is not resolvable via <tt>/etc/hosts</tt> " "or DNS by your monitoring server, you can specify an explicit IP " - "address or a resolvable DNS name of the host here. Note: If you leave " - "this attribute empty, then DNS resolution will be done when you activate " - "the configuration. When you enter a DNS name here, the DNS resolution will " - "be done each time the host is checked. Use this only for hosts with " - "dynamic IP addresses."), + "address or a resolvable DNS name of the host here. Notes: " + "1. If you leave this attribute empty, hostname resolution will be done when " + "you activate the configuration. " + "Check_MKs builtin DNS cache is activated per default in the global " + "configuration to speed up the activation process. The cache is normally " + "updated daily with a cron job. You can manually update the cache with the " + "command <tt>cmk -v --update-dns-cache</tt>. " + "2. If you enter a DNS name here, the DNS resolution will be carried out " + "each time the host is checked. Check_MKs DNS cache will NOT be queried. " + "Use this only for hosts with dynamic IP addresses." + ), allow_empty = False), show_in_table = True, show_in_folder = False)

10 years, 4 months

Check_MK Git: check_mk: Added draft for virtual host trees

by Mathias Kettner

Module: check_mk Branch: master Commit: 01d2b4c69488f3f112572cb2306904b78f9be8a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01d2b4c69488f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 23 11:16:45 2014 +0200 Added draft for virtual host trees --- doc/drafts/LIESMICH.baum_anhand_von_tags | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/doc/drafts/LIESMICH.baum_anhand_von_tags b/doc/drafts/LIESMICH.baum_anhand_von_tags new file mode 100644 index 0000000..c14a81d --- /dev/null +++ b/doc/drafts/LIESMICH.baum_anhand_von_tags @@ -0,0 +1,52 @@ +Konzept für ein automatisches Erzeugen eines Baumes +--------------------------------------------------- + +Ausgangspunkt: WATO sieht über die Ordnerstruktur für Hosts vor, dass man +diese hierarchisch organisieren kann. Nun gibt es hier leider nur einen +Baum. Manchmal möchte man die Hosts nur unter dem Gesichtspunkt von +anderen Hierarchien sehen. + +Die Idee ist jetzt, dass man dazu die vorhandenen Hosttag-Gruppen +verwendet. Denn jeder Host hat in jeder Taggruppe genau einen +Wert. Der Benutzer könnte jetzt eine Anzahl von Taggruppen +herauspicken, z.B.: + +1. Standort +2. Anwendung +3. Kritikalität + +Diese können dann in hierarchieebenen eines logischen Baumes +umgewandelt werden. Auf der obersten Ebene wäre der Standort, +darunter die Anwendung, darunter die Kritikalität. + +Das ganze könnte man wie folgt umsetzen: + +1. In den globalen Einstellungen für Multisite fügen wir eine neue Option ein, +mit der man beliebige virtuelle Baumansichten anlegen kann. Das wird als +Liste realisiert. Dort kann man pro Eintrag eingeben: + - Einen Titel für die Ansicht + - Eine sortierte Liste von Hosttaggruppen, die den Baum bilden sollen. + +2. Ein neues Sidebar-Snanip "Virtuelle Baumansicht" wird geschrieben. Dieses + erlaubt die Auswahl einer der oben realisierten virtuellen Bäume (falls + es mehr als einen gibt). Es stellt dann diesen Baum zum Aufklappen dar. + + Wenn man auf einen Ast klickt, ergibt sich dadurch eine Liste von + Hosttags bzw. von nicht vorhandenen Hosttags (wenn man bei Checkbox- + Hosttags den negativen Wert wählt, oder ein Tag leer ist). + + Man landet dann auf der Ansicht "All Hosts", bei welcher der Filter + für die Host-Tags vorausgefüllt ist. + +3. Die Ansicht "All Hosts" bekommt standardmäßig immer den Filter für + die Host Tags. + + +Eine mögliche Ausbaustufe wäre, dass man das Verhalten des neuen +Snapins analog zu dem "Folders"-Snapin macht. Das würde bedeuten, +dass man nicht immer auf die Ansicht "All Hosts" gelangt, sondern +auf die jeweils gewählte Ansicht. Dazu müsste in jeder Ansicht +der Hosttag-Filter implizit vorhanden sein. Außerdem müsste +der kombinierte Filter aus Ordner und Tags dann sauber funktionieren. +Frage ist, ob das nicht zu komplex wird. +

10 years, 4 months

Check_MK Git: check_mk: BI availability: fix exception on timewarp to non-existing time

by Mathias Kettner

Module: check_mk Branch: master Commit: 9579afcce723750906736a25b98b5818654568d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9579afcce72375… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 23 10:27:18 2014 +0200 BI availability: fix exception on timewarp to non-existing time --- web/plugins/views/availability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 817522b..601d313 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1367,7 +1367,7 @@ def render_bi_availability(title, aggr_rows): timewarp = None these_rows, tree_state = get_bi_timeline(tree, aggr_row["aggr_group"], avoptions, timewarp) rows += these_rows - if timewarp: + if timewarp and tree_state: state, assumed_state, node, subtrees = tree_state eff_state = state if assumed_state != None:

10 years, 4 months

Check_MK Git: check_mk: BI: speedup availability computation

by Mathias Kettner

Module: check_mk Branch: master Commit: 66e2e1d254c95c8454a8374c8fc867ff9a97810f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66e2e1d254c95c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 23 10:07:43 2014 +0200 BI: speedup availability computation --- web/plugins/views/availability.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 5a60a48..817522b 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1422,9 +1422,22 @@ def get_bi_timeline(tree, aggr_group, avoptions, timewarp): "Columns: " + " ".join(columns) + "\n" +\ "Filter: time >= %d\nFilter: time <= %d\n" % range - for host in hosts: + # Create a specific filter. We really only want the services and hosts + # of the aggregation in question. That prevents status changes + # irrelevant services from introducing new phases. + by_host = {} + for site, host, service in bi.find_all_leaves(tree): + by_host.setdefault(host, set([])).add(service) + + for host, services in by_host.items(): query += "Filter: host_name = %s\n" % host - query += "Or: %d\n" % len(hosts) + query += "Filter: service_description = \n" + for service in services: + query += "Filter: service_description = %s\n" % service + query += "Or: %d\nAnd: 2\n" % (len(services) + 1) + if len(hosts) != 1: + query += "Or: %d\n" % len(hosts) + data = html.live.query(query) if not data: raise MKGeneralException(_("No historical data available for this aggregation. Query was: <pre>%s</pre>") % query)

10 years, 4 months

Check_MK Git: check_mk: fixed typographic errors, especially missing blank between number and unit

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 2c1789c0cd5317ded32684b009133c1d98eb3e3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c1789c0cd5317… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 19:59:30 2014 +0200 fixed typographic errors, especially missing blank between number and unit --- checks/cpu_util.include | 4 ++-- checks/df.include | 10 +++++----- checks/ibm_svc_nodestats | 6 +++--- checks/ibm_svc_systemstats | 6 +++--- modules/check_mk_base.py | 32 ++++++++++++++++---------------- web/plugins/perfometer/check_mk.py | 14 +++++++------- 6 files changed, 36 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2c1789c0cd…

10 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014