Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64707 discussions

Check_MK Git: check_mk: Dashboard editor menu can now be opened using right clicks even in non edit mode

by Lars Michelsen

Module: check_mk Branch: master Commit: 164e13945e4457104fd51d656f88775e4fba34ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=164e13945e4457… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 15:51:51 2014 +0100 Dashboard editor menu can now be opened using right clicks even in non edit mode --- web/htdocs/js/dashboard.js | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index f48e90c..08df64a 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -341,7 +341,7 @@ function update_dashlet(id, code) { // DASHBOARD EDITING // -function toggle_dashboard_controls(show, event) { +function toggle_dashboard_menu(show, event) { var controls = document.getElementById('controls'); if (!controls) return; // maybe not permitted -> skip @@ -395,7 +395,7 @@ var g_editing = false; function toggle_dashboard_edit() { // First hide the controls menu - toggle_dashboard_controls(false); + toggle_dashboard_menu(false); g_editing = !g_editing; @@ -720,22 +720,22 @@ function body_click_handler(event) { var target = getTarget(event); var button = getButton(event); - if (g_editing && target.id == 'dashboard' && button == 'RIGHT') { + if (target.id == 'dashboard' && button == 'RIGHT') { // right click on the empty dashboard area - toggle_dashboard_controls(undefined, event); + toggle_dashboard_menu(undefined, event); prevent_default_events(event); return false; } else if (target.parentNode.id == 'controls_toggle' && button == 'LEFT') { // left click on the controls menu - toggle_dashboard_controls(undefined, event); + toggle_dashboard_menu(undefined, event); prevent_default_events(event); return false; } else if (target.parentNode.id != 'controls_toggle' && (!target.parentNode.parentNode || !has_class(target.parentNode.parentNode, 'menu'))) { // Hide the controls menu when clicked somewhere else - toggle_dashboard_controls(false); + toggle_dashboard_menu(false); } return true; @@ -1135,13 +1135,8 @@ add_event_handler('click', function(e) { return body_click_handler(e); }); -// Totally disable the context menu for the dashboards in edit mode +// Totally disable the context menu for all dashboards add_event_handler('contextmenu', function(e) { - if (g_editing) { - prevent_default_events(e); - return false; - } - else { - return true; - } + prevent_default_events(e); + return false; });

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #1019

by Mathias Kettner

Module: check_mk Branch: master Commit: 8af7399ca86b1f7ea7feec22c0e7e55d2dd615d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8af7399ca86b1f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 18:01:05 2014 +0100 Updated bug entries #1019 --- .bugs/1019 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/1019 b/.bugs/1019 index a970d1d..fa15cb6 100644 --- a/.bugs/1019 +++ b/.bugs/1019 @@ -1,10 +1,13 @@ Title: Oracle Tablespace Monitoring - TEMP Tablespaces Component: checks -State: open +Class: nastiness +State: done Date: 2013-09-04 11:22:25 Targetversion: 1.4.0 -Class: nastiness It is senseless to apply thresholds to TEMP tablespaces in oracle. On startup, the tablespace is small, but once allocated it grows and grows, but never gets smaller again. So we should either completely remove those tablespaces or at least disable the thresholds by default. + +2014-12-05 18:01:00: changed state open -> done +Obsoleted by our new ORACLE monitoring.

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2195, #1020, #2231

by Mathias Kettner

Module: check_mk Branch: master Commit: d125c32931c64194f7c9af2f07475e85f1116605 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d125c32931c641… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 18:00:15 2014 +0100 Updated bug entries #2195, #1020, #2231 --- .bugs/1020 | 6 ++++-- .bugs/2195 | 6 ++++-- .bugs/2231 | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.bugs/1020 b/.bugs/1020 index 9bed6aa..dd2d014 100644 --- a/.bugs/1020 +++ b/.bugs/1020 @@ -1,9 +1,9 @@ Title: cmk --snmpwalk does not always get all oids Component: core -State: open +Class: nastiness +State: done Date: 2013-09-04 11:27:53 Targetversion: future -Class: nastiness In some cases, on somehow broken devices, the cmk --snmpwalk feature does not get complete results. At the moment it walks the standard OIDs 1.2.6.1.2 and @@ -21,3 +21,5 @@ e.g. cmk --snmpwalk --extra-oid 1.3.5.1.4.3.5.3.5 HOST + +2014-12-05 17:58:54: changed state open -> done diff --git a/.bugs/2195 b/.bugs/2195 index 7c58a02..d1dcf4e 100644 --- a/.bugs/2195 +++ b/.bugs/2195 @@ -1,9 +1,11 @@ Title: Group all context boxes together into one box in visual editor Component: multisite -State: open +Class: nastiness +State: done Date: 2014-10-06 19:10:03 Targetversion: 1.2.5i1 -Class: nastiness Currently due to the large number of mostly useless boxes everything get's very confuscated... + +2014-12-05 17:59:47: changed state open -> done diff --git a/.bugs/2231 b/.bugs/2231 index 8f36632..e6f0094 100644 --- a/.bugs/2231 +++ b/.bugs/2231 @@ -1,9 +1,11 @@ Title: Put icon-column in all views at the same position Component: multisite -State: open +Class: nastiness +State: done Date: 2014-12-01 10:42:24 Targetversion: 1.2.5i1 -Class: nastiness Currently it is sometimes at the right of the output, sometimes at the left. + +2014-12-05 18:00:10: changed state open -> done

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0840

by Mathias Kettner

Module: check_mk Branch: master Commit: a5fd50960e4fb6c806c267650637c7b2ff02e855 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5fd50960e4fb6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 17:53:20 2014 +0100 Updated bug entries #0840 --- .bugs/840 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/840 b/.bugs/840 index de116e7..dbbe722 100644 --- a/.bugs/840 +++ b/.bugs/840 @@ -1,9 +1,11 @@ Title: Wato condition show only the name of a tag but not the group Component: wato -State: open +Class: nastiness +State: done Date: 2014-01-31 17:38:22 Targetversion: 1.2.5i1 -Class: nastiness If you have multiple tags with the same title but in diffrent groups you cant see it in the condition colums from which tag group this tag is + +2014-12-05 17:53:15: changed state open -> done

9 years, 10 months

Check_MK Git: check_mk: #1707 WATO rule editor: show title of tag group when rendering the conditions of a rule

by Mathias Kettner

Module: check_mk Branch: master Commit: 36b117f4ce7b9c430a4083167a5b6ea42cd953e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36b117f4ce7b9c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 17:53:04 2014 +0100 #1707 WATO rule editor: show title of tag group when rendering the conditions of a rule This makes things clearer if you use the same tag title in more than one group. --- .bugs/837 | 6 ++++-- .werks/1707 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 14 ++++++++++---- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.bugs/837 b/.bugs/837 index 3ea5614..a17d8c6 100644 --- a/.bugs/837 +++ b/.bugs/837 @@ -1,9 +1,9 @@ Title: Service levels are missing in gui Component: multisite -State: open +Class: nastiness +State: done Date: 2013-11-29 17:07:45 Targetversion: 1.2.3i6 -Class: nastiness Its not possible to see the service levels on Hosts/ Services in Multisite. The Reason is, that they are no part of the livestatus output. With cmc its not possible to looking into the configfile to see the sl. @@ -13,3 +13,5 @@ Create: - Filter - Add Detail views of Host / Service - Change Global Settings Group + +2014-12-05 17:41:26: changed state open -> done diff --git a/.werks/1707 b/.werks/1707 new file mode 100644 index 0000000..5aab2a6 --- /dev/null +++ b/.werks/1707 @@ -0,0 +1,9 @@ +Title: WATO rule editor: show title of tag group when rendering the conditions of a rule +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417798331 +Class: feature + +This makes things clearer if you use the same tag title in more than one group. diff --git a/ChangeLog b/ChangeLog index cc45988..bfc596b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -191,6 +191,7 @@ * 1561 Remove Auditlog from the main WATO menu and put it into the activate Changes page * 1562 Move manual checks into a new WATO module... * 1697 Allow non-Ascii characters in topic of host tag groups + * 1707 WATO rule editor: show title of tag group when rendering the conditions of a rule... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 24c94ec..e671adf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14486,12 +14486,18 @@ def render_conditions(ruleset, tagspecs, host_list, item_list, varname, folder): html.write('<li class="condition">') alias = config.tag_alias(tag) + group_alias = config.tag_group_title(tag) if alias: - if negate: - html.write(_("Host is not of type ")) + if group_alias: + html.write(_("Host") + ": " + group_alias + " " + _("is") + " ") + if negate: + html.write("%s " % _("not")) else: - html.write(_("Host is of type ")) - html.write("" + alias + "") + if negate: + html.write(_("Host has tag")) + else: + html.write(_("Host does not have tag")) + html.write(" " + alias + "") else: if negate: html.write(_("Host has not the tag ") + "<tt>" + tag + "</tt>")

9 years, 10 months

Check_MK Git: check_mk: Predefine some service levels in the defaut configuration

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d92b33efbd2931a77d0c5ffc6447abec2050a53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d92b33efbd293… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 17:41:04 2014 +0100 Predefine some service levels in the defaut configuration --- .bugs/812 | 8 ++++++-- .bugs/818 | 7 +++++-- mkeventd/web/plugins/config/mkeventd.py | 6 ++++++ web/plugins/wato/globals_notification.py | 7 ++++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.bugs/812 b/.bugs/812 index 50de5b9..704b99a 100644 --- a/.bugs/812 +++ b/.bugs/812 @@ -1,9 +1,9 @@ Title: Windows fileinfo gets invetorized without escaping backslashes Component: checks -State: open +Class: nastiness +State: done Date: 2012-11-20 15:16:48 Targetversion: 1.4.0 -Class: nastiness The fileinfo check does not escape backslashes upon inventory. resulting items would be i.e. c:\windows\test.ini WATO on the other hand does escape them, @@ -15,3 +15,7 @@ interprets texts as regular expressions (which again interprets backslashes!) Resolution: We put a nice icon into each text input that is being interpreted as regex. When you hover over the icon (or click on it?) you get a help page about regular expressions with nice examples etc. + +2014-12-05 17:20:07: changed state open -> done +When creating rules WATO now escapes regex-chars, so this should e +no problem. diff --git a/.bugs/818 b/.bugs/818 index 92a3d8e..8a9565d 100644 --- a/.bugs/818 +++ b/.bugs/818 @@ -1,9 +1,9 @@ Title: check_mk_agent can incorrectly detect postfix on RHEL Component: core -State: open +Class: nastiness +State: done Date: 2012-10-24 10:19:40 Targetversion: 1.2.3 -Class: nastiness osTicket ID 443234 This probably happens on CentOS too, since it's so similar to RHEL. @@ -38,3 +38,6 @@ fi Resolution could be: use postqueue -p instead of mailq, check with 'which postqueue' + +2014-12-05 17:22:05: changed state open -> done +Should work now. mailq is not anylonger being used. diff --git a/mkeventd/web/plugins/config/mkeventd.py b/mkeventd/web/plugins/config/mkeventd.py index 92a60d2..9a3abd5 100644 --- a/mkeventd/web/plugins/config/mkeventd.py +++ b/mkeventd/web/plugins/config/mkeventd.py @@ -32,3 +32,9 @@ mkeventd_notify_remotehost = None mkeventd_connect_timeout = 10 debug_mkeventd_queries = False log_rulehits = False +mkeventd_service_levels = [ + (0, _("(no Service level)")), + (10, _("Silver")), + (20, _("Gold")), + (30, _("Platinum")), +] diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 3b4c930..0f73e7b 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -248,7 +248,12 @@ register_configvar(group, "Event Console when you forward notifications to it and will override the " "setting of the matching rule."), allow_empty = False, - default_value = [ (0, _("(no service level)")) ], + default_value = [ + (0, _("(no Service level)")), + (10, _("Silver")), + (20, _("Gold")), + (30, _("Platinum")), + ], ), domain = "multisite", allow_reset = False,

9 years, 10 months

Check_MK Git: check_mk: #1705 Better styling of dashboard designer

by Mathias Kettner

Module: check_mk Branch: master Commit: cbff22b5d74f593e33634715135c21a3002faf23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbff22b5d74f59… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 16:38:56 2014 +0100 #1705 Better styling of dashboard designer --- .werks/1705 | 9 +++ ChangeLog | 1 + web/htdocs/dashboard.css | 103 +++++++++++++++------------- web/htdocs/dashboard.py | 4 +- web/htdocs/images/dashlet_anchor_hi.png | Bin 833 -> 706 bytes web/htdocs/images/dashlet_anchor_lo.png | Bin 954 -> 685 bytes web/htdocs/images/dashlet_anchor_off.png | Bin 876 -> 655 bytes web/htdocs/images/dashlet_arrow_b_grow.png | Bin 181 -> 310 bytes web/htdocs/images/dashlet_arrow_b_max.png | Bin 181 -> 307 bytes web/htdocs/images/dashlet_arrow_l_grow.png | Bin 189 -> 285 bytes web/htdocs/images/dashlet_arrow_l_max.png | Bin 189 -> 285 bytes web/htdocs/images/dashlet_arrow_r_grow.png | Bin 134 -> 306 bytes web/htdocs/images/dashlet_arrow_r_max.png | Bin 134 -> 305 bytes web/htdocs/images/dashlet_arrow_t_grow.png | Bin 180 -> 320 bytes web/htdocs/images/dashlet_arrow_t_max.png | Bin 180 -> 319 bytes web/htdocs/images/dashlet_del_hi.png | Bin 1170 -> 705 bytes web/htdocs/images/dashlet_del_lo.png | Bin 1096 -> 719 bytes web/htdocs/images/dashlet_edit_hi.png | Bin 635 -> 692 bytes web/htdocs/images/dashlet_edit_lo.png | Bin 741 -> 721 bytes web/htdocs/js/dashboard.js | 56 ++++++++++----- 20 files changed, 109 insertions(+), 64 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cbff22b5d7…

9 years, 10 months

Check_MK Git: check_mk: Fix minor styling problem in kernel.util

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d61e157264e5e620250bab2275a551bfb24705e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d61e157264e5e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 16:43:33 2014 +0100 Fix minor styling problem in kernel.util --- pnp-templates/check_mk-kernel.util.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pnp-templates/check_mk-kernel.util.php b/pnp-templates/check_mk-kernel.util.php index a9b016e..c52c02b 100644 --- a/pnp-templates/check_mk-kernel.util.php +++ b/pnp-templates/check_mk-kernel.util.php @@ -41,23 +41,23 @@ else $def[1] .= "" . "COMMENT:Average\: " . "AREA:system#ff6000:\"System\" " - . "GPRINT:system:AVERAGE:\"%2.1lf%% \" " + . "GPRINT:system:AVERAGE:\"%4.1lf%% \" " . "AREA:user#60f020:\"User\":STACK " - . "GPRINT:user:AVERAGE:\"%2.1lf%% \" " + . "GPRINT:user:AVERAGE:\"%4.1lf%% \" " . "AREA:wait#00b0c0:\"$thirdname\":STACK " - . "GPRINT:wait:AVERAGE:\"%2.1lf%% \" " + . "GPRINT:wait:AVERAGE:\"%4.1lf%% \" " . "LINE:sum#004080:\"Total\" " - . "GPRINT:sum:AVERAGE:\"%2.1lf%% \\n\" " + . "GPRINT:sum:AVERAGE:\"%4.1lf%% \\n\" " . "COMMENT:\"Last\: \" " . "AREA:system#ff6000:\"System\" " - . "GPRINT:system:LAST:\"%2.1lf%% \" " + . "GPRINT:system:LAST:\"%4.1lf%% \" " . "AREA:user#60f020:\"User\":STACK " - . "GPRINT:user:LAST:\"%2.1lf%% \" " + . "GPRINT:user:LAST:\"%4.1lf%% \" " . "AREA:wait#00b0c0:\"$thirdname\":STACK " - . "GPRINT:wait:LAST:\"%2.1lf%% \" " + . "GPRINT:wait:LAST:\"%4.1lf%% \" " . "LINE:sum#004080:\"Total\" " - . "GPRINT:sum:LAST:\"%2.1lf%% \\n\" " + . "GPRINT:sum:LAST:\"%4.1lf%% \\n\" " ."";

9 years, 10 months

Check_MK Git: check_mk: Use correct icon for link to WATO services list

by Mathias Kettner

Module: check_mk Branch: master Commit: f7ab7da46ae78d2752bf8c0725592b8f1c477ca8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7ab7da46ae78d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 16:54:40 2014 +0100 Use correct icon for link to WATO services list --- web/plugins/icons/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index 84a0444..cf03036 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -39,7 +39,7 @@ def wato_link(folder, site, hostname, where): else: url += "&mode=edithost" help = _("Edit this host") - return '<a href="%s">%s</a>' % (url, html.render_icon('wato', help)) + return '<a href="%s">%s</a>' % (url, html.render_icon('services', help)) else: return ""

9 years, 10 months

Check_MK Git: check_mk: #1706 FIX Fix file permissions when installing MKPs to 0644 or 0755

by Mathias Kettner

Module: check_mk Branch: master Commit: 62a45888464b1c2b5740aab8d241b6f5c174f116 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62a45888464b1c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 17:18:25 2014 +0100 #1706 FIX Fix file permissions when installing MKPs to 0644 or 0755 When installing MKP packages that contain files with invalid permissions then fix these when installing the packages. --- .bugs/763 | 6 ++++-- .bugs/784 | 6 ++++-- .werks/1706 | 10 ++++++++++ ChangeLog | 1 + modules/packaging.py | 51 +++++++++++++++++++++++++++++--------------------- 5 files changed, 49 insertions(+), 25 deletions(-) diff --git a/.bugs/763 b/.bugs/763 index 5186307..1881842 100644 --- a/.bugs/763 +++ b/.bugs/763 @@ -1,9 +1,9 @@ Title: Duplicate Check on Cisco 4500 Component: checks -State: open +Class: nastiness +State: done Date: 2012-06-04 12:20:55 Targetversion: 1.4.0 -Class: nastiness Generating Nagios configuration...Configuration Error: ERROR: Duplicate service description 'Temperature Chassis Temperature Sensor' @@ -29,3 +29,5 @@ Precedence should be: We could do: the cmk -I outputs a warning on duplicate (automatically ignored) services. WATO introduces a new section: "Duplicate Services" that simply displays the ignored services. + +2014-12-05 17:01:29: changed state open -> done diff --git a/.bugs/784 b/.bugs/784 index 08d50dc..55f9ee5 100644 --- a/.bugs/784 +++ b/.bugs/784 @@ -1,9 +1,9 @@ Title: mkp install should fix file permissions Component: core -State: open +Class: nastiness +State: done Date: 2012-07-25 17:42:13 Targetversion: future -Class: nastiness When installing the cmc_lcp checks from Bastian from the Exchange into GIT, then all files are not group/world readable. The MKP installer should @@ -11,3 +11,5 @@ automatically fix file permissions. Resolution: add a new column to packages_parts in packaging.py with the correct target permission for that folder. + +2014-12-05 17:17:35: changed state open -> done diff --git a/.werks/1706 b/.werks/1706 new file mode 100644 index 0000000..0ea1d98 --- /dev/null +++ b/.werks/1706 @@ -0,0 +1,10 @@ +Title: Fix file permissions when installing MKPs to 0644 or 0755 +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i7 +Date: 1417796257 +Class: fix + +When installing MKP packages that contain files with invalid permissions +then fix these when installing the packages. diff --git a/ChangeLog b/ChangeLog index ed7ab9d..cc45988 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 1624 FIX: Remove illegal characters from service descriptions of active checks... * 1628 FIX: Remove trailing backslashes from service descriptions... * 1649 FIX: Check_MK inventory service has been renamed to Check_MK Discovery... + * 1706 FIX: Fix file permissions when installing MKPs to 0644 or 0755... Checks & Agents: * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices diff --git a/modules/packaging.py b/modules/packaging.py index 8a7f115..6808a43 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -44,15 +44,15 @@ except: pass # in case of local directories (OMD) use those instead -package_parts = [ (part, title, ldir and ldir or dir) for part, title, dir, ldir in [ - ( "checks", "Checks", checks_dir, local_checks_dir ), - ( "notifications", "Notification scripts", notifications_dir, local_notifications_dir ), - ( "inventory", "Inventory plugins", inventory_dir, local_inventory_dir ), - ( "checkman", "Checks' man pages", check_manpages_dir, local_check_manpages_dir ), - ( "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 ), - ( "doc", "Documentation files", doc_dir, local_doc_dir ), +package_parts = [ (part, title, perm, ldir and ldir or dir) for part, title, perm, dir, ldir in [ + ( "checks", "Checks", 0644, checks_dir, local_checks_dir ), + ( "notifications", "Notification scripts", 0755, notifications_dir, local_notifications_dir ), + ( "inventory", "Inventory plugins", 0644, inventory_dir, local_inventory_dir ), + ( "checkman", "Checks' man pages", 0644, check_manpages_dir, local_check_manpages_dir ), + ( "agents", "Agents", 0755, agents_dir, local_agents_dir ), + ( "web", "Multisite extensions", 0644, web_dir, local_web_dir ), + ( "pnp-templates", "PNP4Nagios templates", 0644, pnp_templates_dir, local_pnp_templates_dir ), + ( "doc", "Documentation files", 0644, doc_dir, local_doc_dir ), ]] def packaging_usage(): @@ -166,14 +166,14 @@ def show_package(name, show_info = False): else: if opt_verbose: sys.stdout.write("Files in package %s:\n" % name) - for part, title, dir in package_parts: + for part, title, perm, dir in package_parts: files = package["files"].get(part, []) if len(files) > 0: sys.stdout.write(" %s%s%s:\n" % (tty_bold, title, tty_normal)) for f in files: sys.stdout.write(" %s\n" % f) else: - for part, title, dir in package_parts: + for part, title, perm, dir in package_parts: for fn in package["files"].get(part, []): sys.stdout.write(dir + "/" + fn + "\n") @@ -200,7 +200,7 @@ def package_create(args): "files" : filelists } num_files = 0 - for part, title, dir in package_parts: + for part, title, perm, dir in package_parts: files = unpackaged_files_in_dir(part, dir) filelists[part] = files num_files += len(files) @@ -216,7 +216,7 @@ def package_create(args): def package_find(_no_args): first = True - for part, title, dir in package_parts: + for part, title, perm, dir in package_parts: files = unpackaged_files_in_dir(part, dir) if len(files) > 0: if first: @@ -243,7 +243,7 @@ def package_release(args): os.unlink(pacpath) verbose("Releasing files of package %s into freedom...\n" % pacname) if opt_verbose: - for part, title, dir in package_parts: + for part, title, perm, dir in package_parts: filenames = package["files"].get(part, []) if len(filenames) > 0: verbose(" %s%s%s:\n" % (tty_bold, title, tty_normal)) @@ -256,7 +256,7 @@ def package_pack(args): # Make sure, user is not in data directories of Check_MK p = os.path.abspath(os.curdir) - for dir in [var_dir] + [ dir for x,y,dir in package_parts ]: + for dir in [var_dir] + [ dir for x,y,perm,dir in package_parts ]: if p == dir or p.startswith(dir + "/"): raise PackageException("You are in %s!\n" "Please leave the directories of Check_MK before creating\n" @@ -287,7 +287,7 @@ def package_pack(args): tar.addfile(info, info_file) # Now pack the actual files into sub tars - for part, title, dir in package_parts: + for part, title, perm, dir in package_parts: filenames = package["files"].get(part, []) if len(filenames) > 0: verbose(" %s%s%s:\n" % (tty_bold, title, tty_normal)) @@ -310,7 +310,7 @@ def package_remove(args): raise PackageException("No such package %s." % pacname) verbose("Removing package %s...\n" % pacname) - for part, title, dir in package_parts: + for part, title, perm, dir in package_parts: filenames = package["files"].get(part, []) if len(filenames) > 0: verbose(" %s%s%s\n" % (tty_bold, title, tty_normal)) @@ -345,7 +345,7 @@ def package_install(args): # Before installing check for conflicts keep_files = {} - for part, title, dir in package_parts: + for part, title, perm, dir in package_parts: packaged = packaged_files_in_dir(part) keep = [] keep_files[part] = keep @@ -361,7 +361,7 @@ def package_install(args): raise PackageException("File conflict: %s already existing." % path) # Now install files, but only unpack files explicitely listed - for part, title, dir in package_parts: + for part, title, perm, dir in package_parts: filenames = package["files"].get(part, []) if len(filenames) > 0: verbose(" %s%s%s:\n" % (tty_bold, title, tty_normal)) @@ -380,9 +380,18 @@ def package_install(args): break tardest.write(data) + # Fix permissions of extracted files + for filename in filenames: + path = dir + "/" + filename + has_perm = os.stat(path).st_mode & 07777 + if has_perm != perm: + verbose(" Fixing permissions of %s: %04o -> %04o\n" % (path, has_perm, perm)) + os.chmod(path, perm) + + # In case of an update remove files from old_package not present in new one if update: - for part, title, dir in package_parts: + for part, title, perm, dir in package_parts: filenames = old_package["files"].get(part, []) keep = keep_files.get(part, []) for fn in filenames: @@ -403,7 +412,7 @@ def files_in_dir(part, dir, prefix = ""): return [] # Handle case where one part-dir lies below another - taboo_dirs = [ d for p, t, d in package_parts if p != part ] + taboo_dirs = [ d for p, t, perm, d in package_parts if p != part ] if dir in taboo_dirs: return []

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits