1 |
commit: 9dd83ba9636be855abf97ac682cd55be731f0ce2 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 28 15:01:10 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 28 15:02:00 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd83ba9 |
7 |
|
8 |
net-analyzer/zabbix: bumps + security fixes + rewritten + removed obsolete |
9 |
|
10 |
1) many changes and improvements |
11 |
2) config directory and files are not writeable by zabbix |
12 |
3) creation of pid file disabled in zabbix, using s-s-d instead |
13 |
|
14 |
Bug: https://bugs.gentoo.org/629882 |
15 |
Bug: https://bugs.gentoo.org/709926 |
16 |
Bug: https://bugs.gentoo.org/629884 |
17 |
Closes: https://bugs.gentoo.org/665960 |
18 |
Closes: https://bugs.gentoo.org/670652 |
19 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
20 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
21 |
|
22 |
net-analyzer/zabbix/Manifest | 10 +- |
23 |
net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd | 28 - |
24 |
net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy | 27 - |
25 |
net-analyzer/zabbix/files/2.2/init.d/zabbix-server | 26 - |
26 |
.../zabbix/files/2.2/patches/zbx7479.patch | 83 --- |
27 |
.../zabbix/files/2.2/patches/zbx8151.patch | 53 -- |
28 |
net-analyzer/zabbix/files/2.2/zabbix_agent.conf | 81 --- |
29 |
net-analyzer/zabbix/files/2.2/zabbix_agentd.conf | 278 --------- |
30 |
net-analyzer/zabbix/files/2.2/zabbix_proxy.conf | 519 ---------------- |
31 |
net-analyzer/zabbix/files/2.2/zabbix_server.conf | 546 ----------------- |
32 |
net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd | 28 - |
33 |
net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy | 27 - |
34 |
net-analyzer/zabbix/files/3.0/init.d/zabbix-server | 26 - |
35 |
net-analyzer/zabbix/files/3.0/zabbix_agent.conf | 81 --- |
36 |
net-analyzer/zabbix/files/3.0/zabbix_agentd.conf | 390 ------------ |
37 |
net-analyzer/zabbix/files/3.0/zabbix_proxy.conf | 674 --------------------- |
38 |
net-analyzer/zabbix/files/3.0/zabbix_server.conf | 635 ------------------- |
39 |
.../zabbix/files/zabbix-3.0.30-mysql8.patch | 17 + |
40 |
.../zabbix-3.0.30-security-disable-PidFile.patch | 49 ++ |
41 |
...fix.patch => zabbix-4.0.18-modulepathfix.patch} | 0 |
42 |
.../zabbix-4.0.18-security-disable-PidFile.patch | 49 ++ |
43 |
net-analyzer/zabbix/files/zabbix-agentd.init | 20 + |
44 |
net-analyzer/zabbix/files/zabbix-agentd.service | 10 +- |
45 |
.../zabbix-jmx-proxy => zabbix-jmx-proxy.conf} | 0 |
46 |
.../zabbix-jmx-proxy => zabbix-jmx-proxy.init} | 0 |
47 |
net-analyzer/zabbix/files/zabbix-proxy.init | 20 + |
48 |
net-analyzer/zabbix/files/zabbix-proxy.service | 8 +- |
49 |
net-analyzer/zabbix/files/zabbix-server.init | 19 + |
50 |
net-analyzer/zabbix/files/zabbix-server.service | 11 +- |
51 |
net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild | 340 ----------- |
52 |
net-analyzer/zabbix/zabbix-3.0.28.ebuild | 330 ---------- |
53 |
.../{zabbix-3.4.15.ebuild => zabbix-3.0.30.ebuild} | 204 ++++--- |
54 |
net-analyzer/zabbix/zabbix-4.0.13.ebuild | 332 ---------- |
55 |
.../{zabbix-4.2.7.ebuild => zabbix-4.0.18.ebuild} | 207 ++++--- |
56 |
net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild | 333 ---------- |
57 |
.../{zabbix-4.4.5.ebuild => zabbix-4.4.6.ebuild} | 204 ++++--- |
58 |
36 files changed, 523 insertions(+), 5142 deletions(-) |
59 |
|
60 |
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest |
61 |
index 0ca440546b7..4f50f6f2d42 100644 |
62 |
--- a/net-analyzer/zabbix/Manifest |
63 |
+++ b/net-analyzer/zabbix/Manifest |
64 |
@@ -1,7 +1,3 @@ |
65 |
-DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1fd45ecfcf3cc2bdf7e625d54b0fcfa3690ce5d766e987d320d9ccbf7f430957f532c31f180a0a037334d6eb5b51a SHA512 5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd |
66 |
-DIST zabbix-3.0.28.tar.gz 14706285 BLAKE2B ef7f7e59e229847daa92d1bc4771cd0feb627adb914978b1213dbf93ee52d102dedff2a502dc076a6f13456e8808cca9b556b407af81c2af9e1141f973143d17 SHA512 e406c8e51319a05bdf70093f6b9ef47cbe9b276ff0969369b022a260e38f12acf43fb8e2e8295fafe55d2288853a522bdb6cb339f79cad74cb2233807eb27a46 |
67 |
-DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a SHA512 d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f |
68 |
-DIST zabbix-4.0.13.tar.gz 17150333 BLAKE2B fe4eaf999c0fbe4c87ca2bb621ce229480840f3e86de5e7b02d3668d5705046e62bf04f4f4ad75e814c1fa795642df3c0a9d1bfb07ef25c33003b12e0fe44c7b SHA512 150d28b1be88821be30ef1a9d74ac62e6939f556ef13e6acc6c99b915d36d1655d776aeb2399009285404724dfa41acf249b9047797890a954941831c8b5ecba |
69 |
-DIST zabbix-4.2.7.tar.gz 18286402 BLAKE2B 36fbd5938d6d188b29fb2e284a8b2ddec1e3cfda08517094e06fae6ccad9dea8027368f4a1a98cb49957caf0aee580df01a17f4aa19a98e746e2c1164db4b590 SHA512 92341e4efe721f043b66bdd382fc69bc408c4e0435a594fadf51989c37d8ecbd72ae0092517929b521527b41331f933310e9c14da42f18902ca54460170dddf9 |
70 |
-DIST zabbix-4.4.0.tar.gz 20689807 BLAKE2B 7be62a7b124a016a9f3ab5022b349452b1a99c9ef8cff8ba4b8278f7c48a7632d7f3e6677764fd778c44c05fdb86bbe2b066eb6a51f076274fffcbbd94202db4 SHA512 021e7454decb885065417f6f6a0ecc8a9d4f184f68da6ab4efea68280b3a0c0641eab05620ce14016b6e57ce32c44075e53b45f03e764e8726c00bfdd6039406 |
71 |
-DIST zabbix-4.4.5.tar.gz 19284769 BLAKE2B e0c7b99c48128a2379c46d2125497816d484afc1d0e2b8d6d7da5ca93a494346980af0dc90a7f63f7ea5719b7aec6baa658f060fbdfaaddf5102883c2590da1f SHA512 b7971f3c25270c5e35861a0db8e810d8ffe6c59ffc935fa2df5b1fd5d591d577db60e04673ca0a6f158dd126245a6ee4cd4e84a3637c447c9b6f68f77848f114 |
72 |
+DIST zabbix-3.0.30.tar.gz 14700686 BLAKE2B 9caa772c8dfdd53411bc996b8c97dce7c24853ea1049fe3cb71048c089105af5c7d1cf51071d91d1d2a98113181e9977a1ca3b4304e42a4a2f8bb0b87cd725b8 SHA512 6e60c9e5570aa69e1d52f005094eda1618aafc6d7ee831d4e5dc26f64b0691e2d9e494845fd36d22b049175776057fca28142da31d5e8e06d6c6f3e003bde3a3 |
73 |
+DIST zabbix-4.0.18.tar.gz 17200784 BLAKE2B 00c447459518d4c3a600e82f42f2ae14bcda6d8a933eb25a31fb00951f556355925e90960b76e273c2cc08a83b476e7c1a98b2e94aa4c23363fd639d4b199ac5 SHA512 c686611f60242cb2bef408bacbd71b7f3e88ad01b5ac9c34566c36812c9469c85c2388a9efd2ded5b329a3ffa7ec474845f2bac4e100e66b80078823c276cecb |
74 |
+DIST zabbix-4.4.6.tar.gz 19371211 BLAKE2B b63d946f360c529bfc32070e2907cdfada34ee3615c24c6a65ada7379e2ad65ff8e1d182ff9b59e11c844103cb608aafeab0f2bc6bb97fc1a31183214a6df01e SHA512 f9e84872f0210e497261462de95e9096391fc74bee6fd511087825fcfdd8f363003bd090e01a8a092a69ef1f01c4dd31d623f5321cf77dbced0bd337fb91682c |
75 |
|
76 |
diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd |
77 |
deleted file mode 100644 |
78 |
index 50db578f6b5..00000000000 |
79 |
--- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd |
80 |
+++ /dev/null |
81 |
@@ -1,28 +0,0 @@ |
82 |
-#!/sbin/openrc-run |
83 |
-# Copyright 1999-2013 Gentoo Foundation |
84 |
-# Distributed under the terms of the GNU General Public License v2 |
85 |
- |
86 |
-pid_file="/run/zabbix/zabbix_agentd.pid" |
87 |
- |
88 |
-depend() { |
89 |
- need net |
90 |
- provide zabbix-agent |
91 |
- use zabbix-server |
92 |
-} |
93 |
- |
94 |
-start_pre() { |
95 |
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix |
96 |
-} |
97 |
- |
98 |
-start() { |
99 |
- ebegin "Starting Zabbix agent" |
100 |
- start-stop-daemon --start --pidfile ${pid_file} \ |
101 |
- --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf |
102 |
- eend $? |
103 |
-} |
104 |
- |
105 |
-stop() { |
106 |
- ebegin "Stopping Zabbix agent" |
107 |
- start-stop-daemon --stop --pidfile ${pid_file} |
108 |
- eend $? |
109 |
-} |
110 |
|
111 |
diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy b/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy |
112 |
deleted file mode 100644 |
113 |
index 81bd4f3607a..00000000000 |
114 |
--- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy |
115 |
+++ /dev/null |
116 |
@@ -1,27 +0,0 @@ |
117 |
-#!/sbin/openrc-run |
118 |
-# Copyright 1999-2013 Gentoo Foundation |
119 |
-# Distributed under the terms of the GNU General Public License v2 |
120 |
- |
121 |
-pid_file="/run/zabbix/zabbix_proxy.pid" |
122 |
- |
123 |
-depend() { |
124 |
- need net |
125 |
- provide zabbix-proxy |
126 |
-} |
127 |
- |
128 |
-start_pre() { |
129 |
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix |
130 |
-} |
131 |
- |
132 |
-start() { |
133 |
- ebegin "Starting Zabbix proxy" |
134 |
- start-stop-daemon --start --pidfile ${pid_file} \ |
135 |
- --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf |
136 |
- eend $? |
137 |
-} |
138 |
- |
139 |
-stop() { |
140 |
- ebegin "Stopping Zabbix proxy" |
141 |
- start-stop-daemon --stop --pidfile ${pid_file} |
142 |
- eend $? |
143 |
-} |
144 |
|
145 |
diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-server b/net-analyzer/zabbix/files/2.2/init.d/zabbix-server |
146 |
deleted file mode 100644 |
147 |
index abc9002f464..00000000000 |
148 |
--- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-server |
149 |
+++ /dev/null |
150 |
@@ -1,26 +0,0 @@ |
151 |
-#!/sbin/openrc-run |
152 |
-# Copyright 1999-2013 Gentoo Foundation |
153 |
-# Distributed under the terms of the GNU General Public License v2 |
154 |
- |
155 |
-pid_file="/run/zabbix/zabbix_server.pid" |
156 |
- |
157 |
-depend() { |
158 |
- need net |
159 |
- use mysql postgresql |
160 |
-} |
161 |
-start_pre() { |
162 |
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix |
163 |
-} |
164 |
- |
165 |
-start() { |
166 |
- ebegin "Starting Zabbix server" |
167 |
- start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \ |
168 |
- --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf |
169 |
- eend $? |
170 |
-} |
171 |
- |
172 |
-stop() { |
173 |
- ebegin "Stopping Zabbix server" |
174 |
- start-stop-daemon --stop --pidfile ${pid_file} |
175 |
- eend $? |
176 |
-} |
177 |
|
178 |
diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch b/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch |
179 |
deleted file mode 100644 |
180 |
index 79bb92f4bae..00000000000 |
181 |
--- a/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch |
182 |
+++ /dev/null |
183 |
@@ -1,83 +0,0 @@ |
184 |
-Index: src/libs/zbxsysinfo/sysinfo.c |
185 |
-=================================================================== |
186 |
---- src/libs/zbxsysinfo/sysinfo.c (revision 40348) |
187 |
-+++ src/libs/zbxsysinfo/sysinfo.c (working copy) |
188 |
-@@ -427,13 +427,49 @@ |
189 |
- test_aliases(); |
190 |
- } |
191 |
- |
192 |
-+static int zbx_check_user_parameter(const char *param, char *error, int max_error_len) |
193 |
-+{ |
194 |
-+ const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@\n", *c; |
195 |
-+ char *buf = NULL; |
196 |
-+ size_t buf_alloc = 128, buf_offset = 0; |
197 |
-+ |
198 |
-+ if (0 != CONFIG_UNSAFE_USER_PARAMETERS) |
199 |
-+ return SUCCEED; |
200 |
-+ |
201 |
-+ for (c = suppressed_chars; '\0' != *c; c++) |
202 |
-+ { |
203 |
-+ if (NULL == strchr(param, *c)) |
204 |
-+ continue; |
205 |
-+ |
206 |
-+ buf = zbx_malloc(buf, buf_alloc); |
207 |
-+ |
208 |
-+ for (c = suppressed_chars; '\0' != *c; c++) |
209 |
-+ { |
210 |
-+ if (c != suppressed_chars) |
211 |
-+ zbx_strcpy_alloc(&buf, &buf_alloc, &buf_offset, ", "); |
212 |
-+ |
213 |
-+ if (0 != isprint(*c)) |
214 |
-+ zbx_chrcpy_alloc(&buf, &buf_alloc, &buf_offset, *c); |
215 |
-+ else |
216 |
-+ zbx_snprintf_alloc(&buf, &buf_alloc, &buf_offset, "0x%02x", *c); |
217 |
-+ } |
218 |
-+ |
219 |
-+ zbx_snprintf(error, max_error_len, "special characters \"%s\" are not allowed in the parameters", buf); |
220 |
-+ |
221 |
-+ zbx_free(buf); |
222 |
-+ |
223 |
-+ return FAIL; |
224 |
-+ } |
225 |
-+ |
226 |
-+ return SUCCEED; |
227 |
-+} |
228 |
-+ |
229 |
- static int replace_param(const char *cmd, const char *param, char *out, int outlen, char *error, int max_error_len) |
230 |
- { |
231 |
- int ret = SUCCEED; |
232 |
- char buf[MAX_STRING_LEN]; |
233 |
- char command[MAX_STRING_LEN]; |
234 |
- char *pl, *pr; |
235 |
-- const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@", *c; |
236 |
- |
237 |
- assert(out); |
238 |
- |
239 |
-@@ -465,25 +501,10 @@ |
240 |
- { |
241 |
- get_param(param, (int)(pr[1] - '0'), buf, sizeof(buf)); |
242 |
- |
243 |
-- if (0 == CONFIG_UNSAFE_USER_PARAMETERS) |
244 |
-- { |
245 |
-- for (c = suppressed_chars; '\0' != *c; c++) |
246 |
-- { |
247 |
-- if (NULL != strchr(buf, *c)) |
248 |
-- { |
249 |
-- zbx_snprintf(error, max_error_len, "Special characters '%s'" |
250 |
-- " are not allowed in the parameters", |
251 |
-- suppressed_chars); |
252 |
-- ret = FAIL; |
253 |
-- break; |
254 |
-- } |
255 |
-- } |
256 |
-- } |
257 |
-+ if (SUCCEED != (ret = zbx_check_user_parameter(buf, error, max_error_len))) |
258 |
-+ break; |
259 |
- } |
260 |
- |
261 |
-- if (FAIL == ret) |
262 |
-- break; |
263 |
-- |
264 |
- zbx_strlcat(out, buf, outlen); |
265 |
- outlen -= MIN((int)strlen(buf), (int)outlen); |
266 |
- |
267 |
|
268 |
diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch b/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch |
269 |
deleted file mode 100644 |
270 |
index 076e10ab75a..00000000000 |
271 |
--- a/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch |
272 |
+++ /dev/null |
273 |
@@ -1,53 +0,0 @@ |
274 |
-Index: frontends/php/include/defines.inc.php |
275 |
-=================================================================== |
276 |
---- frontends/php/include/defines.inc.php (revision 46596) |
277 |
-+++ frontends/php/include/defines.inc.php (revision 46655) |
278 |
-@@ -835,6 +835,14 @@ |
279 |
- |
280 |
- define('ZBX_DEFAULT_IMPORT_HOST_GROUP', 'Imported hosts'); |
281 |
- |
282 |
-+// XML import flags |
283 |
-+// See ZBX-8151. Old version of libxml suffered from setting DTDLOAD and NOENT flags by default, which allowed |
284 |
-+// performing XXE attacks. Calling libxml_disable_entity_loader(true) also had no affect if flags passed to libxml |
285 |
-+// calls were 0 - so for better security with legacy libxml we need to call libxml_disable_entity_loader(true) AND |
286 |
-+// pass the LIBXML_NONET flag. Please keep in mind that LIBXML_NOENT actually EXPANDS entities, opposite to it's name - |
287 |
-+// so this flag is not needed here. |
288 |
-+define('LIBXML_IMPORT_FLAGS', LIBXML_NONET); |
289 |
-+ |
290 |
- // API errors |
291 |
- define('ZBX_API_ERROR_INTERNAL', 111); |
292 |
- define('ZBX_API_ERROR_PARAMETERS', 100); |
293 |
-Index: frontends/php/include/classes/import/readers/CXmlImportReader.php |
294 |
-=================================================================== |
295 |
---- frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46596) |
296 |
-+++ frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46655) |
297 |
-@@ -32,7 +32,8 @@ |
298 |
- */ |
299 |
- public function read($string) { |
300 |
- libxml_use_internal_errors(true); |
301 |
-- $result = simplexml_load_string($string); |
302 |
-+ libxml_disable_entity_loader(true); |
303 |
-+ $result = simplexml_load_string($string, null, LIBXML_IMPORT_FLAGS); |
304 |
- if (!$result) { |
305 |
- $errors = libxml_get_errors(); |
306 |
- libxml_clear_errors(); |
307 |
-Index: frontends/php/include/classes/import/CXmlImport18.php |
308 |
-=================================================================== |
309 |
---- frontends/php/include/classes/import/CXmlImport18.php (revision 46596) |
310 |
-+++ frontends/php/include/classes/import/CXmlImport18.php (revision 46655) |
311 |
-@@ -390,12 +390,13 @@ |
312 |
- return $array; |
313 |
- } |
314 |
- |
315 |
-- public static function import($file) { |
316 |
-+ public static function import($source) { |
317 |
- |
318 |
- libxml_use_internal_errors(true); |
319 |
-+ libxml_disable_entity_loader(true); |
320 |
- |
321 |
- $xml = new DOMDocument(); |
322 |
-- if (!$xml->loadXML($file)) { |
323 |
-+ if (!$xml->loadXML($source, LIBXML_IMPORT_FLAGS)) { |
324 |
- $text = ''; |
325 |
- foreach (libxml_get_errors() as $error) { |
326 |
- switch ($error->level) { |
327 |
|
328 |
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agent.conf b/net-analyzer/zabbix/files/2.2/zabbix_agent.conf |
329 |
deleted file mode 100644 |
330 |
index dcb4b7248c2..00000000000 |
331 |
--- a/net-analyzer/zabbix/files/2.2/zabbix_agent.conf |
332 |
+++ /dev/null |
333 |
@@ -1,81 +0,0 @@ |
334 |
-# This is a config file for Zabbix internet service daemon agent |
335 |
-# To get more information about Zabbix visit http://www.zabbix.com |
336 |
- |
337 |
-### Option: Server |
338 |
-# IP address of Zabbix server |
339 |
-# Connections from other hosts will be denied |
340 |
-# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. |
341 |
-# |
342 |
-# Mandatory: yes |
343 |
-# Default: |
344 |
-# Server= |
345 |
- |
346 |
-Server=127.0.0.1 |
347 |
- |
348 |
-############ ADVANCED PARAMETERS ################# |
349 |
- |
350 |
-### Option: Alias |
351 |
-# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one. |
352 |
-# |
353 |
-# Mandatory: no |
354 |
-# Range: |
355 |
-# Default: |
356 |
- |
357 |
-### Option: Timeout |
358 |
-# Spend no more than Timeout seconds on processing |
359 |
-# |
360 |
-# Mandatory: no |
361 |
-# Range: 1-30 |
362 |
-# Default: |
363 |
-# Timeout=3 |
364 |
- |
365 |
-### Option: Include |
366 |
-# You may include individual files or all files in a directory in the configuration file. |
367 |
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. |
368 |
-# |
369 |
-# Mandatory: no |
370 |
-# Default: |
371 |
-# Include= |
372 |
- |
373 |
-# Include=/usr/local/etc/zabbix_agent.userparams.conf |
374 |
-# Include=/usr/local/etc/zabbix_agent.conf.d/ |
375 |
- |
376 |
-####### USER-DEFINED MONITORED PARAMETERS ####### |
377 |
- |
378 |
-### Option: UnsafeUserParameters |
379 |
-# Allow all characters to be passed in arguments to user-defined parameters. |
380 |
-# 0 - do not allow |
381 |
-# 1 - allow |
382 |
-# |
383 |
-# Mandatory: no |
384 |
-# Default: |
385 |
-# UnsafeUserParameters=0 |
386 |
- |
387 |
-### Option: UserParameter |
388 |
-# User-defined parameter to monitor. There can be several user-defined parameters. |
389 |
-# Format: UserParameter=<key>,<shell command> |
390 |
-# See 'zabbix_agentd' directory for examples. |
391 |
-# |
392 |
-# Mandatory: no |
393 |
-# Default: |
394 |
-# UserParameter= |
395 |
- |
396 |
-####### LOADABLE MODULES ####### |
397 |
- |
398 |
-### Option: LoadModulePath |
399 |
-# Full path to location of agent modules. |
400 |
-# Default depends on compilation options. |
401 |
-# |
402 |
-# Mandatory: no |
403 |
-# Default: |
404 |
-# LoadModulePath=${libdir}/modules |
405 |
- |
406 |
-### Option: LoadModule |
407 |
-# Module to load at agent startup. Modules are used to extend functionality of the agent. |
408 |
-# Format: LoadModule=<module.so> |
409 |
-# The modules must be located in directory specified by LoadModulePath. |
410 |
-# It is allowed to include multiple LoadModule parameters. |
411 |
-# |
412 |
-# Mandatory: no |
413 |
-# Default: |
414 |
-# LoadModule= |
415 |
|
416 |
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf b/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf |
417 |
deleted file mode 100644 |
418 |
index 4d49d3685e8..00000000000 |
419 |
--- a/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf |
420 |
+++ /dev/null |
421 |
@@ -1,278 +0,0 @@ |
422 |
-# This is a config file for the Zabbix agent daemon (Unix) |
423 |
-# To get more information about Zabbix, visit http://www.zabbix.com |
424 |
- |
425 |
-############ GENERAL PARAMETERS ################# |
426 |
- |
427 |
-### Option: PidFile |
428 |
-# Name of PID file. |
429 |
-# |
430 |
-# Mandatory: no |
431 |
-# Default: |
432 |
-PidFile=/run/zabbix/zabbix_agentd.pid |
433 |
- |
434 |
-### Option: LogFile |
435 |
-# Name of log file. |
436 |
-# If not set, syslog is used. |
437 |
-# |
438 |
-# Mandatory: no |
439 |
-# Default: |
440 |
-# LogFile= |
441 |
- |
442 |
-LogFile=/var/log/zabbix/zabbix_agentd.log |
443 |
- |
444 |
-### Option: LogFileSize |
445 |
-# Maximum size of log file in MB. |
446 |
-# 0 - disable automatic log rotation. |
447 |
-# |
448 |
-# Mandatory: no |
449 |
-# Range: 0-1024 |
450 |
-# Default: |
451 |
-LogFileSize=128 |
452 |
- |
453 |
-### Option: DebugLevel |
454 |
-# Specifies debug level |
455 |
-# 0 - no debug |
456 |
-# 1 - critical information |
457 |
-# 2 - error information |
458 |
-# 3 - warnings |
459 |
-# 4 - for debugging (produces lots of information) |
460 |
-# |
461 |
-# Mandatory: no |
462 |
-# Range: 0-4 |
463 |
-# Default: |
464 |
-# DebugLevel=3 |
465 |
- |
466 |
-### Option: SourceIP |
467 |
-# Source IP address for outgoing connections. |
468 |
-# |
469 |
-# Mandatory: no |
470 |
-# Default: |
471 |
-# SourceIP= |
472 |
- |
473 |
-### Option: EnableRemoteCommands |
474 |
-# Whether remote commands from Zabbix server are allowed. |
475 |
-# 0 - not allowed |
476 |
-# 1 - allowed |
477 |
-# |
478 |
-# Mandatory: no |
479 |
-# Default: |
480 |
-# EnableRemoteCommands=0 |
481 |
- |
482 |
-### Option: LogRemoteCommands |
483 |
-# Enable logging of executed shell commands as warnings. |
484 |
-# 0 - disabled |
485 |
-# 1 - enabled |
486 |
-# |
487 |
-# Mandatory: no |
488 |
-# Default: |
489 |
-# LogRemoteCommands=0 |
490 |
- |
491 |
-##### Passive checks related |
492 |
- |
493 |
-### Option: Server |
494 |
-# List of comma delimited IP addresses (or hostnames) of Zabbix servers. |
495 |
-# Incoming connections will be accepted only from the hosts listed here. |
496 |
-# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. |
497 |
-# |
498 |
-# Mandatory: no |
499 |
-# Default: |
500 |
-# Server= |
501 |
- |
502 |
-Server=127.0.0.1 |
503 |
- |
504 |
-### Option: ListenPort |
505 |
-# Agent will listen on this port for connections from the server. |
506 |
-# |
507 |
-# Mandatory: no |
508 |
-# Range: 1024-32767 |
509 |
-# Default: |
510 |
-# ListenPort=10050 |
511 |
- |
512 |
-### Option: ListenIP |
513 |
-# List of comma delimited IP addresses that the agent should listen on. |
514 |
-# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. |
515 |
-# |
516 |
-# Mandatory: no |
517 |
-# Default: |
518 |
-# ListenIP=0.0.0.0 |
519 |
- |
520 |
-### Option: StartAgents |
521 |
-# Number of pre-forked instances of zabbix_agentd that process passive checks. |
522 |
-# If set to 0, disables passive checks and the agent will not listen on any TCP port. |
523 |
-# |
524 |
-# Mandatory: no |
525 |
-# Range: 0-100 |
526 |
-# Default: |
527 |
-# StartAgents=3 |
528 |
- |
529 |
-##### Active checks related |
530 |
- |
531 |
-### Option: ServerActive |
532 |
-# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. |
533 |
-# If port is not specified, default port is used. |
534 |
-# IPv6 addresses must be enclosed in square brackets if port for that host is specified. |
535 |
-# If port is not specified, square brackets for IPv6 addresses are optional. |
536 |
-# If this parameter is not specified, active checks are disabled. |
537 |
-# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] |
538 |
-# |
539 |
-# Mandatory: no |
540 |
-# Default: |
541 |
-# ServerActive= |
542 |
- |
543 |
-ServerActive=127.0.0.1 |
544 |
- |
545 |
-### Option: Hostname |
546 |
-# Unique, case sensitive hostname. |
547 |
-# Required for active checks and must match hostname as configured on the server. |
548 |
-# Value is acquired from HostnameItem if undefined. |
549 |
-# |
550 |
-# Mandatory: no |
551 |
-# Default: |
552 |
-# Hostname= |
553 |
- |
554 |
-Hostname=Zabbix server |
555 |
- |
556 |
-### Option: HostnameItem |
557 |
-# Item used for generating Hostname if it is undefined. |
558 |
-# Ignored if Hostname is defined. |
559 |
-# |
560 |
-# Mandatory: no |
561 |
-# Default: |
562 |
-# HostnameItem=system.hostname |
563 |
- |
564 |
-### Option: HostMetadata |
565 |
-# Optional parameter that defines host metadata. |
566 |
-# Host metadata is used at host auto-registration process. |
567 |
-# An agent will issue an error and not start if the value is over limit of 255 characters. |
568 |
-# If not defined, value will be acquired from HostMetadataItem. |
569 |
-# |
570 |
-# Mandatory: no |
571 |
-# Range: 0-255 characters |
572 |
-# Default: |
573 |
-# HostMetadata= |
574 |
- |
575 |
-### Option: HostMetadataItem |
576 |
-# Optional parameter that defines an item used for getting host metadata. |
577 |
-# Host metadata is used at host auto-registration process. |
578 |
-# During an auto-registration request an agent will log a warning message if |
579 |
-# the value returned by specified item is over limit of 255 characters. |
580 |
-# This option is only used when HostMetadata is not defined. |
581 |
-# |
582 |
-# Mandatory: no |
583 |
-# Default: |
584 |
-# HostMetadataItem= |
585 |
- |
586 |
-### Option: RefreshActiveChecks |
587 |
-# How often list of active checks is refreshed, in seconds. |
588 |
-# |
589 |
-# Mandatory: no |
590 |
-# Range: 60-3600 |
591 |
-# Default: |
592 |
-# RefreshActiveChecks=120 |
593 |
- |
594 |
-### Option: BufferSend |
595 |
-# Do not keep data longer than N seconds in buffer. |
596 |
-# |
597 |
-# Mandatory: no |
598 |
-# Range: 1-3600 |
599 |
-# Default: |
600 |
-# BufferSend=5 |
601 |
- |
602 |
-### Option: BufferSize |
603 |
-# Maximum number of values in a memory buffer. The agent will send |
604 |
-# all collected data to Zabbix Server or Proxy if the buffer is full. |
605 |
-# |
606 |
-# Mandatory: no |
607 |
-# Range: 2-65535 |
608 |
-# Default: |
609 |
-# BufferSize=100 |
610 |
- |
611 |
-### Option: MaxLinesPerSecond |
612 |
-# Maximum number of new lines the agent will send per second to Zabbix Server |
613 |
-# or Proxy processing 'log' and 'logrt' active checks. |
614 |
-# The provided value will be overridden by the parameter 'maxlines', |
615 |
-# provided in 'log' or 'logrt' item keys. |
616 |
-# |
617 |
-# Mandatory: no |
618 |
-# Range: 1-1000 |
619 |
-# Default: |
620 |
-# MaxLinesPerSecond=100 |
621 |
- |
622 |
-############ ADVANCED PARAMETERS ################# |
623 |
- |
624 |
-### Option: Alias |
625 |
-# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one. |
626 |
-# |
627 |
-# Mandatory: no |
628 |
-# Range: |
629 |
-# Default: |
630 |
- |
631 |
-### Option: Timeout |
632 |
-# Spend no more than Timeout seconds on processing |
633 |
-# |
634 |
-# Mandatory: no |
635 |
-# Range: 1-30 |
636 |
-# Default: |
637 |
-# Timeout=3 |
638 |
- |
639 |
-### Option: AllowRoot |
640 |
-# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent |
641 |
-# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. |
642 |
-# 0 - do not allow |
643 |
-# 1 - allow |
644 |
-# |
645 |
-# Mandatory: no |
646 |
-# Default: |
647 |
-# AllowRoot=0 |
648 |
- |
649 |
-### Option: Include |
650 |
-# You may include individual files or all files in a directory in the configuration file. |
651 |
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. |
652 |
-# |
653 |
-# Mandatory: no |
654 |
-# Default: |
655 |
-# Include= |
656 |
- |
657 |
-# Include=/usr/local/etc/zabbix_agentd.userparams.conf |
658 |
-# Include=/usr/local/etc/zabbix_agentd.conf.d/ |
659 |
- |
660 |
-####### USER-DEFINED MONITORED PARAMETERS ####### |
661 |
- |
662 |
-### Option: UnsafeUserParameters |
663 |
-# Allow all characters to be passed in arguments to user-defined parameters. |
664 |
-# 0 - do not allow |
665 |
-# 1 - allow |
666 |
-# |
667 |
-# Mandatory: no |
668 |
-# Range: 0-1 |
669 |
-# Default: |
670 |
-# UnsafeUserParameters=0 |
671 |
- |
672 |
-### Option: UserParameter |
673 |
-# User-defined parameter to monitor. There can be several user-defined parameters. |
674 |
-# Format: UserParameter=<key>,<shell command> |
675 |
-# See 'zabbix_agentd' directory for examples. |
676 |
-# |
677 |
-# Mandatory: no |
678 |
-# Default: |
679 |
-# UserParameter= |
680 |
- |
681 |
-####### LOADABLE MODULES ####### |
682 |
- |
683 |
-### Option: LoadModulePath |
684 |
-# Full path to location of agent modules. |
685 |
-# Default depends on compilation options. |
686 |
-# |
687 |
-# Mandatory: no |
688 |
-# Default: |
689 |
-# LoadModulePath=${libdir}/modules |
690 |
- |
691 |
-### Option: LoadModule |
692 |
-# Module to load at agent startup. Modules are used to extend functionality of the agent. |
693 |
-# Format: LoadModule=<module.so> |
694 |
-# The modules must be located in directory specified by LoadModulePath. |
695 |
-# It is allowed to include multiple LoadModule parameters. |
696 |
-# |
697 |
-# Mandatory: no |
698 |
-# Default: |
699 |
-# LoadModule= |
700 |
|
701 |
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf b/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf |
702 |
deleted file mode 100644 |
703 |
index d4bae2ea962..00000000000 |
704 |
--- a/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf |
705 |
+++ /dev/null |
706 |
@@ -1,519 +0,0 @@ |
707 |
-# This is a configuration file for Zabbix Proxy process |
708 |
-# To get more information about Zabbix, |
709 |
-# visit http://www.zabbix.com |
710 |
- |
711 |
-############ GENERAL PARAMETERS ################# |
712 |
- |
713 |
-### Option: ProxyMode |
714 |
-# Proxy operating mode |
715 |
-# 0 - proxy in the active mode |
716 |
-# 1 - proxy in the passive mode |
717 |
-# |
718 |
-# Mandatory: no |
719 |
-# Default: |
720 |
-# ProxyMode=0 |
721 |
- |
722 |
-### Option: Server |
723 |
-# IP address (or hostname) of Zabbix server. |
724 |
-# Active proxy will get configuration data from the server. |
725 |
-# For a proxy in the passive mode this parameter will be ignored. |
726 |
-# |
727 |
-# Mandatory: yes (if ProxyMode is set to 0) |
728 |
-# Default: |
729 |
-# Server= |
730 |
- |
731 |
-Server=127.0.0.1 |
732 |
- |
733 |
-### Option: ServerPort |
734 |
-# Port of Zabbix trapper on Zabbix server. |
735 |
-# For a proxy in the passive mode this parameter will be ignored. |
736 |
-# |
737 |
-# Mandatory: no |
738 |
-# Range: 1024-32767 |
739 |
-# Default: |
740 |
-# ServerPort=10051 |
741 |
- |
742 |
-### Option: Hostname |
743 |
-# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server! |
744 |
-# Value is acquired from HostnameItem if undefined. |
745 |
-# |
746 |
-# Mandatory: no |
747 |
-# Default: |
748 |
-# Hostname= |
749 |
- |
750 |
-Hostname=Zabbix proxy |
751 |
- |
752 |
-### Option: HostnameItem |
753 |
-# Item used for generating Hostname if it is undefined. |
754 |
-# Ignored if Hostname is defined. |
755 |
-# |
756 |
-# Mandatory: no |
757 |
-# Default: |
758 |
-# HostnameItem=system.hostname |
759 |
- |
760 |
-### Option: ListenPort |
761 |
-# Listen port for trapper. |
762 |
-# |
763 |
-# Mandatory: no |
764 |
-# Range: 1024-32767 |
765 |
-# Default: |
766 |
-# ListenPort=10051 |
767 |
- |
768 |
-### Option: SourceIP |
769 |
-# Source IP address for outgoing connections. |
770 |
-# |
771 |
-# Mandatory: no |
772 |
-# Default: |
773 |
-# SourceIP= |
774 |
- |
775 |
-### Option: LogFile |
776 |
-# Name of log file. |
777 |
-# If not set, syslog is used. |
778 |
-# |
779 |
-# Mandatory: no |
780 |
-# Default: |
781 |
-# LogFile= |
782 |
- |
783 |
-LogFile=/var/log/zabbix/zabbix_proxy.log |
784 |
- |
785 |
-### Option: LogFileSize |
786 |
-# Maximum size of log file in MB. |
787 |
-# 0 - disable automatic log rotation. |
788 |
-# |
789 |
-# Mandatory: no |
790 |
-# Range: 0-1024 |
791 |
-# Default: |
792 |
-LogFileSize=128 |
793 |
- |
794 |
-### Option: DebugLevel |
795 |
-# Specifies debug level |
796 |
-# 0 - no debug |
797 |
-# 1 - critical information |
798 |
-# 2 - error information |
799 |
-# 3 - warnings |
800 |
-# 4 - for debugging (produces lots of information) |
801 |
-# |
802 |
-# Mandatory: no |
803 |
-# Range: 0-4 |
804 |
-# Default: |
805 |
-# DebugLevel=3 |
806 |
- |
807 |
-### Option: PidFile |
808 |
-# Name of PID file. |
809 |
-# |
810 |
-# Mandatory: no |
811 |
-# Default: |
812 |
-PidFile=/run/zabbix/zabbix_proxy.pid |
813 |
- |
814 |
-### Option: DBHost |
815 |
-# Database host name. |
816 |
-# If set to localhost, socket is used for MySQL. |
817 |
-# If set to empty string, socket is used for PostgreSQL. |
818 |
-# |
819 |
-# Mandatory: no |
820 |
-# Default: |
821 |
-# DBHost=localhost |
822 |
- |
823 |
-### Option: DBName |
824 |
-# Database name. |
825 |
-# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. |
826 |
-# Warning: do not attempt to use the same database Zabbix server is using. |
827 |
-# |
828 |
-# Mandatory: yes |
829 |
-# Default: |
830 |
-# DBName= |
831 |
- |
832 |
-DBName=zabbix_proxy |
833 |
- |
834 |
-### Option: DBSchema |
835 |
-# Schema name. Used for IBM DB2. |
836 |
-# |
837 |
-# Mandatory: no |
838 |
-# Default: |
839 |
-# DBSchema= |
840 |
- |
841 |
-### Option: DBUser |
842 |
-# Database user. Ignored for SQLite. |
843 |
-# |
844 |
-# Default: |
845 |
-# DBUser= |
846 |
- |
847 |
-DBUser=root |
848 |
- |
849 |
-### Option: DBPassword |
850 |
-# Database password. Ignored for SQLite. |
851 |
-# Comment this line if no password is used. |
852 |
-# |
853 |
-# Mandatory: no |
854 |
-# Default: |
855 |
-# DBPassword= |
856 |
- |
857 |
-### Option: DBSocket |
858 |
-# Path to MySQL socket. |
859 |
-# |
860 |
-# Mandatory: no |
861 |
-# Default: |
862 |
-# DBSocket=/tmp/mysql.sock |
863 |
- |
864 |
-# Option: DBPort |
865 |
-# Database port when not using local socket. Ignored for SQLite. |
866 |
-# |
867 |
-# Mandatory: no |
868 |
-# Default (for MySQL): |
869 |
-# DBPort=3306 |
870 |
- |
871 |
-######### PROXY SPECIFIC PARAMETERS ############# |
872 |
- |
873 |
-### Option: ProxyLocalBuffer |
874 |
-# Proxy will keep data locally for N hours, even if the data have already been synced with the server. |
875 |
-# This parameter may be used if local data will be used by third party applications. |
876 |
-# |
877 |
-# Mandatory: no |
878 |
-# Range: 0-720 |
879 |
-# Default: |
880 |
-# ProxyLocalBuffer=0 |
881 |
- |
882 |
-### Option: ProxyOfflineBuffer |
883 |
-# Proxy will keep data for N hours in case if no connectivity with Zabbix Server. |
884 |
-# Older data will be lost. |
885 |
-# |
886 |
-# Mandatory: no |
887 |
-# Range: 1-720 |
888 |
-# Default: |
889 |
-# ProxyOfflineBuffer=1 |
890 |
- |
891 |
-### Option: HeartbeatFrequency |
892 |
-# Frequency of heartbeat messages in seconds. |
893 |
-# Used for monitoring availability of Proxy on server side. |
894 |
-# 0 - heartbeat messages disabled. |
895 |
-# For a proxy in the passive mode this parameter will be ignored. |
896 |
-# |
897 |
-# Mandatory: no |
898 |
-# Range: 0-3600 |
899 |
-# Default: |
900 |
-# HeartbeatFrequency=60 |
901 |
- |
902 |
-### Option: ConfigFrequency |
903 |
-# How often proxy retrieves configuration data from Zabbix Server in seconds. |
904 |
-# For a proxy in the passive mode this parameter will be ignored. |
905 |
-# |
906 |
-# Mandatory: no |
907 |
-# Range: 1-3600*24*7 |
908 |
-# Default: |
909 |
-# ConfigFrequency=3600 |
910 |
- |
911 |
-### Option: DataSenderFrequency |
912 |
-# Proxy will send collected data to the Server every N seconds. |
913 |
-# For a proxy in the passive mode this parameter will be ignored. |
914 |
-# |
915 |
-# Mandatory: no |
916 |
-# Range: 1-3600 |
917 |
-# Default: |
918 |
-# DataSenderFrequency=1 |
919 |
- |
920 |
-############ ADVANCED PARAMETERS ################ |
921 |
- |
922 |
-### Option: StartPollers |
923 |
-# Number of pre-forked instances of pollers. |
924 |
-# |
925 |
-# Mandatory: no |
926 |
-# Range: 0-1000 |
927 |
-# Default: |
928 |
-# StartPollers=5 |
929 |
- |
930 |
-### Option: StartIPMIPollers |
931 |
-# Number of pre-forked instances of IPMI pollers. |
932 |
-# |
933 |
-# Mandatory: no |
934 |
-# Range: 0-1000 |
935 |
-# Default: |
936 |
-# StartIPMIPollers=0 |
937 |
- |
938 |
-### Option: StartPollersUnreachable |
939 |
-# Number of pre-forked instances of pollers for unreachable hosts (including IPMI). |
940 |
-# |
941 |
-# Mandatory: no |
942 |
-# Range: 0-1000 |
943 |
-# Default: |
944 |
-# StartPollersUnreachable=1 |
945 |
- |
946 |
-### Option: StartTrappers |
947 |
-# Number of pre-forked instances of trappers. |
948 |
-# Trappers accept incoming connections from Zabbix sender and active agents. |
949 |
-# |
950 |
-# Mandatory: no |
951 |
-# Range: 0-1000 |
952 |
-# Default: |
953 |
-# StartTrappers=5 |
954 |
- |
955 |
-### Option: StartPingers |
956 |
-# Number of pre-forked instances of ICMP pingers. |
957 |
-# |
958 |
-# Mandatory: no |
959 |
-# Range: 0-1000 |
960 |
-# Default: |
961 |
-# StartPingers=1 |
962 |
- |
963 |
-### Option: StartDiscoverers |
964 |
-# Number of pre-forked instances of discoverers. |
965 |
-# |
966 |
-# Mandatory: no |
967 |
-# Range: 0-250 |
968 |
-# Default: |
969 |
-# StartDiscoverers=1 |
970 |
- |
971 |
-### Option: StartHTTPPollers |
972 |
-# Number of pre-forked instances of HTTP pollers. |
973 |
-# |
974 |
-# Mandatory: no |
975 |
-# Range: 0-1000 |
976 |
-# Default: |
977 |
-# StartHTTPPollers=1 |
978 |
- |
979 |
-### Option: JavaGateway |
980 |
-# IP address (or hostname) of Zabbix Java gateway. |
981 |
-# Only required if Java pollers are started. |
982 |
-# |
983 |
-# Mandatory: no |
984 |
-# Default: |
985 |
-# JavaGateway= |
986 |
- |
987 |
-### Option: JavaGatewayPort |
988 |
-# Port that Zabbix Java gateway listens on. |
989 |
-# |
990 |
-# Mandatory: no |
991 |
-# Range: 1024-32767 |
992 |
-# Default: |
993 |
-# JavaGatewayPort=10052 |
994 |
- |
995 |
-### Option: StartJavaPollers |
996 |
-# Number of pre-forked instances of Java pollers. |
997 |
-# |
998 |
-# Mandatory: no |
999 |
-# Range: 0-1000 |
1000 |
-# Default: |
1001 |
-# StartJavaPollers=0 |
1002 |
- |
1003 |
-### Option: StartVMwareCollectors |
1004 |
-# Number of pre-forked vmware collector instances. |
1005 |
-# |
1006 |
-# Mandatory: no |
1007 |
-# Range: 0-250 |
1008 |
-# Default: |
1009 |
-# StartVMwareCollectors=0 |
1010 |
- |
1011 |
-### Option: VMwareFrequency |
1012 |
-# How often Zabbix will connect to VMware service to obtain a new data. |
1013 |
-# |
1014 |
-# Mandatory: no |
1015 |
-# Range: 10-86400 |
1016 |
-# Default: |
1017 |
-# VMwareFrequency=60 |
1018 |
- |
1019 |
-### Option: VMwareCacheSize |
1020 |
-# Size of VMware cache, in bytes. |
1021 |
-# Shared memory size for storing VMware data. |
1022 |
-# Only used if VMware collectors are started. |
1023 |
-# |
1024 |
-# Mandatory: no |
1025 |
-# Range: 256K-2G |
1026 |
-# Default: |
1027 |
-# VMwareCacheSize=8M |
1028 |
- |
1029 |
-### Option: SNMPTrapperFile |
1030 |
-# Temporary file used for passing data from SNMP trap daemon to the proxy. |
1031 |
-# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. |
1032 |
-# |
1033 |
-# Mandatory: no |
1034 |
-# Default: |
1035 |
-# SNMPTrapperFile=/tmp/zabbix_traps.tmp |
1036 |
- |
1037 |
-### Option: StartSNMPTrapper |
1038 |
-# If 1, SNMP trapper process is started. |
1039 |
-# |
1040 |
-# Mandatory: no |
1041 |
-# Range: 0-1 |
1042 |
-# Default: |
1043 |
-# StartSNMPTrapper=0 |
1044 |
- |
1045 |
-### Option: ListenIP |
1046 |
-# List of comma delimited IP addresses that the trapper should listen on. |
1047 |
-# Trapper will listen on all network interfaces if this parameter is missing. |
1048 |
-# |
1049 |
-# Mandatory: no |
1050 |
-# Default: |
1051 |
-# ListenIP=0.0.0.0 |
1052 |
- |
1053 |
-### Option: HousekeepingFrequency |
1054 |
-# How often Zabbix will perform housekeeping procedure (in hours). |
1055 |
-# Housekeeping is removing unnecessary information from history, alert, and alarms tables. |
1056 |
-# |
1057 |
-# Mandatory: no |
1058 |
-# Range: 1-24 |
1059 |
-# Default: |
1060 |
-# HousekeepingFrequency=1 |
1061 |
- |
1062 |
-### Option: CacheSize |
1063 |
-# Size of configuration cache, in bytes. |
1064 |
-# Shared memory size, for storing hosts and items data. |
1065 |
-# |
1066 |
-# Mandatory: no |
1067 |
-# Range: 128K-2G |
1068 |
-# Default: |
1069 |
-# CacheSize=8M |
1070 |
- |
1071 |
-### Option: StartDBSyncers |
1072 |
-# Number of pre-forked instances of DB Syncers |
1073 |
-# |
1074 |
-# Mandatory: no |
1075 |
-# Range: 1-100 |
1076 |
-# Default: |
1077 |
-# StartDBSyncers=4 |
1078 |
- |
1079 |
-### Option: HistoryCacheSize |
1080 |
-# Size of history cache, in bytes. |
1081 |
-# Shared memory size for storing history data. |
1082 |
-# |
1083 |
-# Mandatory: no |
1084 |
-# Range: 128K-2G |
1085 |
-# Default: |
1086 |
-# HistoryCacheSize=8M |
1087 |
- |
1088 |
-### Option: HistoryTextCacheSize |
1089 |
-# Size of text history cache, in bytes. |
1090 |
-# Shared memory size for storing character, text or log history data. |
1091 |
-# |
1092 |
-# Mandatory: no |
1093 |
-# Range: 128K-2G |
1094 |
-# Default: |
1095 |
-# HistoryTextCacheSize=16M |
1096 |
- |
1097 |
-### Option: Timeout |
1098 |
-# Specifies how long we wait for agent, SNMP device or external check (in seconds). |
1099 |
-# |
1100 |
-# Mandatory: no |
1101 |
-# Range: 1-30 |
1102 |
-# Default: |
1103 |
-# Timeout=3 |
1104 |
- |
1105 |
-### Option: TrapperTimeout |
1106 |
-# Specifies how many seconds trapper may spend processing new data. |
1107 |
-# |
1108 |
-# Mandatory: no |
1109 |
-# Range: 1-300 |
1110 |
-# Default: |
1111 |
-# TrapperTimeout=300 |
1112 |
- |
1113 |
-### Option: UnreachablePeriod |
1114 |
-# After how many seconds of unreachability treat a host as unavailable. |
1115 |
-# |
1116 |
-# Mandatory: no |
1117 |
-# Range: 1-3600 |
1118 |
-# Default: |
1119 |
-# UnreachablePeriod=45 |
1120 |
- |
1121 |
-### Option: UnavailableDelay |
1122 |
-# How often host is checked for availability during the unavailability period, in seconds. |
1123 |
-# |
1124 |
-# Mandatory: no |
1125 |
-# Range: 1-3600 |
1126 |
-# Default: |
1127 |
-# UnavailableDelay=60 |
1128 |
- |
1129 |
-### Option: UnreachableDelay |
1130 |
-# How often host is checked for availability during the unreachability period, in seconds. |
1131 |
-# |
1132 |
-# Mandatory: no |
1133 |
-# Range: 1-3600 |
1134 |
-# Default: |
1135 |
-# UnreachableDelay=15 |
1136 |
- |
1137 |
-### Option: ExternalScripts |
1138 |
-# Full path to location of external scripts. |
1139 |
-# Default depends on compilation options. |
1140 |
-# |
1141 |
-# Mandatory: no |
1142 |
-# Default: |
1143 |
-# ExternalScripts=${datadir}/zabbix/externalscripts |
1144 |
- |
1145 |
-### Option: FpingLocation |
1146 |
-# Location of fping. |
1147 |
-# Make sure that fping binary has root ownership and SUID flag set. |
1148 |
-# |
1149 |
-# Mandatory: no |
1150 |
-# Default: |
1151 |
-# FpingLocation=/usr/sbin/fping |
1152 |
- |
1153 |
-### Option: Fping6Location |
1154 |
-# Location of fping6. |
1155 |
-# Make sure that fping6 binary has root ownership and SUID flag set. |
1156 |
-# Make empty if your fping utility is capable to process IPv6 addresses. |
1157 |
-# |
1158 |
-# Mandatory: no |
1159 |
-# Default: |
1160 |
-# Fping6Location=/usr/sbin/fping6 |
1161 |
- |
1162 |
-### Option: SSHKeyLocation |
1163 |
-# Location of public and private keys for SSH checks and actions. |
1164 |
-# |
1165 |
-# Mandatory: no |
1166 |
-# Default: |
1167 |
-# SSHKeyLocation= |
1168 |
- |
1169 |
-### Option: LogSlowQueries |
1170 |
-# How long a database query may take before being logged (in milliseconds). |
1171 |
-# Only works if DebugLevel set to 3 or 4. |
1172 |
-# 0 - don't log slow queries. |
1173 |
-# |
1174 |
-# Mandatory: no |
1175 |
-# Range: 1-3600000 |
1176 |
-# Default: |
1177 |
-# LogSlowQueries=0 |
1178 |
- |
1179 |
-### Option: TmpDir |
1180 |
-# Temporary directory. |
1181 |
-# |
1182 |
-# Mandatory: no |
1183 |
-# Default: |
1184 |
-# TmpDir=/tmp |
1185 |
- |
1186 |
-### Option: AllowRoot |
1187 |
-# Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy |
1188 |
-# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. |
1189 |
-# 0 - do not allow |
1190 |
-# 1 - allow |
1191 |
-# |
1192 |
-# Mandatory: no |
1193 |
-# Default: |
1194 |
-# AllowRoot=0 |
1195 |
- |
1196 |
-### Option: Include |
1197 |
-# You may include individual files or all files in a directory in the configuration file. |
1198 |
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. |
1199 |
-# |
1200 |
-# Mandatory: no |
1201 |
-# Default: |
1202 |
-# Include= |
1203 |
- |
1204 |
-# Include=/usr/local/etc/zabbix_proxy.general.conf |
1205 |
-# Include=/usr/local/etc/zabbix_proxy.conf.d/ |
1206 |
- |
1207 |
-####### LOADABLE MODULES ####### |
1208 |
- |
1209 |
-### Option: LoadModulePath |
1210 |
-# Full path to location of proxy modules. |
1211 |
-# Default depends on compilation options. |
1212 |
-# |
1213 |
-# Mandatory: no |
1214 |
-# Default: |
1215 |
-# LoadModulePath=${libdir}/modules |
1216 |
- |
1217 |
-### Option: LoadModule |
1218 |
-# Module to load at proxy startup. Modules are used to extend functionality of the proxy. |
1219 |
-# Format: LoadModule=<module.so> |
1220 |
-# The modules must be located in directory specified by LoadModulePath. |
1221 |
-# It is allowed to include multiple LoadModule parameters. |
1222 |
-# |
1223 |
-# Mandatory: no |
1224 |
-# Default: |
1225 |
-# LoadModule= |
1226 |
|
1227 |
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_server.conf b/net-analyzer/zabbix/files/2.2/zabbix_server.conf |
1228 |
deleted file mode 100644 |
1229 |
index caba0190668..00000000000 |
1230 |
--- a/net-analyzer/zabbix/files/2.2/zabbix_server.conf |
1231 |
+++ /dev/null |
1232 |
@@ -1,546 +0,0 @@ |
1233 |
-# This is a configuration file for Zabbix Server process |
1234 |
-# To get more information about Zabbix, |
1235 |
-# visit http://www.zabbix.com |
1236 |
- |
1237 |
-############ GENERAL PARAMETERS ################# |
1238 |
- |
1239 |
-### Option: NodeID |
1240 |
-# Unique NodeID in distributed setup. |
1241 |
-# 0 - standalone server |
1242 |
-# |
1243 |
-# Mandatory: no |
1244 |
-# Range: 0-999 |
1245 |
-# Default: |
1246 |
-# NodeID=0 |
1247 |
- |
1248 |
-### Option: ListenPort |
1249 |
-# Listen port for trapper. |
1250 |
-# |
1251 |
-# Mandatory: no |
1252 |
-# Range: 1024-32767 |
1253 |
-# Default: |
1254 |
-# ListenPort=10051 |
1255 |
- |
1256 |
-### Option: SourceIP |
1257 |
-# Source IP address for outgoing connections. |
1258 |
-# |
1259 |
-# Mandatory: no |
1260 |
-# Default: |
1261 |
-# SourceIP= |
1262 |
- |
1263 |
-### Option: LogFile |
1264 |
-# Name of log file. |
1265 |
-# If not set, syslog is used. |
1266 |
-# |
1267 |
-# Mandatory: no |
1268 |
-# Default: |
1269 |
-# LogFile= |
1270 |
- |
1271 |
-LogFile=/var/log/zabbix/zabbix_server.log |
1272 |
- |
1273 |
-### Option: LogFileSize |
1274 |
-# Maximum size of log file in MB. |
1275 |
-# 0 - disable automatic log rotation. |
1276 |
-# |
1277 |
-# Mandatory: no |
1278 |
-# Range: 0-1024 |
1279 |
-# Default: |
1280 |
-LogFileSize=128 |
1281 |
- |
1282 |
-### Option: DebugLevel |
1283 |
-# Specifies debug level |
1284 |
-# 0 - no debug |
1285 |
-# 1 - critical information |
1286 |
-# 2 - error information |
1287 |
-# 3 - warnings |
1288 |
-# 4 - for debugging (produces lots of information) |
1289 |
-# |
1290 |
-# Mandatory: no |
1291 |
-# Range: 0-4 |
1292 |
-# Default: |
1293 |
-# DebugLevel=3 |
1294 |
- |
1295 |
-### Option: PidFile |
1296 |
-# Name of PID file. |
1297 |
-# |
1298 |
-# Mandatory: no |
1299 |
-# Default: |
1300 |
-PidFile=/run/zabbix/zabbix_server.pid |
1301 |
- |
1302 |
-### Option: DBHost |
1303 |
-# Database host name. |
1304 |
-# If set to localhost, socket is used for MySQL. |
1305 |
-# If set to empty string, socket is used for PostgreSQL. |
1306 |
-# |
1307 |
-# Mandatory: no |
1308 |
-# Default: |
1309 |
-# DBHost=localhost |
1310 |
- |
1311 |
-### Option: DBName |
1312 |
-# Database name. |
1313 |
-# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. |
1314 |
-# |
1315 |
-# Mandatory: yes |
1316 |
-# Default: |
1317 |
-# DBName= |
1318 |
- |
1319 |
-DBName=zabbix |
1320 |
- |
1321 |
-### Option: DBSchema |
1322 |
-# Schema name. Used for IBM DB2. |
1323 |
-# |
1324 |
-# Mandatory: no |
1325 |
-# Default: |
1326 |
-# DBSchema= |
1327 |
- |
1328 |
-### Option: DBUser |
1329 |
-# Database user. Ignored for SQLite. |
1330 |
-# |
1331 |
-# Mandatory: no |
1332 |
-# Default: |
1333 |
-# DBUser= |
1334 |
- |
1335 |
-DBUser=root |
1336 |
- |
1337 |
-### Option: DBPassword |
1338 |
-# Database password. Ignored for SQLite. |
1339 |
-# Comment this line if no password is used. |
1340 |
-# |
1341 |
-# Mandatory: no |
1342 |
-# Default: |
1343 |
-# DBPassword= |
1344 |
- |
1345 |
-### Option: DBSocket |
1346 |
-# Path to MySQL socket. |
1347 |
-# |
1348 |
-# Mandatory: no |
1349 |
-# Default: |
1350 |
-# DBSocket=/tmp/mysql.sock |
1351 |
- |
1352 |
-### Option: DBPort |
1353 |
-# Database port when not using local socket. Ignored for SQLite. |
1354 |
-# |
1355 |
-# Mandatory: no |
1356 |
-# Range: 1024-65535 |
1357 |
-# Default (for MySQL): |
1358 |
-# DBPort=3306 |
1359 |
- |
1360 |
-############ ADVANCED PARAMETERS ################ |
1361 |
- |
1362 |
-### Option: StartPollers |
1363 |
-# Number of pre-forked instances of pollers. |
1364 |
-# |
1365 |
-# Mandatory: no |
1366 |
-# Range: 0-1000 |
1367 |
-# Default: |
1368 |
-# StartPollers=5 |
1369 |
- |
1370 |
-### Option: StartIPMIPollers |
1371 |
-# Number of pre-forked instances of IPMI pollers. |
1372 |
-# |
1373 |
-# Mandatory: no |
1374 |
-# Range: 0-1000 |
1375 |
-# Default: |
1376 |
-# StartIPMIPollers=0 |
1377 |
- |
1378 |
-### Option: StartPollersUnreachable |
1379 |
-# Number of pre-forked instances of pollers for unreachable hosts (including IPMI). |
1380 |
-# |
1381 |
-# Mandatory: no |
1382 |
-# Range: 0-1000 |
1383 |
-# Default: |
1384 |
-# StartPollersUnreachable=1 |
1385 |
- |
1386 |
-### Option: StartTrappers |
1387 |
-# Number of pre-forked instances of trappers. |
1388 |
-# Trappers accept incoming connections from Zabbix sender, active agents, active proxies and child nodes. |
1389 |
-# At least one trapper process must be running to display server availability in the frontend. |
1390 |
-# |
1391 |
-# Mandatory: no |
1392 |
-# Range: 0-1000 |
1393 |
-# Default: |
1394 |
-# StartTrappers=5 |
1395 |
- |
1396 |
-### Option: StartPingers |
1397 |
-# Number of pre-forked instances of ICMP pingers. |
1398 |
-# |
1399 |
-# Mandatory: no |
1400 |
-# Range: 0-1000 |
1401 |
-# Default: |
1402 |
-# StartPingers=1 |
1403 |
- |
1404 |
-### Option: StartDiscoverers |
1405 |
-# Number of pre-forked instances of discoverers. |
1406 |
-# |
1407 |
-# Mandatory: no |
1408 |
-# Range: 0-250 |
1409 |
-# Default: |
1410 |
-# StartDiscoverers=1 |
1411 |
- |
1412 |
-### Option: StartHTTPPollers |
1413 |
-# Number of pre-forked instances of HTTP pollers. |
1414 |
-# |
1415 |
-# Mandatory: no |
1416 |
-# Range: 0-1000 |
1417 |
-# Default: |
1418 |
-# StartHTTPPollers=1 |
1419 |
- |
1420 |
-### Option: StartTimers |
1421 |
-# Number of pre-forked instances of timers. |
1422 |
-# Timers process time-based trigger functions and maintenance periods. |
1423 |
-# Only the first timer process handles the maintenance periods. |
1424 |
-# |
1425 |
-# Mandatory: no |
1426 |
-# Range: 1-1000 |
1427 |
-# Default: |
1428 |
-# StartTimers=1 |
1429 |
- |
1430 |
-### Option: JavaGateway |
1431 |
-# IP address (or hostname) of Zabbix Java gateway. |
1432 |
-# Only required if Java pollers are started. |
1433 |
-# |
1434 |
-# Mandatory: no |
1435 |
-# Default: |
1436 |
-# JavaGateway= |
1437 |
- |
1438 |
-### Option: JavaGatewayPort |
1439 |
-# Port that Zabbix Java gateway listens on. |
1440 |
-# |
1441 |
-# Mandatory: no |
1442 |
-# Range: 1024-32767 |
1443 |
-# Default: |
1444 |
-# JavaGatewayPort=10052 |
1445 |
- |
1446 |
-### Option: StartJavaPollers |
1447 |
-# Number of pre-forked instances of Java pollers. |
1448 |
-# |
1449 |
-# Mandatory: no |
1450 |
-# Range: 0-1000 |
1451 |
-# Default: |
1452 |
-# StartJavaPollers=0 |
1453 |
- |
1454 |
-### Option: StartVMwareCollectors |
1455 |
-# Number of pre-forked vmware collector instances. |
1456 |
-# |
1457 |
-# Mandatory: no |
1458 |
-# Range: 0-250 |
1459 |
-# Default: |
1460 |
-# StartVMwareCollectors=0 |
1461 |
- |
1462 |
-### Option: VMwareFrequency |
1463 |
-# How often Zabbix will connect to VMware service to obtain a new data. |
1464 |
-# |
1465 |
-# Mandatory: no |
1466 |
-# Range: 10-86400 |
1467 |
-# Default: |
1468 |
-# VMwareFrequency=60 |
1469 |
- |
1470 |
-### Option: VMwareCacheSize |
1471 |
-# Size of VMware cache, in bytes. |
1472 |
-# Shared memory size for storing VMware data. |
1473 |
-# Only used if VMware collectors are started. |
1474 |
-# |
1475 |
-# Mandatory: no |
1476 |
-# Range: 256K-2G |
1477 |
-# Default: |
1478 |
-# VMwareCacheSize=8M |
1479 |
- |
1480 |
-### Option: SNMPTrapperFile |
1481 |
-# Temporary file used for passing data from SNMP trap daemon to the server. |
1482 |
-# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. |
1483 |
-# |
1484 |
-# Mandatory: no |
1485 |
-# Default: |
1486 |
-# SNMPTrapperFile=/tmp/zabbix_traps.tmp |
1487 |
- |
1488 |
-### Option: StartSNMPTrapper |
1489 |
-# If 1, SNMP trapper process is started. |
1490 |
-# |
1491 |
-# Mandatory: no |
1492 |
-# Range: 0-1 |
1493 |
-# Default: |
1494 |
-# StartSNMPTrapper=0 |
1495 |
- |
1496 |
-### Option: ListenIP |
1497 |
-# List of comma delimited IP addresses that the trapper should listen on. |
1498 |
-# Trapper will listen on all network interfaces if this parameter is missing. |
1499 |
-# |
1500 |
-# Mandatory: no |
1501 |
-# Default: |
1502 |
-# ListenIP=0.0.0.0 |
1503 |
- |
1504 |
-# ListenIP=127.0.0.1 |
1505 |
- |
1506 |
-### Option: HousekeepingFrequency |
1507 |
-# How often Zabbix will perform housekeeping procedure (in hours). |
1508 |
-# Housekeeping is removing unnecessary information from history, alert, and alarms tables. |
1509 |
-# |
1510 |
-# Mandatory: no |
1511 |
-# Range: 1-24 |
1512 |
-# Default: |
1513 |
-# HousekeepingFrequency=1 |
1514 |
- |
1515 |
-### Option: MaxHousekeeperDelete |
1516 |
-# The table "housekeeper" contains "tasks" for housekeeping procedure in the format: |
1517 |
-# [housekeeperid], [tablename], [field], [value]. |
1518 |
-# No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value]) |
1519 |
-# will be deleted per one task in one housekeeping cycle. |
1520 |
-# SQLite3 does not use this parameter, deletes all corresponding rows without a limit. |
1521 |
-# If set to 0 then no limit is used at all. In this case you must know what you are doing! |
1522 |
-# |
1523 |
-# Mandatory: no |
1524 |
-# Range: 0-1000000 |
1525 |
-# Default: |
1526 |
-# MaxHousekeeperDelete=500 |
1527 |
- |
1528 |
-### Option: SenderFrequency |
1529 |
-# How often Zabbix will try to send unsent alerts (in seconds). |
1530 |
-# |
1531 |
-# Mandatory: no |
1532 |
-# Range: 5-3600 |
1533 |
-# Default: |
1534 |
-# SenderFrequency=30 |
1535 |
- |
1536 |
-### Option: CacheSize |
1537 |
-# Size of configuration cache, in bytes. |
1538 |
-# Shared memory size for storing host, item and trigger data. |
1539 |
-# |
1540 |
-# Mandatory: no |
1541 |
-# Range: 128K-2G |
1542 |
-# Default: |
1543 |
-# CacheSize=8M |
1544 |
- |
1545 |
-### Option: CacheUpdateFrequency |
1546 |
-# How often Zabbix will perform update of configuration cache, in seconds. |
1547 |
-# |
1548 |
-# Mandatory: no |
1549 |
-# Range: 1-3600 |
1550 |
-# Default: |
1551 |
-# CacheUpdateFrequency=60 |
1552 |
- |
1553 |
-### Option: StartDBSyncers |
1554 |
-# Number of pre-forked instances of DB Syncers |
1555 |
-# |
1556 |
-# Mandatory: no |
1557 |
-# Range: 1-100 |
1558 |
-# Default: |
1559 |
-# StartDBSyncers=4 |
1560 |
- |
1561 |
-### Option: HistoryCacheSize |
1562 |
-# Size of history cache, in bytes. |
1563 |
-# Shared memory size for storing history data. |
1564 |
-# |
1565 |
-# Mandatory: no |
1566 |
-# Range: 128K-2G |
1567 |
-# Default: |
1568 |
-# HistoryCacheSize=8M |
1569 |
- |
1570 |
-### Option: TrendCacheSize |
1571 |
-# Size of trend cache, in bytes. |
1572 |
-# Shared memory size for storing trends data. |
1573 |
-# |
1574 |
-# Mandatory: no |
1575 |
-# Range: 128K-2G |
1576 |
-# Default: |
1577 |
-# TrendCacheSize=4M |
1578 |
- |
1579 |
-### Option: HistoryTextCacheSize |
1580 |
-# Size of text history cache, in bytes. |
1581 |
-# Shared memory size for storing character, text or log history data. |
1582 |
-# |
1583 |
-# Mandatory: no |
1584 |
-# Range: 128K-2G |
1585 |
-# Default: |
1586 |
-# HistoryTextCacheSize=16M |
1587 |
- |
1588 |
-### Option: ValueCacheSize |
1589 |
-# Size of history value cache, in bytes. |
1590 |
-# Shared memory size for caching item history data requests |
1591 |
-# Setting to 0 disables value cache. |
1592 |
-# |
1593 |
-# Mandatory: no |
1594 |
-# Range: 0,128K-64G |
1595 |
-# Default: |
1596 |
-# ValueCacheSize=8M |
1597 |
- |
1598 |
-### Option: NodeNoEvents |
1599 |
-# If set to '1' local events won't be sent to master node. |
1600 |
-# This won't impact ability of this node to propagate events from its child nodes. |
1601 |
-# |
1602 |
-# Mandatory: no |
1603 |
-# Range: 0-1 |
1604 |
-# Default: |
1605 |
-# NodeNoEvents=0 |
1606 |
- |
1607 |
-### Option: NodeNoHistory |
1608 |
-# If set to '1' local history won't be sent to master node. |
1609 |
-# This won't impact ability of this node to propagate history from its child nodes. |
1610 |
-# |
1611 |
-# Mandatory: no |
1612 |
-# Range: 0-1 |
1613 |
-# Default: |
1614 |
-# NodeNoHistory=0 |
1615 |
- |
1616 |
-### Option: Timeout |
1617 |
-# Specifies how long we wait for agent, SNMP device or external check (in seconds). |
1618 |
-# |
1619 |
-# Mandatory: no |
1620 |
-# Range: 1-30 |
1621 |
-# Default: |
1622 |
-# Timeout=3 |
1623 |
- |
1624 |
-### Option: TrapperTimeout |
1625 |
-# Specifies how many seconds trapper may spend processing new data. |
1626 |
-# |
1627 |
-# Mandatory: no |
1628 |
-# Range: 1-300 |
1629 |
-# Default: |
1630 |
-# TrapperTimeout=300 |
1631 |
- |
1632 |
-### Option: UnreachablePeriod |
1633 |
-# After how many seconds of unreachability treat a host as unavailable. |
1634 |
-# |
1635 |
-# Mandatory: no |
1636 |
-# Range: 1-3600 |
1637 |
-# Default: |
1638 |
-# UnreachablePeriod=45 |
1639 |
- |
1640 |
-### Option: UnavailableDelay |
1641 |
-# How often host is checked for availability during the unavailability period, in seconds. |
1642 |
-# |
1643 |
-# Mandatory: no |
1644 |
-# Range: 1-3600 |
1645 |
-# Default: |
1646 |
-# UnavailableDelay=60 |
1647 |
- |
1648 |
-### Option: UnreachableDelay |
1649 |
-# How often host is checked for availability during the unreachability period, in seconds. |
1650 |
-# |
1651 |
-# Mandatory: no |
1652 |
-# Range: 1-3600 |
1653 |
-# Default: |
1654 |
-# UnreachableDelay=15 |
1655 |
- |
1656 |
-### Option: AlertScriptsPath |
1657 |
-# Full path to location of custom alert scripts. |
1658 |
-# Default depends on compilation options. |
1659 |
-# |
1660 |
-# Mandatory: no |
1661 |
-# Default: |
1662 |
-AlertScriptsPath=/var/lib/zabbix/alertscripts |
1663 |
- |
1664 |
-### Option: ExternalScripts |
1665 |
-# Full path to location of external scripts. |
1666 |
-# Default depends on compilation options. |
1667 |
-# |
1668 |
-# Mandatory: no |
1669 |
-# Default: |
1670 |
-ExternalScripts=/var/lib/zabbix/externalscripts |
1671 |
- |
1672 |
-### Option: FpingLocation |
1673 |
-# Location of fping. |
1674 |
-# Make sure that fping binary has root ownership and SUID flag set. |
1675 |
-# |
1676 |
-# Mandatory: no |
1677 |
-# Default: |
1678 |
-# FpingLocation=/usr/sbin/fping |
1679 |
- |
1680 |
-### Option: Fping6Location |
1681 |
-# Location of fping6. |
1682 |
-# Make sure that fping6 binary has root ownership and SUID flag set. |
1683 |
-# Make empty if your fping utility is capable to process IPv6 addresses. |
1684 |
-# |
1685 |
-# Mandatory: no |
1686 |
-# Default: |
1687 |
-# Fping6Location=/usr/sbin/fping6 |
1688 |
- |
1689 |
-### Option: SSHKeyLocation |
1690 |
-# Location of public and private keys for SSH checks and actions. |
1691 |
-# |
1692 |
-# Mandatory: no |
1693 |
-# Default: |
1694 |
-# SSHKeyLocation= |
1695 |
- |
1696 |
-### Option: LogSlowQueries |
1697 |
-# How long a database query may take before being logged (in milliseconds). |
1698 |
-# Only works if DebugLevel set to 3 or 4. |
1699 |
-# 0 - don't log slow queries. |
1700 |
-# |
1701 |
-# Mandatory: no |
1702 |
-# Range: 1-3600000 |
1703 |
-# Default: |
1704 |
-# LogSlowQueries=0 |
1705 |
- |
1706 |
-### Option: TmpDir |
1707 |
-# Temporary directory. |
1708 |
-# |
1709 |
-# Mandatory: no |
1710 |
-# Default: |
1711 |
-# TmpDir=/tmp |
1712 |
- |
1713 |
-### Option: StartProxyPollers |
1714 |
-# Number of pre-forked instances of pollers for passive proxies. |
1715 |
-# |
1716 |
-# Mandatory: no |
1717 |
-# Range: 0-250 |
1718 |
-# Default: |
1719 |
-# StartProxyPollers=1 |
1720 |
- |
1721 |
-### Option: ProxyConfigFrequency |
1722 |
-# How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds. |
1723 |
-# This parameter is used only for proxies in the passive mode. |
1724 |
-# |
1725 |
-# Mandatory: no |
1726 |
-# Range: 1-3600*24*7 |
1727 |
-# Default: |
1728 |
-# ProxyConfigFrequency=3600 |
1729 |
- |
1730 |
-### Option: ProxyDataFrequency |
1731 |
-# How often Zabbix Server requests history data from a Zabbix Proxy in seconds. |
1732 |
-# This parameter is used only for proxies in the passive mode. |
1733 |
-# |
1734 |
-# Mandatory: no |
1735 |
-# Range: 1-3600 |
1736 |
-# Default: |
1737 |
-# ProxyDataFrequency=1 |
1738 |
- |
1739 |
-### Option: AllowRoot |
1740 |
-# Allow the server to run as 'root'. If disabled and the server is started by 'root', the server |
1741 |
-# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. |
1742 |
-# 0 - do not allow |
1743 |
-# 1 - allow |
1744 |
-# |
1745 |
-# Mandatory: no |
1746 |
-# Default: |
1747 |
-# AllowRoot=0 |
1748 |
- |
1749 |
-### Option: Include |
1750 |
-# You may include individual files or all files in a directory in the configuration file. |
1751 |
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. |
1752 |
-# |
1753 |
-# Mandatory: no |
1754 |
-# Default: |
1755 |
-# Include= |
1756 |
- |
1757 |
-# Include=/usr/local/etc/zabbix_server.general.conf |
1758 |
-#Include=/etc/zabbix/zabbix_server.conf.d/ |
1759 |
- |
1760 |
-####### LOADABLE MODULES ####### |
1761 |
- |
1762 |
-### Option: LoadModulePath |
1763 |
-# Full path to location of server modules. |
1764 |
-# Default depends on compilation options. |
1765 |
-# |
1766 |
-# Mandatory: no |
1767 |
-# Default: |
1768 |
-# LoadModulePath=${libdir}/modules |
1769 |
- |
1770 |
-### Option: LoadModule |
1771 |
-# Module to load at server startup. Modules are used to extend functionality of the server. |
1772 |
-# Format: LoadModule=<module.so> |
1773 |
-# The modules must be located in directory specified by LoadModulePath. |
1774 |
-# It is allowed to include multiple LoadModule parameters. |
1775 |
-# |
1776 |
-# Mandatory: no |
1777 |
-# Default: |
1778 |
-# LoadModule= |
1779 |
|
1780 |
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd |
1781 |
deleted file mode 100755 |
1782 |
index d803d4450ca..00000000000 |
1783 |
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd |
1784 |
+++ /dev/null |
1785 |
@@ -1,28 +0,0 @@ |
1786 |
-#!/sbin/openrc-run |
1787 |
-# Copyright 1999-2018 Gentoo Authors |
1788 |
-# Distributed under the terms of the GNU General Public License v2 |
1789 |
- |
1790 |
-pid_file="/run/zabbix/zabbix_agentd.pid" |
1791 |
- |
1792 |
-depend() { |
1793 |
- need net |
1794 |
- provide zabbix-agent |
1795 |
- use zabbix-server |
1796 |
-} |
1797 |
- |
1798 |
-start_pre() { |
1799 |
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix |
1800 |
-} |
1801 |
- |
1802 |
-start() { |
1803 |
- ebegin "Starting Zabbix agent" |
1804 |
- start-stop-daemon --start --pidfile ${pid_file} \ |
1805 |
- --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf |
1806 |
- eend $? |
1807 |
-} |
1808 |
- |
1809 |
-stop() { |
1810 |
- ebegin "Stopping Zabbix agent" |
1811 |
- start-stop-daemon --stop --pidfile ${pid_file} |
1812 |
- eend $? |
1813 |
-} |
1814 |
|
1815 |
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy b/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy |
1816 |
deleted file mode 100755 |
1817 |
index 6aa1793435c..00000000000 |
1818 |
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy |
1819 |
+++ /dev/null |
1820 |
@@ -1,27 +0,0 @@ |
1821 |
-#!/sbin/openrc-run |
1822 |
-# Copyright 1999-2018 Gentoo Authors |
1823 |
-# Distributed under the terms of the GNU General Public License v2 |
1824 |
- |
1825 |
-pid_file="/run/zabbix/zabbix_proxy.pid" |
1826 |
- |
1827 |
-depend() { |
1828 |
- need net |
1829 |
- provide zabbix-proxy |
1830 |
-} |
1831 |
- |
1832 |
-start_pre() { |
1833 |
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix |
1834 |
-} |
1835 |
- |
1836 |
-start() { |
1837 |
- ebegin "Starting Zabbix proxy" |
1838 |
- start-stop-daemon --start --pidfile ${pid_file} \ |
1839 |
- --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf |
1840 |
- eend $? |
1841 |
-} |
1842 |
- |
1843 |
-stop() { |
1844 |
- ebegin "Stopping Zabbix proxy" |
1845 |
- start-stop-daemon --stop --pidfile ${pid_file} |
1846 |
- eend $? |
1847 |
-} |
1848 |
|
1849 |
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server b/net-analyzer/zabbix/files/3.0/init.d/zabbix-server |
1850 |
deleted file mode 100755 |
1851 |
index 109c6545d45..00000000000 |
1852 |
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server |
1853 |
+++ /dev/null |
1854 |
@@ -1,26 +0,0 @@ |
1855 |
-#!/sbin/openrc-run |
1856 |
-# Copyright 1999-2018 Gentoo Authors |
1857 |
-# Distributed under the terms of the GNU General Public License v2 |
1858 |
- |
1859 |
-pid_file="/run/zabbix/zabbix_server.pid" |
1860 |
- |
1861 |
-depend() { |
1862 |
- need net |
1863 |
- use mysql postgresql |
1864 |
-} |
1865 |
-start_pre() { |
1866 |
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix |
1867 |
-} |
1868 |
- |
1869 |
-start() { |
1870 |
- ebegin "Starting Zabbix server" |
1871 |
- start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \ |
1872 |
- --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf |
1873 |
- eend $? |
1874 |
-} |
1875 |
- |
1876 |
-stop() { |
1877 |
- ebegin "Stopping Zabbix server" |
1878 |
- start-stop-daemon --stop --pidfile ${pid_file} |
1879 |
- eend $? |
1880 |
-} |
1881 |
|
1882 |
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_agent.conf b/net-analyzer/zabbix/files/3.0/zabbix_agent.conf |
1883 |
deleted file mode 100644 |
1884 |
index dcb4b7248c2..00000000000 |
1885 |
--- a/net-analyzer/zabbix/files/3.0/zabbix_agent.conf |
1886 |
+++ /dev/null |
1887 |
@@ -1,81 +0,0 @@ |
1888 |
-# This is a config file for Zabbix internet service daemon agent |
1889 |
-# To get more information about Zabbix visit http://www.zabbix.com |
1890 |
- |
1891 |
-### Option: Server |
1892 |
-# IP address of Zabbix server |
1893 |
-# Connections from other hosts will be denied |
1894 |
-# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. |
1895 |
-# |
1896 |
-# Mandatory: yes |
1897 |
-# Default: |
1898 |
-# Server= |
1899 |
- |
1900 |
-Server=127.0.0.1 |
1901 |
- |
1902 |
-############ ADVANCED PARAMETERS ################# |
1903 |
- |
1904 |
-### Option: Alias |
1905 |
-# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one. |
1906 |
-# |
1907 |
-# Mandatory: no |
1908 |
-# Range: |
1909 |
-# Default: |
1910 |
- |
1911 |
-### Option: Timeout |
1912 |
-# Spend no more than Timeout seconds on processing |
1913 |
-# |
1914 |
-# Mandatory: no |
1915 |
-# Range: 1-30 |
1916 |
-# Default: |
1917 |
-# Timeout=3 |
1918 |
- |
1919 |
-### Option: Include |
1920 |
-# You may include individual files or all files in a directory in the configuration file. |
1921 |
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. |
1922 |
-# |
1923 |
-# Mandatory: no |
1924 |
-# Default: |
1925 |
-# Include= |
1926 |
- |
1927 |
-# Include=/usr/local/etc/zabbix_agent.userparams.conf |
1928 |
-# Include=/usr/local/etc/zabbix_agent.conf.d/ |
1929 |
- |
1930 |
-####### USER-DEFINED MONITORED PARAMETERS ####### |
1931 |
- |
1932 |
-### Option: UnsafeUserParameters |
1933 |
-# Allow all characters to be passed in arguments to user-defined parameters. |
1934 |
-# 0 - do not allow |
1935 |
-# 1 - allow |
1936 |
-# |
1937 |
-# Mandatory: no |
1938 |
-# Default: |
1939 |
-# UnsafeUserParameters=0 |
1940 |
- |
1941 |
-### Option: UserParameter |
1942 |
-# User-defined parameter to monitor. There can be several user-defined parameters. |
1943 |
-# Format: UserParameter=<key>,<shell command> |
1944 |
-# See 'zabbix_agentd' directory for examples. |
1945 |
-# |
1946 |
-# Mandatory: no |
1947 |
-# Default: |
1948 |
-# UserParameter= |
1949 |
- |
1950 |
-####### LOADABLE MODULES ####### |
1951 |
- |
1952 |
-### Option: LoadModulePath |
1953 |
-# Full path to location of agent modules. |
1954 |
-# Default depends on compilation options. |
1955 |
-# |
1956 |
-# Mandatory: no |
1957 |
-# Default: |
1958 |
-# LoadModulePath=${libdir}/modules |
1959 |
- |
1960 |
-### Option: LoadModule |
1961 |
-# Module to load at agent startup. Modules are used to extend functionality of the agent. |
1962 |
-# Format: LoadModule=<module.so> |
1963 |
-# The modules must be located in directory specified by LoadModulePath. |
1964 |
-# It is allowed to include multiple LoadModule parameters. |
1965 |
-# |
1966 |
-# Mandatory: no |
1967 |
-# Default: |
1968 |
-# LoadModule= |
1969 |
|
1970 |
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf b/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf |
1971 |
deleted file mode 100644 |
1972 |
index 5ff17ce33d6..00000000000 |
1973 |
--- a/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf |
1974 |
+++ /dev/null |
1975 |
@@ -1,390 +0,0 @@ |
1976 |
-# This is a configuration file for Zabbix agent daemon (Unix) |
1977 |
-# To get more information about Zabbix, visit http://www.zabbix.com |
1978 |
- |
1979 |
-############ GENERAL PARAMETERS ################# |
1980 |
- |
1981 |
-### Option: PidFile |
1982 |
-# Name of PID file. |
1983 |
-# |
1984 |
-# Mandatory: no |
1985 |
-# Default: |
1986 |
-# PidFile=/tmp/zabbix_agentd.pid |
1987 |
-PidFile=/run/zabbix/zabbix_agentd.pid |
1988 |
- |
1989 |
-### Option: LogType |
1990 |
-# Specifies where log messages are written to: |
1991 |
-# system - syslog |
1992 |
-# file - file specified with LogFile parameter |
1993 |
-# console - standard output |
1994 |
-# |
1995 |
-# Mandatory: no |
1996 |
-# Default: |
1997 |
-# LogType=file |
1998 |
- |
1999 |
-### Option: LogFile |
2000 |
-# Log file name for LogType 'file' parameter. |
2001 |
-# |
2002 |
-# Mandatory: no |
2003 |
-# Default: |
2004 |
-# LogFile= |
2005 |
- |
2006 |
-LogFile=/var/log/zabbix/zabbix_agentd.log |
2007 |
- |
2008 |
-### Option: LogFileSize |
2009 |
-# Maximum size of log file in MB. |
2010 |
-# 0 - disable automatic log rotation. |
2011 |
-# |
2012 |
-# Mandatory: no |
2013 |
-# Range: 0-1024 |
2014 |
-# Default: |
2015 |
-# LogFileSize=1 |
2016 |
-LogFileSize=128 |
2017 |
- |
2018 |
-### Option: DebugLevel |
2019 |
-# Specifies debug level: |
2020 |
-# 0 - basic information about starting and stopping of Zabbix processes |
2021 |
-# 1 - critical information |
2022 |
-# 2 - error information |
2023 |
-# 3 - warnings |
2024 |
-# 4 - for debugging (produces lots of information) |
2025 |
-# 5 - extended debugging (produces even more information) |
2026 |
-# |
2027 |
-# Mandatory: no |
2028 |
-# Range: 0-5 |
2029 |
-# Default: |
2030 |
-# DebugLevel=3 |
2031 |
- |
2032 |
-### Option: SourceIP |
2033 |
-# Source IP address for outgoing connections. |
2034 |
-# |
2035 |
-# Mandatory: no |
2036 |
-# Default: |
2037 |
-# SourceIP= |
2038 |
- |
2039 |
-### Option: EnableRemoteCommands |
2040 |
-# Whether remote commands from Zabbix server are allowed. |
2041 |
-# 0 - not allowed |
2042 |
-# 1 - allowed |
2043 |
-# |
2044 |
-# Mandatory: no |
2045 |
-# Default: |
2046 |
-# EnableRemoteCommands=0 |
2047 |
- |
2048 |
-### Option: LogRemoteCommands |
2049 |
-# Enable logging of executed shell commands as warnings. |
2050 |
-# 0 - disabled |
2051 |
-# 1 - enabled |
2052 |
-# |
2053 |
-# Mandatory: no |
2054 |
-# Default: |
2055 |
-# LogRemoteCommands=0 |
2056 |
- |
2057 |
-##### Passive checks related |
2058 |
- |
2059 |
-### Option: Server |
2060 |
-# List of comma delimited IP addresses (or hostnames) of Zabbix servers. |
2061 |
-# Incoming connections will be accepted only from the hosts listed here. |
2062 |
-# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. |
2063 |
-# |
2064 |
-# Mandatory: no |
2065 |
-# Default: |
2066 |
-# Server= |
2067 |
- |
2068 |
-Server=127.0.0.1 |
2069 |
- |
2070 |
-### Option: ListenPort |
2071 |
-# Agent will listen on this port for connections from the server. |
2072 |
-# |
2073 |
-# Mandatory: no |
2074 |
-# Range: 1024-32767 |
2075 |
-# Default: |
2076 |
-# ListenPort=10050 |
2077 |
- |
2078 |
-### Option: ListenIP |
2079 |
-# List of comma delimited IP addresses that the agent should listen on. |
2080 |
-# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. |
2081 |
-# |
2082 |
-# Mandatory: no |
2083 |
-# Default: |
2084 |
-# ListenIP=0.0.0.0 |
2085 |
- |
2086 |
-### Option: StartAgents |
2087 |
-# Number of pre-forked instances of zabbix_agentd that process passive checks. |
2088 |
-# If set to 0, disables passive checks and the agent will not listen on any TCP port. |
2089 |
-# |
2090 |
-# Mandatory: no |
2091 |
-# Range: 0-100 |
2092 |
-# Default: |
2093 |
-# StartAgents=3 |
2094 |
- |
2095 |
-##### Active checks related |
2096 |
- |
2097 |
-### Option: ServerActive |
2098 |
-# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. |
2099 |
-# If port is not specified, default port is used. |
2100 |
-# IPv6 addresses must be enclosed in square brackets if port for that host is specified. |
2101 |
-# If port is not specified, square brackets for IPv6 addresses are optional. |
2102 |
-# If this parameter is not specified, active checks are disabled. |
2103 |
-# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] |
2104 |
-# |
2105 |
-# Mandatory: no |
2106 |
-# Default: |
2107 |
-# ServerActive= |
2108 |
- |
2109 |
-ServerActive=127.0.0.1 |
2110 |
- |
2111 |
-### Option: Hostname |
2112 |
-# Unique, case sensitive hostname. |
2113 |
-# Required for active checks and must match hostname as configured on the server. |
2114 |
-# Value is acquired from HostnameItem if undefined. |
2115 |
-# |
2116 |
-# Mandatory: no |
2117 |
-# Default: |
2118 |
-# Hostname= |
2119 |
- |
2120 |
-Hostname=Zabbix server |
2121 |
- |
2122 |
-### Option: HostnameItem |
2123 |
-# Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. |
2124 |
-# Does not support UserParameters or aliases. |
2125 |
-# |
2126 |
-# Mandatory: no |
2127 |
-# Default: |
2128 |
-# HostnameItem=system.hostname |
2129 |
- |
2130 |
-### Option: HostMetadata |
2131 |
-# Optional parameter that defines host metadata. |
2132 |
-# Host metadata is used at host auto-registration process. |
2133 |
-# An agent will issue an error and not start if the value is over limit of 255 characters. |
2134 |
-# If not defined, value will be acquired from HostMetadataItem. |
2135 |
-# |
2136 |
-# Mandatory: no |
2137 |
-# Range: 0-255 characters |
2138 |
-# Default: |
2139 |
-# HostMetadata= |
2140 |
- |
2141 |
-### Option: HostMetadataItem |
2142 |
-# Optional parameter that defines an item used for getting host metadata. |
2143 |
-# Host metadata is used at host auto-registration process. |
2144 |
-# During an auto-registration request an agent will log a warning message if |
2145 |
-# the value returned by specified item is over limit of 255 characters. |
2146 |
-# This option is only used when HostMetadata is not defined. |
2147 |
-# |
2148 |
-# Mandatory: no |
2149 |
-# Default: |
2150 |
-# HostMetadataItem= |
2151 |
- |
2152 |
-### Option: RefreshActiveChecks |
2153 |
-# How often list of active checks is refreshed, in seconds. |
2154 |
-# |
2155 |
-# Mandatory: no |
2156 |
-# Range: 60-3600 |
2157 |
-# Default: |
2158 |
-# RefreshActiveChecks=120 |
2159 |
- |
2160 |
-### Option: BufferSend |
2161 |
-# Do not keep data longer than N seconds in buffer. |
2162 |
-# |
2163 |
-# Mandatory: no |
2164 |
-# Range: 1-3600 |
2165 |
-# Default: |
2166 |
-# BufferSend=5 |
2167 |
- |
2168 |
-### Option: BufferSize |
2169 |
-# Maximum number of values in a memory buffer. The agent will send |
2170 |
-# all collected data to Zabbix Server or Proxy if the buffer is full. |
2171 |
-# |
2172 |
-# Mandatory: no |
2173 |
-# Range: 2-65535 |
2174 |
-# Default: |
2175 |
-# BufferSize=100 |
2176 |
- |
2177 |
-### Option: MaxLinesPerSecond |
2178 |
-# Maximum number of new lines the agent will send per second to Zabbix Server |
2179 |
-# or Proxy processing 'log' and 'logrt' active checks. |
2180 |
-# The provided value will be overridden by the parameter 'maxlines', |
2181 |
-# provided in 'log' or 'logrt' item keys. |
2182 |
-# |
2183 |
-# Mandatory: no |
2184 |
-# Range: 1-1000 |
2185 |
-# Default: |
2186 |
-# MaxLinesPerSecond=20 |
2187 |
- |
2188 |
-############ ADVANCED PARAMETERS ################# |
2189 |
- |
2190 |
-### Option: Alias |
2191 |
-# Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one. |
2192 |
-# Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed. |
2193 |
-# Different Alias keys may reference the same item key. |
2194 |
-# For example, to retrieve the ID of user 'zabbix': |
2195 |
-# Alias=zabbix.userid:vfs.file.regexp[/etc/passwd,^zabbix:.:([0-9]+),,,,\1] |
2196 |
-# Now shorthand key zabbix.userid may be used to retrieve data. |
2197 |
-# Aliases can be used in HostMetadataItem but not in HostnameItem parameters. |
2198 |
-# |
2199 |
-# Mandatory: no |
2200 |
-# Range: |
2201 |
-# Default: |
2202 |
- |
2203 |
-### Option: Timeout |
2204 |
-# Spend no more than Timeout seconds on processing |
2205 |
-# |
2206 |
-# Mandatory: no |
2207 |
-# Range: 1-30 |
2208 |
-# Default: |
2209 |
-# Timeout=3 |
2210 |
- |
2211 |
-### Option: AllowRoot |
2212 |
-# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent |
2213 |
-# will try to switch to the user specified by the User configuration option instead. |
2214 |
-# Has no effect if started under a regular user. |
2215 |
-# 0 - do not allow |
2216 |
-# 1 - allow |
2217 |
-# |
2218 |
-# Mandatory: no |
2219 |
-# Default: |
2220 |
-# AllowRoot=0 |
2221 |
- |
2222 |
-### Option: User |
2223 |
-# Drop privileges to a specific, existing user on the system. |
2224 |
-# Only has effect if run as 'root' and AllowRoot is disabled. |
2225 |
-# |
2226 |
-# Mandatory: no |
2227 |
-# Default: |
2228 |
-# User=zabbix |
2229 |
- |
2230 |
-### Option: Include |
2231 |
-# You may include individual files or all files in a directory in the configuration file. |
2232 |
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. |
2233 |
-# |
2234 |
-# Mandatory: no |
2235 |
-# Default: |
2236 |
-# Include= |
2237 |
- |
2238 |
-# Include=/usr/local/etc/zabbix_agentd.userparams.conf |
2239 |
-# Include=/usr/local/etc/zabbix_agentd.conf.d/ |
2240 |
-# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf |
2241 |
- |
2242 |
-####### USER-DEFINED MONITORED PARAMETERS ####### |
2243 |
- |
2244 |
-### Option: UnsafeUserParameters |
2245 |
-# Allow all characters to be passed in arguments to user-defined parameters. |
2246 |
-# The following characters are not allowed: |
2247 |
-# \ ' " ` * ? [ ] { } ~ $ ! & ; ( ) < > | # @ |
2248 |
-# Additionally, newline characters are not allowed. |
2249 |
-# 0 - do not allow |
2250 |
-# 1 - allow |
2251 |
-# |
2252 |
-# Mandatory: no |
2253 |
-# Range: 0-1 |
2254 |
-# Default: |
2255 |
-# UnsafeUserParameters=0 |
2256 |
- |
2257 |
-### Option: UserParameter |
2258 |
-# User-defined parameter to monitor. There can be several user-defined parameters. |
2259 |
-# Format: UserParameter=<key>,<shell command> |
2260 |
-# See 'zabbix_agentd' directory for examples. |
2261 |
-# |
2262 |
-# Mandatory: no |
2263 |
-# Default: |
2264 |
-# UserParameter= |
2265 |
- |
2266 |
-####### LOADABLE MODULES ####### |
2267 |
- |
2268 |
-### Option: LoadModulePath |
2269 |
-# Full path to location of agent modules. |
2270 |
-# Default depends on compilation options. |
2271 |
-# |
2272 |
-# Mandatory: no |
2273 |
-# Default: |
2274 |
-# LoadModulePath=${libdir}/modules |
2275 |
- |
2276 |
-### Option: LoadModule |
2277 |
-# Module to load at agent startup. Modules are used to extend functionality of the agent. |
2278 |
-# Format: LoadModule=<module.so> |
2279 |
-# The modules must be located in directory specified by LoadModulePath. |
2280 |
-# It is allowed to include multiple LoadModule parameters. |
2281 |
-# |
2282 |
-# Mandatory: no |
2283 |
-# Default: |
2284 |
-# LoadModule= |
2285 |
- |
2286 |
-####### TLS-RELATED PARAMETERS ####### |
2287 |
- |
2288 |
-### Option: TLSConnect |
2289 |
-# How the agent should connect to server or proxy. Used for active checks. |
2290 |
-# Only one value can be specified: |
2291 |
-# unencrypted - connect without encryption |
2292 |
-# psk - connect using TLS and a pre-shared key |
2293 |
-# cert - connect using TLS and a certificate |
2294 |
-# |
2295 |
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) |
2296 |
-# Default: |
2297 |
-# TLSConnect=unencrypted |
2298 |
- |
2299 |
-### Option: TLSAccept |
2300 |
-# What incoming connections to accept. |
2301 |
-# Multiple values can be specified, separated by comma: |
2302 |
-# unencrypted - accept connections without encryption |
2303 |
-# psk - accept connections secured with TLS and a pre-shared key |
2304 |
-# cert - accept connections secured with TLS and a certificate |
2305 |
-# |
2306 |
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) |
2307 |
-# Default: |
2308 |
-# TLSAccept=unencrypted |
2309 |
- |
2310 |
-### Option: TLSCAFile |
2311 |
-# Full pathname of a file containing the top-level CA(s) certificates for |
2312 |
-# peer certificate verification. |
2313 |
-# |
2314 |
-# Mandatory: no |
2315 |
-# Default: |
2316 |
-# TLSCAFile= |
2317 |
- |
2318 |
-### Option: TLSCRLFile |
2319 |
-# Full pathname of a file containing revoked certificates. |
2320 |
-# |
2321 |
-# Mandatory: no |
2322 |
-# Default: |
2323 |
-# TLSCRLFile= |
2324 |
- |
2325 |
-### Option: TLSServerCertIssuer |
2326 |
-# Allowed server certificate issuer. |
2327 |
-# |
2328 |
-# Mandatory: no |
2329 |
-# Default: |
2330 |
-# TLSServerCertIssuer= |
2331 |
- |
2332 |
-### Option: TLSServerCertSubject |
2333 |
-# Allowed server certificate subject. |
2334 |
-# |
2335 |
-# Mandatory: no |
2336 |
-# Default: |
2337 |
-# TLSServerCertSubject= |
2338 |
- |
2339 |
-### Option: TLSCertFile |
2340 |
-# Full pathname of a file containing the agent certificate or certificate chain. |
2341 |
-# |
2342 |
-# Mandatory: no |
2343 |
-# Default: |
2344 |
-# TLSCertFile= |
2345 |
- |
2346 |
-### Option: TLSKeyFile |
2347 |
-# Full pathname of a file containing the agent private key. |
2348 |
-# |
2349 |
-# Mandatory: no |
2350 |
-# Default: |
2351 |
-# TLSKeyFile= |
2352 |
- |
2353 |
-### Option: TLSPSKIdentity |
2354 |
-# Unique, case sensitive string used to identify the pre-shared key. |
2355 |
-# |
2356 |
-# Mandatory: no |
2357 |
-# Default: |
2358 |
-# TLSPSKIdentity= |
2359 |
- |
2360 |
-### Option: TLSPSKFile |
2361 |
-# Full pathname of a file containing the pre-shared key. |
2362 |
-# |
2363 |
-# Mandatory: no |
2364 |
-# Default: |
2365 |
-# TLSPSKFile= |
2366 |
|
2367 |
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf b/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf |
2368 |
deleted file mode 100644 |
2369 |
index f96b0d01f51..00000000000 |
2370 |
--- a/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf |
2371 |
+++ /dev/null |
2372 |
@@ -1,674 +0,0 @@ |
2373 |
-# This is a configuration file for Zabbix proxy daemon |
2374 |
-# To get more information about Zabbix, visit http://www.zabbix.com |
2375 |
- |
2376 |
-############ GENERAL PARAMETERS ################# |
2377 |
- |
2378 |
-### Option: ProxyMode |
2379 |
-# Proxy operating mode. |
2380 |
-# 0 - proxy in the active mode |
2381 |
-# 1 - proxy in the passive mode |
2382 |
-# |
2383 |
-# Mandatory: no |
2384 |
-# Default: |
2385 |
-# ProxyMode=0 |
2386 |
- |
2387 |
-### Option: Server |
2388 |
-# IP address (or hostname) of Zabbix server. |
2389 |
-# Active proxy will get configuration data from the server. |
2390 |
-# For a proxy in the passive mode this parameter will be ignored. |
2391 |
-# |
2392 |
-# Mandatory: yes (if ProxyMode is set to 0) |
2393 |
-# Default: |
2394 |
-# Server= |
2395 |
- |
2396 |
-Server=127.0.0.1 |
2397 |
- |
2398 |
-### Option: ServerPort |
2399 |
-# Port of Zabbix trapper on Zabbix server. |
2400 |
-# For a proxy in the passive mode this parameter will be ignored. |
2401 |
-# |
2402 |
-# Mandatory: no |
2403 |
-# Range: 1024-32767 |
2404 |
-# Default: |
2405 |
-# ServerPort=10051 |
2406 |
- |
2407 |
-### Option: Hostname |
2408 |
-# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server! |
2409 |
-# Value is acquired from HostnameItem if undefined. |
2410 |
-# |
2411 |
-# Mandatory: no |
2412 |
-# Default: |
2413 |
-# Hostname= |
2414 |
- |
2415 |
-Hostname=Zabbix proxy |
2416 |
- |
2417 |
-### Option: HostnameItem |
2418 |
-# Item used for generating Hostname if it is undefined. |
2419 |
-# Ignored if Hostname is defined. |
2420 |
-# |
2421 |
-# Mandatory: no |
2422 |
-# Default: |
2423 |
-# HostnameItem=system.hostname |
2424 |
- |
2425 |
-### Option: ListenPort |
2426 |
-# Listen port for trapper. |
2427 |
-# |
2428 |
-# Mandatory: no |
2429 |
-# Range: 1024-32767 |
2430 |
-# Default: |
2431 |
-# ListenPort=10051 |
2432 |
- |
2433 |
-### Option: SourceIP |
2434 |
-# Source IP address for outgoing connections. |
2435 |
-# |
2436 |
-# Mandatory: no |
2437 |
-# Default: |
2438 |
-# SourceIP= |
2439 |
- |
2440 |
-### Option: LogType |
2441 |
-# Specifies where log messages are written to: |
2442 |
-# system - syslog |
2443 |
-# file - file specified with LogFile parameter |
2444 |
-# console - standard output |
2445 |
-# |
2446 |
-# Mandatory: no |
2447 |
-# Default: |
2448 |
-# LogType=file |
2449 |
- |
2450 |
-### Option: LogFile |
2451 |
-# Log file name for LogType 'file' parameter. |
2452 |
-# |
2453 |
-# Mandatory: no |
2454 |
-# Default: |
2455 |
-# LogFile= |
2456 |
- |
2457 |
-LogFile=/var/log/zabbix/zabbix_proxy.log |
2458 |
- |
2459 |
-### Option: LogFileSize |
2460 |
-# Maximum size of log file in MB. |
2461 |
-# 0 - disable automatic log rotation. |
2462 |
-# |
2463 |
-# Mandatory: no |
2464 |
-# Range: 0-1024 |
2465 |
-# Default: |
2466 |
-# LogFileSize=1 |
2467 |
-LogFileSize=128 |
2468 |
- |
2469 |
-### Option: DebugLevel |
2470 |
-# Specifies debug level: |
2471 |
-# 0 - basic information about starting and stopping of Zabbix processes |
2472 |
-# 1 - critical information |
2473 |
-# 2 - error information |
2474 |
-# 3 - warnings |
2475 |
-# 4 - for debugging (produces lots of information) |
2476 |
-# 5 - extended debugging (produces even more information) |
2477 |
-# |
2478 |
-# Mandatory: no |
2479 |
-# Range: 0-5 |
2480 |
-# Default: |
2481 |
-# DebugLevel=3 |
2482 |
- |
2483 |
-### Option: PidFile |
2484 |
-# Name of PID file. |
2485 |
-# |
2486 |
-# Mandatory: no |
2487 |
-# Default: |
2488 |
-# PidFile=/tmp/zabbix_proxy.pid |
2489 |
-PidFile=/run/zabbix/zabbix_proxy.pid |
2490 |
- |
2491 |
-### Option: DBHost |
2492 |
-# Database host name. |
2493 |
-# If set to localhost, socket is used for MySQL. |
2494 |
-# If set to empty string, socket is used for PostgreSQL. |
2495 |
-# |
2496 |
-# Mandatory: no |
2497 |
-# Default: |
2498 |
-# DBHost=localhost |
2499 |
- |
2500 |
-### Option: DBName |
2501 |
-# Database name. |
2502 |
-# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. |
2503 |
-# Warning: do not attempt to use the same database Zabbix server is using. |
2504 |
-# |
2505 |
-# Mandatory: yes |
2506 |
-# Default: |
2507 |
-# DBName= |
2508 |
- |
2509 |
-DBName=zabbix_proxy |
2510 |
- |
2511 |
-### Option: DBSchema |
2512 |
-# Schema name. Used for IBM DB2 and PostgreSQL. |
2513 |
-# |
2514 |
-# Mandatory: no |
2515 |
-# Default: |
2516 |
-# DBSchema= |
2517 |
- |
2518 |
-### Option: DBUser |
2519 |
-# Database user. Ignored for SQLite. |
2520 |
-# |
2521 |
-# Default: |
2522 |
-# DBUser= |
2523 |
- |
2524 |
-DBUser=zabbix |
2525 |
- |
2526 |
-### Option: DBPassword |
2527 |
-# Database password. Ignored for SQLite. |
2528 |
-# Comment this line if no password is used. |
2529 |
-# |
2530 |
-# Mandatory: no |
2531 |
-# Default: |
2532 |
-# DBPassword= |
2533 |
- |
2534 |
-### Option: DBSocket |
2535 |
-# Path to MySQL socket. |
2536 |
-# |
2537 |
-# Mandatory: no |
2538 |
-# Default: |
2539 |
-# DBSocket=/tmp/mysql.sock |
2540 |
- |
2541 |
-# Option: DBPort |
2542 |
-# Database port when not using local socket. Ignored for SQLite. |
2543 |
-# |
2544 |
-# Mandatory: no |
2545 |
-# Default (for MySQL): |
2546 |
-# DBPort=3306 |
2547 |
- |
2548 |
-######### PROXY SPECIFIC PARAMETERS ############# |
2549 |
- |
2550 |
-### Option: ProxyLocalBuffer |
2551 |
-# Proxy will keep data locally for N hours, even if the data have already been synced with the server. |
2552 |
-# This parameter may be used if local data will be used by third party applications. |
2553 |
-# |
2554 |
-# Mandatory: no |
2555 |
-# Range: 0-720 |
2556 |
-# Default: |
2557 |
-# ProxyLocalBuffer=0 |
2558 |
- |
2559 |
-### Option: ProxyOfflineBuffer |
2560 |
-# Proxy will keep data for N hours in case if no connectivity with Zabbix Server. |
2561 |
-# Older data will be lost. |
2562 |
-# |
2563 |
-# Mandatory: no |
2564 |
-# Range: 1-720 |
2565 |
-# Default: |
2566 |
-# ProxyOfflineBuffer=1 |
2567 |
- |
2568 |
-### Option: HeartbeatFrequency |
2569 |
-# Frequency of heartbeat messages in seconds. |
2570 |
-# Used for monitoring availability of Proxy on server side. |
2571 |
-# 0 - heartbeat messages disabled. |
2572 |
-# For a proxy in the passive mode this parameter will be ignored. |
2573 |
-# |
2574 |
-# Mandatory: no |
2575 |
-# Range: 0-3600 |
2576 |
-# Default: |
2577 |
-# HeartbeatFrequency=60 |
2578 |
- |
2579 |
-### Option: ConfigFrequency |
2580 |
-# How often proxy retrieves configuration data from Zabbix Server in seconds. |
2581 |
-# For a proxy in the passive mode this parameter will be ignored. |
2582 |
-# |
2583 |
-# Mandatory: no |
2584 |
-# Range: 1-3600*24*7 |
2585 |
-# Default: |
2586 |
-# ConfigFrequency=3600 |
2587 |
- |
2588 |
-### Option: DataSenderFrequency |
2589 |
-# Proxy will send collected data to the Server every N seconds. |
2590 |
-# For a proxy in the passive mode this parameter will be ignored. |
2591 |
-# |
2592 |
-# Mandatory: no |
2593 |
-# Range: 1-3600 |
2594 |
-# Default: |
2595 |
-# DataSenderFrequency=1 |
2596 |
- |
2597 |
-############ ADVANCED PARAMETERS ################ |
2598 |
- |
2599 |
-### Option: StartPollers |
2600 |
-# Number of pre-forked instances of pollers. |
2601 |
-# |
2602 |
-# Mandatory: no |
2603 |
-# Range: 0-1000 |
2604 |
-# Default: |
2605 |
-# StartPollers=5 |
2606 |
- |
2607 |
-### Option: StartIPMIPollers |
2608 |
-# Number of pre-forked instances of IPMI pollers. |
2609 |
-# |
2610 |
-# Mandatory: no |
2611 |
-# Range: 0-1000 |
2612 |
-# Default: |
2613 |
-# StartIPMIPollers=0 |
2614 |
- |
2615 |
-### Option: StartPollersUnreachable |
2616 |
-# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). |
2617 |
-# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers |
2618 |
-# are started. |
2619 |
-# |
2620 |
-# Mandatory: no |
2621 |
-# Range: 0-1000 |
2622 |
-# Default: |
2623 |
-# StartPollersUnreachable=1 |
2624 |
- |
2625 |
-### Option: StartTrappers |
2626 |
-# Number of pre-forked instances of trappers. |
2627 |
-# Trappers accept incoming connections from Zabbix sender and active agents. |
2628 |
-# |
2629 |
-# Mandatory: no |
2630 |
-# Range: 0-1000 |
2631 |
-# Default: |
2632 |
-# StartTrappers=5 |
2633 |
- |
2634 |
-### Option: StartPingers |
2635 |
-# Number of pre-forked instances of ICMP pingers. |
2636 |
-# |
2637 |
-# Mandatory: no |
2638 |
-# Range: 0-1000 |
2639 |
-# Default: |
2640 |
-# StartPingers=1 |
2641 |
- |
2642 |
-### Option: StartDiscoverers |
2643 |
-# Number of pre-forked instances of discoverers. |
2644 |
-# |
2645 |
-# Mandatory: no |
2646 |
-# Range: 0-250 |
2647 |
-# Default: |
2648 |
-# StartDiscoverers=1 |
2649 |
- |
2650 |
-### Option: StartHTTPPollers |
2651 |
-# Number of pre-forked instances of HTTP pollers. |
2652 |
-# |
2653 |
-# Mandatory: no |
2654 |
-# Range: 0-1000 |
2655 |
-# Default: |
2656 |
-# StartHTTPPollers=1 |
2657 |
- |
2658 |
-### Option: JavaGateway |
2659 |
-# IP address (or hostname) of Zabbix Java gateway. |
2660 |
-# Only required if Java pollers are started. |
2661 |
-# |
2662 |
-# Mandatory: no |
2663 |
-# Default: |
2664 |
-# JavaGateway= |
2665 |
- |
2666 |
-### Option: JavaGatewayPort |
2667 |
-# Port that Zabbix Java gateway listens on. |
2668 |
-# |
2669 |
-# Mandatory: no |
2670 |
-# Range: 1024-32767 |
2671 |
-# Default: |
2672 |
-# JavaGatewayPort=10052 |
2673 |
- |
2674 |
-### Option: StartJavaPollers |
2675 |
-# Number of pre-forked instances of Java pollers. |
2676 |
-# |
2677 |
-# Mandatory: no |
2678 |
-# Range: 0-1000 |
2679 |
-# Default: |
2680 |
-# StartJavaPollers=0 |
2681 |
- |
2682 |
-### Option: StartVMwareCollectors |
2683 |
-# Number of pre-forked vmware collector instances. |
2684 |
-# |
2685 |
-# Mandatory: no |
2686 |
-# Range: 0-250 |
2687 |
-# Default: |
2688 |
-# StartVMwareCollectors=0 |
2689 |
- |
2690 |
-### Option: VMwareFrequency |
2691 |
-# How often Zabbix will connect to VMware service to obtain a new data. |
2692 |
-# |
2693 |
-# Mandatory: no |
2694 |
-# Range: 10-86400 |
2695 |
-# Default: |
2696 |
-# VMwareFrequency=60 |
2697 |
- |
2698 |
-### Option: VMwarePerfFrequency |
2699 |
-# How often Zabbix will connect to VMware service to obtain performance data. |
2700 |
-# |
2701 |
-# Mandatory: no |
2702 |
-# Range: 10-86400 |
2703 |
-# Default: |
2704 |
-# VMwarePerfFrequency=60 |
2705 |
- |
2706 |
-### Option: VMwareCacheSize |
2707 |
-# Size of VMware cache, in bytes. |
2708 |
-# Shared memory size for storing VMware data. |
2709 |
-# Only used if VMware collectors are started. |
2710 |
-# |
2711 |
-# Mandatory: no |
2712 |
-# Range: 256K-2G |
2713 |
-# Default: |
2714 |
-# VMwareCacheSize=8M |
2715 |
- |
2716 |
-### Option: VMwareTimeout |
2717 |
-# Specifies how many seconds vmware collector waits for response from VMware service. |
2718 |
-# |
2719 |
-# Mandatory: no |
2720 |
-# Range: 1-300 |
2721 |
-# Default: |
2722 |
-# VMwareTimeout=10 |
2723 |
- |
2724 |
-### Option: SNMPTrapperFile |
2725 |
-# Temporary file used for passing data from SNMP trap daemon to the proxy. |
2726 |
-# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. |
2727 |
-# |
2728 |
-# Mandatory: no |
2729 |
-# Default: |
2730 |
-# SNMPTrapperFile=/tmp/zabbix_traps.tmp |
2731 |
- |
2732 |
-### Option: StartSNMPTrapper |
2733 |
-# If 1, SNMP trapper process is started. |
2734 |
-# |
2735 |
-# Mandatory: no |
2736 |
-# Range: 0-1 |
2737 |
-# Default: |
2738 |
-# StartSNMPTrapper=0 |
2739 |
- |
2740 |
-### Option: ListenIP |
2741 |
-# List of comma delimited IP addresses that the trapper should listen on. |
2742 |
-# Trapper will listen on all network interfaces if this parameter is missing. |
2743 |
-# |
2744 |
-# Mandatory: no |
2745 |
-# Default: |
2746 |
-# ListenIP=0.0.0.0 |
2747 |
- |
2748 |
-### Option: HousekeepingFrequency |
2749 |
-# How often Zabbix will perform housekeeping procedure (in hours). |
2750 |
-# Housekeeping is removing outdated information from the database. |
2751 |
-# To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency |
2752 |
-# hours of outdated information are deleted in one housekeeping cycle. |
2753 |
-# To lower load on proxy startup housekeeping is postponed for 30 minutes after proxy start. |
2754 |
-# With HousekeepingFrequency=0 the housekeeper can be only executed using the runtime control option. |
2755 |
-# In this case the period of outdated information deleted in one housekeeping cycle is 4 times the |
2756 |
-# period since the last housekeeping cycle, but not less than 4 hours and not greater than 4 days. |
2757 |
-# |
2758 |
-# Mandatory: no |
2759 |
-# Range: 0-24 |
2760 |
-# Default: |
2761 |
-# HousekeepingFrequency=1 |
2762 |
- |
2763 |
-### Option: CacheSize |
2764 |
-# Size of configuration cache, in bytes. |
2765 |
-# Shared memory size, for storing hosts and items data. |
2766 |
-# |
2767 |
-# Mandatory: no |
2768 |
-# Range: 128K-8G |
2769 |
-# Default: |
2770 |
-# CacheSize=8M |
2771 |
- |
2772 |
-### Option: StartDBSyncers |
2773 |
-# Number of pre-forked instances of DB Syncers. |
2774 |
-# |
2775 |
-# Mandatory: no |
2776 |
-# Range: 1-100 |
2777 |
-# Default: |
2778 |
-# StartDBSyncers=4 |
2779 |
- |
2780 |
-### Option: HistoryCacheSize |
2781 |
-# Size of history cache, in bytes. |
2782 |
-# Shared memory size for storing history data. |
2783 |
-# |
2784 |
-# Mandatory: no |
2785 |
-# Range: 128K-2G |
2786 |
-# Default: |
2787 |
-# HistoryCacheSize=16M |
2788 |
- |
2789 |
-### Option: HistoryIndexCacheSize |
2790 |
-# Size of history index cache, in bytes. |
2791 |
-# Shared memory size for indexing history cache. |
2792 |
-# |
2793 |
-# Mandatory: no |
2794 |
-# Range: 128K-2G |
2795 |
-# Default: |
2796 |
-# HistoryIndexCacheSize=4M |
2797 |
- |
2798 |
-### Option: Timeout |
2799 |
-# Specifies how long we wait for agent, SNMP device or external check (in seconds). |
2800 |
-# |
2801 |
-# Mandatory: no |
2802 |
-# Range: 1-30 |
2803 |
-# Default: |
2804 |
-# Timeout=3 |
2805 |
- |
2806 |
-Timeout=4 |
2807 |
- |
2808 |
-### Option: TrapperTimeout |
2809 |
-# Specifies how many seconds trapper may spend processing new data. |
2810 |
-# |
2811 |
-# Mandatory: no |
2812 |
-# Range: 1-300 |
2813 |
-# Default: |
2814 |
-# TrapperTimeout=300 |
2815 |
- |
2816 |
-### Option: UnreachablePeriod |
2817 |
-# After how many seconds of unreachability treat a host as unavailable. |
2818 |
-# |
2819 |
-# Mandatory: no |
2820 |
-# Range: 1-3600 |
2821 |
-# Default: |
2822 |
-# UnreachablePeriod=45 |
2823 |
- |
2824 |
-### Option: UnavailableDelay |
2825 |
-# How often host is checked for availability during the unavailability period, in seconds. |
2826 |
-# |
2827 |
-# Mandatory: no |
2828 |
-# Range: 1-3600 |
2829 |
-# Default: |
2830 |
-# UnavailableDelay=60 |
2831 |
- |
2832 |
-### Option: UnreachableDelay |
2833 |
-# How often host is checked for availability during the unreachability period, in seconds. |
2834 |
-# |
2835 |
-# Mandatory: no |
2836 |
-# Range: 1-3600 |
2837 |
-# Default: |
2838 |
-# UnreachableDelay=15 |
2839 |
- |
2840 |
-### Option: ExternalScripts |
2841 |
-# Full path to location of external scripts. |
2842 |
-# Default depends on compilation options. |
2843 |
-# |
2844 |
-# Mandatory: no |
2845 |
-# Default: |
2846 |
-# ExternalScripts=${datadir}/zabbix/externalscripts |
2847 |
- |
2848 |
-### Option: FpingLocation |
2849 |
-# Location of fping. |
2850 |
-# Make sure that fping binary has root ownership and SUID flag set. |
2851 |
-# |
2852 |
-# Mandatory: no |
2853 |
-# Default: |
2854 |
-# FpingLocation=/usr/sbin/fping |
2855 |
- |
2856 |
-### Option: Fping6Location |
2857 |
-# Location of fping6. |
2858 |
-# Make sure that fping6 binary has root ownership and SUID flag set. |
2859 |
-# Make empty if your fping utility is capable to process IPv6 addresses. |
2860 |
-# |
2861 |
-# Mandatory: no |
2862 |
-# Default: |
2863 |
-# Fping6Location=/usr/sbin/fping6 |
2864 |
- |
2865 |
-### Option: SSHKeyLocation |
2866 |
-# Location of public and private keys for SSH checks and actions. |
2867 |
-# |
2868 |
-# Mandatory: no |
2869 |
-# Default: |
2870 |
-# SSHKeyLocation= |
2871 |
- |
2872 |
-### Option: LogSlowQueries |
2873 |
-# How long a database query may take before being logged (in milliseconds). |
2874 |
-# Only works if DebugLevel set to 3 or 4. |
2875 |
-# 0 - don't log slow queries. |
2876 |
-# |
2877 |
-# Mandatory: no |
2878 |
-# Range: 1-3600000 |
2879 |
-# Default: |
2880 |
-# LogSlowQueries=0 |
2881 |
- |
2882 |
-LogSlowQueries=3000 |
2883 |
- |
2884 |
-### Option: TmpDir |
2885 |
-# Temporary directory. |
2886 |
-# |
2887 |
-# Mandatory: no |
2888 |
-# Default: |
2889 |
-# TmpDir=/tmp |
2890 |
- |
2891 |
-### Option: AllowRoot |
2892 |
-# Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy |
2893 |
-# will try to switch to the user specified by the User configuration option instead. |
2894 |
-# Has no effect if started under a regular user. |
2895 |
-# 0 - do not allow |
2896 |
-# 1 - allow |
2897 |
-# |
2898 |
-# Mandatory: no |
2899 |
-# Default: |
2900 |
-# AllowRoot=0 |
2901 |
- |
2902 |
-### Option: User |
2903 |
-# Drop privileges to a specific, existing user on the system. |
2904 |
-# Only has effect if run as 'root' and AllowRoot is disabled. |
2905 |
-# |
2906 |
-# Mandatory: no |
2907 |
-# Default: |
2908 |
-# User=zabbix |
2909 |
- |
2910 |
-### Option: Include |
2911 |
-# You may include individual files or all files in a directory in the configuration file. |
2912 |
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. |
2913 |
-# |
2914 |
-# Mandatory: no |
2915 |
-# Default: |
2916 |
-# Include= |
2917 |
- |
2918 |
-# Include=/usr/local/etc/zabbix_proxy.general.conf |
2919 |
-# Include=/usr/local/etc/zabbix_proxy.conf.d/ |
2920 |
-# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf |
2921 |
- |
2922 |
-### Option: SSLCertLocation |
2923 |
-# Location of SSL client certificates. |
2924 |
-# This parameter is used only in web monitoring. |
2925 |
-# |
2926 |
-# Mandatory: no |
2927 |
-# Default: |
2928 |
-# SSLCertLocation=${datadir}/zabbix/ssl/certs |
2929 |
- |
2930 |
-### Option: SSLKeyLocation |
2931 |
-# Location of private keys for SSL client certificates. |
2932 |
-# This parameter is used only in web monitoring. |
2933 |
-# |
2934 |
-# Mandatory: no |
2935 |
-# Default: |
2936 |
-# SSLKeyLocation=${datadir}/zabbix/ssl/keys |
2937 |
- |
2938 |
-### Option: SSLCALocation |
2939 |
-# Location of certificate authority (CA) files for SSL server certificate verification. |
2940 |
-# If not set, system-wide directory will be used. |
2941 |
-# This parameter is used only in web monitoring. |
2942 |
-# |
2943 |
-# Mandatory: no |
2944 |
-# Default: |
2945 |
-# SSLCALocation= |
2946 |
- |
2947 |
-####### LOADABLE MODULES ####### |
2948 |
- |
2949 |
-### Option: LoadModulePath |
2950 |
-# Full path to location of proxy modules. |
2951 |
-# Default depends on compilation options. |
2952 |
-# |
2953 |
-# Mandatory: no |
2954 |
-# Default: |
2955 |
-# LoadModulePath=${libdir}/modules |
2956 |
- |
2957 |
-### Option: LoadModule |
2958 |
-# Module to load at proxy startup. Modules are used to extend functionality of the proxy. |
2959 |
-# Format: LoadModule=<module.so> |
2960 |
-# The modules must be located in directory specified by LoadModulePath. |
2961 |
-# It is allowed to include multiple LoadModule parameters. |
2962 |
-# |
2963 |
-# Mandatory: no |
2964 |
-# Default: |
2965 |
-# LoadModule= |
2966 |
- |
2967 |
-####### TLS-RELATED PARAMETERS ####### |
2968 |
- |
2969 |
-### Option: TLSConnect |
2970 |
-# How the proxy should connect to Zabbix server. Used for an active proxy, ignored on a passive proxy. |
2971 |
-# Only one value can be specified: |
2972 |
-# unencrypted - connect without encryption |
2973 |
-# psk - connect using TLS and a pre-shared key |
2974 |
-# cert - connect using TLS and a certificate |
2975 |
-# |
2976 |
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) |
2977 |
-# Default: |
2978 |
-# TLSConnect=unencrypted |
2979 |
- |
2980 |
-### Option: TLSAccept |
2981 |
-# What incoming connections to accept from Zabbix server. Used for a passive proxy, ignored on an active proxy. |
2982 |
-# Multiple values can be specified, separated by comma: |
2983 |
-# unencrypted - accept connections without encryption |
2984 |
-# psk - accept connections secured with TLS and a pre-shared key |
2985 |
-# cert - accept connections secured with TLS and a certificate |
2986 |
-# |
2987 |
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) |
2988 |
-# Default: |
2989 |
-# TLSAccept=unencrypted |
2990 |
- |
2991 |
-### Option: TLSCAFile |
2992 |
-# Full pathname of a file containing the top-level CA(s) certificates for |
2993 |
-# peer certificate verification. |
2994 |
-# |
2995 |
-# Mandatory: no |
2996 |
-# Default: |
2997 |
-# TLSCAFile= |
2998 |
- |
2999 |
-### Option: TLSCRLFile |
3000 |
-# Full pathname of a file containing revoked certificates. |
3001 |
-# |
3002 |
-# Mandatory: no |
3003 |
-# Default: |
3004 |
-# TLSCRLFile= |
3005 |
- |
3006 |
-### Option: TLSServerCertIssuer |
3007 |
-# Allowed server certificate issuer. |
3008 |
-# |
3009 |
-# Mandatory: no |
3010 |
-# Default: |
3011 |
-# TLSServerCertIssuer= |
3012 |
- |
3013 |
-### Option: TLSServerCertSubject |
3014 |
-# Allowed server certificate subject. |
3015 |
-# |
3016 |
-# Mandatory: no |
3017 |
-# Default: |
3018 |
-# TLSServerCertSubject= |
3019 |
- |
3020 |
-### Option: TLSCertFile |
3021 |
-# Full pathname of a file containing the proxy certificate or certificate chain. |
3022 |
-# |
3023 |
-# Mandatory: no |
3024 |
-# Default: |
3025 |
-# TLSCertFile= |
3026 |
- |
3027 |
-### Option: TLSKeyFile |
3028 |
-# Full pathname of a file containing the proxy private key. |
3029 |
-# |
3030 |
-# Mandatory: no |
3031 |
-# Default: |
3032 |
-# TLSKeyFile= |
3033 |
- |
3034 |
-### Option: TLSPSKIdentity |
3035 |
-# Unique, case sensitive string used to identify the pre-shared key. |
3036 |
-# |
3037 |
-# Mandatory: no |
3038 |
-# Default: |
3039 |
-# TLSPSKIdentity= |
3040 |
- |
3041 |
-### Option: TLSPSKFile |
3042 |
-# Full pathname of a file containing the pre-shared key. |
3043 |
-# |
3044 |
-# Mandatory: no |
3045 |
-# Default: |
3046 |
-# TLSPSKFile= |
3047 |
|
3048 |
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_server.conf b/net-analyzer/zabbix/files/3.0/zabbix_server.conf |
3049 |
deleted file mode 100644 |
3050 |
index 81a4961ee58..00000000000 |
3051 |
--- a/net-analyzer/zabbix/files/3.0/zabbix_server.conf |
3052 |
+++ /dev/null |
3053 |
@@ -1,635 +0,0 @@ |
3054 |
-# This is a configuration file for Zabbix server daemon |
3055 |
-# To get more information about Zabbix, visit http://www.zabbix.com |
3056 |
- |
3057 |
-############ GENERAL PARAMETERS ################# |
3058 |
- |
3059 |
-### Option: ListenPort |
3060 |
-# Listen port for trapper. |
3061 |
-# |
3062 |
-# Mandatory: no |
3063 |
-# Range: 1024-32767 |
3064 |
-# Default: |
3065 |
-# ListenPort=10051 |
3066 |
- |
3067 |
-### Option: SourceIP |
3068 |
-# Source IP address for outgoing connections. |
3069 |
-# |
3070 |
-# Mandatory: no |
3071 |
-# Default: |
3072 |
-# SourceIP= |
3073 |
- |
3074 |
-### Option: LogType |
3075 |
-# Specifies where log messages are written to: |
3076 |
-# system - syslog |
3077 |
-# file - file specified with LogFile parameter |
3078 |
-# console - standard output |
3079 |
-# |
3080 |
-# Mandatory: no |
3081 |
-# Default: |
3082 |
-# LogType=file |
3083 |
- |
3084 |
-### Option: LogFile |
3085 |
-# Log file name for LogType 'file' parameter. |
3086 |
-# |
3087 |
-# Mandatory: no |
3088 |
-# Default: |
3089 |
-# LogFile= |
3090 |
- |
3091 |
-LogFile=/var/log/zabbix/zabbix_server.log |
3092 |
- |
3093 |
-### Option: LogFileSize |
3094 |
-# Maximum size of log file in MB. |
3095 |
-# 0 - disable automatic log rotation. |
3096 |
-# |
3097 |
-# Mandatory: no |
3098 |
-# Range: 0-1024 |
3099 |
-# Default: |
3100 |
-# LogFileSize=1 |
3101 |
-LogFileSize=128 |
3102 |
- |
3103 |
-### Option: DebugLevel |
3104 |
-# Specifies debug level: |
3105 |
-# 0 - basic information about starting and stopping of Zabbix processes |
3106 |
-# 1 - critical information |
3107 |
-# 2 - error information |
3108 |
-# 3 - warnings |
3109 |
-# 4 - for debugging (produces lots of information) |
3110 |
-# 5 - extended debugging (produces even more information) |
3111 |
-# |
3112 |
-# Mandatory: no |
3113 |
-# Range: 0-5 |
3114 |
-# Default: |
3115 |
-# DebugLevel=3 |
3116 |
- |
3117 |
-### Option: PidFile |
3118 |
-# Name of PID file. |
3119 |
-# |
3120 |
-# Mandatory: no |
3121 |
-# Default: |
3122 |
-# PidFile=/tmp/zabbix_server.pid |
3123 |
-PidFile=/run/zabbix/zabbix_server.pid |
3124 |
- |
3125 |
-### Option: DBHost |
3126 |
-# Database host name. |
3127 |
-# If set to localhost, socket is used for MySQL. |
3128 |
-# If set to empty string, socket is used for PostgreSQL. |
3129 |
-# |
3130 |
-# Mandatory: no |
3131 |
-# Default: |
3132 |
-# DBHost=localhost |
3133 |
- |
3134 |
-### Option: DBName |
3135 |
-# Database name. |
3136 |
-# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. |
3137 |
-# |
3138 |
-# Mandatory: yes |
3139 |
-# Default: |
3140 |
-# DBName= |
3141 |
- |
3142 |
-DBName=zabbix |
3143 |
- |
3144 |
-### Option: DBSchema |
3145 |
-# Schema name. Used for IBM DB2 and PostgreSQL. |
3146 |
-# |
3147 |
-# Mandatory: no |
3148 |
-# Default: |
3149 |
-# DBSchema= |
3150 |
- |
3151 |
-### Option: DBUser |
3152 |
-# Database user. Ignored for SQLite. |
3153 |
-# |
3154 |
-# Mandatory: no |
3155 |
-# Default: |
3156 |
-# DBUser= |
3157 |
- |
3158 |
-DBUser=zabbix |
3159 |
- |
3160 |
-### Option: DBPassword |
3161 |
-# Database password. Ignored for SQLite. |
3162 |
-# Comment this line if no password is used. |
3163 |
-# |
3164 |
-# Mandatory: no |
3165 |
-# Default: |
3166 |
-# DBPassword= |
3167 |
- |
3168 |
-### Option: DBSocket |
3169 |
-# Path to MySQL socket. |
3170 |
-# |
3171 |
-# Mandatory: no |
3172 |
-# Default: |
3173 |
-# DBSocket=/tmp/mysql.sock |
3174 |
- |
3175 |
-### Option: DBPort |
3176 |
-# Database port when not using local socket. Ignored for SQLite. |
3177 |
-# |
3178 |
-# Mandatory: no |
3179 |
-# Range: 1024-65535 |
3180 |
-# Default (for MySQL): |
3181 |
-# DBPort=3306 |
3182 |
- |
3183 |
-############ ADVANCED PARAMETERS ################ |
3184 |
- |
3185 |
-### Option: StartPollers |
3186 |
-# Number of pre-forked instances of pollers. |
3187 |
-# |
3188 |
-# Mandatory: no |
3189 |
-# Range: 0-1000 |
3190 |
-# Default: |
3191 |
-# StartPollers=5 |
3192 |
- |
3193 |
-### Option: StartIPMIPollers |
3194 |
-# Number of pre-forked instances of IPMI pollers. |
3195 |
-# |
3196 |
-# Mandatory: no |
3197 |
-# Range: 0-1000 |
3198 |
-# Default: |
3199 |
-# StartIPMIPollers=0 |
3200 |
- |
3201 |
-### Option: StartPollersUnreachable |
3202 |
-# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). |
3203 |
-# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers |
3204 |
-# are started. |
3205 |
-# |
3206 |
-# Mandatory: no |
3207 |
-# Range: 0-1000 |
3208 |
-# Default: |
3209 |
-# StartPollersUnreachable=1 |
3210 |
- |
3211 |
-### Option: StartTrappers |
3212 |
-# Number of pre-forked instances of trappers. |
3213 |
-# Trappers accept incoming connections from Zabbix sender, active agents and active proxies. |
3214 |
-# At least one trapper process must be running to display server availability and view queue |
3215 |
-# in the frontend. |
3216 |
-# |
3217 |
-# Mandatory: no |
3218 |
-# Range: 0-1000 |
3219 |
-# Default: |
3220 |
-# StartTrappers=5 |
3221 |
- |
3222 |
-### Option: StartPingers |
3223 |
-# Number of pre-forked instances of ICMP pingers. |
3224 |
-# |
3225 |
-# Mandatory: no |
3226 |
-# Range: 0-1000 |
3227 |
-# Default: |
3228 |
-# StartPingers=1 |
3229 |
- |
3230 |
-### Option: StartDiscoverers |
3231 |
-# Number of pre-forked instances of discoverers. |
3232 |
-# |
3233 |
-# Mandatory: no |
3234 |
-# Range: 0-250 |
3235 |
-# Default: |
3236 |
-# StartDiscoverers=1 |
3237 |
- |
3238 |
-### Option: StartHTTPPollers |
3239 |
-# Number of pre-forked instances of HTTP pollers. |
3240 |
-# |
3241 |
-# Mandatory: no |
3242 |
-# Range: 0-1000 |
3243 |
-# Default: |
3244 |
-# StartHTTPPollers=1 |
3245 |
- |
3246 |
-### Option: StartTimers |
3247 |
-# Number of pre-forked instances of timers. |
3248 |
-# Timers process time-based trigger functions and maintenance periods. |
3249 |
-# Only the first timer process handles the maintenance periods. |
3250 |
-# |
3251 |
-# Mandatory: no |
3252 |
-# Range: 1-1000 |
3253 |
-# Default: |
3254 |
-# StartTimers=1 |
3255 |
- |
3256 |
-### Option: StartEscalators |
3257 |
-# Number of pre-forked instances of escalators. |
3258 |
-# |
3259 |
-# Mandatory: no |
3260 |
-# Range: 0-100 |
3261 |
-# Default: |
3262 |
-# StartEscalators=1 |
3263 |
- |
3264 |
-### Option: JavaGateway |
3265 |
-# IP address (or hostname) of Zabbix Java gateway. |
3266 |
-# Only required if Java pollers are started. |
3267 |
-# |
3268 |
-# Mandatory: no |
3269 |
-# Default: |
3270 |
-# JavaGateway= |
3271 |
- |
3272 |
-### Option: JavaGatewayPort |
3273 |
-# Port that Zabbix Java gateway listens on. |
3274 |
-# |
3275 |
-# Mandatory: no |
3276 |
-# Range: 1024-32767 |
3277 |
-# Default: |
3278 |
-# JavaGatewayPort=10052 |
3279 |
- |
3280 |
-### Option: StartJavaPollers |
3281 |
-# Number of pre-forked instances of Java pollers. |
3282 |
-# |
3283 |
-# Mandatory: no |
3284 |
-# Range: 0-1000 |
3285 |
-# Default: |
3286 |
-# StartJavaPollers=0 |
3287 |
- |
3288 |
-### Option: StartVMwareCollectors |
3289 |
-# Number of pre-forked vmware collector instances. |
3290 |
-# |
3291 |
-# Mandatory: no |
3292 |
-# Range: 0-250 |
3293 |
-# Default: |
3294 |
-# StartVMwareCollectors=0 |
3295 |
- |
3296 |
-### Option: VMwareFrequency |
3297 |
-# How often Zabbix will connect to VMware service to obtain a new data. |
3298 |
-# |
3299 |
-# Mandatory: no |
3300 |
-# Range: 10-86400 |
3301 |
-# Default: |
3302 |
-# VMwareFrequency=60 |
3303 |
- |
3304 |
-### Option: VMwarePerfFrequency |
3305 |
-# How often Zabbix will connect to VMware service to obtain performance data. |
3306 |
-# |
3307 |
-# Mandatory: no |
3308 |
-# Range: 10-86400 |
3309 |
-# Default: |
3310 |
-# VMwarePerfFrequency=60 |
3311 |
- |
3312 |
-### Option: VMwareCacheSize |
3313 |
-# Size of VMware cache, in bytes. |
3314 |
-# Shared memory size for storing VMware data. |
3315 |
-# Only used if VMware collectors are started. |
3316 |
-# |
3317 |
-# Mandatory: no |
3318 |
-# Range: 256K-2G |
3319 |
-# Default: |
3320 |
-# VMwareCacheSize=8M |
3321 |
- |
3322 |
-### Option: VMwareTimeout |
3323 |
-# Specifies how many seconds vmware collector waits for response from VMware service. |
3324 |
-# |
3325 |
-# Mandatory: no |
3326 |
-# Range: 1-300 |
3327 |
-# Default: |
3328 |
-# VMwareTimeout=10 |
3329 |
- |
3330 |
-### Option: SNMPTrapperFile |
3331 |
-# Temporary file used for passing data from SNMP trap daemon to the server. |
3332 |
-# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. |
3333 |
-# |
3334 |
-# Mandatory: no |
3335 |
-# Default: |
3336 |
-# SNMPTrapperFile=/tmp/zabbix_traps.tmp |
3337 |
- |
3338 |
-### Option: StartSNMPTrapper |
3339 |
-# If 1, SNMP trapper process is started. |
3340 |
-# |
3341 |
-# Mandatory: no |
3342 |
-# Range: 0-1 |
3343 |
-# Default: |
3344 |
-# StartSNMPTrapper=0 |
3345 |
- |
3346 |
-### Option: ListenIP |
3347 |
-# List of comma delimited IP addresses that the trapper should listen on. |
3348 |
-# Trapper will listen on all network interfaces if this parameter is missing. |
3349 |
-# |
3350 |
-# Mandatory: no |
3351 |
-# Default: |
3352 |
-# ListenIP=0.0.0.0 |
3353 |
- |
3354 |
-# ListenIP=127.0.0.1 |
3355 |
- |
3356 |
-### Option: HousekeepingFrequency |
3357 |
-# How often Zabbix will perform housekeeping procedure (in hours). |
3358 |
-# Housekeeping is removing outdated information from the database. |
3359 |
-# To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency |
3360 |
-# hours of outdated information are deleted in one housekeeping cycle, for each item. |
3361 |
-# To lower load on server startup housekeeping is postponed for 30 minutes after server start. |
3362 |
-# With HousekeepingFrequency=0 the housekeeper can be only executed using the runtime control option. |
3363 |
-# In this case the period of outdated information deleted in one housekeeping cycle is 4 times the |
3364 |
-# period since the last housekeeping cycle, but not less than 4 hours and not greater than 4 days. |
3365 |
-# |
3366 |
-# Mandatory: no |
3367 |
-# Range: 0-24 |
3368 |
-# Default: |
3369 |
-# HousekeepingFrequency=1 |
3370 |
- |
3371 |
-### Option: MaxHousekeeperDelete |
3372 |
-# The table "housekeeper" contains "tasks" for housekeeping procedure in the format: |
3373 |
-# [housekeeperid], [tablename], [field], [value]. |
3374 |
-# No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value]) |
3375 |
-# will be deleted per one task in one housekeeping cycle. |
3376 |
-# SQLite3 does not use this parameter, deletes all corresponding rows without a limit. |
3377 |
-# If set to 0 then no limit is used at all. In this case you must know what you are doing! |
3378 |
-# |
3379 |
-# Mandatory: no |
3380 |
-# Range: 0-1000000 |
3381 |
-# Default: |
3382 |
-# MaxHousekeeperDelete=5000 |
3383 |
- |
3384 |
-### Option: SenderFrequency |
3385 |
-# How often Zabbix will try to send unsent alerts (in seconds). |
3386 |
-# |
3387 |
-# Mandatory: no |
3388 |
-# Range: 5-3600 |
3389 |
-# Default: |
3390 |
-# SenderFrequency=30 |
3391 |
- |
3392 |
-### Option: CacheSize |
3393 |
-# Size of configuration cache, in bytes. |
3394 |
-# Shared memory size for storing host, item and trigger data. |
3395 |
-# |
3396 |
-# Mandatory: no |
3397 |
-# Range: 128K-8G |
3398 |
-# Default: |
3399 |
-# CacheSize=8M |
3400 |
- |
3401 |
-### Option: CacheUpdateFrequency |
3402 |
-# How often Zabbix will perform update of configuration cache, in seconds. |
3403 |
-# |
3404 |
-# Mandatory: no |
3405 |
-# Range: 1-3600 |
3406 |
-# Default: |
3407 |
-# CacheUpdateFrequency=60 |
3408 |
- |
3409 |
-### Option: StartDBSyncers |
3410 |
-# Number of pre-forked instances of DB Syncers. |
3411 |
-# |
3412 |
-# Mandatory: no |
3413 |
-# Range: 1-100 |
3414 |
-# Default: |
3415 |
-# StartDBSyncers=4 |
3416 |
- |
3417 |
-### Option: HistoryCacheSize |
3418 |
-# Size of history cache, in bytes. |
3419 |
-# Shared memory size for storing history data. |
3420 |
-# |
3421 |
-# Mandatory: no |
3422 |
-# Range: 128K-2G |
3423 |
-# Default: |
3424 |
-# HistoryCacheSize=16M |
3425 |
- |
3426 |
-### Option: HistoryIndexCacheSize |
3427 |
-# Size of history index cache, in bytes. |
3428 |
-# Shared memory size for indexing history cache. |
3429 |
-# |
3430 |
-# Mandatory: no |
3431 |
-# Range: 128K-2G |
3432 |
-# Default: |
3433 |
-# HistoryIndexCacheSize=4M |
3434 |
- |
3435 |
-### Option: TrendCacheSize |
3436 |
-# Size of trend cache, in bytes. |
3437 |
-# Shared memory size for storing trends data. |
3438 |
-# |
3439 |
-# Mandatory: no |
3440 |
-# Range: 128K-2G |
3441 |
-# Default: |
3442 |
-# TrendCacheSize=4M |
3443 |
- |
3444 |
-### Option: ValueCacheSize |
3445 |
-# Size of history value cache, in bytes. |
3446 |
-# Shared memory size for caching item history data requests. |
3447 |
-# Setting to 0 disables value cache. |
3448 |
-# |
3449 |
-# Mandatory: no |
3450 |
-# Range: 0,128K-64G |
3451 |
-# Default: |
3452 |
-# ValueCacheSize=8M |
3453 |
- |
3454 |
-### Option: Timeout |
3455 |
-# Specifies how long we wait for agent, SNMP device or external check (in seconds). |
3456 |
-# |
3457 |
-# Mandatory: no |
3458 |
-# Range: 1-30 |
3459 |
-# Default: |
3460 |
-# Timeout=3 |
3461 |
- |
3462 |
-Timeout=4 |
3463 |
- |
3464 |
-### Option: TrapperTimeout |
3465 |
-# Specifies how many seconds trapper may spend processing new data. |
3466 |
-# |
3467 |
-# Mandatory: no |
3468 |
-# Range: 1-300 |
3469 |
-# Default: |
3470 |
-# TrapperTimeout=300 |
3471 |
- |
3472 |
-### Option: UnreachablePeriod |
3473 |
-# After how many seconds of unreachability treat a host as unavailable. |
3474 |
-# |
3475 |
-# Mandatory: no |
3476 |
-# Range: 1-3600 |
3477 |
-# Default: |
3478 |
-# UnreachablePeriod=45 |
3479 |
- |
3480 |
-### Option: UnavailableDelay |
3481 |
-# How often host is checked for availability during the unavailability period, in seconds. |
3482 |
-# |
3483 |
-# Mandatory: no |
3484 |
-# Range: 1-3600 |
3485 |
-# Default: |
3486 |
-# UnavailableDelay=60 |
3487 |
- |
3488 |
-### Option: UnreachableDelay |
3489 |
-# How often host is checked for availability during the unreachability period, in seconds. |
3490 |
-# |
3491 |
-# Mandatory: no |
3492 |
-# Range: 1-3600 |
3493 |
-# Default: |
3494 |
-# UnreachableDelay=15 |
3495 |
- |
3496 |
-### Option: AlertScriptsPath |
3497 |
-# Full path to location of custom alert scripts. |
3498 |
-# Default depends on compilation options. |
3499 |
-# |
3500 |
-# Mandatory: no |
3501 |
-# Default: |
3502 |
-# AlertScriptsPath=${datadir}/zabbix/alertscripts |
3503 |
-AlertScriptsPath=/var/lib/zabbix/alertscripts |
3504 |
- |
3505 |
-### Option: ExternalScripts |
3506 |
-# Full path to location of external scripts. |
3507 |
-# Default depends on compilation options. |
3508 |
-# |
3509 |
-# Mandatory: no |
3510 |
-# Default: |
3511 |
-# ExternalScripts=${datadir}/zabbix/externalscripts |
3512 |
-ExternalScripts=/var/lib/zabbix/externalscripts |
3513 |
- |
3514 |
-### Option: FpingLocation |
3515 |
-# Location of fping. |
3516 |
-# Make sure that fping binary has root ownership and SUID flag set. |
3517 |
-# |
3518 |
-# Mandatory: no |
3519 |
-# Default: |
3520 |
-# FpingLocation=/usr/sbin/fping |
3521 |
- |
3522 |
-### Option: Fping6Location |
3523 |
-# Location of fping6. |
3524 |
-# Make sure that fping6 binary has root ownership and SUID flag set. |
3525 |
-# Make empty if your fping utility is capable to process IPv6 addresses. |
3526 |
-# |
3527 |
-# Mandatory: no |
3528 |
-# Default: |
3529 |
-# Fping6Location=/usr/sbin/fping6 |
3530 |
- |
3531 |
-### Option: SSHKeyLocation |
3532 |
-# Location of public and private keys for SSH checks and actions. |
3533 |
-# |
3534 |
-# Mandatory: no |
3535 |
-# Default: |
3536 |
-# SSHKeyLocation= |
3537 |
- |
3538 |
-### Option: LogSlowQueries |
3539 |
-# How long a database query may take before being logged (in milliseconds). |
3540 |
-# Only works if DebugLevel set to 3, 4 or 5. |
3541 |
-# 0 - don't log slow queries. |
3542 |
-# |
3543 |
-# Mandatory: no |
3544 |
-# Range: 1-3600000 |
3545 |
-# Default: |
3546 |
-# LogSlowQueries=0 |
3547 |
- |
3548 |
-LogSlowQueries=3000 |
3549 |
- |
3550 |
-### Option: TmpDir |
3551 |
-# Temporary directory. |
3552 |
-# |
3553 |
-# Mandatory: no |
3554 |
-# Default: |
3555 |
-# TmpDir=/tmp |
3556 |
- |
3557 |
-### Option: StartProxyPollers |
3558 |
-# Number of pre-forked instances of pollers for passive proxies. |
3559 |
-# |
3560 |
-# Mandatory: no |
3561 |
-# Range: 0-250 |
3562 |
-# Default: |
3563 |
-# StartProxyPollers=1 |
3564 |
- |
3565 |
-### Option: ProxyConfigFrequency |
3566 |
-# How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds. |
3567 |
-# This parameter is used only for proxies in the passive mode. |
3568 |
-# |
3569 |
-# Mandatory: no |
3570 |
-# Range: 1-3600*24*7 |
3571 |
-# Default: |
3572 |
-# ProxyConfigFrequency=3600 |
3573 |
- |
3574 |
-### Option: ProxyDataFrequency |
3575 |
-# How often Zabbix Server requests history data from a Zabbix Proxy in seconds. |
3576 |
-# This parameter is used only for proxies in the passive mode. |
3577 |
-# |
3578 |
-# Mandatory: no |
3579 |
-# Range: 1-3600 |
3580 |
-# Default: |
3581 |
-# ProxyDataFrequency=1 |
3582 |
- |
3583 |
-### Option: AllowRoot |
3584 |
-# Allow the server to run as 'root'. If disabled and the server is started by 'root', the server |
3585 |
-# will try to switch to the user specified by the User configuration option instead. |
3586 |
-# Has no effect if started under a regular user. |
3587 |
-# 0 - do not allow |
3588 |
-# 1 - allow |
3589 |
-# |
3590 |
-# Mandatory: no |
3591 |
-# Default: |
3592 |
-# AllowRoot=0 |
3593 |
- |
3594 |
-### Option: User |
3595 |
-# Drop privileges to a specific, existing user on the system. |
3596 |
-# Only has effect if run as 'root' and AllowRoot is disabled. |
3597 |
-# |
3598 |
-# Mandatory: no |
3599 |
-# Default: |
3600 |
-# User=zabbix |
3601 |
- |
3602 |
-### Option: Include |
3603 |
-# You may include individual files or all files in a directory in the configuration file. |
3604 |
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. |
3605 |
-# |
3606 |
-# Mandatory: no |
3607 |
-# Default: |
3608 |
-# Include= |
3609 |
- |
3610 |
-# Include=/usr/local/etc/zabbix_server.general.conf |
3611 |
-# Include=/usr/local/etc/zabbix_server.conf.d/ |
3612 |
-# Include=/usr/local/etc/zabbix_server.conf.d/*.conf |
3613 |
- |
3614 |
-### Option: SSLCertLocation |
3615 |
-# Location of SSL client certificates. |
3616 |
-# This parameter is used only in web monitoring. |
3617 |
-# |
3618 |
-# Mandatory: no |
3619 |
-# Default: |
3620 |
-# SSLCertLocation=${datadir}/zabbix/ssl/certs |
3621 |
- |
3622 |
-### Option: SSLKeyLocation |
3623 |
-# Location of private keys for SSL client certificates. |
3624 |
-# This parameter is used only in web monitoring. |
3625 |
-# |
3626 |
-# Mandatory: no |
3627 |
-# Default: |
3628 |
-# SSLKeyLocation=${datadir}/zabbix/ssl/keys |
3629 |
- |
3630 |
-### Option: SSLCALocation |
3631 |
-# Override the location of certificate authority (CA) files for SSL server certificate verification. |
3632 |
-# If not set, system-wide directory will be used. |
3633 |
-# This parameter is used only in web monitoring and SMTP authentication. |
3634 |
-# |
3635 |
-# Mandatory: no |
3636 |
-# Default: |
3637 |
-# SSLCALocation= |
3638 |
- |
3639 |
-####### LOADABLE MODULES ####### |
3640 |
- |
3641 |
-### Option: LoadModulePath |
3642 |
-# Full path to location of server modules. |
3643 |
-# Default depends on compilation options. |
3644 |
-# |
3645 |
-# Mandatory: no |
3646 |
-# Default: |
3647 |
-# LoadModulePath=${libdir}/modules |
3648 |
- |
3649 |
-### Option: LoadModule |
3650 |
-# Module to load at server startup. Modules are used to extend functionality of the server. |
3651 |
-# Format: LoadModule=<module.so> |
3652 |
-# The modules must be located in directory specified by LoadModulePath. |
3653 |
-# It is allowed to include multiple LoadModule parameters. |
3654 |
-# |
3655 |
-# Mandatory: no |
3656 |
-# Default: |
3657 |
-# LoadModule= |
3658 |
- |
3659 |
-####### TLS-RELATED PARAMETERS ####### |
3660 |
- |
3661 |
-### Option: TLSCAFile |
3662 |
-# Full pathname of a file containing the top-level CA(s) certificates for |
3663 |
-# peer certificate verification. |
3664 |
-# |
3665 |
-# Mandatory: no |
3666 |
-# Default: |
3667 |
-# TLSCAFile= |
3668 |
- |
3669 |
-### Option: TLSCRLFile |
3670 |
-# Full pathname of a file containing revoked certificates. |
3671 |
-# |
3672 |
-# Mandatory: no |
3673 |
-# Default: |
3674 |
-# TLSCRLFile= |
3675 |
- |
3676 |
-### Option: TLSCertFile |
3677 |
-# Full pathname of a file containing the server certificate or certificate chain. |
3678 |
-# |
3679 |
-# Mandatory: no |
3680 |
-# Default: |
3681 |
-# TLSCertFile= |
3682 |
- |
3683 |
-### Option: TLSKeyFile |
3684 |
-# Full pathname of a file containing the server private key. |
3685 |
-# |
3686 |
-# Mandatory: no |
3687 |
-# Default: |
3688 |
-# TLSKeyFile= |
3689 |
|
3690 |
diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch |
3691 |
new file mode 100644 |
3692 |
index 00000000000..7c3694a776e |
3693 |
--- /dev/null |
3694 |
+++ b/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch |
3695 |
@@ -0,0 +1,17 @@ |
3696 |
+diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c |
3697 |
+index a65b9c4..e011c51 100644 |
3698 |
+--- a/src/libs/zbxdb/db.c |
3699 |
++++ b/src/libs/zbxdb/db.c |
3700 |
+@@ -285,7 +285,11 @@ int zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d |
3701 |
+ #if defined(HAVE_IBM_DB2) |
3702 |
+ char *connect = NULL; |
3703 |
+ #elif defined(HAVE_MYSQL) |
3704 |
+- my_bool mysql_reconnect = 1; |
3705 |
++#if LIBMYSQL_VERSION_ID >= 80000 /* my_bool type is removed in MySQL 8.0 */ |
3706 |
++ bool mysql_reconnect = 1; |
3707 |
++#else |
3708 |
++ my_bool mysql_reconnect = 1; |
3709 |
++#endif |
3710 |
+ #elif defined(HAVE_ORACLE) |
3711 |
+ char *connect = NULL; |
3712 |
+ sword err = OCI_SUCCESS; |
3713 |
|
3714 |
diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch |
3715 |
new file mode 100644 |
3716 |
index 00000000000..e0fd74de51c |
3717 |
--- /dev/null |
3718 |
+++ b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch |
3719 |
@@ -0,0 +1,49 @@ |
3720 |
+diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf |
3721 |
+index b73bd45..c10daca 100644 |
3722 |
+--- a/conf/zabbix_agentd.conf |
3723 |
++++ b/conf/zabbix_agentd.conf |
3724 |
+@@ -5,6 +5,7 @@ |
3725 |
+ |
3726 |
+ ### Option: PidFile |
3727 |
+ # Name of PID file. |
3728 |
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) |
3729 |
+ # |
3730 |
+ # Mandatory: no |
3731 |
+ # Default: |
3732 |
+diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf |
3733 |
+index 082f14e..de0284d 100644 |
3734 |
+--- a/conf/zabbix_proxy.conf |
3735 |
++++ b/conf/zabbix_proxy.conf |
3736 |
+@@ -109,6 +109,7 @@ LogFile=/tmp/zabbix_proxy.log |
3737 |
+ |
3738 |
+ ### Option: PidFile |
3739 |
+ # Name of PID file. |
3740 |
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) |
3741 |
+ # |
3742 |
+ # Mandatory: no |
3743 |
+ # Default: |
3744 |
+diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf |
3745 |
+index 9f754ca..3999196 100644 |
3746 |
+--- a/conf/zabbix_server.conf |
3747 |
++++ b/conf/zabbix_server.conf |
3748 |
+@@ -62,6 +62,7 @@ LogFile=/tmp/zabbix_server.log |
3749 |
+ |
3750 |
+ ### Option: PidFile |
3751 |
+ # Name of PID file. |
3752 |
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) |
3753 |
+ # |
3754 |
+ # Mandatory: no |
3755 |
+ # Default: |
3756 |
+diff --git a/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c |
3757 |
+index baa8415..04c7e0c 100644 |
3758 |
+--- a/src/libs/zbxnix/pid.c |
3759 |
++++ b/src/libs/zbxnix/pid.c |
3760 |
+@@ -26,6 +26,8 @@ static int fdpid = -1; |
3761 |
+ |
3762 |
+ int create_pid_file(const char *pidfile) |
3763 |
+ { |
3764 |
++ return SUCCEED; |
3765 |
++ |
3766 |
+ int fd; |
3767 |
+ zbx_stat_t buf; |
3768 |
+ struct flock fl; |
3769 |
|
3770 |
diff --git a/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch |
3771 |
similarity index 100% |
3772 |
rename from net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch |
3773 |
rename to net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch |
3774 |
|
3775 |
diff --git a/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch |
3776 |
new file mode 100644 |
3777 |
index 00000000000..f6a6187b3fc |
3778 |
--- /dev/null |
3779 |
+++ b/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch |
3780 |
@@ -0,0 +1,49 @@ |
3781 |
+diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf |
3782 |
+index 73f1621..825715c 100644 |
3783 |
+--- a/conf/zabbix_agentd.conf |
3784 |
++++ b/conf/zabbix_agentd.conf |
3785 |
+@@ -5,6 +5,7 @@ |
3786 |
+ |
3787 |
+ ### Option: PidFile |
3788 |
+ # Name of PID file. |
3789 |
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) |
3790 |
+ # |
3791 |
+ # Mandatory: no |
3792 |
+ # Default: |
3793 |
+diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf |
3794 |
+index 7498ffa..de6b579 100644 |
3795 |
+--- a/conf/zabbix_proxy.conf |
3796 |
++++ b/conf/zabbix_proxy.conf |
3797 |
+@@ -133,6 +133,7 @@ LogFile=/tmp/zabbix_proxy.log |
3798 |
+ |
3799 |
+ ### Option: PidFile |
3800 |
+ # Name of PID file. |
3801 |
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) |
3802 |
+ # |
3803 |
+ # Mandatory: no |
3804 |
+ # Default: |
3805 |
+diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf |
3806 |
+index 760e685..3a252ae 100644 |
3807 |
+--- a/conf/zabbix_server.conf |
3808 |
++++ b/conf/zabbix_server.conf |
3809 |
+@@ -62,6 +62,7 @@ LogFile=/tmp/zabbix_server.log |
3810 |
+ |
3811 |
+ ### Option: PidFile |
3812 |
+ # Name of PID file. |
3813 |
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) |
3814 |
+ # |
3815 |
+ # Mandatory: no |
3816 |
+ # Default: |
3817 |
+diff --git a/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c |
3818 |
+index 6b1a333..7a9578a 100644 |
3819 |
+--- a/src/libs/zbxnix/pid.c |
3820 |
++++ b/src/libs/zbxnix/pid.c |
3821 |
+@@ -26,6 +26,8 @@ static int fdpid = -1; |
3822 |
+ |
3823 |
+ int create_pid_file(const char *pidfile) |
3824 |
+ { |
3825 |
++ return SUCCEED; |
3826 |
++ |
3827 |
+ int fd; |
3828 |
+ zbx_stat_t buf; |
3829 |
+ struct flock fl; |
3830 |
|
3831 |
diff --git a/net-analyzer/zabbix/files/zabbix-agentd.init b/net-analyzer/zabbix/files/zabbix-agentd.init |
3832 |
new file mode 100644 |
3833 |
index 00000000000..e2433ff8f6e |
3834 |
--- /dev/null |
3835 |
+++ b/net-analyzer/zabbix/files/zabbix-agentd.init |
3836 |
@@ -0,0 +1,20 @@ |
3837 |
+#!/sbin/openrc-run |
3838 |
+# Copyright 1999-2020 Gentoo Authors |
3839 |
+# Distributed under the terms of the GNU General Public License v2 |
3840 |
+ |
3841 |
+command="/usr/sbin/zabbix_agentd" |
3842 |
+command_args="--foreground --config /etc/zabbix/zabbix_agentd.conf" |
3843 |
+command_background="true" |
3844 |
+command_user="zabbix:zabbix" |
3845 |
+pidfile="/run/${RC_SVCNAME}.pid" |
3846 |
+ |
3847 |
+depend() { |
3848 |
+ need net |
3849 |
+ provide zabbix-agent |
3850 |
+ use zabbix-server |
3851 |
+} |
3852 |
+ |
3853 |
+start_pre() { |
3854 |
+ checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix |
3855 |
+ checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf |
3856 |
+} |
3857 |
|
3858 |
diff --git a/net-analyzer/zabbix/files/zabbix-agentd.service b/net-analyzer/zabbix/files/zabbix-agentd.service |
3859 |
index 8485d06f5a3..dc13089e0cf 100644 |
3860 |
--- a/net-analyzer/zabbix/files/zabbix-agentd.service |
3861 |
+++ b/net-analyzer/zabbix/files/zabbix-agentd.service |
3862 |
@@ -1,14 +1,12 @@ |
3863 |
[Unit] |
3864 |
-Description=Zabbix agent daemon |
3865 |
-After=network.target |
3866 |
+Description=Zabbix agent |
3867 |
+Documentation=https://zabbix.com/manuals |
3868 |
+After=network.target network-online.target |
3869 |
|
3870 |
[Service] |
3871 |
-Type=forking |
3872 |
User=zabbix |
3873 |
Group=zabbix |
3874 |
-ExecStart=/usr/sbin/zabbix_agentd -c /etc/zabbix/zabbix_agentd.conf |
3875 |
-PIDFile=/run/zabbix/zabbix_agentd.pid |
3876 |
+ExecStart=/usr/sbin/zabbix_agentd --foreground --config /etc/zabbix/zabbix_agentd.conf |
3877 |
|
3878 |
[Install] |
3879 |
WantedBy=multi-user.target |
3880 |
- |
3881 |
|
3882 |
diff --git a/net-analyzer/zabbix/files/3.0/conf.d/zabbix-jmx-proxy b/net-analyzer/zabbix/files/zabbix-jmx-proxy.conf |
3883 |
similarity index 100% |
3884 |
rename from net-analyzer/zabbix/files/3.0/conf.d/zabbix-jmx-proxy |
3885 |
rename to net-analyzer/zabbix/files/zabbix-jmx-proxy.conf |
3886 |
|
3887 |
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-jmx-proxy b/net-analyzer/zabbix/files/zabbix-jmx-proxy.init |
3888 |
old mode 100755 |
3889 |
new mode 100644 |
3890 |
similarity index 100% |
3891 |
rename from net-analyzer/zabbix/files/3.0/init.d/zabbix-jmx-proxy |
3892 |
rename to net-analyzer/zabbix/files/zabbix-jmx-proxy.init |
3893 |
|
3894 |
diff --git a/net-analyzer/zabbix/files/zabbix-proxy.init b/net-analyzer/zabbix/files/zabbix-proxy.init |
3895 |
new file mode 100644 |
3896 |
index 00000000000..8347b481fff |
3897 |
--- /dev/null |
3898 |
+++ b/net-analyzer/zabbix/files/zabbix-proxy.init |
3899 |
@@ -0,0 +1,20 @@ |
3900 |
+#!/sbin/openrc-run |
3901 |
+# Copyright 1999-2020 Gentoo Authors |
3902 |
+# Distributed under the terms of the GNU General Public License v2 |
3903 |
+ |
3904 |
+command="/usr/sbin/zabbix_proxy" |
3905 |
+command_args="--foreground --config /etc/zabbix/zabbix_proxy.conf" |
3906 |
+command_background="true" |
3907 |
+command_user="zabbix:zabbix" |
3908 |
+pidfile="/run/${RC_SVCNAME}.pid" |
3909 |
+ |
3910 |
+depend() { |
3911 |
+ need net |
3912 |
+ provide zabbix-proxy |
3913 |
+} |
3914 |
+ |
3915 |
+start_pre() { |
3916 |
+ checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix |
3917 |
+ checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf |
3918 |
+} |
3919 |
+ |
3920 |
|
3921 |
diff --git a/net-analyzer/zabbix/files/zabbix-proxy.service b/net-analyzer/zabbix/files/zabbix-proxy.service |
3922 |
index 85ecd79cc88..78b07be0506 100644 |
3923 |
--- a/net-analyzer/zabbix/files/zabbix-proxy.service |
3924 |
+++ b/net-analyzer/zabbix/files/zabbix-proxy.service |
3925 |
@@ -1,14 +1,12 @@ |
3926 |
[Unit] |
3927 |
Description=Zabbix proxy |
3928 |
-After=network.target |
3929 |
+Documentation=https://zabbix.com/manuals |
3930 |
+After=network.target network-online.target |
3931 |
|
3932 |
[Service] |
3933 |
-Type=forking |
3934 |
User=zabbix |
3935 |
Group=zabbix |
3936 |
-ExecStart=/usr/sbin/zabbix_proxy -c /etc/zabbix/zabbix_proxy.conf |
3937 |
-PIDFile=/run/zabbix/zabbix_proxy.pid |
3938 |
+ExecStart=/usr/sbin/zabbix_proxy --foreground --config /etc/zabbix/zabbix_proxy.conf |
3939 |
|
3940 |
[Install] |
3941 |
WantedBy=multi-user.target |
3942 |
- |
3943 |
|
3944 |
diff --git a/net-analyzer/zabbix/files/zabbix-server.init b/net-analyzer/zabbix/files/zabbix-server.init |
3945 |
new file mode 100644 |
3946 |
index 00000000000..b0bf752abaf |
3947 |
--- /dev/null |
3948 |
+++ b/net-analyzer/zabbix/files/zabbix-server.init |
3949 |
@@ -0,0 +1,19 @@ |
3950 |
+#!/sbin/openrc-run |
3951 |
+# Copyright 1999-2020 Gentoo Authors |
3952 |
+# Distributed under the terms of the GNU General Public License v2 |
3953 |
+ |
3954 |
+command="/usr/sbin/zabbix_server" |
3955 |
+command_args="--foreground --config /etc/zabbix/zabbix_server.conf" |
3956 |
+command_background="true" |
3957 |
+command_user="zabbix:zabbix" |
3958 |
+pidfile="/run/${RC_SVCNAME}.pid" |
3959 |
+ |
3960 |
+depend() { |
3961 |
+ need net |
3962 |
+ use mysql postgresql |
3963 |
+} |
3964 |
+ |
3965 |
+start_pre() { |
3966 |
+ checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix |
3967 |
+ checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf |
3968 |
+} |
3969 |
|
3970 |
diff --git a/net-analyzer/zabbix/files/zabbix-server.service b/net-analyzer/zabbix/files/zabbix-server.service |
3971 |
index 3ea973356ef..a7bdc0d1e06 100644 |
3972 |
--- a/net-analyzer/zabbix/files/zabbix-server.service |
3973 |
+++ b/net-analyzer/zabbix/files/zabbix-server.service |
3974 |
@@ -1,14 +1,15 @@ |
3975 |
[Unit] |
3976 |
Description=Zabbix server |
3977 |
-After=syslog.target network.target postgresql.service |
3978 |
+Documentation=https://zabbix.com/manuals |
3979 |
+After=syslog.target syslog.service network.target network-online.target postgresql.service |
3980 |
+After=postgresql-9.6.service postgresql-10.service |
3981 |
+After=postgresql-11.service postgresql-12.service |
3982 |
+ |
3983 |
|
3984 |
[Service] |
3985 |
-Type=forking |
3986 |
User=zabbix |
3987 |
Group=zabbix |
3988 |
-ExecStart=/usr/sbin/zabbix_server -c /etc/zabbix/zabbix_server.conf |
3989 |
-PIDFile=/run/zabbix/zabbix_server.pid |
3990 |
+ExecStart=/usr/sbin/zabbix_server --foreground --config /etc/zabbix/zabbix_server.conf |
3991 |
|
3992 |
[Install] |
3993 |
WantedBy=multi-user.target |
3994 |
- |
3995 |
|
3996 |
diff --git a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild |
3997 |
deleted file mode 100644 |
3998 |
index 26b70005d75..00000000000 |
3999 |
--- a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild |
4000 |
+++ /dev/null |
4001 |
@@ -1,340 +0,0 @@ |
4002 |
-# Copyright 1999-2019 Gentoo Authors |
4003 |
-# Distributed under the terms of the GNU General Public License v2 |
4004 |
- |
4005 |
-EAPI="6" |
4006 |
- |
4007 |
-# needed to make webapp-config dep optional |
4008 |
-WEBAPP_OPTIONAL="yes" |
4009 |
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs |
4010 |
- |
4011 |
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" |
4012 |
-HOMEPAGE="https://www.zabbix.com/" |
4013 |
-MY_P=${P/_/} |
4014 |
-MY_PV=${PV/_/} |
4015 |
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" |
4016 |
-LICENSE="GPL-2" |
4017 |
-SLOT="0" |
4018 |
-WEBAPP_MANUAL_SLOT="yes" |
4019 |
-KEYWORDS="amd64 x86" |
4020 |
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" |
4021 |
-REQUIRED_USE="|| ( agent frontend proxy server ) |
4022 |
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
4023 |
- server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
4024 |
- static? ( !oracle !snmp )" |
4025 |
- |
4026 |
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) |
4027 |
- ldap? ( |
4028 |
- net-nds/openldap |
4029 |
- =dev-libs/cyrus-sasl-2* |
4030 |
- net-libs/gnutls |
4031 |
- ) |
4032 |
- mysql? ( >=virtual/mysql-5.0.3 ) |
4033 |
- sqlite? ( >=dev-db/sqlite-3.3.5 ) |
4034 |
- postgres? ( dev-db/postgresql:* ) |
4035 |
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) |
4036 |
- xmpp? ( dev-libs/iksemel ) |
4037 |
- libxml2? ( dev-libs/libxml2 ) |
4038 |
- curl? ( net-misc/curl ) |
4039 |
- openipmi? ( sys-libs/openipmi ) |
4040 |
- ssh? ( net-libs/libssh2 ) |
4041 |
- java? ( virtual/jdk:* ) |
4042 |
- odbc? ( dev-db/unixODBC )" |
4043 |
- |
4044 |
-RDEPEND="${COMMON_DEPEND} |
4045 |
- proxy? ( net-analyzer/fping ) |
4046 |
- server? ( net-analyzer/fping |
4047 |
- app-admin/webapp-config ) |
4048 |
- java? ( |
4049 |
- >=virtual/jre-1.4 |
4050 |
- dev-java/slf4j-api |
4051 |
- ) |
4052 |
- frontend? ( |
4053 |
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
4054 |
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) |
4055 |
- mysql? ( dev-lang/php[mysqli] ) |
4056 |
- odbc? ( dev-lang/php[odbc] ) |
4057 |
- oracle? ( dev-lang/php[oci8-instant-client] ) |
4058 |
- postgres? ( dev-lang/php[postgres] ) |
4059 |
- sqlite? ( dev-lang/php[sqlite] ) |
4060 |
- media-libs/gd[png] |
4061 |
- app-admin/webapp-config )" |
4062 |
-DEPEND="${COMMON_DEPEND} |
4063 |
- static? ( |
4064 |
- ldap? ( |
4065 |
- net-nds/openldap[static-libs] |
4066 |
- =dev-libs/cyrus-sasl-2*[static-libs] |
4067 |
- net-libs/gnutls[static-libs] |
4068 |
- ) |
4069 |
- mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] ) |
4070 |
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) |
4071 |
- postgres? ( dev-db/postgresql:*[static-libs] ) |
4072 |
- libxml2? ( dev-libs/libxml2[static-libs] ) |
4073 |
- curl? ( net-misc/curl[static-libs] ) |
4074 |
- ssh? ( net-libs/libssh2 ) |
4075 |
- odbc? ( dev-db/unixODBC[static-libs] ) |
4076 |
- ) |
4077 |
- virtual/pkgconfig" |
4078 |
- |
4079 |
-S=${WORKDIR}/${MY_P} |
4080 |
- |
4081 |
-ZABBIXJAVA_BASE="opt/zabbix_java" |
4082 |
- |
4083 |
-pkg_setup() { |
4084 |
- if use oracle; then |
4085 |
- if [ -z "${ORACLE_HOME}" ]; then |
4086 |
- eerror |
4087 |
- eerror "The environment variable ORACLE_HOME must be set" |
4088 |
- eerror "and point to the correct location." |
4089 |
- eerror "It looks like you don't have Oracle installed." |
4090 |
- eerror |
4091 |
- die "Environment variable ORACLE_HOME is not set" |
4092 |
- fi |
4093 |
- if has_version 'dev-db/oracle-instantclient-basic'; then |
4094 |
- ewarn |
4095 |
- ewarn "Please ensure you have a full install of the Oracle client." |
4096 |
- ewarn "dev-db/oracle-instantclient* is NOT sufficient." |
4097 |
- ewarn |
4098 |
- fi |
4099 |
- fi |
4100 |
- |
4101 |
- if use frontend; then |
4102 |
- webapp_pkg_setup |
4103 |
- fi |
4104 |
- |
4105 |
- enewgroup zabbix |
4106 |
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix |
4107 |
-} |
4108 |
- |
4109 |
-java_prepare() { |
4110 |
- cd "${S}/src/zabbix_java/lib" |
4111 |
- rm -v *.jar || die |
4112 |
- |
4113 |
- java-pkg_jar-from slf4j-api |
4114 |
-} |
4115 |
- |
4116 |
-src_prepare() { |
4117 |
- default |
4118 |
-} |
4119 |
- |
4120 |
-src_configure() { |
4121 |
- econf \ |
4122 |
- $(use_enable server) \ |
4123 |
- $(use_enable proxy) \ |
4124 |
- $(use_enable agent) \ |
4125 |
- $(use_enable ipv6) \ |
4126 |
- $(use_enable static) \ |
4127 |
- $(use_enable java) \ |
4128 |
- $(use_with ldap) \ |
4129 |
- $(use_with snmp net-snmp) \ |
4130 |
- $(use_with mysql) \ |
4131 |
- $(use_with postgres postgresql) \ |
4132 |
- $(use_with oracle) \ |
4133 |
- $(use_with sqlite sqlite3) \ |
4134 |
- $(use_with xmpp jabber) \ |
4135 |
- $(use_with curl libcurl) \ |
4136 |
- $(use_with openipmi openipmi) \ |
4137 |
- $(use_with ssh ssh2) \ |
4138 |
- $(use_with libxml2) \ |
4139 |
- $(use_with odbc unixodbc) |
4140 |
-} |
4141 |
- |
4142 |
-src_compile() { |
4143 |
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then |
4144 |
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" |
4145 |
- fi |
4146 |
-} |
4147 |
- |
4148 |
-src_install() { |
4149 |
- dodir \ |
4150 |
- /etc/zabbix \ |
4151 |
- /var/lib/zabbix \ |
4152 |
- /var/lib/zabbix/home \ |
4153 |
- /var/lib/zabbix/scripts \ |
4154 |
- /var/lib/zabbix/alertscripts \ |
4155 |
- /var/lib/zabbix/externalscripts \ |
4156 |
- /var/log/zabbix |
4157 |
- |
4158 |
- keepdir \ |
4159 |
- /etc/zabbix \ |
4160 |
- /var/lib/zabbix \ |
4161 |
- /var/lib/zabbix/home \ |
4162 |
- /var/lib/zabbix/scripts \ |
4163 |
- /var/lib/zabbix/alertscripts \ |
4164 |
- /var/lib/zabbix/externalscripts \ |
4165 |
- /var/log/zabbix |
4166 |
- |
4167 |
- if use server; then |
4168 |
- insinto /etc/zabbix |
4169 |
- doins "${FILESDIR}/2.2"/zabbix_server.conf |
4170 |
- doinitd "${FILESDIR}/2.2"/init.d/zabbix-server |
4171 |
- dosbin src/zabbix_server/zabbix_server |
4172 |
- fowners root:zabbix /etc/zabbix/zabbix_server.conf |
4173 |
- fperms 0640 /etc/zabbix/zabbix_server.conf |
4174 |
- dodir /usr/share/zabbix |
4175 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
4176 |
- systemd_dounit "${FILESDIR}/zabbix-server.service" |
4177 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf |
4178 |
- fi |
4179 |
- |
4180 |
- if use proxy; then |
4181 |
- doinitd \ |
4182 |
- "${FILESDIR}/2.2"/init.d/zabbix-proxy |
4183 |
- dosbin \ |
4184 |
- src/zabbix_proxy/zabbix_proxy |
4185 |
- insinto /etc/zabbix |
4186 |
- doins \ |
4187 |
- "${FILESDIR}/2.2"/zabbix_proxy.conf |
4188 |
- dodir /usr/share/zabbix |
4189 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
4190 |
- systemd_dounit "${FILESDIR}/zabbix-proxy.service" |
4191 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf |
4192 |
- fi |
4193 |
- |
4194 |
- if use agent; then |
4195 |
- insinto /etc/zabbix |
4196 |
- doins \ |
4197 |
- "${FILESDIR}/2.2"/zabbix_agent.conf \ |
4198 |
- "${FILESDIR}/2.2"/zabbix_agentd.conf |
4199 |
- doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd |
4200 |
- dosbin \ |
4201 |
- src/zabbix_agent/zabbix_agent \ |
4202 |
- src/zabbix_agent/zabbix_agentd |
4203 |
- dobin \ |
4204 |
- src/zabbix_sender/zabbix_sender \ |
4205 |
- src/zabbix_get/zabbix_get |
4206 |
- fowners zabbix:zabbix \ |
4207 |
- /etc/zabbix/zabbix_agent.conf \ |
4208 |
- /etc/zabbix/zabbix_agentd.conf |
4209 |
- fperms 0640 \ |
4210 |
- /etc/zabbix/zabbix_agent.conf \ |
4211 |
- /etc/zabbix/zabbix_agentd.conf |
4212 |
- systemd_dounit "${FILESDIR}/zabbix-agentd.service" |
4213 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf |
4214 |
- fi |
4215 |
- |
4216 |
- fowners zabbix:zabbix \ |
4217 |
- /etc/zabbix \ |
4218 |
- /var/lib/zabbix \ |
4219 |
- /var/lib/zabbix/home \ |
4220 |
- /var/lib/zabbix/scripts \ |
4221 |
- /var/lib/zabbix/alertscripts \ |
4222 |
- /var/lib/zabbix/externalscripts \ |
4223 |
- /var/log/zabbix |
4224 |
- fperms 0750 \ |
4225 |
- /etc/zabbix \ |
4226 |
- /var/lib/zabbix \ |
4227 |
- /var/lib/zabbix/home \ |
4228 |
- /var/lib/zabbix/scripts \ |
4229 |
- /var/lib/zabbix/alertscripts \ |
4230 |
- /var/lib/zabbix/externalscripts \ |
4231 |
- /var/log/zabbix |
4232 |
- |
4233 |
- dodoc README INSTALL NEWS ChangeLog \ |
4234 |
- conf/zabbix_agent.conf \ |
4235 |
- conf/zabbix_agentd.conf \ |
4236 |
- conf/zabbix_proxy.conf \ |
4237 |
- conf/zabbix_agentd/userparameter_examples.conf \ |
4238 |
- conf/zabbix_agentd/userparameter_mysql.conf \ |
4239 |
- conf/zabbix_server.conf |
4240 |
- |
4241 |
- if use frontend; then |
4242 |
- webapp_src_preinst |
4243 |
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" |
4244 |
- webapp_configfile \ |
4245 |
- "${MY_HTDOCSDIR}"/include/db.inc.php \ |
4246 |
- "${MY_HTDOCSDIR}"/include/config.inc.php |
4247 |
- webapp_src_install |
4248 |
- fi |
4249 |
- |
4250 |
- if use java; then |
4251 |
- dodir \ |
4252 |
- /${ZABBIXJAVA_BASE} \ |
4253 |
- /${ZABBIXJAVA_BASE}/bin \ |
4254 |
- /${ZABBIXJAVA_BASE}/lib |
4255 |
- keepdir /${ZABBIXJAVA_BASE} |
4256 |
- exeinto /${ZABBIXJAVA_BASE}/bin |
4257 |
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar |
4258 |
- exeinto /${ZABBIXJAVA_BASE}/lib |
4259 |
- doexe \ |
4260 |
- src/zabbix_java/lib/logback-classic-0.9.27.jar \ |
4261 |
- src/zabbix_java/lib/logback-console.xml \ |
4262 |
- src/zabbix_java/lib/logback-core-0.9.27.jar \ |
4263 |
- src/zabbix_java/lib/logback.xml \ |
4264 |
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \ |
4265 |
- src/zabbix_java/lib/slf4j-api-1.6.1.jar |
4266 |
- exeinto /${ZABBIXJAVA_BASE}/ |
4267 |
- doexe \ |
4268 |
- src/zabbix_java/settings.sh \ |
4269 |
- src/zabbix_java/startup.sh \ |
4270 |
- src/zabbix_java/shutdown.sh |
4271 |
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} |
4272 |
- fi |
4273 |
-} |
4274 |
- |
4275 |
-pkg_postinst() { |
4276 |
- if use server || use proxy ; then |
4277 |
- elog |
4278 |
- elog "You may need to configure your database for Zabbix," |
4279 |
- elog "if you have not already done so. " |
4280 |
- elog |
4281 |
- |
4282 |
- zabbix_homedir=$(egethome zabbix) |
4283 |
- if [ -n "${zabbix_homedir}" ] && \ |
4284 |
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then |
4285 |
- ewarn |
4286 |
- ewarn "The user 'zabbix' should have his homedir changed" |
4287 |
- ewarn "to /var/lib/zabbix/home if you want to use" |
4288 |
- ewarn "custom alert scripts." |
4289 |
- ewarn |
4290 |
- ewarn "A real homedir might be needed for configfiles" |
4291 |
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" |
4292 |
- ewarn "using sendxmpp for Jabber alerts)." |
4293 |
- ewarn |
4294 |
- ewarn "To change the homedir use:" |
4295 |
- ewarn " usermod -d /var/lib/zabbix/home zabbix" |
4296 |
- ewarn |
4297 |
- fi |
4298 |
- fi |
4299 |
- |
4300 |
- if use server; then |
4301 |
- elog |
4302 |
- elog "For distributed monitoring you have to run:" |
4303 |
- elog |
4304 |
- elog "zabbix_server -n <nodeid>" |
4305 |
- elog |
4306 |
- elog "This will convert database data for use with Node ID" |
4307 |
- elog "and also adds a local node." |
4308 |
- elog |
4309 |
- fi |
4310 |
- |
4311 |
- elog "--" |
4312 |
- elog |
4313 |
- elog "You may need to add these lines to /etc/services:" |
4314 |
- elog |
4315 |
- elog "zabbix-agent 10050/tcp Zabbix Agent" |
4316 |
- elog "zabbix-agent 10050/udp Zabbix Agent" |
4317 |
- elog "zabbix-trapper 10051/tcp Zabbix Trapper" |
4318 |
- elog "zabbix-trapper 10051/udp Zabbix Trapper" |
4319 |
- elog |
4320 |
- |
4321 |
- if use server || use proxy ; then |
4322 |
- # check for fping |
4323 |
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) |
4324 |
- case "${fping_perms}" in |
4325 |
- 4[157][157][157]) |
4326 |
- ;; |
4327 |
- *) |
4328 |
- ewarn |
4329 |
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," |
4330 |
- ewarn "you have to make /usr/sbin/fping setuid root and executable" |
4331 |
- ewarn "by everyone. Run the following command to fix it:" |
4332 |
- ewarn |
4333 |
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" |
4334 |
- ewarn |
4335 |
- ewarn "Please be aware that this might impose a security risk," |
4336 |
- ewarn "depending on the code quality of fping." |
4337 |
- ewarn |
4338 |
- ;; |
4339 |
- esac |
4340 |
- fi |
4341 |
-} |
4342 |
|
4343 |
diff --git a/net-analyzer/zabbix/zabbix-3.0.28.ebuild b/net-analyzer/zabbix/zabbix-3.0.28.ebuild |
4344 |
deleted file mode 100644 |
4345 |
index 09ba412f2f8..00000000000 |
4346 |
--- a/net-analyzer/zabbix/zabbix-3.0.28.ebuild |
4347 |
+++ /dev/null |
4348 |
@@ -1,330 +0,0 @@ |
4349 |
-# Copyright 1999-2019 Gentoo Authors |
4350 |
-# Distributed under the terms of the GNU General Public License v2 |
4351 |
- |
4352 |
-EAPI="6" |
4353 |
- |
4354 |
-# needed to make webapp-config dep optional |
4355 |
-WEBAPP_OPTIONAL="yes" |
4356 |
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs |
4357 |
- |
4358 |
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" |
4359 |
-HOMEPAGE="https://www.zabbix.com/" |
4360 |
-MY_P=${P/_/} |
4361 |
-MY_PV=${PV/_/} |
4362 |
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" |
4363 |
-LICENSE="GPL-2" |
4364 |
-SLOT="0" |
4365 |
-WEBAPP_MANUAL_SLOT="yes" |
4366 |
-KEYWORDS="~amd64 ~x86" |
4367 |
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static" |
4368 |
-REQUIRED_USE="|| ( agent frontend proxy server ) |
4369 |
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
4370 |
- server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
4371 |
- static? ( !oracle !snmp )" |
4372 |
- |
4373 |
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) |
4374 |
- ldap? ( |
4375 |
- net-nds/openldap |
4376 |
- =dev-libs/cyrus-sasl-2* |
4377 |
- net-libs/gnutls |
4378 |
- ) |
4379 |
- mysql? ( >=virtual/mysql-5.0.3 ) |
4380 |
- sqlite? ( >=dev-db/sqlite-3.3.5 ) |
4381 |
- postgres? ( dev-db/postgresql:* ) |
4382 |
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) |
4383 |
- xmpp? ( dev-libs/iksemel ) |
4384 |
- libxml2? ( dev-libs/libxml2 ) |
4385 |
- curl? ( net-misc/curl ) |
4386 |
- openipmi? ( sys-libs/openipmi ) |
4387 |
- ssh? ( net-libs/libssh2 ) |
4388 |
- java? ( virtual/jdk:* ) |
4389 |
- odbc? ( dev-db/unixODBC ) |
4390 |
- ssl? ( dev-libs/openssl:=[-bindist] )" |
4391 |
- |
4392 |
-RDEPEND="${COMMON_DEPEND} |
4393 |
- proxy? ( net-analyzer/fping ) |
4394 |
- server? ( net-analyzer/fping |
4395 |
- app-admin/webapp-config ) |
4396 |
- java? ( |
4397 |
- >=virtual/jre-1.4 |
4398 |
- dev-java/slf4j-api |
4399 |
- ) |
4400 |
- frontend? ( |
4401 |
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
4402 |
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) |
4403 |
- mysql? ( dev-lang/php[mysqli] ) |
4404 |
- odbc? ( dev-lang/php[odbc] ) |
4405 |
- oracle? ( dev-lang/php[oci8-instant-client] ) |
4406 |
- postgres? ( dev-lang/php[postgres] ) |
4407 |
- sqlite? ( dev-lang/php[sqlite] ) |
4408 |
- media-libs/gd[png] |
4409 |
- app-admin/webapp-config )" |
4410 |
-DEPEND="${COMMON_DEPEND} |
4411 |
- static? ( |
4412 |
- ldap? ( |
4413 |
- net-nds/openldap[static-libs] |
4414 |
- =dev-libs/cyrus-sasl-2*[static-libs] |
4415 |
- net-libs/gnutls[static-libs] |
4416 |
- ) |
4417 |
- mysql? ( >=virtual/mysql-5.0.3[static-libs] ) |
4418 |
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) |
4419 |
- postgres? ( dev-db/postgresql:*[static-libs] ) |
4420 |
- libxml2? ( dev-libs/libxml2[static-libs] ) |
4421 |
- curl? ( net-misc/curl[static-libs] ) |
4422 |
- ssh? ( net-libs/libssh2 ) |
4423 |
- odbc? ( dev-db/unixODBC[static-libs] ) |
4424 |
- ) |
4425 |
- virtual/pkgconfig" |
4426 |
- |
4427 |
-S=${WORKDIR}/${MY_P} |
4428 |
- |
4429 |
-ZABBIXJAVA_BASE="opt/zabbix_java" |
4430 |
- |
4431 |
-pkg_setup() { |
4432 |
- if use oracle; then |
4433 |
- if [ -z "${ORACLE_HOME}" ]; then |
4434 |
- eerror |
4435 |
- eerror "The environment variable ORACLE_HOME must be set" |
4436 |
- eerror "and point to the correct location." |
4437 |
- eerror "It looks like you don't have Oracle installed." |
4438 |
- eerror |
4439 |
- die "Environment variable ORACLE_HOME is not set" |
4440 |
- fi |
4441 |
- if has_version 'dev-db/oracle-instantclient-basic'; then |
4442 |
- ewarn |
4443 |
- ewarn "Please ensure you have a full install of the Oracle client." |
4444 |
- ewarn "dev-db/oracle-instantclient* is NOT sufficient." |
4445 |
- ewarn |
4446 |
- fi |
4447 |
- fi |
4448 |
- |
4449 |
- if use frontend; then |
4450 |
- webapp_pkg_setup |
4451 |
- fi |
4452 |
- |
4453 |
- enewgroup zabbix |
4454 |
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix |
4455 |
-} |
4456 |
- |
4457 |
-java_prepare() { |
4458 |
- cd "${S}/src/zabbix_java/lib" |
4459 |
- rm -v *.jar || die |
4460 |
- |
4461 |
- java-pkg_jar-from slf4j-api |
4462 |
-} |
4463 |
- |
4464 |
-src_prepare() { |
4465 |
- default |
4466 |
-} |
4467 |
- |
4468 |
-src_configure() { |
4469 |
- econf \ |
4470 |
- $(use_enable server) \ |
4471 |
- $(use_enable proxy) \ |
4472 |
- $(use_enable agent) \ |
4473 |
- $(use_enable ipv6) \ |
4474 |
- $(use_enable static) \ |
4475 |
- $(use_enable java) \ |
4476 |
- $(use_with ldap) \ |
4477 |
- $(use_with snmp net-snmp) \ |
4478 |
- $(use_with mysql) \ |
4479 |
- $(use_with postgres postgresql) \ |
4480 |
- $(use_with oracle) \ |
4481 |
- $(use_with sqlite sqlite3) \ |
4482 |
- $(use_with xmpp jabber) \ |
4483 |
- $(use_with curl libcurl) \ |
4484 |
- $(use_with openipmi openipmi) \ |
4485 |
- $(use_with ssh ssh2) \ |
4486 |
- $(use_with libxml2) \ |
4487 |
- $(use_with odbc unixodbc) \ |
4488 |
- $(use_with ssl openssl) |
4489 |
-} |
4490 |
- |
4491 |
-src_compile() { |
4492 |
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then |
4493 |
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" |
4494 |
- fi |
4495 |
-} |
4496 |
- |
4497 |
-src_install() { |
4498 |
- dodir \ |
4499 |
- /etc/zabbix \ |
4500 |
- /var/lib/zabbix \ |
4501 |
- /var/lib/zabbix/home \ |
4502 |
- /var/lib/zabbix/scripts \ |
4503 |
- /var/lib/zabbix/alertscripts \ |
4504 |
- /var/lib/zabbix/externalscripts \ |
4505 |
- /var/log/zabbix |
4506 |
- |
4507 |
- keepdir \ |
4508 |
- /etc/zabbix \ |
4509 |
- /var/lib/zabbix \ |
4510 |
- /var/lib/zabbix/home \ |
4511 |
- /var/lib/zabbix/scripts \ |
4512 |
- /var/lib/zabbix/alertscripts \ |
4513 |
- /var/lib/zabbix/externalscripts \ |
4514 |
- /var/log/zabbix |
4515 |
- |
4516 |
- if use server; then |
4517 |
- insinto /etc/zabbix |
4518 |
- doins "${FILESDIR}/3.0"/zabbix_server.conf |
4519 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server |
4520 |
- dosbin src/zabbix_server/zabbix_server |
4521 |
- fowners root:zabbix /etc/zabbix/zabbix_server.conf |
4522 |
- fperms 0640 /etc/zabbix/zabbix_server.conf |
4523 |
- dodir /usr/share/zabbix |
4524 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
4525 |
- systemd_dounit "${FILESDIR}/zabbix-server.service" |
4526 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf |
4527 |
- fi |
4528 |
- |
4529 |
- if use proxy; then |
4530 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy |
4531 |
- dosbin src/zabbix_proxy/zabbix_proxy |
4532 |
- insinto /etc/zabbix |
4533 |
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf |
4534 |
- dodir /usr/share/zabbix |
4535 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
4536 |
- systemd_dounit "${FILESDIR}/zabbix-proxy.service" |
4537 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf |
4538 |
- fi |
4539 |
- |
4540 |
- if use agent; then |
4541 |
- insinto /etc/zabbix |
4542 |
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf |
4543 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd |
4544 |
- dosbin src/zabbix_agent/zabbix_agentd |
4545 |
- dobin \ |
4546 |
- src/zabbix_sender/zabbix_sender \ |
4547 |
- src/zabbix_get/zabbix_get |
4548 |
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf |
4549 |
- fperms 0640 /etc/zabbix/zabbix_agentd.conf |
4550 |
- systemd_dounit "${FILESDIR}/zabbix-agentd.service" |
4551 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf |
4552 |
- fi |
4553 |
- |
4554 |
- fowners zabbix:zabbix \ |
4555 |
- /etc/zabbix \ |
4556 |
- /var/lib/zabbix \ |
4557 |
- /var/lib/zabbix/home \ |
4558 |
- /var/lib/zabbix/scripts \ |
4559 |
- /var/lib/zabbix/alertscripts \ |
4560 |
- /var/lib/zabbix/externalscripts \ |
4561 |
- /var/log/zabbix |
4562 |
- fperms 0750 \ |
4563 |
- /etc/zabbix \ |
4564 |
- /var/lib/zabbix \ |
4565 |
- /var/lib/zabbix/home \ |
4566 |
- /var/lib/zabbix/scripts \ |
4567 |
- /var/lib/zabbix/alertscripts \ |
4568 |
- /var/lib/zabbix/externalscripts \ |
4569 |
- /var/log/zabbix |
4570 |
- |
4571 |
- dodoc README INSTALL NEWS ChangeLog \ |
4572 |
- conf/zabbix_agentd.conf \ |
4573 |
- conf/zabbix_proxy.conf \ |
4574 |
- conf/zabbix_agentd/userparameter_examples.conf \ |
4575 |
- conf/zabbix_agentd/userparameter_mysql.conf \ |
4576 |
- conf/zabbix_server.conf |
4577 |
- |
4578 |
- if use frontend; then |
4579 |
- webapp_src_preinst |
4580 |
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" |
4581 |
- webapp_configfile \ |
4582 |
- "${MY_HTDOCSDIR}"/include/db.inc.php \ |
4583 |
- "${MY_HTDOCSDIR}"/include/config.inc.php |
4584 |
- webapp_src_install |
4585 |
- fi |
4586 |
- |
4587 |
- if use java; then |
4588 |
- dodir \ |
4589 |
- /${ZABBIXJAVA_BASE} \ |
4590 |
- /${ZABBIXJAVA_BASE}/bin \ |
4591 |
- /${ZABBIXJAVA_BASE}/lib |
4592 |
- keepdir /${ZABBIXJAVA_BASE} |
4593 |
- exeinto /${ZABBIXJAVA_BASE}/bin |
4594 |
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar |
4595 |
- exeinto /${ZABBIXJAVA_BASE}/lib |
4596 |
- doexe \ |
4597 |
- src/zabbix_java/lib/logback-classic-0.9.27.jar \ |
4598 |
- src/zabbix_java/lib/logback-console.xml \ |
4599 |
- src/zabbix_java/lib/logback-core-0.9.27.jar \ |
4600 |
- src/zabbix_java/lib/logback.xml \ |
4601 |
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \ |
4602 |
- src/zabbix_java/lib/slf4j-api-1.6.1.jar |
4603 |
- exeinto /${ZABBIXJAVA_BASE}/ |
4604 |
- doexe \ |
4605 |
- src/zabbix_java/settings.sh \ |
4606 |
- src/zabbix_java/startup.sh \ |
4607 |
- src/zabbix_java/shutdown.sh |
4608 |
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} |
4609 |
- fi |
4610 |
-} |
4611 |
- |
4612 |
-pkg_postinst() { |
4613 |
- if use server || use proxy ; then |
4614 |
- elog |
4615 |
- elog "You may need to configure your database for Zabbix," |
4616 |
- elog "if you have not already done so. " |
4617 |
- elog |
4618 |
- |
4619 |
- zabbix_homedir=$(egethome zabbix) |
4620 |
- if [ -n "${zabbix_homedir}" ] && \ |
4621 |
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then |
4622 |
- ewarn |
4623 |
- ewarn "The user 'zabbix' should have his homedir changed" |
4624 |
- ewarn "to /var/lib/zabbix/home if you want to use" |
4625 |
- ewarn "custom alert scripts." |
4626 |
- ewarn |
4627 |
- ewarn "A real homedir might be needed for configfiles" |
4628 |
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" |
4629 |
- ewarn "using sendxmpp for Jabber alerts)." |
4630 |
- ewarn |
4631 |
- ewarn "To change the homedir use:" |
4632 |
- ewarn " usermod -d /var/lib/zabbix/home zabbix" |
4633 |
- ewarn |
4634 |
- fi |
4635 |
- fi |
4636 |
- |
4637 |
- if use server; then |
4638 |
- elog |
4639 |
- elog "For distributed monitoring you have to run:" |
4640 |
- elog |
4641 |
- elog "zabbix_server -n <nodeid>" |
4642 |
- elog |
4643 |
- elog "This will convert database data for use with Node ID" |
4644 |
- elog "and also adds a local node." |
4645 |
- elog |
4646 |
- fi |
4647 |
- |
4648 |
- elog "--" |
4649 |
- elog |
4650 |
- elog "You may need to add these lines to /etc/services:" |
4651 |
- elog |
4652 |
- elog "zabbix-agent 10050/tcp Zabbix Agent" |
4653 |
- elog "zabbix-agent 10050/udp Zabbix Agent" |
4654 |
- elog "zabbix-trapper 10051/tcp Zabbix Trapper" |
4655 |
- elog "zabbix-trapper 10051/udp Zabbix Trapper" |
4656 |
- elog |
4657 |
- |
4658 |
- if use server || use proxy ; then |
4659 |
- # check for fping |
4660 |
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) |
4661 |
- case "${fping_perms}" in |
4662 |
- 4[157][157][157]) |
4663 |
- ;; |
4664 |
- *) |
4665 |
- ewarn |
4666 |
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," |
4667 |
- ewarn "you have to make /usr/sbin/fping setuid root and executable" |
4668 |
- ewarn "by everyone. Run the following command to fix it:" |
4669 |
- ewarn |
4670 |
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" |
4671 |
- ewarn |
4672 |
- ewarn "Please be aware that this might impose a security risk," |
4673 |
- ewarn "depending on the code quality of fping." |
4674 |
- ewarn |
4675 |
- ;; |
4676 |
- esac |
4677 |
- fi |
4678 |
-} |
4679 |
|
4680 |
diff --git a/net-analyzer/zabbix/zabbix-3.4.15.ebuild b/net-analyzer/zabbix/zabbix-3.0.30.ebuild |
4681 |
similarity index 71% |
4682 |
rename from net-analyzer/zabbix/zabbix-3.4.15.ebuild |
4683 |
rename to net-analyzer/zabbix/zabbix-3.0.30.ebuild |
4684 |
index 0169c3ac73b..7a392ccf338 100644 |
4685 |
--- a/net-analyzer/zabbix/zabbix-3.4.15.ebuild |
4686 |
+++ b/net-analyzer/zabbix/zabbix-3.0.30.ebuild |
4687 |
@@ -1,7 +1,7 @@ |
4688 |
-# Copyright 1999-2019 Gentoo Authors |
4689 |
+# Copyright 1999-2020 Gentoo Authors |
4690 |
# Distributed under the terms of the GNU General Public License v2 |
4691 |
|
4692 |
-EAPI="6" |
4693 |
+EAPI=7 |
4694 |
|
4695 |
# needed to make webapp-config dep optional |
4696 |
WEBAPP_OPTIONAL="yes" |
4697 |
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and |
4698 |
HOMEPAGE="https://www.zabbix.com/" |
4699 |
MY_P=${P/_/} |
4700 |
MY_PV=${PV/_/} |
4701 |
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" |
4702 |
+SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" |
4703 |
LICENSE="GPL-2" |
4704 |
SLOT="0" |
4705 |
WEBAPP_MANUAL_SLOT="yes" |
4706 |
@@ -22,60 +22,78 @@ REQUIRED_USE="|| ( agent frontend proxy server ) |
4707 |
server? ( ^^ ( mysql oracle postgres odbc ) ) |
4708 |
static? ( !oracle !snmp )" |
4709 |
|
4710 |
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) |
4711 |
+COMMON_DEPEND=" |
4712 |
+ curl? ( net-misc/curl ) |
4713 |
+ java? ( >=virtual/jdk-1.8:* ) |
4714 |
ldap? ( |
4715 |
- net-nds/openldap |
4716 |
=dev-libs/cyrus-sasl-2* |
4717 |
net-libs/gnutls |
4718 |
+ net-nds/openldap |
4719 |
) |
4720 |
- mysql? ( >=virtual/mysql-5.0.3 ) |
4721 |
- sqlite? ( >=dev-db/sqlite-3.3.5 ) |
4722 |
- postgres? ( dev-db/postgresql:* ) |
4723 |
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) |
4724 |
- xmpp? ( dev-libs/iksemel ) |
4725 |
libxml2? ( dev-libs/libxml2 ) |
4726 |
- curl? ( net-misc/curl ) |
4727 |
+ mysql? ( dev-db/mysql-connector-c ) |
4728 |
+ odbc? ( dev-db/unixODBC ) |
4729 |
openipmi? ( sys-libs/openipmi ) |
4730 |
+ oracle? ( dev-db/oracle-instantclient-basic ) |
4731 |
+ postgres? ( dev-db/postgresql:* ) |
4732 |
+ proxy? ( sys-libs/zlib ) |
4733 |
+ server? ( |
4734 |
+ dev-libs/libevent |
4735 |
+ sys-libs/zlib |
4736 |
+ ) |
4737 |
+ snmp? ( net-analyzer/net-snmp ) |
4738 |
+ sqlite? ( dev-db/sqlite ) |
4739 |
ssh? ( net-libs/libssh2 ) |
4740 |
- java? ( virtual/jdk:* ) |
4741 |
- odbc? ( dev-db/unixODBC ) |
4742 |
- ssl? ( dev-libs/openssl:=[-bindist] )" |
4743 |
+ ssl? ( dev-libs/openssl:=[-bindist] ) |
4744 |
+ xmpp? ( dev-libs/iksemel ) |
4745 |
+" |
4746 |
|
4747 |
RDEPEND="${COMMON_DEPEND} |
4748 |
+ java? ( >=virtual/jre-1.8:* ) |
4749 |
+ mysql? ( virtual/mysql ) |
4750 |
proxy? ( net-analyzer/fping[suid] ) |
4751 |
- server? ( net-analyzer/fping[suid] |
4752 |
+ server? ( |
4753 |
app-admin/webapp-config |
4754 |
- dev-libs/libevent ) |
4755 |
- java? ( |
4756 |
- >=virtual/jre-1.4 |
4757 |
- dev-java/slf4j-api |
4758 |
+ dev-libs/libevent |
4759 |
+ dev-libs/libpcre |
4760 |
+ net-analyzer/fping[suid] |
4761 |
) |
4762 |
frontend? ( |
4763 |
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
4764 |
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) |
4765 |
+ app-admin/webapp-config |
4766 |
+ dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
4767 |
+ media-libs/gd[png] |
4768 |
+ virtual/httpd-php:* |
4769 |
mysql? ( dev-lang/php[mysqli] ) |
4770 |
odbc? ( dev-lang/php[odbc] ) |
4771 |
oracle? ( dev-lang/php[oci8-instant-client] ) |
4772 |
postgres? ( dev-lang/php[postgres] ) |
4773 |
sqlite? ( dev-lang/php[sqlite] ) |
4774 |
- media-libs/gd[png] |
4775 |
- app-admin/webapp-config )" |
4776 |
+ ) |
4777 |
+" |
4778 |
DEPEND="${COMMON_DEPEND} |
4779 |
static? ( |
4780 |
+ curl? ( net-misc/curl[static-libs] ) |
4781 |
ldap? ( |
4782 |
- net-nds/openldap[static-libs] |
4783 |
=dev-libs/cyrus-sasl-2*[static-libs] |
4784 |
net-libs/gnutls[static-libs] |
4785 |
+ net-nds/openldap[static-libs] |
4786 |
) |
4787 |
- mysql? ( >=virtual/mysql-5.0.3[static-libs] ) |
4788 |
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) |
4789 |
- postgres? ( dev-db/postgresql:*[static-libs] ) |
4790 |
- libxml2? ( dev-libs/libxml2[static-libs] ) |
4791 |
- curl? ( net-misc/curl[static-libs] ) |
4792 |
- ssh? ( net-libs/libssh2 ) |
4793 |
- odbc? ( dev-db/unixODBC[static-libs] ) |
4794 |
+ libxml2? ( dev-libs/libxml2[static-libs] ) |
4795 |
+ mysql? ( dev-db/mysql-connector-c[static-libs] ) |
4796 |
+ odbc? ( dev-db/unixODBC[static-libs] ) |
4797 |
+ postgres? ( dev-db/postgresql:*[static-libs] ) |
4798 |
+ sqlite? ( dev-db/sqlite[static-libs] ) |
4799 |
+ ssh? ( net-libs/libssh2 ) |
4800 |
) |
4801 |
- virtual/pkgconfig" |
4802 |
+" |
4803 |
+BDEPEND=" |
4804 |
+ virtual/pkgconfig |
4805 |
+" |
4806 |
+ |
4807 |
+PATCHES=( |
4808 |
+ "${FILESDIR}/${P}-security-disable-PidFile.patch" |
4809 |
+ "${FILESDIR}/${P}-mysql8.patch" |
4810 |
+) |
4811 |
|
4812 |
S=${WORKDIR}/${MY_P} |
4813 |
|
4814 |
@@ -105,13 +123,8 @@ pkg_setup() { |
4815 |
|
4816 |
enewgroup zabbix |
4817 |
enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix |
4818 |
-} |
4819 |
- |
4820 |
-java_prepare() { |
4821 |
- cd "${S}/src/zabbix_java/lib" |
4822 |
- rm -v *.jar || die |
4823 |
|
4824 |
- java-pkg_jar-from slf4j-api |
4825 |
+ java-pkg-opt-2_pkg_setup |
4826 |
} |
4827 |
|
4828 |
src_prepare() { |
4829 |
@@ -120,25 +133,25 @@ src_prepare() { |
4830 |
|
4831 |
src_configure() { |
4832 |
econf \ |
4833 |
- $(use_enable server) \ |
4834 |
- $(use_enable proxy) \ |
4835 |
$(use_enable agent) \ |
4836 |
$(use_enable ipv6) \ |
4837 |
- $(use_enable static) \ |
4838 |
$(use_enable java) \ |
4839 |
+ $(use_enable proxy) \ |
4840 |
+ $(use_enable server) \ |
4841 |
+ $(use_enable static) \ |
4842 |
+ $(use_with curl libcurl) \ |
4843 |
$(use_with ldap) \ |
4844 |
- $(use_with snmp net-snmp) \ |
4845 |
+ $(use_with libxml2) \ |
4846 |
$(use_with mysql) \ |
4847 |
- $(use_with postgres postgresql) \ |
4848 |
+ $(use_with odbc unixodbc) \ |
4849 |
+ $(use_with openipmi openipmi) \ |
4850 |
$(use_with oracle) \ |
4851 |
+ $(use_with postgres postgresql) \ |
4852 |
+ $(use_with snmp net-snmp) \ |
4853 |
$(use_with sqlite sqlite3) \ |
4854 |
- $(use_with xmpp jabber) \ |
4855 |
- $(use_with curl libcurl) \ |
4856 |
- $(use_with openipmi openipmi) \ |
4857 |
$(use_with ssh ssh2) \ |
4858 |
- $(use_with libxml2) \ |
4859 |
- $(use_with odbc unixodbc) \ |
4860 |
- $(use_with ssl openssl) |
4861 |
+ $(use_with ssl openssl) \ |
4862 |
+ $(use_with xmpp jabber) |
4863 |
} |
4864 |
|
4865 |
src_compile() { |
4866 |
@@ -148,64 +161,74 @@ src_compile() { |
4867 |
} |
4868 |
|
4869 |
src_install() { |
4870 |
- dodir \ |
4871 |
- /etc/zabbix \ |
4872 |
- /var/lib/zabbix \ |
4873 |
- /var/lib/zabbix/home \ |
4874 |
- /var/lib/zabbix/scripts \ |
4875 |
- /var/lib/zabbix/alertscripts \ |
4876 |
- /var/lib/zabbix/externalscripts \ |
4877 |
+ local dirs=( |
4878 |
+ /etc/zabbix |
4879 |
+ /var/lib/zabbix |
4880 |
+ /var/lib/zabbix/home |
4881 |
+ /var/lib/zabbix/scripts |
4882 |
+ /var/lib/zabbix/alertscripts |
4883 |
+ /var/lib/zabbix/externalscripts |
4884 |
/var/log/zabbix |
4885 |
+ ) |
4886 |
|
4887 |
- keepdir \ |
4888 |
- /etc/zabbix \ |
4889 |
- /var/lib/zabbix \ |
4890 |
- /var/lib/zabbix/home \ |
4891 |
- /var/lib/zabbix/scripts \ |
4892 |
- /var/lib/zabbix/alertscripts \ |
4893 |
- /var/lib/zabbix/externalscripts \ |
4894 |
- /var/log/zabbix |
4895 |
+ for dir in "${dirs[@]}"; do |
4896 |
+ dodir "${dir}" |
4897 |
+ keepdir "${dir}" |
4898 |
+ done |
4899 |
|
4900 |
if use server; then |
4901 |
insinto /etc/zabbix |
4902 |
- doins "${FILESDIR}/3.0"/zabbix_server.conf |
4903 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server |
4904 |
- dosbin src/zabbix_server/zabbix_server |
4905 |
- fowners root:zabbix /etc/zabbix/zabbix_server.conf |
4906 |
+ doins "${S}"/conf/zabbix_server.conf |
4907 |
fperms 0640 /etc/zabbix/zabbix_server.conf |
4908 |
- dodir /usr/share/zabbix |
4909 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
4910 |
- systemd_dounit "${FILESDIR}/zabbix-server.service" |
4911 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf |
4912 |
+ fowners root:zabbix /etc/zabbix/zabbix_server.conf |
4913 |
+ |
4914 |
+ newinitd "${FILESDIR}"/zabbix-server.init zabbix-server |
4915 |
+ |
4916 |
+ dosbin src/zabbix_server/zabbix_server |
4917 |
+ |
4918 |
+ insinto /usr/share/zabbix |
4919 |
+ doins -r "${S}"/database/ |
4920 |
+ |
4921 |
+ systemd_dounit "${FILESDIR}"/zabbix-server.service |
4922 |
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf |
4923 |
fi |
4924 |
|
4925 |
if use proxy; then |
4926 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy |
4927 |
- dosbin src/zabbix_proxy/zabbix_proxy |
4928 |
insinto /etc/zabbix |
4929 |
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf |
4930 |
- dodir /usr/share/zabbix |
4931 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
4932 |
- systemd_dounit "${FILESDIR}/zabbix-proxy.service" |
4933 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf |
4934 |
+ doins "${S}"/conf/zabbix_proxy.conf |
4935 |
+ fperms 0640 /etc/zabbix/zabbix_proxy.conf |
4936 |
+ fowners root:zabbix /etc/zabbix/zabbix_proxy.conf |
4937 |
+ |
4938 |
+ newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy |
4939 |
+ |
4940 |
+ dosbin src/zabbix_proxy/zabbix_proxy |
4941 |
+ |
4942 |
+ insinto /usr/share/zabbix |
4943 |
+ doins -r "${S}"/database/ |
4944 |
+ |
4945 |
+ systemd_dounit "${FILESDIR}"/zabbix-proxy.service |
4946 |
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf |
4947 |
fi |
4948 |
|
4949 |
if use agent; then |
4950 |
insinto /etc/zabbix |
4951 |
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf |
4952 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd |
4953 |
+ doins "${S}"/conf/zabbix_agentd.conf |
4954 |
+ fperms 0640 /etc/zabbix/zabbix_agentd.conf |
4955 |
+ fowners root:zabbix /etc/zabbix/zabbix_agentd.conf |
4956 |
+ |
4957 |
+ newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd |
4958 |
+ |
4959 |
dosbin src/zabbix_agent/zabbix_agentd |
4960 |
dobin \ |
4961 |
src/zabbix_sender/zabbix_sender \ |
4962 |
src/zabbix_get/zabbix_get |
4963 |
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf |
4964 |
- fperms 0640 /etc/zabbix/zabbix_agentd.conf |
4965 |
- systemd_dounit "${FILESDIR}/zabbix-agentd.service" |
4966 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf |
4967 |
+ |
4968 |
+ systemd_dounit "${FILESDIR}"/zabbix-agentd.service |
4969 |
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf |
4970 |
fi |
4971 |
|
4972 |
+ fowners root:zabbix /etc/zabbix |
4973 |
fowners zabbix:zabbix \ |
4974 |
- /etc/zabbix \ |
4975 |
/var/lib/zabbix \ |
4976 |
/var/lib/zabbix/home \ |
4977 |
/var/lib/zabbix/scripts \ |
4978 |
@@ -253,17 +276,16 @@ src_install() { |
4979 |
src/zabbix_java/lib/logback.xml \ |
4980 |
src/zabbix_java/lib/android-json-4.3_r3.1.jar \ |
4981 |
src/zabbix_java/lib/slf4j-api-1.6.1.jar |
4982 |
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} |
4983 |
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy |
4984 |
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy |
4985 |
+ newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy |
4986 |
+ newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy |
4987 |
fi |
4988 |
} |
4989 |
|
4990 |
pkg_postinst() { |
4991 |
if use server || use proxy ; then |
4992 |
elog |
4993 |
- elog "You may need to configure your database for Zabbix," |
4994 |
- elog "if you have not already done so. " |
4995 |
+ elog "You may need to configure your database for Zabbix" |
4996 |
+ elog "if you have not already done so." |
4997 |
elog |
4998 |
|
4999 |
zabbix_homedir=$(egethome zabbix) |
5000 |
|
5001 |
diff --git a/net-analyzer/zabbix/zabbix-4.0.13.ebuild b/net-analyzer/zabbix/zabbix-4.0.13.ebuild |
5002 |
deleted file mode 100644 |
5003 |
index 2e1f7d32099..00000000000 |
5004 |
--- a/net-analyzer/zabbix/zabbix-4.0.13.ebuild |
5005 |
+++ /dev/null |
5006 |
@@ -1,332 +0,0 @@ |
5007 |
-# Copyright 1999-2019 Gentoo Authors |
5008 |
-# Distributed under the terms of the GNU General Public License v2 |
5009 |
- |
5010 |
-EAPI="6" |
5011 |
- |
5012 |
-# needed to make webapp-config dep optional |
5013 |
-WEBAPP_OPTIONAL="yes" |
5014 |
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs |
5015 |
- |
5016 |
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" |
5017 |
-HOMEPAGE="https://www.zabbix.com/" |
5018 |
-MY_P=${P/_/} |
5019 |
-MY_PV=${PV/_/} |
5020 |
-SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" |
5021 |
-LICENSE="GPL-2" |
5022 |
-SLOT="0" |
5023 |
-WEBAPP_MANUAL_SLOT="yes" |
5024 |
-KEYWORDS="~amd64 ~x86" |
5025 |
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" |
5026 |
-REQUIRED_USE="|| ( agent frontend proxy server ) |
5027 |
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
5028 |
- server? ( ^^ ( mysql oracle postgres odbc ) ) |
5029 |
- static? ( !oracle !snmp )" |
5030 |
- |
5031 |
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) |
5032 |
- ldap? ( |
5033 |
- net-nds/openldap |
5034 |
- =dev-libs/cyrus-sasl-2* |
5035 |
- net-libs/gnutls |
5036 |
- ) |
5037 |
- mysql? ( >=virtual/mysql-5.0.3 ) |
5038 |
- sqlite? ( >=dev-db/sqlite-3.3.5 ) |
5039 |
- postgres? ( >=dev-db/postgresql-8.1:* ) |
5040 |
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) |
5041 |
- xmpp? ( dev-libs/iksemel ) |
5042 |
- libxml2? ( dev-libs/libxml2 ) |
5043 |
- curl? ( net-misc/curl ) |
5044 |
- openipmi? ( sys-libs/openipmi ) |
5045 |
- ssh? ( net-libs/libssh2 ) |
5046 |
- java? ( virtual/jdk:* ) |
5047 |
- odbc? ( dev-db/unixODBC ) |
5048 |
- server? ( sys-libs/zlib ) |
5049 |
- proxy? ( sys-libs/zlib ) |
5050 |
- ssl? ( dev-libs/openssl:=[-bindist] )" |
5051 |
- |
5052 |
-RDEPEND="${COMMON_DEPEND} |
5053 |
- proxy? ( net-analyzer/fping[suid] ) |
5054 |
- server? ( net-analyzer/fping[suid] |
5055 |
- app-admin/webapp-config |
5056 |
- dev-libs/libpcre |
5057 |
- dev-libs/libevent ) |
5058 |
- java? ( |
5059 |
- >=virtual/jre-1.4 |
5060 |
- dev-java/slf4j-api |
5061 |
- ) |
5062 |
- frontend? ( |
5063 |
- >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
5064 |
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) |
5065 |
- mysql? ( dev-lang/php[mysqli] ) |
5066 |
- odbc? ( dev-lang/php[odbc] ) |
5067 |
- oracle? ( dev-lang/php[oci8-instant-client] ) |
5068 |
- postgres? ( dev-lang/php[postgres] ) |
5069 |
- sqlite? ( dev-lang/php[sqlite] ) |
5070 |
- media-libs/gd[png] |
5071 |
- app-admin/webapp-config )" |
5072 |
-DEPEND="${COMMON_DEPEND} |
5073 |
- static? ( |
5074 |
- ldap? ( |
5075 |
- net-nds/openldap[static-libs] |
5076 |
- =dev-libs/cyrus-sasl-2*[static-libs] |
5077 |
- net-libs/gnutls[static-libs] |
5078 |
- ) |
5079 |
- mysql? ( >=virtual/mysql-5.0.3[static-libs] ) |
5080 |
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) |
5081 |
- postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) |
5082 |
- libxml2? ( dev-libs/libxml2[static-libs] ) |
5083 |
- curl? ( net-misc/curl[static-libs] ) |
5084 |
- ssh? ( net-libs/libssh2 ) |
5085 |
- odbc? ( dev-db/unixODBC[static-libs] ) |
5086 |
- ) |
5087 |
- virtual/pkgconfig" |
5088 |
- |
5089 |
-S=${WORKDIR}/${MY_P} |
5090 |
- |
5091 |
-ZABBIXJAVA_BASE="opt/zabbix_java" |
5092 |
- |
5093 |
-pkg_setup() { |
5094 |
- if use oracle; then |
5095 |
- if [ -z "${ORACLE_HOME}" ]; then |
5096 |
- eerror |
5097 |
- eerror "The environment variable ORACLE_HOME must be set" |
5098 |
- eerror "and point to the correct location." |
5099 |
- eerror "It looks like you don't have Oracle installed." |
5100 |
- eerror |
5101 |
- die "Environment variable ORACLE_HOME is not set" |
5102 |
- fi |
5103 |
- if has_version 'dev-db/oracle-instantclient-basic'; then |
5104 |
- ewarn |
5105 |
- ewarn "Please ensure you have a full install of the Oracle client." |
5106 |
- ewarn "dev-db/oracle-instantclient* is NOT sufficient." |
5107 |
- ewarn |
5108 |
- fi |
5109 |
- fi |
5110 |
- |
5111 |
- if use frontend; then |
5112 |
- webapp_pkg_setup |
5113 |
- fi |
5114 |
- |
5115 |
- enewgroup zabbix |
5116 |
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix |
5117 |
-} |
5118 |
- |
5119 |
-java_prepare() { |
5120 |
- cd "${S}/src/zabbix_java/lib" |
5121 |
- rm -v *.jar || die |
5122 |
- |
5123 |
- java-pkg_jar-from slf4j-api |
5124 |
-} |
5125 |
- |
5126 |
-src_prepare() { |
5127 |
- eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" |
5128 |
- eapply_user |
5129 |
-} |
5130 |
- |
5131 |
-src_configure() { |
5132 |
- econf \ |
5133 |
- $(use_enable server) \ |
5134 |
- $(use_enable proxy) \ |
5135 |
- $(use_enable agent) \ |
5136 |
- $(use_enable ipv6) \ |
5137 |
- $(use_enable static) \ |
5138 |
- $(use_enable java) \ |
5139 |
- $(use_with ldap) \ |
5140 |
- $(use_with snmp net-snmp) \ |
5141 |
- $(use_with mysql) \ |
5142 |
- $(use_with postgres postgresql) \ |
5143 |
- $(use_with oracle) \ |
5144 |
- $(use_with sqlite sqlite3) \ |
5145 |
- $(use_with xmpp jabber) \ |
5146 |
- $(use_with curl libcurl) \ |
5147 |
- $(use_with openipmi openipmi) \ |
5148 |
- $(use_with ssh ssh2) \ |
5149 |
- $(use_with libxml2) \ |
5150 |
- $(use_with odbc unixodbc) \ |
5151 |
- $(use_with ssl openssl) |
5152 |
-} |
5153 |
- |
5154 |
-src_compile() { |
5155 |
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then |
5156 |
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" |
5157 |
- fi |
5158 |
-} |
5159 |
- |
5160 |
-src_install() { |
5161 |
- dodir \ |
5162 |
- /etc/zabbix \ |
5163 |
- /var/lib/zabbix \ |
5164 |
- /var/lib/zabbix/home \ |
5165 |
- /var/lib/zabbix/scripts \ |
5166 |
- /var/lib/zabbix/alertscripts \ |
5167 |
- /var/lib/zabbix/externalscripts \ |
5168 |
- /var/log/zabbix |
5169 |
- |
5170 |
- keepdir \ |
5171 |
- /etc/zabbix \ |
5172 |
- /var/lib/zabbix \ |
5173 |
- /var/lib/zabbix/home \ |
5174 |
- /var/lib/zabbix/scripts \ |
5175 |
- /var/lib/zabbix/alertscripts \ |
5176 |
- /var/lib/zabbix/externalscripts \ |
5177 |
- /var/log/zabbix |
5178 |
- |
5179 |
- if use server; then |
5180 |
- insinto /etc/zabbix |
5181 |
- doins "${FILESDIR}/3.0"/zabbix_server.conf |
5182 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server |
5183 |
- dosbin src/zabbix_server/zabbix_server |
5184 |
- fowners root:zabbix /etc/zabbix/zabbix_server.conf |
5185 |
- fperms 0640 /etc/zabbix/zabbix_server.conf |
5186 |
- dodir /usr/share/zabbix |
5187 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
5188 |
- systemd_dounit "${FILESDIR}/zabbix-server.service" |
5189 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf |
5190 |
- fi |
5191 |
- |
5192 |
- if use proxy; then |
5193 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy |
5194 |
- dosbin src/zabbix_proxy/zabbix_proxy |
5195 |
- insinto /etc/zabbix |
5196 |
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf |
5197 |
- dodir /usr/share/zabbix |
5198 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
5199 |
- systemd_dounit "${FILESDIR}/zabbix-proxy.service" |
5200 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf |
5201 |
- fi |
5202 |
- |
5203 |
- if use agent; then |
5204 |
- insinto /etc/zabbix |
5205 |
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf |
5206 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd |
5207 |
- dosbin src/zabbix_agent/zabbix_agentd |
5208 |
- dobin \ |
5209 |
- src/zabbix_sender/zabbix_sender \ |
5210 |
- src/zabbix_get/zabbix_get |
5211 |
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf |
5212 |
- fperms 0640 /etc/zabbix/zabbix_agentd.conf |
5213 |
- systemd_dounit "${FILESDIR}/zabbix-agentd.service" |
5214 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf |
5215 |
- fi |
5216 |
- |
5217 |
- fowners zabbix:zabbix \ |
5218 |
- /etc/zabbix \ |
5219 |
- /var/lib/zabbix \ |
5220 |
- /var/lib/zabbix/home \ |
5221 |
- /var/lib/zabbix/scripts \ |
5222 |
- /var/lib/zabbix/alertscripts \ |
5223 |
- /var/lib/zabbix/externalscripts \ |
5224 |
- /var/log/zabbix |
5225 |
- fperms 0750 \ |
5226 |
- /etc/zabbix \ |
5227 |
- /var/lib/zabbix \ |
5228 |
- /var/lib/zabbix/home \ |
5229 |
- /var/lib/zabbix/scripts \ |
5230 |
- /var/lib/zabbix/alertscripts \ |
5231 |
- /var/lib/zabbix/externalscripts \ |
5232 |
- /var/log/zabbix |
5233 |
- |
5234 |
- dodoc README INSTALL NEWS ChangeLog \ |
5235 |
- conf/zabbix_agentd.conf \ |
5236 |
- conf/zabbix_proxy.conf \ |
5237 |
- conf/zabbix_agentd/userparameter_examples.conf \ |
5238 |
- conf/zabbix_agentd/userparameter_mysql.conf \ |
5239 |
- conf/zabbix_server.conf |
5240 |
- |
5241 |
- if use frontend; then |
5242 |
- webapp_src_preinst |
5243 |
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" |
5244 |
- webapp_configfile \ |
5245 |
- "${MY_HTDOCSDIR}"/include/db.inc.php \ |
5246 |
- "${MY_HTDOCSDIR}"/include/config.inc.php |
5247 |
- webapp_src_install |
5248 |
- fi |
5249 |
- |
5250 |
- if use java; then |
5251 |
- dodir \ |
5252 |
- /${ZABBIXJAVA_BASE} \ |
5253 |
- /${ZABBIXJAVA_BASE}/bin \ |
5254 |
- /${ZABBIXJAVA_BASE}/lib |
5255 |
- keepdir /${ZABBIXJAVA_BASE} |
5256 |
- exeinto /${ZABBIXJAVA_BASE}/bin |
5257 |
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar |
5258 |
- exeinto /${ZABBIXJAVA_BASE}/lib |
5259 |
- doexe \ |
5260 |
- src/zabbix_java/lib/logback-classic-0.9.27.jar \ |
5261 |
- src/zabbix_java/lib/logback-console.xml \ |
5262 |
- src/zabbix_java/lib/logback-core-0.9.27.jar \ |
5263 |
- src/zabbix_java/lib/logback.xml \ |
5264 |
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \ |
5265 |
- src/zabbix_java/lib/slf4j-api-1.6.1.jar |
5266 |
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} |
5267 |
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy |
5268 |
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy |
5269 |
- fi |
5270 |
-} |
5271 |
- |
5272 |
-pkg_postinst() { |
5273 |
- if use server || use proxy ; then |
5274 |
- elog |
5275 |
- elog "You may need to configure your database for Zabbix," |
5276 |
- elog "if you have not already done so. " |
5277 |
- elog |
5278 |
- |
5279 |
- zabbix_homedir=$(egethome zabbix) |
5280 |
- if [ -n "${zabbix_homedir}" ] && \ |
5281 |
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then |
5282 |
- ewarn |
5283 |
- ewarn "The user 'zabbix' should have his homedir changed" |
5284 |
- ewarn "to /var/lib/zabbix/home if you want to use" |
5285 |
- ewarn "custom alert scripts." |
5286 |
- ewarn |
5287 |
- ewarn "A real homedir might be needed for configfiles" |
5288 |
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" |
5289 |
- ewarn "using sendxmpp for Jabber alerts)." |
5290 |
- ewarn |
5291 |
- ewarn "To change the homedir use:" |
5292 |
- ewarn " usermod -d /var/lib/zabbix/home zabbix" |
5293 |
- ewarn |
5294 |
- fi |
5295 |
- fi |
5296 |
- |
5297 |
- if use server; then |
5298 |
- elog |
5299 |
- elog "For distributed monitoring you have to run:" |
5300 |
- elog |
5301 |
- elog "zabbix_server -n <nodeid>" |
5302 |
- elog |
5303 |
- elog "This will convert database data for use with Node ID" |
5304 |
- elog "and also adds a local node." |
5305 |
- elog |
5306 |
- fi |
5307 |
- |
5308 |
- elog "--" |
5309 |
- elog |
5310 |
- elog "You may need to add these lines to /etc/services:" |
5311 |
- elog |
5312 |
- elog "zabbix-agent 10050/tcp Zabbix Agent" |
5313 |
- elog "zabbix-agent 10050/udp Zabbix Agent" |
5314 |
- elog "zabbix-trapper 10051/tcp Zabbix Trapper" |
5315 |
- elog "zabbix-trapper 10051/udp Zabbix Trapper" |
5316 |
- elog |
5317 |
- |
5318 |
- if use server || use proxy ; then |
5319 |
- # check for fping |
5320 |
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) |
5321 |
- case "${fping_perms}" in |
5322 |
- 4[157][157][157]) |
5323 |
- ;; |
5324 |
- *) |
5325 |
- ewarn |
5326 |
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," |
5327 |
- ewarn "you have to make /usr/sbin/fping setuid root and executable" |
5328 |
- ewarn "by everyone. Run the following command to fix it:" |
5329 |
- ewarn |
5330 |
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" |
5331 |
- ewarn |
5332 |
- ewarn "Please be aware that this might impose a security risk," |
5333 |
- ewarn "depending on the code quality of fping." |
5334 |
- ewarn |
5335 |
- ;; |
5336 |
- esac |
5337 |
- fi |
5338 |
-} |
5339 |
|
5340 |
diff --git a/net-analyzer/zabbix/zabbix-4.2.7.ebuild b/net-analyzer/zabbix/zabbix-4.0.18.ebuild |
5341 |
similarity index 70% |
5342 |
rename from net-analyzer/zabbix/zabbix-4.2.7.ebuild |
5343 |
rename to net-analyzer/zabbix/zabbix-4.0.18.ebuild |
5344 |
index 19016227289..28210112c73 100644 |
5345 |
--- a/net-analyzer/zabbix/zabbix-4.2.7.ebuild |
5346 |
+++ b/net-analyzer/zabbix/zabbix-4.0.18.ebuild |
5347 |
@@ -1,7 +1,7 @@ |
5348 |
-# Copyright 1999-2019 Gentoo Authors |
5349 |
+# Copyright 1999-2020 Gentoo Authors |
5350 |
# Distributed under the terms of the GNU General Public License v2 |
5351 |
|
5352 |
-EAPI="6" |
5353 |
+EAPI=7 |
5354 |
|
5355 |
# needed to make webapp-config dep optional |
5356 |
WEBAPP_OPTIONAL="yes" |
5357 |
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and |
5358 |
HOMEPAGE="https://www.zabbix.com/" |
5359 |
MY_P=${P/_/} |
5360 |
MY_PV=${PV/_/} |
5361 |
-SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" |
5362 |
+SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" |
5363 |
LICENSE="GPL-2" |
5364 |
SLOT="0" |
5365 |
WEBAPP_MANUAL_SLOT="yes" |
5366 |
@@ -22,63 +22,78 @@ REQUIRED_USE="|| ( agent frontend proxy server ) |
5367 |
server? ( ^^ ( mysql oracle postgres odbc ) ) |
5368 |
static? ( !oracle !snmp )" |
5369 |
|
5370 |
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) |
5371 |
+COMMON_DEPEND=" |
5372 |
+ curl? ( net-misc/curl ) |
5373 |
+ java? ( >=virtual/jdk-1.8:* ) |
5374 |
ldap? ( |
5375 |
- net-nds/openldap |
5376 |
=dev-libs/cyrus-sasl-2* |
5377 |
net-libs/gnutls |
5378 |
+ net-nds/openldap |
5379 |
) |
5380 |
- mysql? ( >=virtual/mysql-5.0.3 ) |
5381 |
- sqlite? ( >=dev-db/sqlite-3.3.5 ) |
5382 |
- postgres? ( >=dev-db/postgresql-8.1:* ) |
5383 |
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) |
5384 |
- xmpp? ( dev-libs/iksemel ) |
5385 |
libxml2? ( dev-libs/libxml2 ) |
5386 |
- curl? ( net-misc/curl ) |
5387 |
- openipmi? ( sys-libs/openipmi ) |
5388 |
- ssh? ( net-libs/libssh2 ) |
5389 |
- java? ( virtual/jdk:* ) |
5390 |
+ mysql? ( dev-db/mysql-connector-c ) |
5391 |
odbc? ( dev-db/unixODBC ) |
5392 |
- server? ( sys-libs/zlib ) |
5393 |
+ openipmi? ( sys-libs/openipmi ) |
5394 |
+ oracle? ( dev-db/oracle-instantclient-basic ) |
5395 |
+ postgres? ( dev-db/postgresql:* ) |
5396 |
proxy? ( sys-libs/zlib ) |
5397 |
- ssl? ( dev-libs/openssl:=[-bindist] )" |
5398 |
+ server? ( |
5399 |
+ dev-libs/libevent |
5400 |
+ sys-libs/zlib |
5401 |
+ ) |
5402 |
+ snmp? ( net-analyzer/net-snmp ) |
5403 |
+ sqlite? ( dev-db/sqlite ) |
5404 |
+ ssh? ( net-libs/libssh2 ) |
5405 |
+ ssl? ( dev-libs/openssl:=[-bindist] ) |
5406 |
+ xmpp? ( dev-libs/iksemel ) |
5407 |
+" |
5408 |
|
5409 |
RDEPEND="${COMMON_DEPEND} |
5410 |
+ java? ( >=virtual/jre-1.8:* ) |
5411 |
+ mysql? ( virtual/mysql ) |
5412 |
proxy? ( net-analyzer/fping[suid] ) |
5413 |
- server? ( net-analyzer/fping[suid] |
5414 |
+ server? ( |
5415 |
app-admin/webapp-config |
5416 |
+ dev-libs/libevent |
5417 |
dev-libs/libpcre |
5418 |
- dev-libs/libevent ) |
5419 |
- java? ( |
5420 |
- >=virtual/jre-1.4 |
5421 |
- dev-java/slf4j-api |
5422 |
+ net-analyzer/fping[suid] |
5423 |
) |
5424 |
frontend? ( |
5425 |
- >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
5426 |
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) |
5427 |
+ app-admin/webapp-config |
5428 |
+ dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
5429 |
+ media-libs/gd[png] |
5430 |
+ virtual/httpd-php:* |
5431 |
mysql? ( dev-lang/php[mysqli] ) |
5432 |
odbc? ( dev-lang/php[odbc] ) |
5433 |
oracle? ( dev-lang/php[oci8-instant-client] ) |
5434 |
postgres? ( dev-lang/php[postgres] ) |
5435 |
sqlite? ( dev-lang/php[sqlite] ) |
5436 |
- media-libs/gd[png] |
5437 |
- app-admin/webapp-config )" |
5438 |
+ ) |
5439 |
+" |
5440 |
DEPEND="${COMMON_DEPEND} |
5441 |
static? ( |
5442 |
+ curl? ( net-misc/curl[static-libs] ) |
5443 |
ldap? ( |
5444 |
- net-nds/openldap[static-libs] |
5445 |
=dev-libs/cyrus-sasl-2*[static-libs] |
5446 |
net-libs/gnutls[static-libs] |
5447 |
+ net-nds/openldap[static-libs] |
5448 |
) |
5449 |
- mysql? ( >=virtual/mysql-5.0.3[static-libs] ) |
5450 |
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) |
5451 |
- postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) |
5452 |
- libxml2? ( dev-libs/libxml2[static-libs] ) |
5453 |
- curl? ( net-misc/curl[static-libs] ) |
5454 |
- ssh? ( net-libs/libssh2 ) |
5455 |
- odbc? ( dev-db/unixODBC[static-libs] ) |
5456 |
+ libxml2? ( dev-libs/libxml2[static-libs] ) |
5457 |
+ mysql? ( dev-db/mysql-connector-c[static-libs] ) |
5458 |
+ odbc? ( dev-db/unixODBC[static-libs] ) |
5459 |
+ postgres? ( dev-db/postgresql:*[static-libs] ) |
5460 |
+ sqlite? ( dev-db/sqlite[static-libs] ) |
5461 |
+ ssh? ( net-libs/libssh2 ) |
5462 |
) |
5463 |
- virtual/pkgconfig" |
5464 |
+" |
5465 |
+BDEPEND=" |
5466 |
+ virtual/pkgconfig |
5467 |
+" |
5468 |
+ |
5469 |
+PATCHES=( |
5470 |
+ "${FILESDIR}/${P}-modulepathfix.patch" |
5471 |
+ "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" |
5472 |
+) |
5473 |
|
5474 |
S=${WORKDIR}/${MY_P} |
5475 |
|
5476 |
@@ -108,41 +123,35 @@ pkg_setup() { |
5477 |
|
5478 |
enewgroup zabbix |
5479 |
enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix |
5480 |
-} |
5481 |
- |
5482 |
-java_prepare() { |
5483 |
- cd "${S}/src/zabbix_java/lib" |
5484 |
- rm -v *.jar || die |
5485 |
|
5486 |
- java-pkg_jar-from slf4j-api |
5487 |
+ java-pkg-opt-2_pkg_setup |
5488 |
} |
5489 |
|
5490 |
src_prepare() { |
5491 |
- eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" |
5492 |
- eapply_user |
5493 |
+ default |
5494 |
} |
5495 |
|
5496 |
src_configure() { |
5497 |
econf \ |
5498 |
- $(use_enable server) \ |
5499 |
- $(use_enable proxy) \ |
5500 |
$(use_enable agent) \ |
5501 |
$(use_enable ipv6) \ |
5502 |
- $(use_enable static) \ |
5503 |
$(use_enable java) \ |
5504 |
+ $(use_enable proxy) \ |
5505 |
+ $(use_enable server) \ |
5506 |
+ $(use_enable static) \ |
5507 |
+ $(use_with curl libcurl) \ |
5508 |
$(use_with ldap) \ |
5509 |
- $(use_with snmp net-snmp) \ |
5510 |
+ $(use_with libxml2) \ |
5511 |
$(use_with mysql) \ |
5512 |
- $(use_with postgres postgresql) \ |
5513 |
+ $(use_with odbc unixodbc) \ |
5514 |
+ $(use_with openipmi openipmi) \ |
5515 |
$(use_with oracle) \ |
5516 |
+ $(use_with postgres postgresql) \ |
5517 |
+ $(use_with snmp net-snmp) \ |
5518 |
$(use_with sqlite sqlite3) \ |
5519 |
- $(use_with xmpp jabber) \ |
5520 |
- $(use_with curl libcurl) \ |
5521 |
- $(use_with openipmi openipmi) \ |
5522 |
$(use_with ssh ssh2) \ |
5523 |
- $(use_with libxml2) \ |
5524 |
- $(use_with odbc unixodbc) \ |
5525 |
- $(use_with ssl openssl) |
5526 |
+ $(use_with ssl openssl) \ |
5527 |
+ $(use_with xmpp jabber) |
5528 |
} |
5529 |
|
5530 |
src_compile() { |
5531 |
@@ -152,67 +161,74 @@ src_compile() { |
5532 |
} |
5533 |
|
5534 |
src_install() { |
5535 |
- dodir \ |
5536 |
- /etc/zabbix \ |
5537 |
- /var/lib/zabbix \ |
5538 |
- /var/lib/zabbix/home \ |
5539 |
- /var/lib/zabbix/scripts \ |
5540 |
- /var/lib/zabbix/alertscripts \ |
5541 |
- /var/lib/zabbix/externalscripts \ |
5542 |
+ local dirs=( |
5543 |
+ /etc/zabbix |
5544 |
+ /var/lib/zabbix |
5545 |
+ /var/lib/zabbix/home |
5546 |
+ /var/lib/zabbix/scripts |
5547 |
+ /var/lib/zabbix/alertscripts |
5548 |
+ /var/lib/zabbix/externalscripts |
5549 |
/var/log/zabbix |
5550 |
+ ) |
5551 |
|
5552 |
- keepdir \ |
5553 |
- /etc/zabbix \ |
5554 |
- /var/lib/zabbix \ |
5555 |
- /var/lib/zabbix/home \ |
5556 |
- /var/lib/zabbix/scripts \ |
5557 |
- /var/lib/zabbix/alertscripts \ |
5558 |
- /var/lib/zabbix/externalscripts \ |
5559 |
- /var/log/zabbix |
5560 |
+ for dir in "${dirs[@]}"; do |
5561 |
+ dodir "${dir}" |
5562 |
+ keepdir "${dir}" |
5563 |
+ done |
5564 |
|
5565 |
if use server; then |
5566 |
insinto /etc/zabbix |
5567 |
- doins "${FILESDIR}/3.0"/zabbix_server.conf |
5568 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server |
5569 |
- dosbin src/zabbix_server/zabbix_server |
5570 |
- fowners root:zabbix /etc/zabbix/zabbix_server.conf |
5571 |
+ doins "${S}"/conf/zabbix_server.conf |
5572 |
fperms 0640 /etc/zabbix/zabbix_server.conf |
5573 |
- dodir /usr/share/zabbix |
5574 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
5575 |
- systemd_dounit "${FILESDIR}/zabbix-server.service" |
5576 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf |
5577 |
+ fowners root:zabbix /etc/zabbix/zabbix_server.conf |
5578 |
+ |
5579 |
+ newinitd "${FILESDIR}"/zabbix-server.init zabbix-server |
5580 |
+ |
5581 |
+ dosbin src/zabbix_server/zabbix_server |
5582 |
+ |
5583 |
+ insinto /usr/share/zabbix |
5584 |
+ doins -r "${S}"/database/ |
5585 |
+ |
5586 |
+ systemd_dounit "${FILESDIR}"/zabbix-server.service |
5587 |
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf |
5588 |
fi |
5589 |
|
5590 |
if use proxy; then |
5591 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy |
5592 |
- dosbin src/zabbix_proxy/zabbix_proxy |
5593 |
insinto /etc/zabbix |
5594 |
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf |
5595 |
- fowners root:zabbix /etc/zabbix/zabbix_proxy.conf |
5596 |
+ doins "${S}"/conf/zabbix_proxy.conf |
5597 |
fperms 0640 /etc/zabbix/zabbix_proxy.conf |
5598 |
- dodir /usr/share/zabbix |
5599 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
5600 |
- systemd_dounit "${FILESDIR}/zabbix-proxy.service" |
5601 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf |
5602 |
+ fowners root:zabbix /etc/zabbix/zabbix_proxy.conf |
5603 |
+ |
5604 |
+ newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy |
5605 |
+ |
5606 |
+ dosbin src/zabbix_proxy/zabbix_proxy |
5607 |
+ |
5608 |
+ insinto /usr/share/zabbix |
5609 |
+ doins -r "${S}"/database/ |
5610 |
+ |
5611 |
+ systemd_dounit "${FILESDIR}"/zabbix-proxy.service |
5612 |
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf |
5613 |
fi |
5614 |
|
5615 |
if use agent; then |
5616 |
insinto /etc/zabbix |
5617 |
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf |
5618 |
- fowners root:zabbix /etc/zabbix/zabbix_agentd.conf |
5619 |
+ doins "${S}"/conf/zabbix_agentd.conf |
5620 |
fperms 0640 /etc/zabbix/zabbix_agentd.conf |
5621 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd |
5622 |
+ fowners root:zabbix /etc/zabbix/zabbix_agentd.conf |
5623 |
+ |
5624 |
+ newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd |
5625 |
+ |
5626 |
dosbin src/zabbix_agent/zabbix_agentd |
5627 |
dobin \ |
5628 |
src/zabbix_sender/zabbix_sender \ |
5629 |
src/zabbix_get/zabbix_get |
5630 |
- fperms 0640 /etc/zabbix/zabbix_agentd.conf |
5631 |
- systemd_dounit "${FILESDIR}/zabbix-agentd.service" |
5632 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf |
5633 |
+ |
5634 |
+ systemd_dounit "${FILESDIR}"/zabbix-agentd.service |
5635 |
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf |
5636 |
fi |
5637 |
|
5638 |
+ fowners root:zabbix /etc/zabbix |
5639 |
fowners zabbix:zabbix \ |
5640 |
- /etc/zabbix \ |
5641 |
/var/lib/zabbix \ |
5642 |
/var/lib/zabbix/home \ |
5643 |
/var/lib/zabbix/scripts \ |
5644 |
@@ -260,17 +276,16 @@ src_install() { |
5645 |
src/zabbix_java/lib/logback.xml \ |
5646 |
src/zabbix_java/lib/android-json-4.3_r3.1.jar \ |
5647 |
src/zabbix_java/lib/slf4j-api-1.6.1.jar |
5648 |
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} |
5649 |
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy |
5650 |
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy |
5651 |
+ newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy |
5652 |
+ newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy |
5653 |
fi |
5654 |
} |
5655 |
|
5656 |
pkg_postinst() { |
5657 |
if use server || use proxy ; then |
5658 |
elog |
5659 |
- elog "You may need to configure your database for Zabbix," |
5660 |
- elog "if you have not already done so. " |
5661 |
+ elog "You may need to configure your database for Zabbix" |
5662 |
+ elog "if you have not already done so." |
5663 |
elog |
5664 |
|
5665 |
zabbix_homedir=$(egethome zabbix) |
5666 |
|
5667 |
diff --git a/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild b/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild |
5668 |
deleted file mode 100644 |
5669 |
index bf5db4ac645..00000000000 |
5670 |
--- a/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild |
5671 |
+++ /dev/null |
5672 |
@@ -1,333 +0,0 @@ |
5673 |
-# Copyright 1999-2019 Gentoo Authors |
5674 |
-# Distributed under the terms of the GNU General Public License v2 |
5675 |
- |
5676 |
-EAPI="6" |
5677 |
- |
5678 |
-# needed to make webapp-config dep optional |
5679 |
-WEBAPP_OPTIONAL="yes" |
5680 |
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs |
5681 |
- |
5682 |
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" |
5683 |
-HOMEPAGE="https://www.zabbix.com/" |
5684 |
-MY_P=${P/_/} |
5685 |
-MY_PV=${PV/_/} |
5686 |
-SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" |
5687 |
-LICENSE="GPL-2" |
5688 |
-SLOT="0" |
5689 |
-WEBAPP_MANUAL_SLOT="yes" |
5690 |
-KEYWORDS="amd64 x86" |
5691 |
-IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" |
5692 |
-REQUIRED_USE="|| ( agent frontend proxy server ) |
5693 |
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
5694 |
- server? ( ^^ ( mysql oracle postgres odbc ) ) |
5695 |
- static? ( !oracle !snmp )" |
5696 |
- |
5697 |
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) |
5698 |
- ldap? ( |
5699 |
- net-nds/openldap |
5700 |
- =dev-libs/cyrus-sasl-2* |
5701 |
- net-libs/gnutls |
5702 |
- ) |
5703 |
- mysql? ( >=virtual/mysql-5.0.3 ) |
5704 |
- sqlite? ( >=dev-db/sqlite-3.3.5 ) |
5705 |
- postgres? ( >=dev-db/postgresql-8.1:* ) |
5706 |
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) |
5707 |
- libxml2? ( dev-libs/libxml2 ) |
5708 |
- curl? ( net-misc/curl ) |
5709 |
- openipmi? ( sys-libs/openipmi ) |
5710 |
- ssh? ( net-libs/libssh2 ) |
5711 |
- java? ( virtual/jdk:* ) |
5712 |
- odbc? ( dev-db/unixODBC ) |
5713 |
- server? ( sys-libs/zlib ) |
5714 |
- proxy? ( sys-libs/zlib ) |
5715 |
- server? ( dev-libs/libevent ) |
5716 |
- ssl? ( dev-libs/openssl:=[-bindist] )" |
5717 |
- |
5718 |
-RDEPEND="${COMMON_DEPEND} |
5719 |
- proxy? ( net-analyzer/fping[suid] ) |
5720 |
- server? ( net-analyzer/fping[suid] |
5721 |
- app-admin/webapp-config |
5722 |
- dev-libs/libpcre ) |
5723 |
- java? ( |
5724 |
- >=virtual/jre-1.4 |
5725 |
- dev-java/slf4j-api |
5726 |
- ) |
5727 |
- frontend? ( |
5728 |
- >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
5729 |
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) |
5730 |
- mysql? ( dev-lang/php[mysqli] ) |
5731 |
- odbc? ( dev-lang/php[odbc] ) |
5732 |
- oracle? ( dev-lang/php[oci8-instant-client] ) |
5733 |
- postgres? ( dev-lang/php[postgres] ) |
5734 |
- sqlite? ( dev-lang/php[sqlite] ) |
5735 |
- media-libs/gd[png] |
5736 |
- app-admin/webapp-config )" |
5737 |
-DEPEND="${COMMON_DEPEND} |
5738 |
- static? ( |
5739 |
- ldap? ( |
5740 |
- net-nds/openldap[static-libs] |
5741 |
- =dev-libs/cyrus-sasl-2*[static-libs] |
5742 |
- net-libs/gnutls[static-libs] |
5743 |
- ) |
5744 |
- mysql? ( >=virtual/mysql-5.0.3[static] ) |
5745 |
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) |
5746 |
- postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) |
5747 |
- libxml2? ( dev-libs/libxml2[static-libs] ) |
5748 |
- curl? ( net-misc/curl[static-libs] ) |
5749 |
- ssh? ( net-libs/libssh2 ) |
5750 |
- odbc? ( dev-db/unixODBC[static-libs] ) |
5751 |
- ) |
5752 |
- virtual/pkgconfig" |
5753 |
- |
5754 |
-S=${WORKDIR}/${MY_P} |
5755 |
- |
5756 |
-ZABBIXJAVA_BASE="opt/zabbix_java" |
5757 |
- |
5758 |
-pkg_setup() { |
5759 |
- if use oracle; then |
5760 |
- if [ -z "${ORACLE_HOME}" ]; then |
5761 |
- eerror |
5762 |
- eerror "The environment variable ORACLE_HOME must be set" |
5763 |
- eerror "and point to the correct location." |
5764 |
- eerror "It looks like you don't have Oracle installed." |
5765 |
- eerror |
5766 |
- die "Environment variable ORACLE_HOME is not set" |
5767 |
- fi |
5768 |
- if has_version 'dev-db/oracle-instantclient-basic'; then |
5769 |
- ewarn |
5770 |
- ewarn "Please ensure you have a full install of the Oracle client." |
5771 |
- ewarn "dev-db/oracle-instantclient* is NOT sufficient." |
5772 |
- ewarn |
5773 |
- fi |
5774 |
- fi |
5775 |
- |
5776 |
- if use frontend; then |
5777 |
- webapp_pkg_setup |
5778 |
- fi |
5779 |
- |
5780 |
- enewgroup zabbix |
5781 |
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix |
5782 |
-} |
5783 |
- |
5784 |
-java_prepare() { |
5785 |
- cd "${S}/src/zabbix_java/lib" |
5786 |
- rm -v *.jar || die |
5787 |
- |
5788 |
- java-pkg_jar-from slf4j-api |
5789 |
-} |
5790 |
- |
5791 |
-src_prepare() { |
5792 |
- eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" |
5793 |
- eapply_user |
5794 |
-} |
5795 |
- |
5796 |
-src_configure() { |
5797 |
- econf \ |
5798 |
- $(use_enable server) \ |
5799 |
- $(use_enable proxy) \ |
5800 |
- $(use_enable agent) \ |
5801 |
- $(use_enable ipv6) \ |
5802 |
- $(use_enable static) \ |
5803 |
- $(use_enable java) \ |
5804 |
- $(use_with ldap) \ |
5805 |
- $(use_with snmp net-snmp) \ |
5806 |
- $(use_with mysql) \ |
5807 |
- $(use_with postgres postgresql) \ |
5808 |
- $(use_with oracle) \ |
5809 |
- $(use_with sqlite sqlite3) \ |
5810 |
- $(use_with curl libcurl) \ |
5811 |
- $(use_with openipmi openipmi) \ |
5812 |
- $(use_with ssh ssh2) \ |
5813 |
- $(use_with libxml2) \ |
5814 |
- $(use_with odbc unixodbc) \ |
5815 |
- $(use_with ssl openssl) |
5816 |
-} |
5817 |
- |
5818 |
-src_compile() { |
5819 |
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then |
5820 |
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" |
5821 |
- fi |
5822 |
-} |
5823 |
- |
5824 |
-src_install() { |
5825 |
- dodir \ |
5826 |
- /etc/zabbix \ |
5827 |
- /var/lib/zabbix \ |
5828 |
- /var/lib/zabbix/home \ |
5829 |
- /var/lib/zabbix/scripts \ |
5830 |
- /var/lib/zabbix/alertscripts \ |
5831 |
- /var/lib/zabbix/externalscripts \ |
5832 |
- /var/log/zabbix |
5833 |
- |
5834 |
- keepdir \ |
5835 |
- /etc/zabbix \ |
5836 |
- /var/lib/zabbix \ |
5837 |
- /var/lib/zabbix/home \ |
5838 |
- /var/lib/zabbix/scripts \ |
5839 |
- /var/lib/zabbix/alertscripts \ |
5840 |
- /var/lib/zabbix/externalscripts \ |
5841 |
- /var/log/zabbix |
5842 |
- |
5843 |
- if use server; then |
5844 |
- insinto /etc/zabbix |
5845 |
- doins "${FILESDIR}/3.0"/zabbix_server.conf |
5846 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server |
5847 |
- dosbin src/zabbix_server/zabbix_server |
5848 |
- fowners root:zabbix /etc/zabbix/zabbix_server.conf |
5849 |
- fperms 0640 /etc/zabbix/zabbix_server.conf |
5850 |
- dodir /usr/share/zabbix |
5851 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
5852 |
- systemd_dounit "${FILESDIR}/zabbix-server.service" |
5853 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf |
5854 |
- fi |
5855 |
- |
5856 |
- if use proxy; then |
5857 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy |
5858 |
- dosbin src/zabbix_proxy/zabbix_proxy |
5859 |
- insinto /etc/zabbix |
5860 |
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf |
5861 |
- fowners root:zabbix /etc/zabbix/zabbix_proxy.conf |
5862 |
- fperms 0640 /etc/zabbix/zabbix_proxy.conf |
5863 |
- dodir /usr/share/zabbix |
5864 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
5865 |
- systemd_dounit "${FILESDIR}/zabbix-proxy.service" |
5866 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf |
5867 |
- fi |
5868 |
- |
5869 |
- if use agent; then |
5870 |
- insinto /etc/zabbix |
5871 |
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf |
5872 |
- fowners root:zabbix /etc/zabbix/zabbix_agentd.conf |
5873 |
- fperms 0640 /etc/zabbix/zabbix_agentd.conf |
5874 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd |
5875 |
- dosbin src/zabbix_agent/zabbix_agentd |
5876 |
- dobin \ |
5877 |
- src/zabbix_sender/zabbix_sender \ |
5878 |
- src/zabbix_get/zabbix_get |
5879 |
- fperms 0640 /etc/zabbix/zabbix_agentd.conf |
5880 |
- systemd_dounit "${FILESDIR}/zabbix-agentd.service" |
5881 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf |
5882 |
- fi |
5883 |
- |
5884 |
- fowners zabbix:zabbix \ |
5885 |
- /etc/zabbix \ |
5886 |
- /var/lib/zabbix \ |
5887 |
- /var/lib/zabbix/home \ |
5888 |
- /var/lib/zabbix/scripts \ |
5889 |
- /var/lib/zabbix/alertscripts \ |
5890 |
- /var/lib/zabbix/externalscripts \ |
5891 |
- /var/log/zabbix |
5892 |
- fperms 0750 \ |
5893 |
- /etc/zabbix \ |
5894 |
- /var/lib/zabbix \ |
5895 |
- /var/lib/zabbix/home \ |
5896 |
- /var/lib/zabbix/scripts \ |
5897 |
- /var/lib/zabbix/alertscripts \ |
5898 |
- /var/lib/zabbix/externalscripts \ |
5899 |
- /var/log/zabbix |
5900 |
- |
5901 |
- dodoc README INSTALL NEWS ChangeLog \ |
5902 |
- conf/zabbix_agentd.conf \ |
5903 |
- conf/zabbix_proxy.conf \ |
5904 |
- conf/zabbix_agentd/userparameter_examples.conf \ |
5905 |
- conf/zabbix_agentd/userparameter_mysql.conf \ |
5906 |
- conf/zabbix_server.conf |
5907 |
- |
5908 |
- if use frontend; then |
5909 |
- webapp_src_preinst |
5910 |
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" |
5911 |
- webapp_configfile \ |
5912 |
- "${MY_HTDOCSDIR}"/include/db.inc.php \ |
5913 |
- "${MY_HTDOCSDIR}"/include/config.inc.php |
5914 |
- webapp_src_install |
5915 |
- fi |
5916 |
- |
5917 |
- if use java; then |
5918 |
- dodir \ |
5919 |
- /${ZABBIXJAVA_BASE} \ |
5920 |
- /${ZABBIXJAVA_BASE}/bin \ |
5921 |
- /${ZABBIXJAVA_BASE}/lib |
5922 |
- keepdir /${ZABBIXJAVA_BASE} |
5923 |
- exeinto /${ZABBIXJAVA_BASE}/bin |
5924 |
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar |
5925 |
- exeinto /${ZABBIXJAVA_BASE}/lib |
5926 |
- doexe \ |
5927 |
- src/zabbix_java/lib/logback-classic-0.9.27.jar \ |
5928 |
- src/zabbix_java/lib/logback-console.xml \ |
5929 |
- src/zabbix_java/lib/logback-core-0.9.27.jar \ |
5930 |
- src/zabbix_java/lib/logback.xml \ |
5931 |
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \ |
5932 |
- src/zabbix_java/lib/slf4j-api-1.6.1.jar |
5933 |
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} |
5934 |
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy |
5935 |
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy |
5936 |
- fi |
5937 |
-} |
5938 |
- |
5939 |
-pkg_postinst() { |
5940 |
- if use server || use proxy ; then |
5941 |
- elog |
5942 |
- elog "You may need to configure your database for Zabbix," |
5943 |
- elog "if you have not already done so. " |
5944 |
- elog |
5945 |
- |
5946 |
- zabbix_homedir=$(egethome zabbix) |
5947 |
- if [ -n "${zabbix_homedir}" ] && \ |
5948 |
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then |
5949 |
- ewarn |
5950 |
- ewarn "The user 'zabbix' should have his homedir changed" |
5951 |
- ewarn "to /var/lib/zabbix/home if you want to use" |
5952 |
- ewarn "custom alert scripts." |
5953 |
- ewarn |
5954 |
- ewarn "A real homedir might be needed for configfiles" |
5955 |
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" |
5956 |
- ewarn "using sendxmpp for Jabber alerts)." |
5957 |
- ewarn |
5958 |
- ewarn "To change the homedir use:" |
5959 |
- ewarn " usermod -d /var/lib/zabbix/home zabbix" |
5960 |
- ewarn |
5961 |
- fi |
5962 |
- fi |
5963 |
- |
5964 |
- if use server; then |
5965 |
- elog |
5966 |
- elog "For distributed monitoring you have to run:" |
5967 |
- elog |
5968 |
- elog "zabbix_server -n <nodeid>" |
5969 |
- elog |
5970 |
- elog "This will convert database data for use with Node ID" |
5971 |
- elog "and also adds a local node." |
5972 |
- elog |
5973 |
- fi |
5974 |
- |
5975 |
- elog "--" |
5976 |
- elog |
5977 |
- elog "You may need to add these lines to /etc/services:" |
5978 |
- elog |
5979 |
- elog "zabbix-agent 10050/tcp Zabbix Agent" |
5980 |
- elog "zabbix-agent 10050/udp Zabbix Agent" |
5981 |
- elog "zabbix-trapper 10051/tcp Zabbix Trapper" |
5982 |
- elog "zabbix-trapper 10051/udp Zabbix Trapper" |
5983 |
- elog |
5984 |
- |
5985 |
- if use server || use proxy ; then |
5986 |
- # check for fping |
5987 |
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) |
5988 |
- case "${fping_perms}" in |
5989 |
- 4[157][157][157]) |
5990 |
- ;; |
5991 |
- *) |
5992 |
- ewarn |
5993 |
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," |
5994 |
- ewarn "you have to make /usr/sbin/fping setuid root and executable" |
5995 |
- ewarn "by everyone. Run the following command to fix it:" |
5996 |
- ewarn |
5997 |
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" |
5998 |
- ewarn |
5999 |
- ewarn "Please be aware that this might impose a security risk," |
6000 |
- ewarn "depending on the code quality of fping." |
6001 |
- ewarn |
6002 |
- ;; |
6003 |
- esac |
6004 |
- fi |
6005 |
-} |
6006 |
|
6007 |
diff --git a/net-analyzer/zabbix/zabbix-4.4.5.ebuild b/net-analyzer/zabbix/zabbix-4.4.6.ebuild |
6008 |
similarity index 70% |
6009 |
rename from net-analyzer/zabbix/zabbix-4.4.5.ebuild |
6010 |
rename to net-analyzer/zabbix/zabbix-4.4.6.ebuild |
6011 |
index 2ff7b0830d7..8d4030480f5 100644 |
6012 |
--- a/net-analyzer/zabbix/zabbix-4.4.5.ebuild |
6013 |
+++ b/net-analyzer/zabbix/zabbix-4.4.6.ebuild |
6014 |
@@ -1,7 +1,7 @@ |
6015 |
# Copyright 1999-2020 Gentoo Authors |
6016 |
# Distributed under the terms of the GNU General Public License v2 |
6017 |
|
6018 |
-EAPI="6" |
6019 |
+EAPI=7 |
6020 |
|
6021 |
# needed to make webapp-config dep optional |
6022 |
WEBAPP_OPTIONAL="yes" |
6023 |
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and |
6024 |
HOMEPAGE="https://www.zabbix.com/" |
6025 |
MY_P=${P/_/} |
6026 |
MY_PV=${PV/_/} |
6027 |
-SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" |
6028 |
+SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" |
6029 |
LICENSE="GPL-2" |
6030 |
SLOT="0" |
6031 |
WEBAPP_MANUAL_SLOT="yes" |
6032 |
@@ -22,62 +22,77 @@ REQUIRED_USE="|| ( agent frontend proxy server ) |
6033 |
server? ( ^^ ( mysql oracle postgres odbc ) ) |
6034 |
static? ( !oracle !snmp )" |
6035 |
|
6036 |
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) |
6037 |
+COMMON_DEPEND=" |
6038 |
+ curl? ( net-misc/curl ) |
6039 |
+ java? ( >=virtual/jdk-1.8:* ) |
6040 |
ldap? ( |
6041 |
- net-nds/openldap |
6042 |
=dev-libs/cyrus-sasl-2* |
6043 |
net-libs/gnutls |
6044 |
+ net-nds/openldap |
6045 |
) |
6046 |
- mysql? ( >=virtual/mysql-5.0.3 ) |
6047 |
- sqlite? ( >=dev-db/sqlite-3.3.5 ) |
6048 |
- postgres? ( >=dev-db/postgresql-8.1:* ) |
6049 |
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) |
6050 |
libxml2? ( dev-libs/libxml2 ) |
6051 |
- curl? ( net-misc/curl ) |
6052 |
- openipmi? ( sys-libs/openipmi ) |
6053 |
- ssh? ( net-libs/libssh2 ) |
6054 |
- java? ( virtual/jdk:* ) |
6055 |
+ mysql? ( dev-db/mysql-connector-c ) |
6056 |
odbc? ( dev-db/unixODBC ) |
6057 |
- server? ( sys-libs/zlib ) |
6058 |
+ openipmi? ( sys-libs/openipmi ) |
6059 |
+ oracle? ( dev-db/oracle-instantclient-basic ) |
6060 |
+ postgres? ( dev-db/postgresql:* ) |
6061 |
proxy? ( sys-libs/zlib ) |
6062 |
- server? ( dev-libs/libevent ) |
6063 |
- ssl? ( dev-libs/openssl:=[-bindist] )" |
6064 |
+ server? ( |
6065 |
+ dev-libs/libevent |
6066 |
+ sys-libs/zlib |
6067 |
+ ) |
6068 |
+ snmp? ( net-analyzer/net-snmp ) |
6069 |
+ sqlite? ( dev-db/sqlite ) |
6070 |
+ ssh? ( net-libs/libssh2 ) |
6071 |
+ ssl? ( dev-libs/openssl:=[-bindist] ) |
6072 |
+" |
6073 |
|
6074 |
RDEPEND="${COMMON_DEPEND} |
6075 |
+ java? ( >=virtual/jre-1.8:* ) |
6076 |
+ mysql? ( virtual/mysql ) |
6077 |
proxy? ( net-analyzer/fping[suid] ) |
6078 |
- server? ( net-analyzer/fping[suid] |
6079 |
+ server? ( |
6080 |
app-admin/webapp-config |
6081 |
- dev-libs/libpcre ) |
6082 |
- java? ( |
6083 |
- >=virtual/jre-1.4 |
6084 |
- dev-java/slf4j-api |
6085 |
+ dev-libs/libevent |
6086 |
+ dev-libs/libpcre |
6087 |
+ net-analyzer/fping[suid] |
6088 |
) |
6089 |
frontend? ( |
6090 |
- >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
6091 |
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) |
6092 |
+ app-admin/webapp-config |
6093 |
+ dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
6094 |
+ media-libs/gd[png] |
6095 |
+ virtual/httpd-php:* |
6096 |
mysql? ( dev-lang/php[mysqli] ) |
6097 |
odbc? ( dev-lang/php[odbc] ) |
6098 |
oracle? ( dev-lang/php[oci8-instant-client] ) |
6099 |
postgres? ( dev-lang/php[postgres] ) |
6100 |
sqlite? ( dev-lang/php[sqlite] ) |
6101 |
- media-libs/gd[png] |
6102 |
- app-admin/webapp-config )" |
6103 |
+ ) |
6104 |
+" |
6105 |
DEPEND="${COMMON_DEPEND} |
6106 |
static? ( |
6107 |
+ curl? ( net-misc/curl[static-libs] ) |
6108 |
ldap? ( |
6109 |
- net-nds/openldap[static-libs] |
6110 |
=dev-libs/cyrus-sasl-2*[static-libs] |
6111 |
net-libs/gnutls[static-libs] |
6112 |
+ net-nds/openldap[static-libs] |
6113 |
) |
6114 |
- mysql? ( >=virtual/mysql-5.0.3[static] ) |
6115 |
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) |
6116 |
- postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) |
6117 |
- libxml2? ( dev-libs/libxml2[static-libs] ) |
6118 |
- curl? ( net-misc/curl[static-libs] ) |
6119 |
- ssh? ( net-libs/libssh2 ) |
6120 |
- odbc? ( dev-db/unixODBC[static-libs] ) |
6121 |
+ libxml2? ( dev-libs/libxml2[static-libs] ) |
6122 |
+ mysql? ( dev-db/mysql-connector-c[static-libs] ) |
6123 |
+ odbc? ( dev-db/unixODBC[static-libs] ) |
6124 |
+ postgres? ( dev-db/postgresql:*[static-libs] ) |
6125 |
+ sqlite? ( dev-db/sqlite[static-libs] ) |
6126 |
+ ssh? ( net-libs/libssh2 ) |
6127 |
) |
6128 |
- virtual/pkgconfig" |
6129 |
+" |
6130 |
+BDEPEND=" |
6131 |
+ virtual/pkgconfig |
6132 |
+" |
6133 |
+ |
6134 |
+PATCHES=( |
6135 |
+ "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" |
6136 |
+ "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" |
6137 |
+) |
6138 |
|
6139 |
S=${WORKDIR}/${MY_P} |
6140 |
|
6141 |
@@ -107,39 +122,33 @@ pkg_setup() { |
6142 |
|
6143 |
enewgroup zabbix |
6144 |
enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix |
6145 |
-} |
6146 |
- |
6147 |
-java_prepare() { |
6148 |
- cd "${S}/src/zabbix_java/lib" |
6149 |
- rm -v *.jar || die |
6150 |
|
6151 |
- java-pkg_jar-from slf4j-api |
6152 |
+ java-pkg-opt-2_pkg_setup |
6153 |
} |
6154 |
|
6155 |
src_prepare() { |
6156 |
- eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" |
6157 |
- eapply_user |
6158 |
+ default |
6159 |
} |
6160 |
|
6161 |
src_configure() { |
6162 |
econf \ |
6163 |
- $(use_enable server) \ |
6164 |
- $(use_enable proxy) \ |
6165 |
$(use_enable agent) \ |
6166 |
$(use_enable ipv6) \ |
6167 |
- $(use_enable static) \ |
6168 |
$(use_enable java) \ |
6169 |
+ $(use_enable proxy) \ |
6170 |
+ $(use_enable server) \ |
6171 |
+ $(use_enable static) \ |
6172 |
+ $(use_with curl libcurl) \ |
6173 |
$(use_with ldap) \ |
6174 |
- $(use_with snmp net-snmp) \ |
6175 |
+ $(use_with libxml2) \ |
6176 |
$(use_with mysql) \ |
6177 |
- $(use_with postgres postgresql) \ |
6178 |
+ $(use_with odbc unixodbc) \ |
6179 |
+ $(use_with openipmi openipmi) \ |
6180 |
$(use_with oracle) \ |
6181 |
+ $(use_with postgres postgresql) \ |
6182 |
+ $(use_with snmp net-snmp) \ |
6183 |
$(use_with sqlite sqlite3) \ |
6184 |
- $(use_with curl libcurl) \ |
6185 |
- $(use_with openipmi openipmi) \ |
6186 |
$(use_with ssh ssh2) \ |
6187 |
- $(use_with libxml2) \ |
6188 |
- $(use_with odbc unixodbc) \ |
6189 |
$(use_with ssl openssl) |
6190 |
} |
6191 |
|
6192 |
@@ -150,67 +159,74 @@ src_compile() { |
6193 |
} |
6194 |
|
6195 |
src_install() { |
6196 |
- dodir \ |
6197 |
- /etc/zabbix \ |
6198 |
- /var/lib/zabbix \ |
6199 |
- /var/lib/zabbix/home \ |
6200 |
- /var/lib/zabbix/scripts \ |
6201 |
- /var/lib/zabbix/alertscripts \ |
6202 |
- /var/lib/zabbix/externalscripts \ |
6203 |
+ local dirs=( |
6204 |
+ /etc/zabbix |
6205 |
+ /var/lib/zabbix |
6206 |
+ /var/lib/zabbix/home |
6207 |
+ /var/lib/zabbix/scripts |
6208 |
+ /var/lib/zabbix/alertscripts |
6209 |
+ /var/lib/zabbix/externalscripts |
6210 |
/var/log/zabbix |
6211 |
+ ) |
6212 |
|
6213 |
- keepdir \ |
6214 |
- /etc/zabbix \ |
6215 |
- /var/lib/zabbix \ |
6216 |
- /var/lib/zabbix/home \ |
6217 |
- /var/lib/zabbix/scripts \ |
6218 |
- /var/lib/zabbix/alertscripts \ |
6219 |
- /var/lib/zabbix/externalscripts \ |
6220 |
- /var/log/zabbix |
6221 |
+ for dir in "${dirs[@]}"; do |
6222 |
+ dodir "${dir}" |
6223 |
+ keepdir "${dir}" |
6224 |
+ done |
6225 |
|
6226 |
if use server; then |
6227 |
insinto /etc/zabbix |
6228 |
- doins "${FILESDIR}/3.0"/zabbix_server.conf |
6229 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server |
6230 |
- dosbin src/zabbix_server/zabbix_server |
6231 |
- fowners root:zabbix /etc/zabbix/zabbix_server.conf |
6232 |
+ doins "${S}"/conf/zabbix_server.conf |
6233 |
fperms 0640 /etc/zabbix/zabbix_server.conf |
6234 |
- dodir /usr/share/zabbix |
6235 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
6236 |
- systemd_dounit "${FILESDIR}/zabbix-server.service" |
6237 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf |
6238 |
+ fowners root:zabbix /etc/zabbix/zabbix_server.conf |
6239 |
+ |
6240 |
+ newinitd "${FILESDIR}"/zabbix-server.init zabbix-server |
6241 |
+ |
6242 |
+ dosbin src/zabbix_server/zabbix_server |
6243 |
+ |
6244 |
+ insinto /usr/share/zabbix |
6245 |
+ doins -r "${S}"/database/ |
6246 |
+ |
6247 |
+ systemd_dounit "${FILESDIR}"/zabbix-server.service |
6248 |
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf |
6249 |
fi |
6250 |
|
6251 |
if use proxy; then |
6252 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy |
6253 |
- dosbin src/zabbix_proxy/zabbix_proxy |
6254 |
insinto /etc/zabbix |
6255 |
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf |
6256 |
- fowners root:zabbix /etc/zabbix/zabbix_proxy.conf |
6257 |
+ doins "${S}"/conf/zabbix_proxy.conf |
6258 |
fperms 0640 /etc/zabbix/zabbix_proxy.conf |
6259 |
- dodir /usr/share/zabbix |
6260 |
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ |
6261 |
- systemd_dounit "${FILESDIR}/zabbix-proxy.service" |
6262 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf |
6263 |
+ fowners root:zabbix /etc/zabbix/zabbix_proxy.conf |
6264 |
+ |
6265 |
+ newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy |
6266 |
+ |
6267 |
+ dosbin src/zabbix_proxy/zabbix_proxy |
6268 |
+ |
6269 |
+ insinto /usr/share/zabbix |
6270 |
+ doins -r "${S}"/database/ |
6271 |
+ |
6272 |
+ systemd_dounit "${FILESDIR}"/zabbix-proxy.service |
6273 |
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf |
6274 |
fi |
6275 |
|
6276 |
if use agent; then |
6277 |
insinto /etc/zabbix |
6278 |
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf |
6279 |
- fowners root:zabbix /etc/zabbix/zabbix_agentd.conf |
6280 |
+ doins "${S}"/conf/zabbix_agentd.conf |
6281 |
fperms 0640 /etc/zabbix/zabbix_agentd.conf |
6282 |
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd |
6283 |
+ fowners root:zabbix /etc/zabbix/zabbix_agentd.conf |
6284 |
+ |
6285 |
+ newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd |
6286 |
+ |
6287 |
dosbin src/zabbix_agent/zabbix_agentd |
6288 |
dobin \ |
6289 |
src/zabbix_sender/zabbix_sender \ |
6290 |
src/zabbix_get/zabbix_get |
6291 |
- fperms 0640 /etc/zabbix/zabbix_agentd.conf |
6292 |
- systemd_dounit "${FILESDIR}/zabbix-agentd.service" |
6293 |
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf |
6294 |
+ |
6295 |
+ systemd_dounit "${FILESDIR}"/zabbix-agentd.service |
6296 |
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf |
6297 |
fi |
6298 |
|
6299 |
+ fowners root:zabbix /etc/zabbix |
6300 |
fowners zabbix:zabbix \ |
6301 |
- /etc/zabbix \ |
6302 |
/var/lib/zabbix \ |
6303 |
/var/lib/zabbix/home \ |
6304 |
/var/lib/zabbix/scripts \ |
6305 |
@@ -258,17 +274,16 @@ src_install() { |
6306 |
src/zabbix_java/lib/logback.xml \ |
6307 |
src/zabbix_java/lib/android-json-4.3_r3.1.jar \ |
6308 |
src/zabbix_java/lib/slf4j-api-1.6.1.jar |
6309 |
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} |
6310 |
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy |
6311 |
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy |
6312 |
+ newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy |
6313 |
+ newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy |
6314 |
fi |
6315 |
} |
6316 |
|
6317 |
pkg_postinst() { |
6318 |
if use server || use proxy ; then |
6319 |
elog |
6320 |
- elog "You may need to configure your database for Zabbix," |
6321 |
- elog "if you have not already done so. " |
6322 |
+ elog "You may need to configure your database for Zabbix" |
6323 |
+ elog "if you have not already done so." |
6324 |
elog |
6325 |
|
6326 |
zabbix_homedir=$(egethome zabbix) |
6327 |
@@ -280,8 +295,7 @@ pkg_postinst() { |
6328 |
ewarn "custom alert scripts." |
6329 |
ewarn |
6330 |
ewarn "A real homedir might be needed for configfiles" |
6331 |
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" |
6332 |
- ewarn "using sendxmpp for Jabber alerts)." |
6333 |
+ ewarn "for custom alert scripts." |
6334 |
ewarn |
6335 |
ewarn "To change the homedir use:" |
6336 |
ewarn " usermod -d /var/lib/zabbix/home zabbix" |