working project, maybe
This commit is contained in:
@@ -549,25 +549,46 @@ class DynamicStatus(object):
|
||||
tags={'type': 'mem'})
|
||||
net = net_result.get_points(measurement='net_aggregated',
|
||||
tags={'host':'plutonium', 'type':'wlan0'})
|
||||
|
||||
try:
|
||||
iss_solars = iss_solar.send(None)
|
||||
iss_capacitors = iss_capacitor.send(None)
|
||||
RasPI_cpus = RasPI_cpu.send(None)
|
||||
RasPI_disks = RasPI_disk.send(None)
|
||||
RasPI_mems = RasPI_mem.send(None)
|
||||
nets = net.send(None)
|
||||
try:
|
||||
iss_solars = iss_solar.send(None)
|
||||
except:
|
||||
iss_solars = {"last_voltage": 999}
|
||||
try:
|
||||
iss_capacitors = iss_capacitor.send(None)
|
||||
except:
|
||||
iss_capacitors = {"last_voltage": 999}
|
||||
try:
|
||||
RasPI_cpus = RasPI_cpu.send(None)
|
||||
except:
|
||||
RasPI_cpus = {"last_usage": 999}
|
||||
try:
|
||||
RasPI_disks = RasPI_disk.send(None)
|
||||
except:
|
||||
RasPI_disks = {"last_usage": 999}
|
||||
try:
|
||||
RasPI_mems = RasPI_mem.send(None)
|
||||
except:
|
||||
RasPI_mems = {"last_usage": 999}
|
||||
try:
|
||||
nets = net.send(None)
|
||||
except:
|
||||
nets = {"rate_b_in": 999, "rate_b_out": 999}
|
||||
except:
|
||||
return False
|
||||
result = {}
|
||||
t_stamp = time.strptime(RasPI_cpus['time'].split('.')[0],
|
||||
"%Y-%m-%dT%H:%M:%S")
|
||||
result['time'] = time.strftime("%d.%m.%Y %H:%M:%S", t_stamp)
|
||||
try:
|
||||
t_stamp = time.strptime(RasPI_cpus['time'].split('.')[0],
|
||||
"%Y-%m-%dT%H:%M:%S")
|
||||
result['time'] = time.strftime("%d.%m.%Y %H:%M:%S",
|
||||
t_stamp)
|
||||
except:
|
||||
result['time'] = "(ERROR)"
|
||||
result['iss_solar'] = round(iss_solars['last_voltage'] / 100, 1)
|
||||
result['iss_capacitor'] = round(iss_capacitors['last_voltage'], 1)
|
||||
result['RasPI_cpu'] = round(RasPI_cpus["last_usage"],1)
|
||||
result['RasPI_disk'] = round(RasPI_disks["last_usage"],1)
|
||||
result['RasPI_mem'] = round(RasPI_mems["last_usage"],1)
|
||||
result['RasPI_cpu'] = round(RasPI_cpus['last_usage'],1)
|
||||
result['RasPI_disk'] = round(RasPI_disks['last_usage'],1)
|
||||
result['RasPI_mem'] = round(RasPI_mems['last_usage'],1)
|
||||
result['net'] = {
|
||||
'b_in': round(nets['rate_b_in']/30/1024, 1),
|
||||
'b_out': round(nets['rate_b_out']/30/1024, 1)
|
||||
@@ -765,20 +786,46 @@ class DynamicWeather(object):
|
||||
rainrate = rainrate_result.get_points(measurement='rain',
|
||||
tags={'type':'rainrate'})
|
||||
try:
|
||||
wind_speeds = wind_speed.send(None)
|
||||
wind_directions = wind_dir.send(None)
|
||||
wind_gusts = wind_gust.send(None)
|
||||
temphumi_outs = temphumi_out.send(None)
|
||||
temphumi_ins = temphumi_in.send(None)
|
||||
pressures = pressure.send(None)
|
||||
rainrates = rainrate.send(None)
|
||||
try:
|
||||
wind_speeds = wind_speed.send(None)
|
||||
except:
|
||||
wind_speeds = {'last_value': 999}
|
||||
try:
|
||||
wind_directions = wind_dir.send(None)
|
||||
except:
|
||||
wind_directions = {'last_value': 999}
|
||||
try:
|
||||
wind_gusts = wind_gust.send(None)
|
||||
except:
|
||||
wind_gusts = {'last_value': 999}
|
||||
try:
|
||||
temphumi_outs = temphumi_out.send(None)
|
||||
except:
|
||||
temphumi_outs = {'last_temperature': 999,
|
||||
'last_humidity': 999}
|
||||
try:
|
||||
temphumi_ins = temphumi_in.send(None)
|
||||
except:
|
||||
temphumi_ins = {'last_temperature': 999,
|
||||
'last_humidity': 999}
|
||||
try:
|
||||
pressures = pressure.send(None)
|
||||
except:
|
||||
pressures = {'last_pressure': 999}
|
||||
try:
|
||||
rainrates = rainrate.send(None)
|
||||
except:
|
||||
rainrates = {'last_value': 999}
|
||||
except:
|
||||
return False
|
||||
result = {}
|
||||
wind_dir = int(wind_directions['last_value'])
|
||||
t_stamp = time.strptime(wind_speeds['time'].split('.')[0],
|
||||
"%Y-%m-%dT%H:%M:%S")
|
||||
result['time'] = time.strftime("%d.%m.%Y %H:%M:%S", t_stamp)
|
||||
try:
|
||||
t_stamp = time.strptime(wind_speeds['time'].split('.')[0],
|
||||
"%Y-%m-%dT%H:%M:%S")
|
||||
result['time'] = time.strftime("%d.%m.%Y %H:%M:%S", t_stamp)
|
||||
except:
|
||||
result['time'] = "(ERROR)"
|
||||
result['wind'] = {
|
||||
'speed': round(wind_speeds['last_value'], 1),
|
||||
'speed_ms': round(wind_speeds['last_value'] / 3.6, 1),
|
||||
|
||||
Reference in New Issue
Block a user