Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

#2924 WATO can now add contact groups from hosts also to services

by Mathias Kettner

Module: check_mk Branch: master Commit: c7eea0a5fa51f22472dc09d047fc85f0ed5d7d66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7eea0a5fa51f2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 14 14:48:30 2016 +0100 #2924 WATO can now add contact groups from hosts also to services In WATO in a host or folder you can assign contact groups to hosts. The new checkbox <i>Always add host contact groups also to its services</i> allows you now to also assign these groups to the services of the host. Here is some explanation from the online help: <i>With this option contact groups that are added to hosts are always being added to services, as well. This only makes a difference if you have assigned other contact groups to services via rules in Host & Service Parameters. As long as you do not have any such rule a service always inherits all contact groups from its host.</i> --- .werks/2924 | 18 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 6 ++-- web/htdocs/watolib.py | 83 +++++++++++++++++++++++++++++++++++-------------- 4 files changed, 80 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c7eea0a5fa…

8 years, 8 months

WATO: fix exception on folder move combo in some cases

by Mathias Kettner

Module: check_mk Branch: master Commit: 91517b670875dc3de7d9598ebcd4443c6754adb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91517b670875dc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 14 14:46:43 2016 +0100 WATO: fix exception on folder move combo in some cases --- web/htdocs/watolib.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 1c33f8d..e914974 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -653,6 +653,7 @@ class Folder(BaseFolder): self._name = name self._parent = parent_folder self._subfolders = {} + self._choices_for_moving_host = None if folder_path != None: self._init_by_loading_existing_directory(folder_path) else: @@ -1108,10 +1109,9 @@ class Folder(BaseFolder): def choices_for_moving_host(self): - # Cached? - try: - return self._choices_for_moving_host - except: + if self._choices_for_moving_host != None: + return self._choices_for_moving_host # Cached + else: self._choices_for_moving_host = self._choices_for_moving("host") return self._choices_for_moving_host

8 years, 8 months

Add extra_offset to DynamicColumn.

by Sven Panne

Module: check_mk Branch: master Commit: 0d3ab38efdc176ca7519b6403f4f4d16ca53c6ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d3ab38efdc176… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 14 14:32:23 2016 +0100 Add extra_offset to DynamicColumn. --- livestatus/src/DynamicColumn.cc | 2 +- livestatus/src/DynamicColumn.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/livestatus/src/DynamicColumn.cc b/livestatus/src/DynamicColumn.cc index e281e0a..9efd7dc 100644 --- a/livestatus/src/DynamicColumn.cc +++ b/livestatus/src/DynamicColumn.cc @@ -30,5 +30,5 @@ DynamicColumn::~DynamicColumn() Column *DynamicColumn::createColumn(const char *arguments) { - return createColumn(_indirect_offset, arguments); + return createColumn(_indirect_offset, _extra_offset, arguments); } diff --git a/livestatus/src/DynamicColumn.h b/livestatus/src/DynamicColumn.h index 3c3771f..92d9738 100644 --- a/livestatus/src/DynamicColumn.h +++ b/livestatus/src/DynamicColumn.h @@ -35,14 +35,15 @@ class DynamicColumn std::string _name; std::string _description; int _indirect_offset; + int _extra_offset; public: - DynamicColumn(std::string name, std::string description, int indirect_offset) : - _name(name), _description(description), _indirect_offset(indirect_offset) {} + DynamicColumn(std::string name, std::string description, int indirect_offset, int extra_offset) : + _name(name), _description(description), _indirect_offset(indirect_offset), _extra_offset(extra_offset) {} virtual ~DynamicColumn(); const char *name() const { return _name.c_str(); } const char *description() const { return _description.c_str(); } Column *createColumn(const char *arguments); - virtual Column *createColumn(int indirect_offset, const char *arguments) = 0; + virtual Column *createColumn(int indirect_offset, int extra_offset, const char *arguments) = 0; }; #endif // DynamicColumn_h

8 years, 8 months

Updated bug entries #2325

by Lars Michelsen

Module: check_mk Branch: master Commit: 84fed279993859916e855938165c9ec091653e2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84fed279993859… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 14 14:04:25 2016 +0100 Updated bug entries #2325 --- .bugs/2325 | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/.bugs/2325 b/.bugs/2325 new file mode 100644 index 0000000..d70d7bb --- /dev/null +++ b/.bugs/2325 @@ -0,0 +1,78 @@ +Title: oracle_sessions: Read parameters from the database +Component: checks +State: open +Date: 2016-01-14 14:02:49 +Targetversion: future +Class: feature + +ich wollt nur ne kleine Anregung fuer euren neuen check oracle_sessions in 1.2.7i geben. + +Waere es sinnvoll, die Parameter fuer die Sessions direkt aus der Datenbank zu holen, da diese dort per default vorhanden sind. + +Der Select waere + +select current_utilization,limit_value from v\\\$resource_limit where resource_name like 'sessions' + +damit haette man als Output die Werte Nutzung Limit + +Bsp: + +dialentw 59 1522 + +und koennte dann die Schwellwerte prozentual festlegen + +Ich habe einen entsprechenden check gebaut und ich haeng ihn einfach mal als Beispiel an + + +---------------------------- + +Beispielcheck: + +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- + +# <<<oracle_total_sessions>>> +# pengt 15 40 +# hirni 22 70 + +oracle_total_sessions_default_levels = (70.0, 90.0) + +def inventory_oracle_total_sessions(info): + return [ (line[0], "oracle_total_sessions_default_levels") for line in info if len(line) >= 2 ] + +def check_oracle_total_sessions(item, params, info): + for line in info: + if line[0] == item: + + err = oracle_handle_ora_errors(line) + if err == False: + continue + elif isinstance(err, tuple): + return err + + warn, crit = params + sessions = int(line[1]) + maxsess = int(line[2]) + sessUse = ((sessions * 100) / maxsess) + infotext = "%.2f %% used: %d of max. %d Sessions (Levels: %.2f / %.2f %%)" % (sessUse, sessions, maxsess, warn, crit) + perfdata = [("total_sessions", sessUse, warn, crit)] + + if sessUse >= crit: + return (2, infotext, perfdata) + elif sessUse >= warn: + return (1, infotext, perfdata) + else: + return (0, infotext, perfdata) + + infotext = "Database not existing or not running" + return (3, infotext) + +check_includes['oracle_total_sessions'] = [ "oracle.include" ] + +check_info["oracle_total_sessions"] = { + 'check_function': check_oracle_total_sessions, + 'inventory_function': inventory_oracle_total_sessions, + 'service_description': 'ORA %s total_Sessions', + 'has_perfdata': True, + 'group': 'oracle_total_sessions', +}

8 years, 8 months

Thread indirect_offset and extra_offset through all column constructors.

by Sven Panne

Module: check_mk Branch: master Commit: bf6995b6a605d386c7bec69eac2ff8d74094be70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf6995b6a605d3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 14 13:16:12 2016 +0100 Thread indirect_offset and extra_offset through all column constructors. --- livestatus/src/BlobColumn.h | 4 ++-- livestatus/src/Column.h | 2 +- livestatus/src/ColumnsColumn.h | 4 ++-- livestatus/src/ContactgroupsColumn.h | 4 ++-- livestatus/src/ContactgroupsMemberColumn.h | 4 ++-- livestatus/src/ContactsColumn.h | 4 ++-- livestatus/src/CustomTimeperiodColumn.h | 4 ++-- livestatus/src/CustomVarsColumn.h | 4 ++-- livestatus/src/CustomVarsExplicitColumn.h | 4 ++-- livestatus/src/DoubleColumn.h | 4 ++-- livestatus/src/DoublePointerColumn.h | 4 ++-- livestatus/src/DownCommColumn.h | 4 ++-- livestatus/src/EmptyColumn.h | 4 ++-- livestatus/src/FixedIntColumn.h | 4 ++-- livestatus/src/GlobalCountersColumn.h | 4 ++-- livestatus/src/HostContactsColumn.h | 4 ++-- livestatus/src/HostFileColumn.cc | 4 ++-- livestatus/src/HostFileColumn.h | 2 +- livestatus/src/HostSpecialDoubleColumn.h | 4 ++-- livestatus/src/HostSpecialIntColumn.h | 4 ++-- livestatus/src/HostgroupsColumn.h | 4 ++-- livestatus/src/HostlistColumn.h | 4 ++-- livestatus/src/HostlistStateColumn.h | 4 ++-- livestatus/src/IntColumn.h | 2 +- livestatus/src/IntPointerColumn.h | 4 ++-- livestatus/src/ListColumn.h | 4 ++-- livestatus/src/MetricsColumn.h | 4 ++-- livestatus/src/NullColumn.h | 4 ++-- livestatus/src/OffsetDoubleColumn.h | 4 ++-- livestatus/src/OffsetIntColumn.h | 4 ++-- livestatus/src/OffsetStringColumn.h | 4 ++-- livestatus/src/OffsetStringHostMacroColumn.h | 4 ++-- livestatus/src/OffsetStringMacroColumn.h | 4 ++-- livestatus/src/OffsetStringServiceMacroColumn.h | 4 ++-- livestatus/src/OffsetTimeColumn.h | 4 ++-- livestatus/src/OffsetTimeperiodColumn.cc | 4 ++-- livestatus/src/OffsetTimeperiodColumn.h | 2 +- livestatus/src/ServiceContactsColumn.h | 4 ++-- livestatus/src/ServiceSpecialDoubleColumn.h | 4 ++-- livestatus/src/ServiceSpecialIntColumn.h | 4 ++-- livestatus/src/ServicegroupsColumn.h | 4 ++-- livestatus/src/ServicelistColumn.h | 4 ++-- livestatus/src/ServicelistStateColumn.h | 4 ++-- livestatus/src/StatusSpecialIntColumn.h | 4 ++-- livestatus/src/StringColumn.h | 4 ++-- livestatus/src/StringPointerColumn.h | 4 ++-- livestatus/src/TimePointerColumn.h | 4 ++-- 47 files changed, 90 insertions(+), 90 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bf6995b6a6…

8 years, 8 months

#2923 SNMP community in WATO is now always displayed with ******

by Mathias Kettner

Module: check_mk Branch: master Commit: 2fe80798ec9bfbf24b64f4609dbd4427c40b0f05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fe80798ec9bfb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 14 13:13:11 2016 +0100 #2923 SNMP community in WATO is now always displayed with ****** This is due to security. SNMP communities are basically passwords and should not be shown in plaintext in the GUI. Of course this change makes it harder to read existing rules. If that is a problem for you then you can add the plaintext community to the comment field of a rule. Alas - security is always linked with inconveniance... --- .werks/2923 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- web/plugins/wato/builtin_attributes.py | 26 ++++++++++++++++---------- web/plugins/wato/check_mk_configuration.py | 3 +-- web/plugins/wato/notifications.py | 2 +- 6 files changed, 33 insertions(+), 14 deletions(-) diff --git a/.werks/2923 b/.werks/2923 new file mode 100644 index 0000000..3251bda --- /dev/null +++ b/.werks/2923 @@ -0,0 +1,13 @@ +Title: SNMP community in WATO is now always displayed with ****** +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1452773424 +Class: feature + +This is due to security. SNMP communities are basically passwords and should +not be shown in plaintext in the GUI. Of course this change makes it harder +to read existing rules. If that is a problem for you then you can add the +plaintext community to the comment field of a rule. Alas - security is always +linked with inconveniance... diff --git a/ChangeLog b/ChangeLog index 6283a31..c9a35c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -226,6 +226,7 @@ * 2879 WATO-Replication of MKPs and files in the local/ hierarchy... * 2897 Changed move host action to be an action icon using a popup menu... * 2900 Bulk Host import can now handle CSV files including several host attributes... + * 2923 SNMP community in WATO is now always displayed with ******... * 2666 FIX: Fix search for global configuration variables: ignore case now * 2715 FIX: Fixed visibility of BI aggregations in editor * 2716 FIX: Fixed error reporting on disabled checks page in case of broken man pages diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e2281ae..142bca4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2435,7 +2435,7 @@ def mode_diag_host(phase): title = _('IP address'), allow_empty = False )), - ('snmp_community', TextAscii( + ('snmp_community', Password( title = _("SNMP Community"), allow_empty = False )), diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index abd7e8b..ebe625c 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -72,16 +72,22 @@ declare_host_attribute(TextAttribute("ipv6address", _("IPv6 Address"), show_in_folder = False, depends_on_tags = ["ip-v6"]) -declare_host_attribute(TextAttribute("snmp_community", _("SNMP Community"), - _("Using this option you can configure the community which should be used when " - "contacting this host via SNMP v1 or v2. It is possible to configure the SNMP community by " - "using the <a href=\"%s\">SNMP Communities</a> ruleset, but when you configure " - "a community here, this will override the community defined by the rules.") % \ - html.makeuri([('mode', 'edit_ruleset'), ('varname', 'snmp_communities')]), - allow_empty = False), - show_in_table = False, - show_in_folder = True, - depends_on_tags = ['snmp']) +declare_host_attribute( + ValueSpecAttribute( + "snmp_community", + Password( + title = _("SNMP Community"), + help = _("Using this option you can configure the community which should be used when " + "contacting this host via SNMP v1 or v2. It is possible to configure the SNMP community by " + "using the <a href=\"%s\">SNMP Communities</a> ruleset, but when you configure " + "a community here, this will override the community defined by the rules.") % \ + html.makeuri([('mode', 'edit_ruleset'), ('varname', 'snmp_communities')]), + allow_empty = False, + )), + show_in_table = False, + show_in_folder = True, + depends_on_tags = ['snmp'], +) # Attribute for configuring parents class ParentsAttribute(ValueSpecAttribute): diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index a506042..174f992 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1913,10 +1913,9 @@ register_rule(group, "snmp_communities", Alternative( elements = [ - TextAscii( + Password( title = _("SNMP community (SNMP Versions 1 and 2c)"), allow_empty = False, - attrencode = True, ), Tuple( title = _("Credentials for SNMPv3 without authentication and privacy (noAuthNoPriv)"), diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py index b6e3804..41dd285 100644 --- a/web/plugins/wato/notifications.py +++ b/web/plugins/wato/notifications.py @@ -250,7 +250,7 @@ register_notification_parameters( ), ), ( "community", - TextAscii( + Password( title = _("SNMP Community"), help = _("SNMP Community for the SNMP trap") )

8 years, 8 months

Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: c908a246e7480c754734c1f4f6f40b66e4939f58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c908a246e7480c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 14 13:10:18 2016 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 5b844d0..60dac18 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2923 +2933

8 years, 8 months

Merge branck 'master' of ssh://mathias-kettner.de/check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: d5a6a5d3fd0ca8abb36e561985c5f375d875c5c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5a6a5d3fd0ca8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 14 13:09:52 2016 +0100 Merge branck 'master' of ssh://mathias-kettner.de/check_mk ---

8 years, 8 months

Fix validation function of ValuespecAttribute

by Mathias Kettner

Module: check_mk Branch: master Commit: c97308d2bdec10ed41bb1018c25f5abfacba57e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c97308d2bdec10… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 14 13:09:43 2016 +0100 Fix validation function of ValuespecAttribute the varprefix was applied twice here. --- 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 0061bf2..1c33f8d 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -2480,7 +2480,7 @@ class ValueSpecAttribute(Attribute): return self._valuespec.from_html_vars(varprefix + self._name) def validate_input(self, varprefix): - value = self.from_html_vars(varprefix + self._name) + value = self.from_html_vars(varprefix) self._valuespec.validate_value(value, varprefix + self._name)

8 years, 8 months

#2918 agent_jolokia: jolokia can now be monitored using a special agent

by Sebastian Herbord

Module: check_mk Branch: master Commit: abbac4fe0fac6a8859491d5f7ef4667d0efc83bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abbac4fe0fac6a… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jan 14 11:59:29 2016 +0100 #2918 agent_jolokia: jolokia can now be monitored using a special agent --- .werks/2918 | 9 + ChangeLog | 1 + agents/mocks/jolokia.py | 63 ++++++ agents/special/agent_jolokia | 365 +++++++++++++++++++++++++++++++ checks/agent_jolokia | 49 +++++ web/plugins/wato/datasource_programs.py | 58 +++++ 6 files changed, 545 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=abbac4fe0f…

8 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016