Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

Check_MK Git: check_mk: WATO: Rule editor: improve sorting of groups and rulesets

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d20d75ce5c264b6b220cfe7bf16bd95014c49a08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d20d75ce5c264b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 16:09:19 2012 +0200 WATO: Rule editor: improve sorting of groups and rulesets --- ChangeLog | 3 +- web/htdocs/wato.py | 39 +++++-- web/plugins/wato/check_mk_configuration.py | 156 +++++++++++++++------------- web/plugins/wato/check_parameters.py | 4 +- 4 files changed, 116 insertions(+), 86 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d20d75ce5c…

12 years, 5 months

Check_MK Git: check_mk: WATO: removed duplicate "sec" in timeout rule

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8bbc705ae848d05bda889ed995127c9f23f4088c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bbc705ae848d0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 15:27:46 2012 +0200 WATO: removed duplicate "sec" in timeout rule --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 98e16b0..4a9354a 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -201,7 +201,7 @@ register_configvar(group, minvalue = 1.0, default_value = 10.0, unit = "sec", - display_format = "%.1f sec"), + display_format = "%.1f"), domain = "multisite") register_configvar(group,

12 years, 5 months

Check_MK Git: check_mk: Added missing icon

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 724032f112722edee6b6a250f97958a5248afbdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=724032f112722e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 15:25:57 2012 +0200 Added missing icon --- web/htdocs/images/icon_host.png | Bin 0 -> 4814 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_host.png b/web/htdocs/images/icon_host.png new file mode 100644 index 0000000..8f07fa9 Binary files /dev/null and b/web/htdocs/images/icon_host.png differ

12 years, 5 months

Check_MK Git: check_mk: WATO: show host context in rule editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7963b11562b59bbb29d1c7fb62d29aad816a42c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7963b11562b59b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 15:25:41 2012 +0200 WATO: show host context in rule editor Also remove obsolete option for showing only rules with local context. Was never really useful. --- .bugs/677 | 7 +++++-- web/htdocs/pages.css | 1 + web/htdocs/wato.css | 1 + web/htdocs/wato.py | 41 +++++++++++++++++++++++++---------------- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.bugs/677 b/.bugs/677 index 1ddddd1..6e909e5 100644 --- a/.bugs/677 +++ b/.bugs/677 @@ -1,9 +1,12 @@ Title: WATO rule editor does not show host context Component: wato -State: open +Class: bug +State: done Date: 2012-04-17 14:53:36 Targetversion: 1.2.0 -Class: bug The main rule menu keeps the host context, but does not show it anywhere. + +2012-04-17 15:25:03: changed state open -> done +Should work now diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index adff9bd..3b0816d 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -304,6 +304,7 @@ tr.groupheader td { margin: 0px; padding-top: 2px; font-weight: bold; + color: white; } tr.groupheader a { color: #000; diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 959198b..40ecee5 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -439,6 +439,7 @@ table.validationerror img { .wato table.configmodules { empty-cells: show; border-spacing: 8px; + margin-left: -8px; } .wato table.configmodules td { background-image: url("images/form_background.png"); diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 65e50d0..38b6a95 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1925,7 +1925,7 @@ def mode_inventory(phase, firsttime): html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") html.context_button(_("Host properties"), - make_link([("mode", "edithost"), ("host", hostname)]), "back") + make_link([("mode", "edithost"), ("host", hostname)]), "host") html.context_button(_("Full Scan"), html.makeuri([("_scan", "yes")])) elif phase == "action": @@ -8504,13 +8504,20 @@ def change_host_tags_in_rules(folder, operations, mode): def mode_ruleeditor(phase): only_host = html.var("host", "") - only_local = html.var("local") + only_local = "" # html.var("local") if phase == "title": - return _("Configuration of Hosts and Services (Ruleeditor)") + if only_host: + return _("Rules effective on host ") + only_host + else: + return _("Configuration of Hosts and Services (Ruleeditor)") elif phase == "buttons": global_buttons() + if only_host: + html.context_button(only_host, + make_link([("mode", "edithost"), ("host", only_host)]), "host") + return elif phase == "action": @@ -8518,6 +8525,8 @@ def mode_ruleeditor(phase): if not only_host: render_folder_path(keepvarnames = ["mode", "local"]) + else: + html.write("<h3>%s: %s</h3>" % (_("Host"), only_host)) # Group names are separated with "/" into main group and optional subgroup groupnames = list(set([ gn.split("/")[0] for gn in g_rulespec_groups.keys() ])) @@ -8537,7 +8546,7 @@ def mode_rulesets(phase): group = html.var("group") # obligatory title, help = g_rulegroups.get(group, (group, None)) only_host = html.var("host", "") - only_local = html.var("local") + only_local = "" # html.var("local") if phase == "title": if only_host: @@ -8550,7 +8559,7 @@ def mode_rulesets(phase): home_button() html.context_button(_("All Rulesets"), make_link([("mode", "ruleeditor"), ("host", only_host)]), "back") html.context_button(only_host, - make_link([("mode", "edithost"), ("host", only_host)]), "back") + make_link([("mode", "edithost"), ("host", only_host)]), "host") else: global_buttons() html.context_button(_("All Rulesets"), make_link([("mode", "ruleeditor")]), "back") @@ -8567,17 +8576,17 @@ def mode_rulesets(phase): if help: html.write("<div class=info>%s</div>" % help) - html.begin_form("local") - html.checkbox("local", False, onclick="form.submit();") - if only_host: - html.write(" " + _("show only rulesets that contain rules explicitely listing the host <b>%s</b>." % - only_host)) - else: - html.write(" " + _("Show only rulesets that contain rules in the current folder.")) - html.write(' <img align=absbottom class=icon src="images/icon_localrule.png"> ') - html.hidden_fields() - html.end_form() - html.write("<br>") + # html.begin_form("local") + # html.checkbox("local", False, onclick="form.submit();") + # if only_host: + # html.write(" " + _("show only rulesets that contain rules explicitely listing the host <b>%s</b>." % + # only_host)) + # else: + # html.write(" " + _("Show only rulesets that contain rules in the current folder.")) + # html.write(' <img align=absbottom class=icon src="images/icon_localrule.png"> ') + # html.hidden_fields() + # html.end_form() + # html.write("<br>") # Load all rules from all folders. Hope this doesn't take too much time. # We need this information only for displaying the number of rules in

12 years, 5 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f32056d89571c693f79b883a404025fef67d3ab1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f32056d89571c6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 15:25:44 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0669

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4a575885df2589edc2720dc291e80efe3283a2a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a575885df2589… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 15:05:39 2012 +0200 Updated bug entries #0669 --- .bugs/669 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/669 b/.bugs/669 index 4488b77..f35b899 100644 --- a/.bugs/669 +++ b/.bugs/669 @@ -1,12 +1,15 @@ Title: Legacy checks prevent auto full scan in inventory Component: wato -State: open +Class: bug +State: done Date: 2012-03-08 16:00:40 Targetversion: 1.2.0 -Class: bug If you have configured legacy checks via rules then the inventory of a new host will only work if you click on "Full Scan" since the list of services of the host is not empty. The condition for this should rather be "if the host has no inventorized services". + +2012-04-17 15:05:37: changed state open -> done +Has already been fixed.

12 years, 5 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 63559252d93c182516d76527f7b4a7c23934fb62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63559252d93c18… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 15:05:42 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0677

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c609674a43f61e85cdbee31e83e39089da932ca1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c609674a43f61e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 15:03:11 2012 +0200 Updated bug entries #0677 --- .bugs/677 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/677 b/.bugs/677 new file mode 100644 index 0000000..1ddddd1 --- /dev/null +++ b/.bugs/677 @@ -0,0 +1,9 @@ +Title: WATO rule editor does not show host context +Component: wato +State: open +Date: 2012-04-17 14:53:36 +Targetversion: 1.2.0 +Class: bug + +The main rule menu keeps the host context, but does not show +it anywhere.

12 years, 5 months

Check_MK Git: check_mk: FIX: reset counter in case of (broken) future time

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1ad380edac05a7b7f6fd515d81d33a083d75dcc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ad380edac05a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 14:43:04 2012 +0200 FIX: reset counter in case of (broken) future time --- .bugs/630 | 7 +++++-- ChangeLog | 1 + modules/check_mk_base.py | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.bugs/630 b/.bugs/630 index be89306..c2b4827 100644 --- a/.bugs/630 +++ b/.bugs/630 @@ -1,9 +1,9 @@ Title: Reset counter in case of time step Component: core -State: open +Class: bug +State: done Date: 2012-02-02 15:08:44 Targetversion: 1.2.0 -Class: bug If get_counter detects a future timestamp then it should reset the counter to the current time so @@ -11,3 +11,6 @@ that at least the next time the counter will work. This happens e.g. in at Windows, because the agent was sending invalid timestamps in older versions that are lying in the future and are now repaired. + +2012-04-17 14:42:52: changed state open -> done +fixed. diff --git a/ChangeLog b/ChangeLog index 5143458..53b2dbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.0b2: Core: * FIX: Cluster host checks were UNKNOWN all the time + * FIX: reset counter in case of (broken) future time WATO: * Added new permission "move hosts" to allow/deny moving of hosts in WATO diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 86cb88e..2054205 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -599,6 +599,8 @@ def get_counter(countername, this_time, this_val, allow_negative=False): last_time, last_val = g_counters.get(countername) timedif = this_time - last_time if timedif <= 0: # do not update counter + # Reset counter to a (hopefully) reasonable value + g_counters[countername] = (this_time, this_val) # Do not suppress this check on check_mk -nv if opt_dont_submit: return 1.0, 0.0

12 years, 5 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e8f8d56874002b007a9a478d03312864d97994c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8f8d56874002b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 15:03:38 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

12 years, 5 months

← Newer
1
...
8
9
10
11
12
13
14
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2012