Skip to content

Commit

Permalink
add influxdb tag for shield id
Browse files Browse the repository at this point in the history
  • Loading branch information
bastinc committed Aug 23, 2018
1 parent 94c9a9d commit 396dfbb
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 10 deletions.
30 changes: 20 additions & 10 deletions ardas/raspardas.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ def init_logging():
except Exception as e:
msg_logger.error('Unable to read restart_msg.txt: %s' % e)
influxdb_log_event(influxdb_client=client, title=title,
default_tags=ARDAS_CONFIG['net_id'] + ',' + 'start',
default_tags='net_id: ' + ARDAS_CONFIG['net_id'] + ',' + 'shield_id: ' +
ARDAS_CONFIG['shield_id'] + ',' + 'start',
event_args=text, msg_logger=msg_logger)
except Exception as e:
msg_logger.error('*** Unable to log to database %s: %s' % (DATABASE['dbname'], e))
Expand Down Expand Up @@ -293,7 +294,8 @@ def process_record(record):
for i in range(n_channels):
if sensors[i].log:
data.append({'measurement': DATABASE['series'],
'tags': {'sensor': '%s-%04d' % (ARDAS_CONFIG['net_id'], instr[i])},
'tags': {'sensor': '%s-%04d' % (ARDAS_CONFIG['net_id'], instr[i]),
'shield_id': '%s' % (ARDAS_CONFIG['shield_id'])},
'time': record_date.strftime('%Y-%m-%d %H:%M:%S %Z'),
'fields': {'value': val[i]}})
msg_logger.debug('Writing to InfluxDB : %s' % str(data))
Expand Down Expand Up @@ -355,7 +357,8 @@ def connect_master():
title = 'Connection by user'
event_args = 'addr: ' + str(addr)
influxdb_log_event(influxdb_client=client, title=title,
default_tags=ARDAS_CONFIG['net_id'] + ',' + 'connection',
default_tags='net_id: ' + ARDAS_CONFIG['net_id'] + ',' + 'shield_id: ' +
ARDAS_CONFIG['shield_id'] + ',' + 'connection',
event_args=event_args, msg_logger=msg_logger)
master_online = True
except Exception as e:
Expand Down Expand Up @@ -409,15 +412,17 @@ def listen_master():
event_args = msg[4:-1].decode('utf-8')
msg_logger.info('%s: %s' %(title, event_args))
influxdb_log_event(influxdb_client=client, title=title,
default_tags=ARDAS_CONFIG['net_id'] + ',' + 'resume',
default_tags='net_id: ' + ARDAS_CONFIG['net_id'] + ',' + 'shield_id: ' +
ARDAS_CONFIG['shield_id'] + ',' + 'resume',
event_args=event_args, msg_logger=msg_logger)
else:
title = 'Paused by user'
if len(msg) > 4:
event_args = msg[4:-1].decode('utf-8')
msg_logger.info('%s: %s' % (title, event_args))
influxdb_log_event(influxdb_client=client, title=title,
default_tags=ARDAS_CONFIG['net_id'] + ',' + 'pause',
default_tags='net_id: ' + ARDAS_CONFIG['net_id'] + ',' + 'shield_id: ' +
ARDAS_CONFIG['shield_id'] + ',' + 'pause',
event_args=event_args, msg_logger=msg_logger)
pause = not pause
elif msg[:-1] == b'#RC':
Expand All @@ -432,7 +437,8 @@ def listen_master():
event_args = msg[4:-1].decode('utf-8')
msg_logger.info('%s: %s' % (title, event_args))
influxdb_log_event(influxdb_client=client, title=title,
default_tags=ARDAS_CONFIG['net_id'] + ',' + 'stop',
default_tags='net_id: ' + ARDAS_CONFIG['net_id'] + ',' + 'shield_id: ' +
ARDAS_CONFIG['shield_id'] + ',' + 'stop',
event_args=event_args, msg_logger=msg_logger)
stop = True
elif msg[:3] == b'#MS':
Expand All @@ -441,15 +447,17 @@ def listen_master():
event_args = msg[4:-1].decode('utf-8')
msg_logger.info('%s: %s' % (title, event_args))
influxdb_log_event(influxdb_client=client, title=title,
default_tags=ARDAS_CONFIG['net_id'] + ',' + 'message',
default_tags='net_id: ' + ARDAS_CONFIG['net_id'] + ',' + 'shield_id: ' +
ARDAS_CONFIG['shield_id'] + ',' + 'message',
event_args=event_args, msg_logger=msg_logger)
elif msg[:3] == b'#QT':
title = 'Connection ended by user'
if len(msg) > 4:
event_args = msg[4:-1].decode('utf-8')
msg_logger.info('%s: %s' % (title, event_args))
influxdb_log_event(influxdb_client=client, title=title,
default_tags=ARDAS_CONFIG['net_id'] + ',' + 'end connection',
default_tags='net_id: ' + ARDAS_CONFIG['net_id'] + ',' + 'shield_id: ' +
ARDAS_CONFIG['shield_id'] + ',' + 'end connection',
event_args=event_args, msg_logger=msg_logger)
master_online = False
else:
Expand Down Expand Up @@ -632,7 +640,8 @@ def start_sequence():
integration_period = ARDAS_CONFIG['integration_period']
pause = True
influxdb_log_event(influxdb_client=client, title='Pause logging',
default_tags=ARDAS_CONFIG['net_id'] + ',' + 'pause',
default_tags='net_id: ' + ARDAS_CONFIG['net_id'] + ',' + 'shield_id: ' +
ARDAS_CONFIG['shield_id'] + ',' + 'pause',
event_args='reconfiguration started', msg_logger=msg_logger)
slave_talker = Thread(target=talk_slave)
slave_talker.setDaemon(True)
Expand All @@ -655,7 +664,8 @@ def start_sequence():
master_listener.setDaemon(True)
master_listener.start()
influxdb_log_event(influxdb_client=client, title='Resume logging',
default_tags=ARDAS_CONFIG['net_id'] + ',' + 'resume',
default_tags='net_id: ' + ARDAS_CONFIG['net_id'] + ',' + 'shield_id: ' +
ARDAS_CONFIG['shield_id'] + ',' + 'resume',
event_args='reconfiguration complete', msg_logger=msg_logger)
pause = False
msg_logger.info('*** Starting logging... ***')
Expand Down
1 change: 1 addition & 0 deletions ardas/settings_example.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
ARDAS_CONFIG = {
'station': '', # 4 characters
'net_id': '', # 3 characters
'shield_id': '', # 3 characters
'integration_period': '0001', # 4 characters convertible to int
'tty': '/dev/ttyACM0',
'raw_data_on_disk': False # to implement in raspardas
Expand Down

0 comments on commit 396dfbb

Please sign in to comment.