admin can select tags for data now
This commit is contained in:
parent
3a392f2084
commit
04c5895667
1 changed files with 17 additions and 10 deletions
15
main.py
15
main.py
|
@ -42,6 +42,9 @@ def pkt_loss(data):
|
||||||
|
|
||||||
def tag_selection(data):
|
def tag_selection(data):
|
||||||
tags = DB_TAGS
|
tags = DB_TAGS
|
||||||
|
if tags is None:
|
||||||
|
return None
|
||||||
|
# tag_switch takes in _data and attaches CLIoutput to more readable ids
|
||||||
tag_switch = {
|
tag_switch = {
|
||||||
'isp': data['isp'],
|
'isp': data['isp'],
|
||||||
'interface': data['interface']['name'],
|
'interface': data['interface']['name'],
|
||||||
|
@ -59,12 +62,11 @@ def tag_selection(data):
|
||||||
'speedtest_id': data['result']['id'],
|
'speedtest_id': data['result']['id'],
|
||||||
'speedtest_url': data['result']['url']
|
'speedtest_url': data['result']['url']
|
||||||
}
|
}
|
||||||
|
|
||||||
options = {}
|
options = {}
|
||||||
if tags == '':
|
|
||||||
return None
|
|
||||||
else:
|
|
||||||
tags = tags.split(',')
|
tags = tags.split(',')
|
||||||
for tag in tags:
|
for tag in tags:
|
||||||
|
# split the tag string, strip and add selected tags to {options} with corresponding tag_switch data
|
||||||
tag = tag.strip()
|
tag = tag.strip()
|
||||||
options[tag] = tag_switch[tag]
|
options[tag] = tag_switch[tag]
|
||||||
return options
|
return options
|
||||||
|
@ -110,7 +112,12 @@ def format_for_influx(cliout):
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
tags = tag_selection(data)
|
||||||
|
if tags is None:
|
||||||
|
return influx_data
|
||||||
|
else:
|
||||||
|
for measurement in influx_data:
|
||||||
|
measurement['tags'] = tags
|
||||||
return influx_data
|
return influx_data
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue