diff --git a/sensors/main.py b/sensors/main.py index 8b85572..539fda4 100644 --- a/sensors/main.py +++ b/sensors/main.py @@ -14,7 +14,7 @@ def cfg(): 'LATITUDE': float(os.getenv('LATITUDE', '0.0')), 'LONGITUDE': float(os.getenv('LONGITUDE', '0.0')), 'ALTITUDE': float(os.getenv('ALTITUDE', '0.0')), - 'VM_URL': os.getenv('VM_URL', 'http://localhost:8428'), + 'DB_HOST': os.getenv('DB_HOST', 'http://localhost:8428'), 'GPS_PORT': os.getenv('GPS_PORT', '/dev/ttyS0'), 'GPS_BAUD': int( os.getenv('GPS_BAUD', '9600')), 'GAS_REFERENCE': int( os.getenv('GAS_REFERENCE', '250000')), @@ -46,7 +46,7 @@ def write(c, fields, collection='weather'): for k, v in fields.items() if v is not None ) if not field_str: return - requests.post(f"{c['VM_URL']}/write", data=f"{collection} {field_str}", timeout=2) + requests.post(f"{c['DB_HOST']}/write", data=f"{collection} {field_str}", timeout=2) # ── Helpers ─────────────────────────────────────────────────────────────────── diff --git a/server/src/config.mjs b/server/src/config.mjs index f0d4ede..e8d51a6 100644 --- a/server/src/config.mjs +++ b/server/src/config.mjs @@ -10,10 +10,7 @@ export function cfg() { return { PORT: process.env.PORT || 3000, ADSB_URL: process.env.ADSB_URL || '', - INFLUX_URL: process.env.INFLUX_URL || 'http://localhost:8086', - INFLUX_TOKEN: process.env.INFLUX_TOKEN || '', - INFLUX_ORG: process.env.INFLUX_ORG || 'weather', - INFLUX_BUCKET: process.env.INFLUX_BUCKET || 'station', + DB_HOST: process.env.DB_HOST || 'http://localhost:8428', LATITUDE: parseFloat(process.env.LATITUDE || '0'), LONGITUDE: parseFloat(process.env.LONGITUDE || '0'), ALTITUDE: parseFloat(process.env.ALTITUDE || '0'), diff --git a/server/src/sensors.mjs b/server/src/sensors.mjs index b760371..a066890 100644 --- a/server/src/sensors.mjs +++ b/server/src/sensors.mjs @@ -1,7 +1,7 @@ import {cfg} from './config.mjs'; async function query(c, q, start, end) { - const url = new URL('/api/v1/query_range', c.VM_URL); + const url = new URL('/api/v1/query_range', c.DB_HOST); url.searchParams.set('query', q); url.searchParams.set('step', '60s'); if (start) url.searchParams.set('start', start); @@ -12,7 +12,7 @@ async function query(c, q, start, end) { } async function queryInstant(c, q) { - const url = new URL('/api/v1/query', c.VM_URL); + const url = new URL('/api/v1/query', c.DB_HOST); url.searchParams.set('query', q); const res = await fetch(url); const json = await res.json();