[checkmk-commits] 4286 SNMP MIBs of the Event Console can now be packed using MKPs

Module: check_mk Branch: master Commit: ad46a55d681f26a394260300a5d49a4f4febabdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad46a55d681f26… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Jan 25 13:02:11 2017 +0100 4286 SNMP MIBs of the Event Console can now be packed using MKPs The MIB files stored below <tt>local/share/snmp/mibs</tt> can now be packed with MKP packages. Change-Id: I5abd84ec2b6ba8658076bf60a17038afc48e92b9 --- .werks/4286 | 10 ++++++++++ ChangeLog | 1 + cmk_base/packaging.py | 1 + lib/paths.py | 5 ++++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/4286 b/.werks/4286 new file mode 100644 index 0000000..708b33a --- /dev/null +++ b/.werks/4286 @@ -0,0 +1,10 @@ +Title: SNMP MIBs of the Event Console can now be packed using MKPs +Level: 1 +Component: core +Compatible: compat +Version: 1.4.0i4 +Date: 1485345684 +Class: feature + +The MIB files stored below <tt>local/share/snmp/mibs</tt> can now +be packed with MKP packages. diff --git a/ChangeLog b/ChangeLog index cd55277..fc07451 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.4.0i4: Core & Setup: + * 4286 SNMP MIBs of the Event Console can now be packed using MKPs... * 4269 FIX: Verifying unexpected keys in check_info while loading checks... * 4281 FIX: Fixed piggyback hosts with spaces in names leading to crashes... diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index b0812f7..e0d4f21 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -73,6 +73,7 @@ package_parts = [ (part, title, perm, ldir and ldir or dir) for part, title, per ( "doc", "Documentation files", 0644, cmk.paths.doc_dir, cmk.paths.local_doc_dir ), ( "bin", "Binaries", 0755, None, cmk.paths.local_bin_dir ), ( "lib", "Libraries", 0644, None, cmk.paths.local_lib_dir), + ( "mibs", "SNMP MIBs", 0644, None, cmk.paths.local_mib_dir), ]] package_ignored_files = { diff --git a/lib/paths.py b/lib/paths.py index b84d44b..7092d45 100644 --- a/lib/paths.py +++ b/lib/paths.py @@ -85,8 +85,10 @@ mibs_dir = None web_dir = None pnp_templates_dir = None doc_dir = None +locale_dir = None bin_dir = None lib_dir = None +mib_dir = None # TODO: Add active_checks_dir and make it used in code local_share_dir = None @@ -99,10 +101,10 @@ local_mibs_dir = None local_web_dir = None local_pnp_templates_dir = None local_doc_dir = None -locale_dir = None local_locale_dir = None local_bin_dir = None local_lib_dir = None +local_mib_dir = None def _set_paths(): @@ -206,6 +208,7 @@ def _set_overridable_paths(local=False): var_prefix+"locale_dir" : os.path.join(omd_root, rel_base, "share/check_mk/locale"), var_prefix+"bin_dir" : os.path.join(omd_root, rel_base, "bin"), var_prefix+"lib_dir" : os.path.join(omd_root, rel_base, "lib"), + var_prefix+"mib_dir" : os.path.join(omd_root, rel_base, "share/snmp/mibs"), })