Removed RRD tools configuration, script, and README reference (#157)

home-climate-control · Apr 14, 2021 · 507cb4c · 507cb4c
1 parent 7c0e925
commit 507cb4c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 294 deletions.
diff --git a/dz3-shell/README b/dz3-shell/README
@@ -10,11 +10,6 @@ Run this to start JMX instrumentation for the above:
 
 	./dz-jconsole
 
-Run this to produce PNG graphs for your RRD database content (look in
-./rrd/html):
-
-	./dz_graph_temperature.v2
-
 For the rest, go to:
 
 	http://diy-zoning.blogspot.com/

diff --git a/dz3-shell/conf/core-instrumentation.xml b/dz3-shell/conf/core-instrumentation.xml
@@ -53,24 +53,6 @@
     </bean>
 
     <!-- Loggers -->
-    <bean id="rrdtool" class="java.io.File">
-        <constructor-arg type="java.lang.String" value="/usr/bin/rrdtool" />
-    </bean>
-    <bean id="rrdbase_onewire" class="java.io.File">
-        <constructor-arg type="java.lang.String" value="./rrd" />
-    </bean>
-    <bean id="rrdlogger_onewire" class="com.homeclimatecontrol.jukebox.datastream.logger.impl.rrd.RrdLogger" init-method="start">
-        <constructor-arg index="0" type="java.util.Set">
-            <set>
-                <ref bean="device_factory" />
-                <ref bean="splitter-pid_controller-6500000055FF1A26" />
-                <ref bean="splitter-thermostat-6500000055FF1A26" />
-                <ref bean="zone_controller-6500000055FF1A26" />
-            </set>
-        </constructor-arg>
-        <constructor-arg index="1" type="java.io.File" ref="rrdbase_onewire" />
-        <constructor-arg index="2" type="java.io.File" ref="rrdtool" />
-    </bean>
 
     <!-- JMX configuration -->
     <bean id="jmx-wrapper" class="com.homeclimatecontrol.jukebox.jmx.JmxWrapper">

diff --git a/dz3-shell/conf/raspberry-pi.xml b/dz3-shell/conf/raspberry-pi.xml
@@ -50,22 +50,14 @@
     </bean>
 
     <!-- Loggers -->
-    <bean id="rrdtool" class="java.io.File">
-        <constructor-arg type="java.lang.String" value="/usr/bin/rrdtool" />
-    </bean>
-    <bean id="rrdbase_onewire" class="java.io.File">
-        <constructor-arg type="java.lang.String" value="./rrd" />
-    </bean>
-    <bean id="rrdlogger_onewire" class="com.homeclimatecontrol.jukebox.datastream.logger.impl.rrd.RrdLogger" init-method="start">
+    <bean id="influxdb_sensors" class="net.sf.dz3.view.influxdb.v1.InfluxDbLogger" init-method="start">
         <constructor-arg index="0" type="java.util.Set">
             <set>
-                <ref bean="splitter-pid_controller-vcgencmd" />
-                <ref bean="splitter-thermostat-vcgencmd" />
-                <ref bean="zone_controller-vcgencmd" />
+                <ref bean="temperature_sensor-vcgencmd" />
             </set>
         </constructor-arg>
-        <constructor-arg index="1" type="java.io.File" ref="rrdbase_onewire" />
-        <constructor-arg index="2" type="java.io.File" ref="rrdtool" />
+        <constructor-arg index="1" type="java.lang.String" value="raspberry-pi"/>
+        <constructor-arg index="2" type="java.lang.String" value="http://localhost:8086/"/>
     </bean>
 
     <!-- JMX configuration -->

diff --git a/dz3-shell/dz_graph_temperature.v2 b/dz3-shell/dz_graph_temperature.v2