cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix zabbix after the removal of swapin and swapout from uvm statistics

Browse Source 
reported by naddy@
This commit is contained in:
robert 2013-05-21 20:18:52 +00:00
parent 84bfb8478a
commit 57f0861d5e
2 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/zabbix/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.82 2013/05/15 17:59:38 robert Exp $
# $OpenBSD: Makefile,v 1.83 2013/05/21 20:18:52 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/

66
net/zabbix/patches/patch-src_libs_zbxsysinfo_openbsd_swap_c Normal file
View File

@ -0,0 +1,66 @@
$OpenBSD: patch-src_libs_zbxsysinfo_openbsd_swap_c,v 1.1 2013/05/21 20:18:52 robert Exp $
--- src/libs/zbxsysinfo/openbsd/swap.c.orig Tue May 21 22:11:55 2013
+++ src/libs/zbxsysinfo/openbsd/swap.c Tue May 21 22:15:42 2013
@@ -155,7 +155,7 @@ int SYSTEM_SWAP_SIZE(const char *cmd, const char *para
return SYSINFO_RET_FAIL;
}
-static int get_swap_io(zbx_uint64_t *icount, zbx_uint64_t *ipages, zbx_uint64_t *ocount, zbx_uint64_t *opages)
+static int get_swap_io(zbx_uint64_t *ipages, zbx_uint64_t *opages)
{
int mib[2];
size_t len;
@@ -169,17 +169,11 @@ static int get_swap_io(zbx_uint64_t *icount, zbx_uint6
if (0 != sysctl(mib, 2, &v, &len, NULL, 0))
return SYSINFO_RET_FAIL;
- /* int swapins; swapins */
- /* int swapouts; swapouts */
/* int pgswapin; pages swapped in */
/* int pgswapout; pages swapped out */
- if (icount)
- *icount = (zbx_uint64_t)v.swapins;
if (ipages)
*ipages = (zbx_uint64_t)v.pgswapin;
- if (ocount)
- *ocount = (zbx_uint64_t)v.swapouts;
if (opages)
*opages = (zbx_uint64_t)v.pgswapout;
@@ -212,16 +206,11 @@ int SYSTEM_SWAP_IN(const char *cmd, const char *param,
if (*mode == '\0')
zbx_snprintf(mode, sizeof(mode), "count");
- if (0 == strcmp(mode, "count"))
+ if (0 == strcmp(mode, "pages"))
{
- if (SYSINFO_RET_OK != get_swap_io(&value, NULL, NULL, NULL))
+ if (SYSINFO_RET_OK != get_swap_io(&value, NULL))
return SYSINFO_RET_FAIL;
}
- else if (0 == strcmp(mode, "pages"))
- {
- if (SYSINFO_RET_OK != get_swap_io(NULL, &value, NULL, NULL))
- return SYSINFO_RET_FAIL;
- }
else
return SYSINFO_RET_FAIL;
@@ -256,14 +245,9 @@ int SYSTEM_SWAP_OUT(const char *cmd, const char *param
if (*mode == '\0')
zbx_snprintf(mode, sizeof(mode), "count");
- if (0 == strcmp(mode, "count"))
+ if (0 == strcmp(mode,"pages"))
{
- if (SYSINFO_RET_OK != get_swap_io(NULL, NULL, &value, NULL))
- return SYSINFO_RET_FAIL;
- }
- else if (0 == strcmp(mode,"pages"))
- {
- if (SYSINFO_RET_OK != get_swap_io(NULL, NULL, NULL, &value))
+ if (SYSINFO_RET_OK != get_swap_io(NULL, &value))
return SYSINFO_RET_FAIL;
}
else