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

Add support for reading temperature sensors or the average of them

Browse Source
This commit is contained in:
robert 2010-09-28 11:04:14 +00:00
parent eda8228b4f
commit faea99a8b5
3 changed files with 181 additions and 2 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.27 2010/09/27 08:10:32 robert Exp $
# $OpenBSD: Makefile,v 1.28 2010/09/28 11:04:14 robert Exp $
COMMENT-main = network and application monitoring - agent
COMMENT-server = network and application monitoring - server
@ -13,7 +13,7 @@ FULLPKGNAME-web = zabbix-web-${VERSION}
FULLPKGPATH-web = net/zabbix,-web
CATEGORIES = net
REVISION-main= 0
REVISION-main= 1
MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}

11
net/zabbix/patches/patch-src_libs_zbxsysinfo_openbsd_openbsd_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_libs_zbxsysinfo_openbsd_openbsd_c,v 1.1 2010/09/28 11:04:14 robert Exp $
--- src/libs/zbxsysinfo/openbsd/openbsd.c.orig Mon Sep 27 19:49:49 2010
+++ src/libs/zbxsysinfo/openbsd/openbsd.c Mon Sep 27 19:50:59 2010
@@ -58,5 +58,7 @@ ZBX_METRIC parameters_specific[]=
{"system.uptime", 0, SYSTEM_UPTIME, 0, 0},
{"system.boottime", 0, SYSTEM_BOOTTIME, 0, 0},
+ {"sensor", CF_USEUPARAM, GET_SENSOR, 0, 0},
+
{0}
};

168
net/zabbix/patches/patch-src_libs_zbxsysinfo_openbsd_sensors_c Normal file
View File

@ -0,0 +1,168 @@
$OpenBSD: patch-src_libs_zbxsysinfo_openbsd_sensors_c,v 1.1 2010/09/28 11:04:14 robert Exp $
--- src/libs/zbxsysinfo/openbsd/sensors.c.orig Sun Sep 26 23:48:07 2010
+++ src/libs/zbxsysinfo/openbsd/sensors.c Mon Sep 27 22:01:44 2010
@@ -1,5 +1,6 @@
/*
** ZABBIX
+** Copyright (C) 2010 Robert Nagy <robert@openbsd.org>
** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
@@ -23,94 +24,89 @@
#include "md5.h"
-static int get_sensor(const char *name, unsigned flags, AGENT_RESULT *result)
+#include <sys/sensors.h>
+
+#define CELSIUS(x) ((x - 273150000) / 1000000.0)
+
+int sensor_value(int[], struct sensor *);
+
+int sensor_value(int mib[], struct sensor *sensor)
{
- DIR *dir;
- struct dirent *entries;
- struct stat buf;
- char filename[MAX_STRING_LEN];
- char line[MAX_STRING_LEN];
- double d1,d2,d3;
+ size_t slen;
- FILE *f;
+ mib[3] = SENSOR_TEMP;
+ mib[4] = 0;
- assert(result);
+ slen = sizeof(*sensor);
+ if (sysctl(mib, 5, sensor, &slen, NULL, 0) == -1)
+ return SYSINFO_RET_FAIL;
- init_result(result);
+ return SYSINFO_RET_OK;
+}
- dir=opendir("/proc/sys/dev/sensors");
- if(NULL == dir)
+int GET_SENSOR(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
+{
+ enum sensor_type type;
+ struct sensordev sensordev;
+ struct sensor sensor;
+ size_t sdlen = sizeof(sensordev);
+ int mib[3], dev, numt, cnt = 0, ret = SYSINFO_RET_FAIL;
+ uint64_t aggr = 0;
+ char key[MAX_STRING_LEN];
+
+ assert(result);
+
+ init_result(result);
+
+ if(num_param(param) > 1)
{
return SYSINFO_RET_FAIL;
}
- while((entries=readdir(dir))!=NULL)
+ if(get_param(param, 1, key, MAX_STRING_LEN) != 0)
{
- strscpy(filename,"/proc/sys/dev/sensors/");
- zbx_strlcat(filename,entries->d_name,MAX_STRING_LEN);
- zbx_strlcat(filename,name,MAX_STRING_LEN);
+ return SYSINFO_RET_FAIL;
+ }
- if(stat(filename,&buf)==0)
+ mib[0] = CTL_HW;
+ mib[1] = HW_SENSORS;
+
+ for (dev = 0; ; dev++)
+ {
+ mib[2] = dev;
+
+ if (sysctl(mib, 3, &sensordev, &sdlen, NULL, 0) == -1)
{
- if(NULL == (f = fopen(filename,"r")))
- {
+ if (errno == ENXIO)
continue;
- }
- fgets(line,MAX_STRING_LEN,f);
- zbx_fclose(f);
+ if (errno == ENOENT)
+ break;
- if(sscanf(line,"%lf\t%lf\t%lf\n",&d1, &d2, &d3) == 3)
+ return SYSINFO_RET_FAIL;
+ }
+
+ if (!strcmp(key, "") || !strcmp(key, "cpu"))
+ {
+ if (!strncmp(sensordev.xname, "cpu", 3))
{
- closedir(dir);
- SET_DBL_RESULT(result, d3);
- return SYSINFO_RET_OK;
+ ret = sensor_value(mib, &sensor);
+ aggr += sensor.value;
+ cnt++;
}
- else
+ }
+ else
+ {
+ if (!strcmp(sensordev.xname, key))
{
- closedir(dir);
- return SYSINFO_RET_FAIL;
+ ret = sensor_value(mib, &sensor);
+ if (sensor.type == SENSOR_TEMP)
+ SET_DBL_RESULT(result, CELSIUS(sensor.value));
}
}
}
- closedir(dir);
- return SYSINFO_RET_FAIL;
-}
-int OLD_SENSOR(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
-{
- char key[MAX_STRING_LEN];
- int ret;
+ if (!strcmp(key, "") || !strcmp(key, "cpu"))
+ SET_DBL_RESULT(result, CELSIUS(aggr / cnt));
- assert(result);
-
- init_result(result);
-
- if(num_param(param) > 1)
- {
- return SYSINFO_RET_FAIL;
- }
-
- if(get_param(param, 1, key, MAX_STRING_LEN) != 0)
- {
- return SYSINFO_RET_FAIL;
- }
-
- if(strcmp(key,"temp1") == 0)
- {
- ret = get_sensor("temp1", flags, result);
- }
- else if(strcmp(key,"temp2") == 0)
- {
- ret = get_sensor("temp2", flags, result);
- }
- else if(strcmp(key,"temp3") == 0)
- {
- ret = get_sensor("temp3", flags, result);
- }
- else
- {
- ret = SYSINFO_RET_FAIL;
- }
-
- return ret;
+ return ret;
}