Update to zabbix-1.8.3.
Based on a submission from Florian Gross with several fixes and tweaks. ok sthen@
This commit is contained in:
parent
4522829097
commit
12ecf96b34
@ -1,14 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.25 2010/07/12 22:07:42 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.26 2010/08/22 14:43:23 ajacoutot Exp $
|
||||
|
||||
COMMENT-main = network and application monitoring - agent
|
||||
COMMENT-server = network and application monitoring - server
|
||||
COMMENT-web = network and application monitoring - web frontend
|
||||
|
||||
VERSION = 1.8.2
|
||||
VERSION = 1.8.3
|
||||
DISTNAME = zabbix-${VERSION}
|
||||
REVISION-main = 3
|
||||
REVISION-server = 2
|
||||
REVISION-web = 2
|
||||
FULLPKGNAME-main = zabbix-agent-${VERSION}
|
||||
FULLPKGPATH-main = net/zabbix,-main
|
||||
PKGNAME-server = zabbix-server-${VERSION}
|
||||
@ -36,17 +33,18 @@ FLAVORS = mysql pgsql sqlite3
|
||||
|
||||
SUBST_VARS += PREFIX-web ZABBIX_WEB MAJV
|
||||
|
||||
WANTLIB = c kvm m
|
||||
LIB_DEPENDS = lber,ldap::databases/openldap
|
||||
WANTLIB = c kvm m execinfo lber ldap
|
||||
LIB_DEPENDS = ::databases/openldap \
|
||||
::devel/libexecinfo
|
||||
|
||||
LIB_DEPENDS-server = ${LIB_DEPENDS} \
|
||||
curl::net/curl \
|
||||
netsnmp::net/net-snmp \
|
||||
iksemel::textproc/iksemel
|
||||
::net/curl \
|
||||
::net/net-snmp \
|
||||
::textproc/iksemel
|
||||
RUN_DEPENDS-server = ::net/fping
|
||||
# we want the _zabbix user&group as well as README.OpenBSD
|
||||
RUN_DEPENDS-server += :zabbix-agent-${VERSION}:net/zabbix,-main
|
||||
WANTLIB-server = ${WANTLIB} crypto idn ssl z
|
||||
WANTLIB-server = ${WANTLIB} crypto idn ssl z curl netsnmp iksemel
|
||||
|
||||
CONFIGURE_STYLE = gnu
|
||||
CONFIGURE_ARGS = --enable-server \
|
||||
@ -58,7 +56,7 @@ CONFIGURE_ARGS = --enable-server \
|
||||
--with-ldap \
|
||||
--with-jabber="${LOCALBASE}"
|
||||
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" \
|
||||
ac_cv_search___res_query=no
|
||||
|
||||
PREFIX-web = /var/www
|
||||
@ -76,16 +74,19 @@ FLAVOR ?= no_server
|
||||
BACKEND = ${FLAVOR}
|
||||
.if ${BACKEND} == "mysql"
|
||||
MULTI_PACKAGES += -server
|
||||
LIB_DEPENDS-server += mysqlclient::databases/mysql,-main
|
||||
LIB_DEPENDS-server += ::databases/mysql,-main
|
||||
CONFIGURE_ARGS += --with-mysql
|
||||
WANTLIB-server += mysqlclient
|
||||
.elif ${BACKEND} == "pgsql"
|
||||
MULTI_PACKAGES += -server
|
||||
LIB_DEPENDS-server += pq::databases/postgresql,-main
|
||||
LIB_DEPENDS-server += ::databases/postgresql,-main
|
||||
CONFIGURE_ARGS += --with-pgsql
|
||||
WANTLIB-server += pq
|
||||
.elif ${BACKEND} == "sqlite3"
|
||||
MULTI_PACKAGES += -server
|
||||
LIB_DEPENDS-server += sqlite3.>=14::databases/sqlite3,-main
|
||||
LIB_DEPENDS-server += ::databases/sqlite3,-main
|
||||
CONFIGURE_ARGS += --with-sqlite3
|
||||
WANTLIB-server += sqlite3
|
||||
.elif ${BACKEND} == "no_server"
|
||||
CONFIGURE_ARGS += --disable-server \
|
||||
--disable-proxy
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (zabbix-1.8.2.tar.gz) = +kvk+nrCCjPMCqXCe4J3Rg==
|
||||
RMD160 (zabbix-1.8.2.tar.gz) = YzO7TGdkIpVqYMAcruPGfJwF3eI=
|
||||
SHA1 (zabbix-1.8.2.tar.gz) = WVc+/f/kgfHg0CD051tnDaqDfe0=
|
||||
SHA256 (zabbix-1.8.2.tar.gz) = uh0ARUVRwcbw0nD3Zxi2nOn1TEJ+Iqy1oTzLyeYh/YE=
|
||||
SIZE (zabbix-1.8.2.tar.gz) = 3706540
|
||||
MD5 (zabbix-1.8.3.tar.gz) = V1wxiA1z9v5B5zCHTr/GMw==
|
||||
RMD160 (zabbix-1.8.3.tar.gz) = 8NVMHNiGXJUpRajsOVjn692aktU=
|
||||
SHA1 (zabbix-1.8.3.tar.gz) = aPXR8SiXvGnG/13uorrYKwwfV2E=
|
||||
SHA256 (zabbix-1.8.3.tar.gz) = NyYtdRyWYaNhOAvxSA0nfYFiHYpJxgqBZny+JYAhBlw=
|
||||
SIZE (zabbix-1.8.3.tar.gz) = 4106152
|
||||
|
@ -1,16 +1,7 @@
|
||||
$OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.4 2010/04/09 10:17:59 ajacoutot Exp $
|
||||
--- misc/conf/zabbix_proxy.conf.orig Mon Mar 29 19:22:44 2010
|
||||
+++ misc/conf/zabbix_proxy.conf Fri Apr 9 10:23:05 2010
|
||||
@@ -55,8 +55,6 @@ Server=127.0.0.1
|
||||
# Default:
|
||||
# LogFile=
|
||||
|
||||
-LogFile=/tmp/zabbix_proxy.log
|
||||
-
|
||||
### Option: LogFileSize
|
||||
# Maximum size of log file in MB.
|
||||
# 0 - disable automatic log rotation.
|
||||
@@ -85,6 +83,7 @@ LogFile=/tmp/zabbix_proxy.log
|
||||
$OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.5 2010/08/22 14:43:24 ajacoutot Exp $
|
||||
--- misc/conf/zabbix_proxy.conf.orig Thu Aug 19 16:33:48 2010
|
||||
+++ misc/conf/zabbix_proxy.conf Thu Aug 19 16:36:24 2010
|
||||
@@ -96,6 +96,7 @@ LogFile=/tmp/zabbix_proxy.log
|
||||
# Mandatory: no
|
||||
# Default:
|
||||
# PidFile=/tmp/zabbix_proxy.pid
|
||||
@ -18,7 +9,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.4 2010/04/09 10:17:59 ajacoutot
|
||||
|
||||
### Option: DBHost
|
||||
# Database host name.
|
||||
@@ -110,7 +109,7 @@ DBName=zabbix
|
||||
@@ -121,7 +122,7 @@ DBName=zabbix
|
||||
# Default:
|
||||
# DBUser=
|
||||
|
||||
@ -27,7 +18,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.4 2010/04/09 10:17:59 ajacoutot
|
||||
|
||||
### Option: DBPassword
|
||||
# Database password. Ignored for SQLite.
|
||||
@@ -126,6 +125,7 @@ DBUser=root
|
||||
@@ -137,6 +138,7 @@ DBUser=root
|
||||
# Mandatory: no
|
||||
# Default:
|
||||
# DBSocket=/tmp/mysql.sock
|
||||
@ -35,7 +26,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.4 2010/04/09 10:17:59 ajacoutot
|
||||
|
||||
# Option: DBPort
|
||||
# Database port when not using local socket. Ignored for SQLite.
|
||||
@@ -359,6 +359,7 @@ DBUser=root
|
||||
@@ -372,6 +374,7 @@ DBUser=root
|
||||
# Mandatory: no
|
||||
# Default:
|
||||
# ExternalScripts=/etc/zabbix/externalscripts
|
||||
@ -43,7 +34,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.4 2010/04/09 10:17:59 ajacoutot
|
||||
|
||||
### Option: FpingLocation
|
||||
# Location of fping.
|
||||
@@ -367,6 +368,7 @@ DBUser=root
|
||||
@@ -380,6 +383,7 @@ DBUser=root
|
||||
# Mandatory: no
|
||||
# Default:
|
||||
# FpingLocation=/usr/sbin/fping
|
||||
@ -51,11 +42,11 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.4 2010/04/09 10:17:59 ajacoutot
|
||||
|
||||
### Option: Fping6Location
|
||||
# Location of fping6.
|
||||
@@ -376,6 +378,7 @@ DBUser=root
|
||||
@@ -389,6 +393,7 @@ DBUser=root
|
||||
# Mandatory: no
|
||||
# Default:
|
||||
# Fping6Location=/usr/sbin/fping6
|
||||
+FpingLocation=${LOCALBASE}/sbin/fping6
|
||||
+Fping6Location=${LOCALBASE}/sbin/fping6
|
||||
|
||||
### Option: SSHKeyLocation
|
||||
# Location of public keys for SSH checks
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-misc_conf_zabbix_server_conf,v 1.4 2010/04/09 10:17:59 ajacoutot Exp $
|
||||
--- misc/conf/zabbix_server.conf.orig Mon Mar 29 19:22:44 2010
|
||||
+++ misc/conf/zabbix_server.conf Fri Apr 9 10:23:05 2010
|
||||
$OpenBSD: patch-misc_conf_zabbix_server_conf,v 1.5 2010/08/22 14:43:24 ajacoutot Exp $
|
||||
--- misc/conf/zabbix_server.conf.orig Thu Aug 19 16:37:36 2010
|
||||
+++ misc/conf/zabbix_server.conf Thu Aug 19 16:40:20 2010
|
||||
@@ -36,8 +36,6 @@
|
||||
# Default:
|
||||
# LogFile=
|
||||
@ -35,7 +35,7 @@ $OpenBSD: patch-misc_conf_zabbix_server_conf,v 1.4 2010/04/09 10:17:59 ajacoutot
|
||||
|
||||
### Option: DBPort
|
||||
# Database port when not using local socket. Ignored for SQLite.
|
||||
@@ -335,6 +335,7 @@ DBUser=root
|
||||
@@ -334,6 +334,7 @@ DBUser=root
|
||||
# Mandatory: no
|
||||
# Default:
|
||||
# AlertScriptsPath=/home/zabbix/bin/
|
||||
@ -43,7 +43,7 @@ $OpenBSD: patch-misc_conf_zabbix_server_conf,v 1.4 2010/04/09 10:17:59 ajacoutot
|
||||
|
||||
### Option: ExternalScripts
|
||||
# Location of external scripts
|
||||
@@ -342,6 +343,7 @@ DBUser=root
|
||||
@@ -341,6 +342,7 @@ DBUser=root
|
||||
# Mandatory: no
|
||||
# Default:
|
||||
# ExternalScripts=/etc/zabbix/externalscripts
|
||||
@ -51,7 +51,7 @@ $OpenBSD: patch-misc_conf_zabbix_server_conf,v 1.4 2010/04/09 10:17:59 ajacoutot
|
||||
|
||||
### Option: FpingLocation
|
||||
# Location of fping.
|
||||
@@ -350,6 +352,7 @@ DBUser=root
|
||||
@@ -349,6 +351,7 @@ DBUser=root
|
||||
# Mandatory: no
|
||||
# Default:
|
||||
# FpingLocation=/usr/sbin/fping
|
||||
@ -59,11 +59,11 @@ $OpenBSD: patch-misc_conf_zabbix_server_conf,v 1.4 2010/04/09 10:17:59 ajacoutot
|
||||
|
||||
### Option: Fping6Location
|
||||
# Location of fping6.
|
||||
@@ -359,6 +362,7 @@ DBUser=root
|
||||
@@ -358,6 +361,7 @@ DBUser=root
|
||||
# Mandatory: no
|
||||
# Default:
|
||||
# Fping6Location=/usr/sbin/fping6
|
||||
+FpingLocation=${LOCALBASE}/sbin/fping6
|
||||
+Fping6Location=${LOCALBASE}/sbin/fping6
|
||||
|
||||
### Option: SSHKeyLocation
|
||||
# Location of public keys for SSH checks
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_libs_zbxnix_daemon_c,v 1.3 2010/01/11 18:30:01 jasper Exp $
|
||||
--- src/libs/zbxnix/daemon.c.orig Thu Dec 24 00:00:51 2009
|
||||
+++ src/libs/zbxnix/daemon.c Thu Dec 24 00:01:05 2009
|
||||
@@ -91,7 +91,7 @@ int daemon_start(int allow_root)
|
||||
$OpenBSD: patch-src_libs_zbxnix_daemon_c,v 1.4 2010/08/22 14:43:24 ajacoutot Exp $
|
||||
--- src/libs/zbxnix/daemon.c.orig Thu Aug 19 16:43:41 2010
|
||||
+++ src/libs/zbxnix/daemon.c Thu Aug 19 16:44:01 2010
|
||||
@@ -138,7 +138,7 @@ int daemon_start(int allow_root)
|
||||
pid_t pid;
|
||||
struct passwd *pwd;
|
||||
struct sigaction phan;
|
||||
|
@ -1,173 +0,0 @@
|
||||
$OpenBSD: patch-src_libs_zbxsysinfo_openbsd_proc_c,v 1.1 2010/01/24 14:09:00 okan Exp $
|
||||
--- src/libs/zbxsysinfo/openbsd/proc.c.orig Mon Dec 7 14:43:56 2009
|
||||
+++ src/libs/zbxsysinfo/openbsd/proc.c Mon Jan 18 17:10:47 2010
|
||||
@@ -43,9 +43,11 @@ static int proc_argv(pid_t pid, char ***argv, size_t *
|
||||
mib[1] = KERN_PROC_ARGS;
|
||||
mib[2] = (int)pid;
|
||||
mib[3] = KERN_PROC_ARGV;
|
||||
+ mib[4] = sizeof(struct kinfo_proc2);
|
||||
+ mib[5] = 0;
|
||||
retry:
|
||||
sz = *argv_alloc;
|
||||
- if (0 != sysctl(mib, 4, *argv, &sz, NULL, 0)) {
|
||||
+ if (0 != sysctl(mib, 6, *argv, &sz, NULL, 0)) {
|
||||
if (errno == ENOMEM) {
|
||||
*argv_alloc *= 2;
|
||||
*argv = zbx_realloc(*argv, *argv_alloc);
|
||||
@@ -57,7 +59,8 @@ retry:
|
||||
mib[3] = KERN_PROC_NARGV;
|
||||
|
||||
sz = sizeof(int);
|
||||
- if (0 != sysctl(mib, 4, argc, &sz, NULL, 0))
|
||||
+ mib[5] = (int)(sz / sizeof(struct kinfo_proc2));
|
||||
+ if (0 != sysctl(mib, 6, argc, &sz, NULL, 0))
|
||||
return FAIL;
|
||||
|
||||
return SUCCEED;
|
||||
@@ -98,7 +101,7 @@ int PROC_MEMORY(const char *cmd, const char *param
|
||||
|
||||
size_t sz;
|
||||
|
||||
- struct kinfo_proc *proc = NULL;
|
||||
+ struct kinfo_proc2 *proc = NULL;
|
||||
struct passwd *usrinfo;
|
||||
|
||||
char **argv = NULL, *args = NULL;
|
||||
@@ -150,7 +153,7 @@ int PROC_MEMORY(const char *cmd, const char *param
|
||||
pagesize = getpagesize();
|
||||
|
||||
mib[0] = CTL_KERN;
|
||||
- mib[1] = KERN_PROC;
|
||||
+ mib[1] = KERN_PROC2;
|
||||
if (NULL != usrinfo) {
|
||||
mib[2] = KERN_PROC_UID;
|
||||
mib[3] = usrinfo->pw_uid;
|
||||
@@ -158,28 +161,31 @@ int PROC_MEMORY(const char *cmd, const char *param
|
||||
mib[2] = KERN_PROC_ALL;
|
||||
mib[3] = 0;
|
||||
}
|
||||
+ mib[4] = sizeof(struct kinfo_proc2);
|
||||
+ mib[5] = 0;
|
||||
|
||||
sz = 0;
|
||||
- if (0 != sysctl(mib, 4, NULL, &sz, NULL, 0))
|
||||
+ if (0 != sysctl(mib, 6, NULL, &sz, NULL, 0))
|
||||
return SYSINFO_RET_FAIL;
|
||||
|
||||
- proc = (struct kinfo_proc *)zbx_malloc(proc, sz);
|
||||
- if (0 != sysctl(mib, 4, proc, &sz, NULL, 0)) {
|
||||
+ proc = (struct kinfo_proc2 *)zbx_malloc(proc, sz);
|
||||
+ mib[5] = (int)(sz / sizeof(struct kinfo_proc2));
|
||||
+ if (0 != sysctl(mib, 6, proc, &sz, NULL, 0)) {
|
||||
zbx_free(proc);
|
||||
return SYSINFO_RET_FAIL;
|
||||
}
|
||||
|
||||
- count = sz / sizeof(struct kinfo_proc);
|
||||
+ count = sz / sizeof(struct kinfo_proc2);
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
proc_ok = 0;
|
||||
comm_ok = 0;
|
||||
|
||||
- if (*procname == '\0' || 0 == strcmp(procname, proc[i].kp_proc.p_comm))
|
||||
+ if (*procname == '\0' || 0 == strcmp(procname, proc[i].p_comm))
|
||||
proc_ok = 1;
|
||||
|
||||
if (*proccomm != '\0') {
|
||||
- if (SUCCEED == proc_argv(proc[i].kp_proc.p_pid, &argv, &argv_alloc, &argc)) {
|
||||
+ if (SUCCEED == proc_argv(proc[i].p_pid, &argv, &argv_alloc, &argc)) {
|
||||
collect_args(argv, argc, &args, &args_alloc);
|
||||
if (NULL != zbx_regexp_match(args, proccomm, NULL))
|
||||
comm_ok = 1;
|
||||
@@ -188,9 +194,9 @@ int PROC_MEMORY(const char *cmd, const char *param
|
||||
comm_ok = 1;
|
||||
|
||||
if (proc_ok && comm_ok) {
|
||||
- value = proc[i].kp_eproc.e_vm.vm_tsize
|
||||
- + proc[i].kp_eproc.e_vm.vm_dsize
|
||||
- + proc[i].kp_eproc.e_vm.vm_ssize;
|
||||
+ value = proc[i].p_vm_tsize
|
||||
+ + proc[i].p_vm_dsize
|
||||
+ + proc[i].p_vm_ssize;
|
||||
value *= pagesize;
|
||||
|
||||
if (0 == proccount++)
|
||||
@@ -231,7 +237,7 @@ int PROC_NUM(const char *cmd, const char *param, unsig
|
||||
|
||||
size_t sz;
|
||||
|
||||
- struct kinfo_proc *proc = NULL;
|
||||
+ struct kinfo_proc2 *proc = NULL;
|
||||
struct passwd *usrinfo;
|
||||
|
||||
char **argv = NULL, *args = NULL;
|
||||
@@ -281,7 +287,7 @@ int PROC_NUM(const char *cmd, const char *param, unsig
|
||||
*proccomm = '\0';
|
||||
|
||||
mib[0] = CTL_KERN;
|
||||
- mib[1] = KERN_PROC;
|
||||
+ mib[1] = KERN_PROC2;
|
||||
if (NULL != usrinfo) {
|
||||
mib[2] = KERN_PROC_UID;
|
||||
mib[3] = usrinfo->pw_uid;
|
||||
@@ -289,39 +295,42 @@ int PROC_NUM(const char *cmd, const char *param, unsig
|
||||
mib[2] = KERN_PROC_ALL;
|
||||
mib[3] = 0;
|
||||
}
|
||||
+ mib[4] = sizeof(struct kinfo_proc2);
|
||||
+ mib[5] = 0;
|
||||
|
||||
sz = 0;
|
||||
- if (0 != sysctl(mib, 4, NULL, &sz, NULL, 0))
|
||||
+ if (0 != sysctl(mib, 6, NULL, &sz, NULL, 0))
|
||||
return SYSINFO_RET_FAIL;
|
||||
|
||||
- proc = (struct kinfo_proc *)zbx_malloc(proc, sz);
|
||||
- if (0 != sysctl(mib, 4, proc, &sz, NULL, 0)) {
|
||||
+ proc = (struct kinfo_proc2 *)zbx_malloc(proc, sz);
|
||||
+ mib[5] = (int)(sz / sizeof(struct kinfo_proc2));
|
||||
+ if (0 != sysctl(mib, 6, proc, &sz, NULL, 0)) {
|
||||
zbx_free(proc);
|
||||
return SYSINFO_RET_FAIL;
|
||||
}
|
||||
|
||||
- count = sz / sizeof(struct kinfo_proc);
|
||||
+ count = sz / sizeof(struct kinfo_proc2);
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
proc_ok = 0;
|
||||
stat_ok = 0;
|
||||
comm_ok = 0;
|
||||
|
||||
- if (*procname == '\0' || 0 == strcmp(procname, proc[i].kp_proc.p_comm))
|
||||
+ if (*procname == '\0' || 0 == strcmp(procname, proc[i].p_comm))
|
||||
proc_ok = 1;
|
||||
|
||||
if (zbx_proc_stat != ZBX_PROC_STAT_ALL) {
|
||||
switch (zbx_proc_stat) {
|
||||
case ZBX_PROC_STAT_RUN:
|
||||
- if (proc[i].kp_proc.p_stat == SRUN || proc[i].kp_proc.p_stat == SONPROC)
|
||||
+ if (proc[i].p_stat == SRUN || proc[i].p_stat == SONPROC)
|
||||
stat_ok = 1;
|
||||
break;
|
||||
case ZBX_PROC_STAT_SLEEP:
|
||||
- if (proc[i].kp_proc.p_stat == SSLEEP)
|
||||
+ if (proc[i].p_stat == SSLEEP)
|
||||
stat_ok = 1;
|
||||
break;
|
||||
case ZBX_PROC_STAT_ZOMB:
|
||||
- if (proc[i].kp_proc.p_stat == SZOMB || proc[i].kp_proc.p_stat == SDEAD)
|
||||
+ if (proc[i].p_stat == SZOMB || proc[i].p_stat == SDEAD)
|
||||
stat_ok = 1;
|
||||
break;
|
||||
}
|
||||
@@ -329,7 +338,7 @@ int PROC_NUM(const char *cmd, const char *param, unsig
|
||||
stat_ok = 1;
|
||||
|
||||
if (*proccomm != '\0') {
|
||||
- if (SUCCEED == proc_argv(proc[i].kp_proc.p_pid, &argv, &argv_alloc, &argc)) {
|
||||
+ if (SUCCEED == proc_argv(proc[i].p_pid, &argv, &argv_alloc, &argc)) {
|
||||
collect_args(argv, argc, &args, &args_alloc);
|
||||
if (zbx_regexp_match(args, proccomm, NULL) != NULL)
|
||||
comm_ok = 1;
|
@ -1,10 +1,9 @@
|
||||
@comment $OpenBSD: PLIST-server,v 1.7 2010/04/09 10:17:59 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-server,v 1.8 2010/08/22 14:43:24 ajacoutot Exp $
|
||||
@man man/man8/zabbix_proxy.8
|
||||
@man man/man8/zabbix_server.8
|
||||
@sample ${SYSCONFDIR}/zabbix/
|
||||
@bin sbin/zabbix_proxy
|
||||
@bin sbin/zabbix_server
|
||||
share/examples/zabbix/
|
||||
share/examples/zabbix/zabbix_proxy.conf
|
||||
@mode 640
|
||||
@group _zabbix
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-web,v 1.9 2010/04/09 10:17:59 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-web,v 1.10 2010/08/22 14:43:24 ajacoutot Exp $
|
||||
@pkgpath net/zabbix,-web,mysql
|
||||
@pkgpath net/zabbix,-web,pgsql
|
||||
conf/modules.sample/zabbix.conf
|
||||
@ -15,15 +15,21 @@ zabbix/api/classes/class.caction.php
|
||||
zabbix/api/classes/class.calert.php
|
||||
zabbix/api/classes/class.capiinfo.php
|
||||
zabbix/api/classes/class.capplication.php
|
||||
zabbix/api/classes/class.cdcheck.php
|
||||
zabbix/api/classes/class.cdhost.php
|
||||
zabbix/api/classes/class.cdrule.php
|
||||
zabbix/api/classes/class.cdservice.php
|
||||
zabbix/api/classes/class.cevent.php
|
||||
zabbix/api/classes/class.cgraph.php
|
||||
zabbix/api/classes/class.cgraphitem.php
|
||||
zabbix/api/classes/class.chistory.php
|
||||
zabbix/api/classes/class.chost.php
|
||||
zabbix/api/classes/class.chostgroup.php
|
||||
zabbix/api/classes/class.cimage.php
|
||||
zabbix/api/classes/class.citem.php
|
||||
zabbix/api/classes/class.cmaintenance.php
|
||||
zabbix/api/classes/class.cmap.php
|
||||
zabbix/api/classes/class.cmediatype.php
|
||||
zabbix/api/classes/class.cproxy.php
|
||||
zabbix/api/classes/class.cscreen.php
|
||||
zabbix/api/classes/class.cscript.php
|
||||
@ -39,12 +45,13 @@ zabbix/api/rpc/class.czbxrpc.php
|
||||
zabbix/api_jsonrpc.php
|
||||
zabbix/applications.php
|
||||
zabbix/audio/
|
||||
zabbix/audio/trigger_off.wav
|
||||
zabbix/audio/trigger_on.wav
|
||||
zabbix/audio/trigger_on_average.wav
|
||||
zabbix/audio/trigger_on_disaster.wav
|
||||
zabbix/audio/trigger_on_high.wav
|
||||
zabbix/audio/trigger_on_warning.wav
|
||||
zabbix/audio/alarm_average.wav
|
||||
zabbix/audio/alarm_disaster.wav
|
||||
zabbix/audio/alarm_high.wav
|
||||
zabbix/audio/alarm_information.wav
|
||||
zabbix/audio/alarm_ok.wav
|
||||
zabbix/audio/alarm_warning.wav
|
||||
zabbix/audio/no_sound.wav
|
||||
zabbix/auditacts.php
|
||||
zabbix/auditlogs.php
|
||||
zabbix/authentication.php
|
||||
@ -72,7 +79,6 @@ zabbix/dashconf.php
|
||||
zabbix/discovery.php
|
||||
zabbix/discoveryconf.php
|
||||
zabbix/events.php
|
||||
zabbix/export.php
|
||||
zabbix/fonts/
|
||||
zabbix/fonts/DejaVuSans.ttf
|
||||
zabbix/graphs.php
|
||||
@ -104,37 +110,24 @@ zabbix/images/general/bar/right.png
|
||||
zabbix/images/general/bar/right_arr.png
|
||||
zabbix/images/general/bttn/
|
||||
zabbix/images/general/bttn/arrowdown.png
|
||||
zabbix/images/general/bttn/arrowdown_bb.png
|
||||
zabbix/images/general/bttn/arrowleft.png
|
||||
zabbix/images/general/bttn/arrowleft_bb.png
|
||||
zabbix/images/general/bttn/arrowright.png
|
||||
zabbix/images/general/bttn/arrowright_bb.png
|
||||
zabbix/images/general/bttn/arrowup.png
|
||||
zabbix/images/general/bttn/arrowup_bb.png
|
||||
zabbix/images/general/bttn/close.png
|
||||
zabbix/images/general/bttn/config.png
|
||||
zabbix/images/general/bttn/config_bb.png
|
||||
zabbix/images/general/bttn/config_hl.png
|
||||
zabbix/images/general/bttn/config_hl_bb.png
|
||||
zabbix/images/general/bttn/down.png
|
||||
zabbix/images/general/bttn/down_bb.png
|
||||
zabbix/images/general/bttn/fullscreen.png
|
||||
zabbix/images/general/bttn/fullscreen_bb.png
|
||||
zabbix/images/general/bttn/help.png
|
||||
zabbix/images/general/bttn/help_bb.png
|
||||
zabbix/images/general/bttn/menu.png
|
||||
zabbix/images/general/bttn/menu_bb.png
|
||||
zabbix/images/general/bttn/minus.png
|
||||
zabbix/images/general/bttn/minus_bb.png
|
||||
zabbix/images/general/bttn/move.png
|
||||
zabbix/images/general/bttn/mute.png
|
||||
zabbix/images/general/bttn/mute_bb.png
|
||||
zabbix/images/general/bttn/plus.png
|
||||
zabbix/images/general/bttn/plus_bb.png
|
||||
zabbix/images/general/bttn/reset.png
|
||||
zabbix/images/general/bttn/reset_bb.png
|
||||
zabbix/images/general/bttn/snooze.png
|
||||
zabbix/images/general/bttn/sound.png
|
||||
zabbix/images/general/bttn/sound_bb.png
|
||||
zabbix/images/general/bttn/up.png
|
||||
zabbix/images/general/bttn/up_bb.png
|
||||
zabbix/images/general/chart.png
|
||||
zabbix/images/general/closed.gif
|
||||
zabbix/images/general/dbl_arrow_down.png
|
||||
@ -163,16 +156,10 @@ zabbix/images/general/snmp_available.png
|
||||
zabbix/images/general/snmp_available_bb.png
|
||||
zabbix/images/general/snmp_unavailable.png
|
||||
zabbix/images/general/snmp_unknown.png
|
||||
zabbix/images/general/sort_down.png
|
||||
zabbix/images/general/sort_down_bb.png
|
||||
zabbix/images/general/sort_downw.gif
|
||||
zabbix/images/general/sort_up.png
|
||||
zabbix/images/general/sort_up_bb.png
|
||||
zabbix/images/general/sort_upw.gif
|
||||
zabbix/images/general/sortdown.gif
|
||||
zabbix/images/general/sortdown_off.gif
|
||||
zabbix/images/general/sortup.gif
|
||||
zabbix/images/general/sortup_off.gif
|
||||
zabbix/images/general/sort_down.gif
|
||||
zabbix/images/general/sort_down_od.gif
|
||||
zabbix/images/general/sort_up.gif
|
||||
zabbix/images/general/sort_up_od.gif
|
||||
zabbix/images/general/tick.png
|
||||
zabbix/images/general/tr_space.gif
|
||||
zabbix/images/general/tr_top_bottom.gif
|
||||
@ -188,6 +175,7 @@ zabbix/images/general/tree/zero.gif
|
||||
zabbix/images/general/up_icon.png
|
||||
zabbix/images/general/warning16r.gif
|
||||
zabbix/images/general/warning_small.gif
|
||||
zabbix/images/general/x.gif
|
||||
zabbix/images/general/zabbix.ico
|
||||
zabbix/images/general/zabbix.png
|
||||
zabbix/images/general/zabbix_available.png
|
||||
@ -195,6 +183,7 @@ zabbix/images/general/zabbix_available_bb.png
|
||||
zabbix/images/general/zabbix_bb.ico
|
||||
zabbix/images/general/zabbix_bb.png
|
||||
zabbix/images/general/zabbix_ob.ico
|
||||
zabbix/images/general/zabbix_od.png
|
||||
zabbix/images/general/zabbix_unavailable.png
|
||||
zabbix/images/general/zabbix_unknown.png
|
||||
zabbix/images/general/zero.gif
|
||||
@ -246,12 +235,10 @@ zabbix/images/sysmaps/old/Router.png
|
||||
zabbix/images/sysmaps/old/Server.png
|
||||
zabbix/images/sysmaps/old/Workstation.png
|
||||
zabbix/imgstore.php
|
||||
zabbix/import.php
|
||||
zabbix/include/
|
||||
zabbix/include/.htaccess
|
||||
zabbix/include/acknow.inc.php
|
||||
zabbix/include/actions.inc.php
|
||||
zabbix/include/apicalls.inc.php
|
||||
zabbix/include/audit.inc.php
|
||||
zabbix/include/blocks.inc.php
|
||||
zabbix/include/classes/
|
||||
@ -277,11 +264,13 @@ zabbix/include/classes/class.cflash.php
|
||||
zabbix/include/classes/class.cflashclock.php
|
||||
zabbix/include/classes/class.cflashembed.php
|
||||
zabbix/include/classes/class.cform.php
|
||||
zabbix/include/classes/class.cformelement.php
|
||||
zabbix/include/classes/class.cformtable.php
|
||||
zabbix/include/classes/class.cgraphdraw.php
|
||||
zabbix/include/classes/class.chelp.php
|
||||
zabbix/include/classes/class.chostsinfo.php
|
||||
zabbix/include/classes/class.chttp_request.php
|
||||
zabbix/include/classes/class.cicon.php
|
||||
zabbix/include/classes/class.ciframe.php
|
||||
zabbix/include/classes/class.cimagetexttable.php
|
||||
zabbix/include/classes/class.cimg.php
|
||||
@ -295,6 +284,7 @@ zabbix/include/classes/class.clistbox.php
|
||||
zabbix/include/classes/class.clistitem.php
|
||||
zabbix/include/classes/class.cnumericbox.php
|
||||
zabbix/include/classes/class.cobject.php
|
||||
zabbix/include/classes/class.cpagefilter.php
|
||||
zabbix/include/classes/class.cparam.php
|
||||
zabbix/include/classes/class.cpassbox.php
|
||||
zabbix/include/classes/class.cpie.php
|
||||
@ -302,6 +292,7 @@ zabbix/include/classes/class.cpumenu.php
|
||||
zabbix/include/classes/class.crow.php
|
||||
zabbix/include/classes/class.cserverinfo.php
|
||||
zabbix/include/classes/class.cspan.php
|
||||
zabbix/include/classes/class.cstringparser.php
|
||||
zabbix/include/classes/class.ctable.php
|
||||
zabbix/include/classes/class.ctableinfo.php
|
||||
zabbix/include/classes/class.ctag.php
|
||||
@ -336,6 +327,7 @@ zabbix/include/js.inc.php
|
||||
zabbix/include/locales/
|
||||
zabbix/include/locales.inc.php
|
||||
zabbix/include/locales/cn_zh.inc.php
|
||||
zabbix/include/locales/cs_cz.inc.php
|
||||
zabbix/include/locales/de_de.inc.php
|
||||
zabbix/include/locales/en_gb.inc.php
|
||||
zabbix/include/locales/fr_fr.inc.php
|
||||
@ -363,40 +355,52 @@ zabbix/include/profiles.inc.php
|
||||
zabbix/include/regexp.inc.php
|
||||
zabbix/include/reports.inc.php
|
||||
zabbix/include/requirements.inc.php
|
||||
zabbix/include/schema.inc.php
|
||||
zabbix/include/screens.inc.php
|
||||
zabbix/include/scripts.inc.php
|
||||
zabbix/include/services.inc.php
|
||||
zabbix/include/setup.inc.php
|
||||
zabbix/include/sounds.inc.php
|
||||
zabbix/include/triggers.inc.php
|
||||
zabbix/include/users.inc.php
|
||||
zabbix/include/validate.inc.php
|
||||
zabbix/include/valuemap.inc.php
|
||||
zabbix/index.php
|
||||
zabbix/instal.php
|
||||
zabbix/items.php
|
||||
zabbix/js/
|
||||
zabbix/js/class.bbcode.js
|
||||
zabbix/js/class.calendar.js
|
||||
zabbix/js/class.cdate.js
|
||||
zabbix/js/class.cdebug.js
|
||||
zabbix/js/class.cmap.js
|
||||
zabbix/js/class.cmessages.js
|
||||
zabbix/js/class.cookie.js
|
||||
zabbix/js/class.cscreen.js
|
||||
zabbix/js/class.csuggest.js
|
||||
zabbix/js/class.cswitcher.js
|
||||
zabbix/js/class.ctree.js
|
||||
zabbix/js/class.curl.js
|
||||
zabbix/js/class.cviewswitcher.js
|
||||
zabbix/js/class.pmaster.js
|
||||
zabbix/js/class.rpc.js
|
||||
zabbix/js/common.js
|
||||
zabbix/js/dom.js
|
||||
zabbix/js/functions.js
|
||||
zabbix/js/gtlc.js
|
||||
zabbix/js/ie6fix.js
|
||||
zabbix/js/main.js
|
||||
zabbix/js/menu.js
|
||||
zabbix/js/prototype.js
|
||||
zabbix/js/scriptaculous/
|
||||
zabbix/js/scriptaculous.js
|
||||
zabbix/js/scriptaculous/builder.js
|
||||
zabbix/js/scriptaculous/controls.js
|
||||
zabbix/js/scriptaculous/dragdrop.js
|
||||
zabbix/js/scriptaculous/effects.js
|
||||
zabbix/js/scriptaculous/slider.js
|
||||
zabbix/js/scriptaculous/sound.js
|
||||
zabbix/jsLoader.php
|
||||
zabbix/jsrpc.php
|
||||
zabbix/latest.php
|
||||
zabbix/locales.php
|
||||
zabbix/maintenance.php
|
||||
@ -434,6 +438,7 @@ zabbix/search.php
|
||||
zabbix/services.php
|
||||
zabbix/services_form.php
|
||||
zabbix/setup.php
|
||||
zabbix/slideconf.php
|
||||
zabbix/slides.php
|
||||
zabbix/srv_status.php
|
||||
zabbix/styles/
|
||||
@ -441,9 +446,12 @@ zabbix/styles/blocks.css
|
||||
zabbix/styles/calendar.css
|
||||
zabbix/styles/css_bb.css
|
||||
zabbix/styles/css_ob.css
|
||||
zabbix/styles/css_od.css
|
||||
zabbix/styles/default.css
|
||||
zabbix/styles/div.css
|
||||
zabbix/styles/form.css
|
||||
zabbix/styles/ie.css
|
||||
zabbix/styles/ie_css_od.css
|
||||
zabbix/styles/link.css
|
||||
zabbix/styles/p.css
|
||||
zabbix/styles/popupmenu.css
|
||||
|
Loading…
Reference in New Issue
Block a user