Skip to content

Commit ddb7cf8

Browse files
author
Alex Zurhake
committed
Build and depoly maintenance via Bazel
CMK-21586 Change-Id: Iaa8ddd9bd5543a42645e1d658397a68a57475f25
1 parent 23ce744 commit ddb7cf8

File tree

7 files changed

+70
-16
lines changed

7 files changed

+70
-16
lines changed

bazel_variables.bzl

+5
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,30 @@ edition_deps = {
2626

2727
edition_skel_permissions = {
2828
"cre": [
29+
"//omd/packages/maintenance:skel.permissions",
2930
"//omd/packages/redis:skel.permissions",
3031
"//omd/packages/stunnel:skel.permissions",
3132
],
3233
"cce": [
34+
"//omd/packages/maintenance:skel.permissions",
3335
"//omd/packages/redis:skel.permissions",
3436
"//omd/packages/stunnel:skel.permissions",
3537
"//non-free/packages/cmk-mknotifyd:skel.permissions",
3638
],
3739
"cee": [
40+
"//omd/packages/maintenance:skel.permissions",
3841
"//omd/packages/redis:skel.permissions",
3942
"//omd/packages/stunnel:skel.permissions",
4043
"//non-free/packages/cmk-mknotifyd:skel.permissions",
4144
],
4245
"cme": [
46+
"//omd/packages/maintenance:skel.permissions",
4347
"//omd/packages/redis:skel.permissions",
4448
"//omd/packages/stunnel:skel.permissions",
4549
"//non-free/packages/cmk-mknotifyd:skel.permissions",
4650
],
4751
"cse": [
52+
"//omd/packages/maintenance:skel.permissions",
4853
"//omd/packages/redis:skel.permissions",
4954
"//omd/packages/stunnel:skel.permissions",
5055
"//non-free/packages/cmk-mknotifyd:skel.permissions",

omd/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ create_venv(
3535
#added here instead of above because of disappearing file
3636
"//omd/packages/Python:python_tar",
3737
"//omd/packages/heirloom-pkgtools",
38+
"//omd/packages/maintenance",
3839
"//omd/packages/mod_fcgid",
3940
"//omd/packages/mod_wsgi",
4041
"//omd/packages/net-snmp:net-snmp_tar",

omd/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ PACKAGES := \
4141
omd \
4242
navicli \
4343
pnp4nagios \
44-
maintenance \
4544
heirloom-mailx \
4645
livestatus \
4746
unixcat \

omd/packages/maintenance/BUILD

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_files", "pkg_mkdirs", "pkg_mklink", "strip_prefix")
2+
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
3+
4+
exports_files(["skel.permissions"])
5+
6+
pkg_files(
7+
name = "bin_pkg",
8+
srcs = [
9+
"logrotate",
10+
"merge-crontabs",
11+
],
12+
attributes = pkg_attributes(
13+
mode = "0755",
14+
),
15+
prefix = "bin",
16+
)
17+
18+
pkg_files(
19+
name = "bin_diskspace_pkg",
20+
srcs = [
21+
"diskspace.py",
22+
],
23+
attributes = pkg_attributes(
24+
mode = "0755",
25+
),
26+
prefix = "bin",
27+
renames = {"diskspace.py": "diskspace"},
28+
)
29+
30+
pkg_files(
31+
name = "skel",
32+
srcs = [
33+
"skel/etc/cron.d/diskspace",
34+
"skel/etc/cron.d/logrotate",
35+
"skel/etc/init.d/crontab",
36+
"skel/etc/logrotate.conf",
37+
"skel/etc/logrotate.d/apache",
38+
"skel/etc/logrotate.d/diskspace",
39+
],
40+
strip_prefix = strip_prefix.from_pkg(""),
41+
)
42+
43+
pkg_mkdirs(
44+
name = "skel_diskspace",
45+
dirs = ["skel/local/share/diskspace"],
46+
)
47+
48+
pkg_mklink(
49+
name = "skel_crontab",
50+
link_name = "skel/etc/rc.d/99-crontab",
51+
target = "../init.d/crontab",
52+
)
53+
54+
pkg_tar(
55+
name = "maintenance",
56+
srcs = [
57+
":bin_diskspace_pkg",
58+
":bin_pkg",
59+
":skel",
60+
":skel_crontab",
61+
":skel_diskspace",
62+
],
63+
visibility = ["//omd:__pkg__"],
64+
)

omd/packages/maintenance/maintenance.make

-14
This file was deleted.

omd/packages/maintenance/skel/local/share/diskspace/.gitignore

Whitespace-only changes.

omd/packages/packages.make

-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ include \
184184
packages/cpp-libs/cpp-libs.make \
185185
packages/check_mk/check_mk.make \
186186
packages/libgsf/libgsf.make \
187-
packages/maintenance/maintenance.make \
188187
packages/monitoring-plugins/monitoring-plugins.make \
189188
packages/check-cert/check-cert.make \
190189
packages/lcab/lcab.make \

0 commit comments

Comments
 (0)