update for python3

.gitignore

@@ -60,3 +60,6 @@ docs/_build/
 
 # PyBuilder
 target/
+
+bin
+pyvenv.cfg

README.md

@@ -9,6 +9,15 @@ One remark: Since the DS18S20 needs 750ms to measure the temperature and convert
 should set your Prometheus scrape_interval to at least *n* * 750ms. *n* is the number of DS18S20 sensors on your 1-wire
  bus.
 
+
+# Usage
+
+```
+python exporter.py
+```
+
+Use the `--internal` flag to montior the internal temp of the Rpi CPU instead. That requires /usr/bin/vcgencmd to be installed.
+
 # Installation
 
 First checkout this git repository:
@@ -51,4 +60,4 @@ Now you are done and can check your sensor values via:
     curl localhost:8001
 ```
 
-Have fun!
+Have fun!

exporter.py

@@ -6,7 +6,7 @@
 import argparse
 
 TEMP_REGEX = re.compile('t=-?([0-9]+)')
-INTERNAL_TEMP_REGEX = re.compile('temp=([0-9]+\.[0-9])')
+INTERNAL_TEMP_REGEX = re.compile('temp=([0-9]+\\.[0-9])')
 SENSOR_PATH = "/sys/bus/w1/devices"
 CRC_ERROR="Could not read sensor. Wrong CRC."
 DEFAULT_VALUE_ERROR="Could not read sensor. Sensor returned default value."
@@ -95,16 +95,16 @@ def read_sensor(self):
                     else:
                         self.unset_missread()
                         return ret_val, ""
-                except Exception, e:
-                    print self.id, "Ups something went wrong.", e.message
+                except (Exception, e):
+                    print( self.id, "Ups something went wrong.", e.message)
                     if crc is not None:
-                        print "CRC Line: ", crc
+                        print( "CRC Line: ", crc)
                     if l is not None:
-                        print "l Line: ", l
+                        print( "l Line: ", l)
                     self.set_missread()
                     return None, e.message
-        except IOError, e:
-            print e.message
+        except (IOError, e):
+            print( e.message)
             self.set_missread()
             return None, e.message
 
@@ -119,7 +119,7 @@ def register_prometheus_gauges(export_internal_raspberry=False):
     g = Gauge("sensor_temperature_in_celsius", "Local room temperature around the raspberry pi", ["sensor"])
     error_g = Gauge("faulty_sensor_read", "Is 1 if the sensor could not be read.", ["sensor"])
     sensors = find_sensors()
-    print "Found sensors:", ", ".join(map(lambda x: str(x), sensors))
+    print( "Found sensors:", ", ".join(map(lambda x: str(x), sensors)))
     for sensor in sensors:
         g.labels(str(sensor)).set_function(sensor)
         sensor.set_error_gauge(error_g.labels(str(sensor)))

temperature_sensor.initd

@@ -0,0 +1,6 @@
+#!/sbin/openrc-run
+command="/usr/bin/env python /opt/prometheus_temperature/exporter.py"
+pidfile="/run/${RC_SVCNAME}.pid"
+command_args="-p ${pidfile}"
+command_background=True
+

temperature_sensor.service

@@ -3,7 +3,7 @@ Description=Simple HTTP Service to measure temperature via local w1-Sensor
 Before=prometheus.service
 
 [Service]
-ExecStart=/usr/bin/python /opt/prometheus_temperature/exporter.py --internal
+ExecStart=/usr/bin/python /opt/prometheus_temperature/exporter.py 
 
 [Install]
 WantedBy=multi-user.target