config in ini

python/davis_etl.py

@@ -25,6 +25,7 @@ import datetime
 import serial
 import simplejson as json
 import influxdb
+import configparser
 
 # optionally, future modules, locally available, I hate dependencies
 from pprint import pprint
@@ -40,6 +41,9 @@ sys.path.append(_SCRIPT_PATH + "/lib")
             Define variables
 --------------------------------------------------------------------------------
 '''
+config = configparser.ConfigParser()
+config.read(_SCRIPT_PATH + "/../web/config/plutonium.ini")
+
 _VERSION = 2.0
 _NAME = u"Vantage Vue Decoding shite"
 _LOG_DIR = _SCRIPT_PATH + '/log/'
@@ -64,12 +68,13 @@ rain = 0
 influx_status_write = []
 influx_weather_write = []
 
-influx_host = 'localhost'
-influx_port = 8086
-influx_user = 'pi'
-influx_pwd = 'Ventil6996'
-weather_db = 'weather_v2'
-status_db = 'status'
+influx_host = config['InfluxDB']['_influx_host']
+influx_port = config['InfluxDB']['_influx_port']
+influx_user = config['InfluxDB']['_influx_user']
+influx_pwd = config['InfluxDB']['_influx_pwd']
+weather_db = config['InfluxDB']['_influx_weather_db']
+status_db = config['InfluxDB']['_influx_status_db']
+
 
 '''
 --------------------------------------------------------------------------------

python/enriched_data_collect.py

@@ -37,6 +37,8 @@ import datetime
 import serial
 import simplejson as json
 import influxdb
+import configparser
+
 
 # optionally, future modules, locally available, I hate dependencies
 from pprint import pprint
@@ -51,6 +53,9 @@ sys.path.append(_SCRIPT_PATH + "/lib")
             Define variables
 --------------------------------------------------------------------------------
 '''
+config = configparser.ConfigParser()
+config.read(_SCRIPT_PATH + "/../web/config/plutonium.ini")
+
 _VERSION = 1.0
 _NAME = u"Vantage Vue external measure enrichment"
 _LOG_DIR = _SCRIPT_PATH + '/log/'
@@ -67,11 +72,12 @@ pressure_adjusted = 0
 
 influx_weather_write = []
 
-influx_host = 'localhost'
-influx_port = 8086
-influx_user = 'pi'
-influx_pwd = 'Ventil6996'
-weather_db = 'weather_v2'
+influx_host = config['InfluxDB']['_influx_host']
+influx_port = config['InfluxDB']['_influx_port']
+influx_user = config['InfluxDB']['_influx_user']
+influx_pwd = config['InfluxDB']['_influx_pwd']
+weather_db = config['InfluxDB']['_influx_weather_db']
+status_db = config['InfluxDB']['_influx_status_db']
 
 '''
 --------------------------------------------------------------------------------

python/sysstats.py

@@ -24,6 +24,7 @@ import simplejson as json
 import influxdb
 import psutil
 import socket
+import configparser
 
 # optionally, future modules, locally available, I hate dependencies
 from pprint import pprint
@@ -40,8 +41,11 @@ _hostname = socket.gethostname()
             Define variables
 --------------------------------------------------------------------------------
 '''
+config = configparser.ConfigParser()
+config.read(_SCRIPT_PATH + "/../web/config/plutonium.ini")
+
 _VERSION = 2.0
-_NAME = u"Vantage Vue Decoding shite"
+_NAME = u"System statistics for RasPi"
 _LOG_DIR = _SCRIPT_PATH + '/log/'
 _LOG_FILE_ROOT = re.sub(u'./', '', sys.argv[0])
 _LOG_FILE = _LOG_DIR + _LOG_FILE_ROOT + u'.log'
@@ -49,11 +53,12 @@ _DEBUG_FILE = _LOG_DIR + _LOG_FILE_ROOT + u'.dbg'
 
 influx_status_write = []
 
-influx_host = 'localhost'
-influx_port = 8086
-influx_user = 'pi'
-influx_pwd = 'Ventil6996'
-status_db = 'status'
+influx_host = config['InfluxDB']['_influx_host']
+influx_port = config['InfluxDB']['_influx_port']
+influx_user = config['InfluxDB']['_influx_user']
+influx_pwd = config['InfluxDB']['_influx_pwd']
+status_db = config['InfluxDB']['_influx_status_db']
+
 
 '''
 --------------------------------------------------------------------------------

web/chttpd.py

@@ -48,7 +48,7 @@ def main_server_loop():
         }
     }
 
-    cherrypy.tree.mount(voltage.EnergyInfo(), "/", conf)
+    cherrypy.tree.mount(index.landingPage(), "/", conf)
     cherrypy.tree.mount(voltage.EnergyInfo(), "/energy", conf)
     cherrypy.tree.mount(weather.WeatherInfo(), "/weather", conf)
     cherrypy.tree.mount(status.StatusInfo(), "/status", conf)

web/config/plutonium.ini

@@ -1,11 +1,14 @@
+[General]
 _server_protocol = https
 _server_name = bastart.spoton.cz
 _server_port = 443
 _server_bind_ip = 0.0.0.0
+
+[InfluxDB]
 _influx_host = localhost
 _influx_port = 8086
 _influx_user = pi
-_influx_pwd = Ventil
+_influx_pwd = Ventil6996
 _influx_weather_db = weather_v2
 _influx_status_db = status
 _influx_voltage_db = voltage

web/templates/landing_page.html

@@ -4,19 +4,25 @@
         <div class="col"></div>
         <main class="pt-4 col-10">
           <h1>Plutonium monitoring</h1>
-          <h5>Keeping an eye on things</h5>
+          <h5>Keeping an eye on things, since 11/2017</h5>
 
-          <section class="row text-center placeholders">
+          <section class="row text-left placeholders">
             <div class="col placeholder">
-                Not available, due to RasPi gone crazy from all that traffic
-            </div>
-            <div class="col placeholder">
-                But is surely was beautiful. 
+                <p>The whole idea of this is a RasPi based monitoring of</p>
+                <ul>
+                <li>Base RasPi metrics</li>
+                <li>Victron based solar MPPT trackers (optional module)</li>
+                <li>Davis Vantage Vue (optional module)</li>
+                <li>Any other IoT stuff (optional)</li>
+                </ul>
+                <p>Feel free to explore the tabs in the upper menu</p>
+                <p>For additional information, look at
+                <a href="https://bastart.spoton.cz/git/spoton/freedavis">Git for this project</a></p>
             </div>
           </section>
           <section class="row text-center placeholders">
             <div class="col">
-                <img src="./static/img/old_fame.jpg" class="img-fluid">
+                Cheers.
             </div>
           </section>
 

web/templates/top_menu.html

@@ -7,7 +7,7 @@
       <div class="collapse navbar-collapse" id="navbarsExampleDefault">
         <ul class="navbar-nav mr-auto">
           <li class="nav-item {energy}">
-            <a class="nav-link" href="https://bastart.spoton.cz">Energy</a>
+            <a class="nav-link" href="https://bastart.spoton.cz/energy">Energy</a>
           </li>
           <li class="nav-item {weather}">
             <a class="nav-link" href="https://bastart.spoton.cz/weather">Weather</a>