disk: Convert temperatures to Kelvin

[collecty.git] / src / collecty / plugins / disk.py

diff --git a/src/collecty/plugins/disk.py b/src/collecty/plugins/disk.py
index b5a234673e6a151ed175ad86cc78018b1579cae5..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 = [
-               "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",
@@ -196,7 +196,7 @@ class DiskObject(base.Object):
        def collect(self):
                stats = self.parse_stats()
 
-               return ":".join((
+               return (
                        self.is_awake(),
                        stats.get("read_ios"),
                        stats.get("read_sectors"),
@@ -204,7 +204,7 @@ class DiskObject(base.Object):
                        stats.get("write_sectors"),
                        self.get_bad_sectors(),
                        self.get_temperature(),
-               ))
+               )
 
        def parse_stats(self):
                """