If zabbix_agent does not have perms to access kmem, then
fallback to using the SIOCGIFDATA ioctl to get iface stats.
This commit is contained in:
robert
parent
ab3f543bdf
commit
a03fdd18d8
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.26 2010/08/22 14:43:23 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.27 2010/09/27 08:10:32 robert Exp $
|
||||
|
||||
COMMENT-main = network and application monitoring - agent
|
||||
COMMENT-server = network and application monitoring - server
|
||||
@ -13,6 +13,8 @@ FULLPKGNAME-web = zabbix-web-${VERSION}
|
||||
FULLPKGPATH-web = net/zabbix,-web
|
||||
CATEGORIES = net
|
||||
|
||||
REVISION-main= 0
|
||||
|
||||
MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
|
||||
|
||||
HOMEPAGE = http://www.zabbix.com/
|
||||
|
||||
@ -1,12 +1,161 @@
|
||||
$OpenBSD: patch-src_libs_zbxsysinfo_openbsd_net_c,v 1.2 2010/01/11 18:30:01 jasper Exp $
|
||||
--- src/libs/zbxsysinfo/openbsd/net.c.orig Thu Dec 24 00:03:53 2009
|
||||
+++ src/libs/zbxsysinfo/openbsd/net.c Thu Dec 24 00:04:20 2009
|
||||
@@ -21,6 +21,8 @@
|
||||
$OpenBSD: patch-src_libs_zbxsysinfo_openbsd_net_c,v 1.3 2010/09/27 08:10:32 robert Exp $
|
||||
--- src/libs/zbxsysinfo/openbsd/net.c.orig Mon Aug 16 10:19:32 2010
|
||||
+++ src/libs/zbxsysinfo/openbsd/net.c Sun Sep 26 16:28:44 2010
|
||||
@@ -21,6 +21,10 @@
|
||||
|
||||
#include "sysinfo.h"
|
||||
|
||||
+#include <sys/sockio.h>
|
||||
+
|
||||
+#define N_UNDF 0x00 /* undefined */
|
||||
+
|
||||
static struct nlist kernel_symbols[] =
|
||||
{
|
||||
{"_ifnet", N_UNDF, 0, 0, 0},
|
||||
@@ -37,15 +41,50 @@ static int get_ifdata(const char *if_name, zbx_uint64_
|
||||
{
|
||||
struct ifnet_head head;
|
||||
struct ifnet *ifp;
|
||||
- struct ifnet v;
|
||||
|
||||
kvm_t *kp;
|
||||
int len = 0;
|
||||
int ret = SYSINFO_RET_FAIL;
|
||||
|
||||
+ /* if_ibytes; total number of octets received */
|
||||
+ /* if_ipackets; packets received on interface */
|
||||
+ /* if_ierrors; input errors on interface */
|
||||
+ /* if_iqdrops; dropped on input, this interface */
|
||||
+ /* if_obytes; total number of octets sent */
|
||||
+ /* if_opackets; packets sent on interface */
|
||||
+ /* if_oerrors; output errors on interface */
|
||||
+ /* if_collisions; collisions on csma interfaces */
|
||||
+
|
||||
+ if (ibytes)
|
||||
+ *ibytes = 0;
|
||||
+ if (ipackets)
|
||||
+ *ipackets = 0;
|
||||
+ if (ierrors)
|
||||
+ *ierrors = 0;
|
||||
+ if (idropped)
|
||||
+ *idropped = 0;
|
||||
+ if (obytes)
|
||||
+ *obytes = 0;
|
||||
+ if (opackets)
|
||||
+ *opackets = 0;
|
||||
+ if (oerrors)
|
||||
+ *oerrors = 0;
|
||||
+ if (tbytes)
|
||||
+ *tbytes = 0;
|
||||
+ if (tpackets)
|
||||
+ *tpackets = 0;
|
||||
+ if (terrors)
|
||||
+ *terrors = 0;
|
||||
+ if (tdropped)
|
||||
+ *tdropped = 0;
|
||||
+ if (icollisions)
|
||||
+ *icollisions = 0;
|
||||
+
|
||||
kp = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
|
||||
|
||||
if (kp) {
|
||||
+ struct ifnet v;
|
||||
+
|
||||
if (N_UNDF == kernel_symbols[IFNET_ID].n_type)
|
||||
if (0 != kvm_nlist(kp, &kernel_symbols[0]))
|
||||
kernel_symbols[IFNET_ID].n_type = N_UNDF;
|
||||
@@ -56,40 +95,6 @@ static int get_ifdata(const char *if_name, zbx_uint64_
|
||||
if (kvm_read(kp, kernel_symbols[IFNET_ID].n_value, &head, len) >= len) {
|
||||
len = sizeof(struct ifnet);
|
||||
|
||||
- /* if_ibytes; total number of octets received */
|
||||
- /* if_ipackets; packets received on interface */
|
||||
- /* if_ierrors; input errors on interface */
|
||||
- /* if_iqdrops; dropped on input, this interface */
|
||||
- /* if_obytes; total number of octets sent */
|
||||
- /* if_opackets; packets sent on interface */
|
||||
- /* if_oerrors; output errors on interface */
|
||||
- /* if_collisions; collisions on csma interfaces */
|
||||
-
|
||||
- if (ibytes)
|
||||
- *ibytes = 0;
|
||||
- if (ipackets)
|
||||
- *ipackets = 0;
|
||||
- if (ierrors)
|
||||
- *ierrors = 0;
|
||||
- if (idropped)
|
||||
- *idropped = 0;
|
||||
- if (obytes)
|
||||
- *obytes = 0;
|
||||
- if (opackets)
|
||||
- *opackets = 0;
|
||||
- if (oerrors)
|
||||
- *oerrors = 0;
|
||||
- if (tbytes)
|
||||
- *tbytes = 0;
|
||||
- if (tpackets)
|
||||
- *tpackets = 0;
|
||||
- if (terrors)
|
||||
- *terrors = 0;
|
||||
- if (tdropped)
|
||||
- *tdropped = 0;
|
||||
- if (icollisions)
|
||||
- *icollisions = 0;
|
||||
-
|
||||
for(ifp = head.tqh_first; ifp; ifp = v.if_list.tqe_next) {
|
||||
if (kvm_read(kp, (u_long)ifp, &v, len) < len)
|
||||
break;
|
||||
@@ -125,8 +130,53 @@ static int get_ifdata(const char *if_name, zbx_uint64_
|
||||
}
|
||||
}
|
||||
kvm_close(kp);
|
||||
+ } else { /* Fallback to using SIOCGIFDATA */
|
||||
+ int if_s = -1;
|
||||
+ struct ifreq ifr;
|
||||
+ struct if_data v;
|
||||
+
|
||||
+ if ((if_s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
|
||||
+ goto out;
|
||||
+
|
||||
+ zbx_strlcpy(ifr.ifr_name, if_name, IFNAMSIZ - 1);
|
||||
+ ifr.ifr_data = (caddr_t)&v;
|
||||
+
|
||||
+ if (ioctl(if_s, SIOCGIFDATA, &ifr))
|
||||
+ goto out;
|
||||
+
|
||||
+ if (*if_name == '\0' || 0 == strcmp(if_name, ifr.ifr_name)) {
|
||||
+ if (ibytes)
|
||||
+ *ibytes += v.ifi_ibytes;
|
||||
+ if (ipackets)
|
||||
+ *ipackets += v.ifi_ipackets;
|
||||
+ if (ierrors)
|
||||
+ *ierrors += v.ifi_ierrors;
|
||||
+ if (idropped)
|
||||
+ *idropped += v.ifi_iqdrops;
|
||||
+ if (obytes)
|
||||
+ *obytes += v.ifi_obytes;
|
||||
+ if (opackets)
|
||||
+ *opackets += v.ifi_opackets;
|
||||
+ if (oerrors)
|
||||
+ *oerrors += v.ifi_oerrors;
|
||||
+ if (tbytes)
|
||||
+ *tbytes += v.ifi_ibytes + v.ifi_obytes;
|
||||
+ if (tpackets)
|
||||
+ *tpackets += v.ifi_ipackets + v.ifi_opackets;
|
||||
+ if (terrors)
|
||||
+ *terrors += v.ifi_ierrors + v.ifi_oerrors;
|
||||
+ if (tdropped)
|
||||
+ *tdropped += v.ifi_iqdrops;
|
||||
+ if (icollisions)
|
||||
+ *icollisions += v.ifi_collisions;
|
||||
+ }
|
||||
+
|
||||
+ close(if_s);
|
||||
+
|
||||
+ ret = SYSINFO_RET_OK;
|
||||
}
|
||||
|
||||
+out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user