Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64380 discussions

Check_MK Git: check_mk: Default config: add contact group 'all' and put all hosts into it

by Mathias Kettner

Module: check_mk Branch: master Commit: fe3238c26a4a257b872e5736b9834446b2bb65a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe3238c26a4a25… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 11:28:53 2012 +0100 Default config: add contact group 'all' and put all hosts into it --- ChangeLog | 3 ++- web/htdocs/wato.py | 43 ++++++++++++++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea48465..aef65b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,7 +48,6 @@ users using the form based authentication with LDAP. It is also possible to synchronize some attributes like mail addresses, names and roles from LDAP into multisite. - * Modularized the authentication and user management code in WATO * Restructured cookie auth cookies (all auth cookies will be invalid after update -> all users have to login again) * Modularized login and cookie validation @@ -76,6 +75,8 @@ * FIX: Persisting changing of folder titles when only the title has changed * Add: Creating a new rule immediately opens its edit formular * The rules formular now uses POST as transaction method + * Modularized the authentication and user management code + * Default config: add contact group 'all' and put all hosts into it Event Console: * FIX: fix exception in rules that use facility local7 diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 08cb129..f8e0342 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5653,7 +5653,8 @@ def mode_groups(phase, what): global_buttons() html.context_button(_("New group"), make_link([("mode", "edit_%s_group" % what)]), "new") if what == "contact": - pass + html.context_button(_("Rules"), make_link([("mode", "rulesets"), + ("filled_in", "search"), ("search", "contact group")]), "rulesets") else: varname = what + "_groups" html.context_button(_("Rules"), make_link([("mode", "edit_ruleset"), ("varname", varname)]), "rulesets") @@ -10950,14 +10951,22 @@ def page_user_profile(): # | Functions for creating an example configuration | # '----------------------------------------------------------------------' -# Create a very basic sample configuration, but only if no host tags -# or rules have been defined *ever*. +# Create a very basic sample configuration, but only if none of the +# files that we will create already exists. That is e.g. the case +# after an update from an older version where no sample config had +# been created. def create_sample_config(): if os.path.exists(multisite_dir + "hosttags.mk") \ - or os.path.exists(root_dir + "rules.mk"): + or os.path.exists(root_dir + "rules.mk") \ + or os.path.exists(root_dir + "groups.mk"): return - # Example values for host tags + # A contact group where everyone is member of + groups = { + "contact" : { 'all', u'Everybody' }, + } + + # Basic setting of host tags wato_host_tags = \ [('agent', u'Agent type', @@ -10984,17 +10993,29 @@ def create_sample_config(): save_hosttags(wato_host_tags, wato_aux_tags) - # Example values for rules + # Rules that match the upper host tag definition rulesets = { + # Make the tag 'offline' remove hosts from the monitoring 'only_hosts': [ - (['!offline'], ['@all'])], - 'ping_levels': [ + (['!offline'], ['@all'], + {'comment': u'Do not monitor hosts with the tag "offline"'})], + + # Rule for WAN hosts with adapted PING levels + 'ping_levels': [ ({'loss': (80.0, 100.0), 'packets': 6, 'rta': (1500.0, 3000.0), - 'timeout': 20}, ['wan'], ['@all'])], - 'bulkwalk_hosts': [ - (['!snmp-v1'], ['@all'])], + 'timeout': 20}, ['wan'], ['@all'], + {'comment': u'Allow longer round trip times when pinging WAN hosts'})], + + # All hosts should use SNMP v2c if not specially tagged + 'bulkwalk_hosts': [ + (['!snmp-v1'], ['@all'], {'comment': u'Hosts with the tag "snmp-v1" must not use bulkwalk'})], + + # Put all hosts and the contact group 'all' + 'host_contactgroups': [ + ('all', [], ALL_HOSTS, {'comment': u'Put all hosts into the contact group "all"'} ), + ] } save_rulesets(g_root_folder, rulesets)

11 years, 9 months

Check_MK Git: check_mk: Disable notification per default for new users

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b6b8004d58cf66de4e9cb20b5d55243b70518a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b6b8004d58cf6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 11:48:12 2012 +0100 Disable notification per default for new users Now you can edit and save omdadmin without an error message or changing something of the status quo --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aa84a62..a7a229a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8148,7 +8148,7 @@ def mode_edit_user(phase): forms.header(_("Notifications"), isopen=False) forms.section(_("Enabling"), simple=True) - html.checkbox("notifications_enabled", user.get("notifications_enabled", True), + html.checkbox("notifications_enabled", user.get("notifications_enabled", False), label = _("enable notifications")) html.help(_("Notifications are sent out " "when the status of a host or service changes."))

11 years, 9 months

Check_MK Git: check_mk: Fix message about no assigned contact groups

by Mathias Kettner

Module: check_mk Branch: master Commit: 42d879faa135dccf58e7018b4a790617fa78d544 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42d879faa135dc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 11:46:54 2012 +0100 Fix message about no assigned contact groups --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f8e0342..aa84a62 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8135,7 +8135,7 @@ def mode_edit_user(phase): html.hidden_field("cg_" + gid, is_member and '1' or '') - if not is_member_of_at_least_one: + if is_locked('contactgroups') and not is_member_of_at_least_one: html.write('<i>%s</i>' % _('No contact groups assigned.')) html.help(_("Contact groups are used to assign monitoring "

11 years, 9 months

Check_MK Git: check_mk: WATO: fix error message when creation of rules fail

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c78b0242f1a7867c11da16073991f86940d72be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c78b0242f1a78… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 11:48:53 2012 +0100 WATO: fix error message when creation of rules fail for example if no selection elements are available --- web/htdocs/wato.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a7a229a..5a0bbc0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10265,7 +10265,12 @@ def mode_edit_rule(phase, new = False): if html.has_var("_new_host_rule"): host = html.var("host") item = html.has_var("item") and mk_eval(html.var("item")) or NO_ITEM - rule = create_rule(rulespec, host, item) + try: + rule = create_rule(rulespec, host, item) + except Exception, e: + if phase != "action": + html.message(_("Cannot create rule: %s") % e) + return rulenr = len(rules) else: rulenr = int(html.var("rulenr"))

11 years, 9 months

Check_MK Git: check_mk: Fix creation of default contact group

by Mathias Kettner

Module: check_mk Branch: master Commit: 41919cf4ba70821816ce3d4c2d9152ccfdd19e38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41919cf4ba7082… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 11:49:09 2012 +0100 Fix creation of default contact group --- web/htdocs/wato.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5a0bbc0..89189e5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10968,8 +10968,9 @@ def create_sample_config(): # A contact group where everyone is member of groups = { - "contact" : { 'all', u'Everybody' }, + "contact" : { 'all' : u'Everybody' }, } + save_group_information(groups) # Basic setting of host tags wato_host_tags = \

11 years, 9 months

Check_MK Git: check_mk: Revert "checkmk.js: show rows warning on page reload"

by Andreas Boesl

Module: check_mk Branch: master Commit: 7745f81c15e605bd57fc22beeef0a67785403869 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7745f81c15e605… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 21 17:11:27 2012 +0100 Revert "checkmk.js: show rows warning on page reload" This reverts commit 2274047f3da62b53bf94e4fa013f8b6bb681cc9a. --- web/htdocs/js/checkmk.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 006c602..c6744ce 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -841,7 +841,7 @@ function handleReload(url) { opts = null; // Add optional display_options if not defined in original display_options - var opts = [ 'W' ]; + var opts = [ 'w' ]; for (var i = 0; i < opts.length; i++) { if (display_options.indexOf(opts[i].toUpperCase()) == -1) display_options += opts[i];

11 years, 9 months

Check_MK Git: check_mk: checkmk.js: show rows warning on page reload

by Andreas Boesl

Module: check_mk Branch: master Commit: 2274047f3da62b53bf94e4fa013f8b6bb681cc9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2274047f3da62b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 21 16:00:28 2012 +0100 checkmk.js: show rows warning on page reload --- web/htdocs/js/checkmk.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index c6744ce..006c602 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -841,7 +841,7 @@ function handleReload(url) { opts = null; // Add optional display_options if not defined in original display_options - var opts = [ 'w' ]; + var opts = [ 'W' ]; for (var i = 0; i < opts.length; i++) { if (display_options.indexOf(opts[i].toUpperCase()) == -1) display_options += opts[i];

11 years, 9 months

Check_MK Git: check_mk: FIX: hr_fs: handle negative values in order to larger disks

by Andreas Boesl

Module: check_mk Branch: master Commit: 29bf807ce01fecbbd876ee235cabfa7b405ab9f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29bf807ce01fec… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 21 10:41:06 2012 +0100 FIX: hr_fs: handle negative values in order to larger disks --- checks/hr_fs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/hr_fs b/checks/hr_fs index 1d07ebd..b451123 100644 --- a/checks/hr_fs +++ b/checks/hr_fs @@ -46,7 +46,7 @@ def check_hr_fs(item, params, info): size = hrsize * unit_size hrused = saveint(hrused) if hrused < 0: - hrsize = hrused+2**32 + hrused = hrused+2**32 used = hrused * unit_size size_mb = size / 1048576.0 used_mb = used / 1048576.0

11 years, 9 months

Check_MK Git: check_mk: FIX: hr_fs: handle negative values in order to larger disks (thanks to Christof Musik)

by Mathias Kettner

Module: check_mk Branch: master Commit: aeaae825c2b86500cc3c334751b4f871113f8c00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeaae825c2b865… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 21 09:25:33 2012 +0100 FIX: hr_fs: handle negative values in order to larger disks (thanks to Christof Musik) --- ChangeLog | 1 + checks/hr_fs | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24819b3..a7a34e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * FIX: fixed missing localisation in check_parameteres.py * FIX: userdb/ldap.py: fixed invalid call site.getsitepackages() for python 2.6 * FIX: zpool_status: fixed crash when spare devices were available + * FIX: hr_fs: handle negative values in order to larger disks (thanks to Christof Musik) Multisite: diff --git a/checks/hr_fs b/checks/hr_fs index b73d2b0..1d07ebd 100644 --- a/checks/hr_fs +++ b/checks/hr_fs @@ -40,8 +40,14 @@ def check_hr_fs(item, params, info): for hrtype, hrdescr, hrunits, hrsize, hrused in info: if "patterns" in params or item == hrdescr: unit_size = saveint(hrunits) - size = saveint(hrsize) * unit_size - used = saveint(hrused) * unit_size + hrsize = saveint(hrsize) + if hrsize < 0: + hrsize = hrsize+2**32 + size = hrsize * unit_size + hrused = saveint(hrused) + if hrused < 0: + hrsize = hrused+2**32 + used = hrused * unit_size size_mb = size / 1048576.0 used_mb = used / 1048576.0 avail_mb = size_mb - used_mb

11 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: fadf03b27f0e2fd2c6cf3726f4624ed9774b8751 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fadf03b27f0e2f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 21 09:25:36 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits