disk: Convert temperatures to Kelvin

diff --git a/src/_collectymodule.c b/src/_collectymodule.c
index 38ade7df096446ff8e82c46a44f5eab162bef545..e57970eabf904e0d5380de7d56b17e075acb8628 100644 (file)
--- a/src/_collectymodule.c
+++ b/src/_collectymodule.c
@@ -254,7 +254,8 @@ static PyObject* BlockDevice_get_temperature(PyObject* self) {
        if (r)
                return NULL;
 
        if (r)
                return NULL;
 

-       return PyLong_FromUnsignedLongLong((unsigned long long)mkelvin);
+       // Convert the temperature to Kelvin
+       return PyFloat_FromDouble((double)mkelvin / 1000.0);

 }
 
 static PyGetSetDef BlockDevice_getsetters[] = {
 }
 
 static PyGetSetDef BlockDevice_getsetters[] = {

diff --git a/src/collecty/plugins/disk.py b/src/collecty/plugins/disk.py
index 759156cb9f0dc2536e95dcc7bdcfa09394c0ea70..b0f40a2924c4939b53f284034b5d844f53377427 100644 (file)
--- a/src/collecty/plugins/disk.py
+++ b/src/collecty/plugins/disk.py
@@ -135,8 +135,8 @@ class GraphTemplateDiskTemperature(base.GraphTemplate):
        name = "disk-temperature"
 
        rrd_graph = [
        name = "disk-temperature"
 
        rrd_graph = [

-               "DEF:mkelvin=%(file)s:temperature:AVERAGE",
-               "CDEF:celsius=mkelvin,1000,/,273.15,-",
+               "DEF:kelvin=%(file)s:temperature:AVERAGE",
+               "CDEF:celsius=kelvin,273.15,-",

 
                "LINE2:celsius#ff0000:%s" % _("Temperature"),
                "VDEF:temp_cur=celsius,LAST",
 
                "LINE2:celsius#ff0000:%s" % _("Temperature"),
                "VDEF:temp_cur=celsius,LAST",