Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: WATO: add confirmation for deletion of host tags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4e5600aa249a99adbbd34d1db514f478a5fa89f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4e5600aa249a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 20:53:30 2011 +0100 WATO: add confirmation for deletion of host tags --- web/htdocs/wato.py | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aaabbb2..0163cbc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7985,6 +7985,16 @@ def mode_hosttags(phase): operations = [ x[0] for x in e[2] ] message = rename_host_tags_after_confirmation(del_id, operations) + if message == True: # no confirmation yet + c = wato_confirm(_("Confirm deletion of the host " + "tag group '%s'") % del_id, + _("Do you really want to delete the " + "host tag group '%s'?") % del_id) + if c == False: + return "" + elif c == None: + return None + if message: hosttags = [ e for e in hosttags if e[0] != del_id ] save_hosttags(hosttags) @@ -8295,7 +8305,8 @@ def save_hosttags(hosttags): def rename_host_tags_after_confirmation(tag_id, operations): mode = html.var("_repair") if mode == "abort": - raise MKUserError("id_0", "Please refine your changes or go back to the list of tag groups.") + raise MKUserError("id_0", _("Aborting change.")) + elif mode: if type(operations) == list: # make attribute unknown to system, important for save() operations undeclare_host_tag_attribute(tag_id) @@ -8309,7 +8320,8 @@ def rename_host_tags_after_confirmation(tag_id, operations): change_host_tags_in_folders(tag_id, operations, "check", g_root_folder) if affected_folders: - message += _("Affected folders with an explicit reference to this tag group and that are affected by the change") + ":<ul>" + message += _("Affected folders with an explicit reference to this tag " + "group and that are affected by the change") + ":<ul>" for folder in affected_folders: message += '<li><a href="%s">%s</a></li>' % ( make_link_to([("mode", "editfolder")], folder), @@ -8317,7 +8329,8 @@ def rename_host_tags_after_confirmation(tag_id, operations): message += "</ul>" if affected_hosts: - message += _("Hosts where this tag group is explicitely set and that are effected by the change") + ":<ul><li>" + message += _("Hosts where this tag group is explicitely set " + "and that are effected by the change") + ":<ul><li>" for nr, host in enumerate(affected_hosts): if nr > 20: message += "... (%d more)" % (len(affected_hosts) - 20)

12 years, 6 months

Check_MK Git: check_mk: WATO: fix reordering of host tags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dcd221bf4b2057ff4084888841eef94a2fc2beb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcd221bf4b2057… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 20:41:15 2011 +0100 WATO: fix reordering of host tags --- 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 d0a4e9b..aaabbb2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7996,7 +7996,7 @@ def mode_hosttags(phase): if move_nr != None: if html.check_transaction(): move_nr = int(move_nr) - if move_nr > 0: + if move_nr >= 0: dir = 1 else: move_nr = -move_nr

12 years, 6 months

Check_MK Git: check_mk: WATO: fix selection of empty tag

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 854c47607cf10fe1adffe69aa5b4307197a388d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=854c47607cf10f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 20:36:31 2011 +0100 WATO: fix selection of empty tag --- .bugs/481 | 10 +++++++--- web/htdocs/wato.py | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.bugs/481 b/.bugs/481 index ad05856..d43b2b2 100644 --- a/.bugs/481 +++ b/.bugs/481 @@ -1,11 +1,15 @@ Title: Tag group with empty tag does not show default Component: wato -Benefit: 1 -State: open Cost: 1 Date: 2011-12-06 12:26:37 -Targetversion: 1.2.0 +State: done Class: bug +Benefit: 1 +Fun: 0 +Targetversion: 1.2.0 If a tag group has an empty tag then that choice is not being shown in the combo box. + +2011-12-07 20:36:48: changed state open -> done +fixed. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2ec191e..d0a4e9b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3442,6 +3442,8 @@ class HostTagAttribute(Attribute): # But case could occur if tags definitions have been changed. def render_input(self, value): + if value == None: + value = "" # Important for tag groups with an empty tag entry # Tag groups with just one entry are being displayed # as checkboxes choices = []

12 years, 6 months

Check_MK Git: check_mk: builin views: fix syntax error

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a585787fe213eedd5538cfcc8dcc95453b02d2a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a585787fe213ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 20:32:22 2011 +0100 builin views: fix syntax error --- web/plugins/views/builtin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 0edf462..61f8fbf 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2434,7 +2434,7 @@ multisite_builtin_views.update({ 'sorters': [], 'title': u'Single Aggregation', 'topic': u'Business Intelligence', - 'user_sortable': None} + 'user_sortable': None}, # +----------------------------------------------------------------------+ # | _ _ _ _ __ _ _ _ |

12 years, 6 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: 42de3c84f777489a681816594ec197d95545f018 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42de3c84f77748… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 20:32:25 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: Sidebar: fix body margin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ba26a1223e779c3f2cd8e2f1061cd7c8a6ec4233 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba26a1223e779c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 20:32:13 2011 +0100 Sidebar: fix body margin --- web/htdocs/sidebar.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 387a182..e20873c 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -44,6 +44,7 @@ body.side { overflow:hidden; font-family: verdana, arial, helvetica, sans-serif; font-size: 9pt; + margin: 0px; } /* Top logo part */

12 years, 6 months

Check_MK Git: check_mk: WATO: js bugfix, for-each loop cycles through array elements again (was index)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e23af4858a1bbb2b1db07854ebf75379e88e6335 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e23af4858a1bbb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 7 20:21:51 2011 +0100 WATO: js bugfix, for-each loop cycles through array elements again (was index) --- web/htdocs/js/wato.js | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 640bd40..de7e593 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -135,8 +135,7 @@ function wato_fix_visibility() { delete hide_topics[index]; } } - - for (var item in volatile_topics){ + for each (var item in volatile_topics){ var oTr = document.getElementById("topic_" + item); if(oTr) { if(hide_topics.indexOf(item) > -1 )

12 years, 6 months

Check_MK Git: check_mk: Added example for creating checks from BI aggregates

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1593faa594a1cc6e3999abe0046b127b43d6ef5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1593faa594a1cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 16:57:07 2011 +0100 Added example for creating checks from BI aggregates --- doc/treasures/check_bi_local.py | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/doc/treasures/check_bi_local.py b/doc/treasures/check_bi_local.py new file mode 100755 index 0000000..2c86b72 --- /dev/null +++ b/doc/treasures/check_bi_local.py @@ -0,0 +1,26 @@ +#!/usr/bin/python + +# Example for creating real Nagios checks from BI +# aggregations. You need to create a view with +# the name aggr_service with the two columns +# Aggr State and Aggr Name. + +import os + +url = 'http://omdadmin:omd@localhost/bi/check_mk/view.py?view_name=aggr_webservice…' + +data = eval(os.popen("curl --silent '%s'" % url).read()) + +states = { + "OK" : 0, + "WARN" : 1, + "CRIT" : 2, + "UNKNOWN" : 3, +} + +for state, name in data[1:]: + state_nr = states.get(state, -1) + descr = "BI_Aggr_" + name.replace(" ", "_") + if state_nr != -1: + print "%d %s - %s" % (state_nr, descr, state) +

12 years, 6 months

Check_MK Git: check_mk: packager: remove obsolete rra

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4da2f749babbe6120f6027f495c30f9f5137f2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4da2f749babbe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 16:23:30 2011 +0100 packager: remove obsolete rra --- modules/packaging.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/packaging.py b/modules/packaging.py index b241deb..7961211 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -50,7 +50,6 @@ package_parts = [ (part, title, ldir and ldir or dir) for part, title, dir, ldir ( "agents", "Agents", agents_dir, local_agents_dir ), ( "web", "Multisite extensions", web_dir, local_web_dir ), ( "pnp-templates", "PNP4Nagios templates", pnp_templates_dir, local_pnp_templates_dir ), - ( "pnp-rraconf", "RRA configuration for PNP", pnp_rraconf_dir, local_pnp_rraconf_dir ), ( "doc", "Documentation files", doc_dir, local_doc_dir ), ]]

12 years, 6 months

Check_MK Git: check_mk: Updated bug entries #0482, #0483

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b059d5292e890c7b0f99af206d58322398205d33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b059d5292e890c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 16:23:20 2011 +0100 Updated bug entries #0482, #0483 --- .bugs/482 | 10 ++++++++++ .bugs/483 | 11 +++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/.bugs/482 b/.bugs/482 new file mode 100644 index 0000000..cd2793d --- /dev/null +++ b/.bugs/482 @@ -0,0 +1,10 @@ +Title: Make cmk --checks=local -v Localhost work +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-07 09:37:54 +Targetversion: 1.2.0 +Class: feature + +The normal Check_MK call should honor the --checks option. diff --git a/.bugs/483 b/.bugs/483 new file mode 100644 index 0000000..f115845 --- /dev/null +++ b/.bugs/483 @@ -0,0 +1,11 @@ +Title: Rule-Editor: autocompletion for explicit hosts +Component: wato +Benefit: 2 +State: open +Cost: 2 +Date: 2011-12-07 14:11:27 +Targetversion: future +Class: feature + +When editing explicit host exceptions we could provide +an autocompletion for actually existing hosts.

12 years, 6 months

← Newer
1
...
24
25
26
27
28
29
30
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011