Skip to content

Commit

Permalink
reworked influx client to influx2
Browse files Browse the repository at this point in the history
  • Loading branch information
wassfila committed May 27, 2023
1 parent d6864e0 commit 85e3d84
Show file tree
Hide file tree
Showing 10 changed files with 602 additions and 255 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.pyc
venv
1 change: 1 addition & 0 deletions py/influx/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ __pycache__
venv
create
data
.env
18 changes: 0 additions & 18 deletions py/influx/config_WassDell.json

This file was deleted.

126 changes: 126 additions & 0 deletions py/influx/config_lifo copy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
{
"mqtt":{
"host":"localhost",
"port":1883,
"keepalive":60,
"client_id":"influx2mqtt",
"subscriptions":[ "lzig/living heat",
"lzig/kitchen heat",
"lzig/bedroom heat",
"lzig/office heat",
"lzig/bathroom heat",
"lzig/office heat weather",
"lzig/living heat weather",
"lzig/bedroom heat weather",
"lzig/fridge weather",
"lzig/freezer weather",
"lzig/servers weather",
"lzig/office weather",
"lzig/office weather aaa",
"lzig/bedroom switch",
"lzig/living double switch",
"lzig/office switch",
"lzig/hallway entrance switch",
"lzig/hallway corridor switch",
"lzig/hallway living switch",
"lzig/toilet switch",
"lzig/bedroom window",
"lzig/kitchen window",
"lzig/balcony window left",
"lzig/balcony window right",
"lzig/office window left",
"lzig/office window right",
"lzig/bedroom roll",
"lzig/balcony door",
"lzig/day light",
"lzig/office pc power",
"lzig/pc socket",
"lzig/poster socket",
"lzig/sonos front socket",
"lzig/sonos rear socket",
"lzig/poster socket",
"lzig/lifx socket",
"lzig/wifi mesh socket",
"lzig/floody",
"nrf/livingroom window tag",
"nrf/hallway tag",
"nrf/balcony tag",
"nrf/bathroom tag",
"nrf/livingroom tag",
"nrf/office tag",
"nrf/bedroom tag",
"nrf/kitchen tag",
"shellies/#",
"thread_tags/#"
],
"publish" :false,
"subscribe" :true,
"discard":[
"path",
"eurotronic_host_flags",
"occupancy",
"update"
]
},
"influxdb":{
"host":"localhost",
"port":8086,
"db":"mqtt"
},
"log":{
"logfile":"/home/pi/share/influx_client_(date).log",
"level":"Info"
},
"allow":{
"energy" :"float",
"power" :"float",
"current" :"float",
"light" :"float",
"pressure" :"float",
"temperature" :"float",
"humidity" :"float",
"voltage" :"float",
"battery" :"int",
"moisture" :"int",
"conductivity" :"int",
"current_heating_setpoint" :"float",
"occupied_heating_setpoint":"float",
"unoccupied_heating_setpoint":"float",
"pi_heating_demand" :"int",
"rssi":"int"
},
"topics_names":{
"shellies/shellyplug-s-01E2B5/relay/0/power":"shelly dryer",
"shellies/shellyplug-s-B86655/relay/0/power":"shelly fridge",
"shellies/shellyplug-s-B86BAA/relay/0/power":"shelly freezer",
"shellies/shellyplug-s-51D82E/relay/0/power":"shelly washing machine",
"shellies/shellyplug-s-B86270/relay/0/power":"shelly micro wave",
"shellies/shellyplug-s-B85D8C/relay/0/power":"shelly dish washer",
"shellies/shellyplug-s-B85CA1/relay/0/power":"shelly routers servers",
"shellies/shellyplug-s-1697DA/relay/0/power":"shelly tv",
"shellies/shellyplug-s-6A5CE5/relay/0/power":"shelly sonos front",
"shellies/shellyplug-s-6A5DCF/relay/0/power":"shelly ethernet repeater",
"shellies/shellyplug-s-B85CCA/relay/0/power":"shelly dell pc",
"shellies/shellyplug-s-B85D90/relay/0/power":"shelly sonos sat",
"shellies/shellyplug-s-021700/relay/0/power":"shelly entrance",
"shellies/shellyswitch25-B8A4EE/relay/0/power":"shelly bathroom light",
"shellies/shellyswitch25-B8A4EE/relay/1/power":"shelly bathroom fan",
"shellies/shelly1pm-C45303/relay/0/power":"shelly bed",
"shellies/shellyplug-s-01E2B5/relay/0/energy":"shelly dryer",
"shellies/shellyplug-s-B86655/relay/0/energy":"shelly fridge",
"shellies/shellyplug-s-B86BAA/relay/0/energy":"shelly freezer",
"shellies/shellyplug-s-51D82E/relay/0/energy":"shelly washing machine",
"shellies/shellyplug-s-B86270/relay/0/energy":"shelly micro wave",
"shellies/shellyplug-s-B85D8C/relay/0/energy":"shelly dish washer",
"shellies/shellyplug-s-B85CA1/relay/0/energy":"shelly routers servers",
"shellies/shellyplug-s-1697DA/relay/0/energy":"shelly tv",
"shellies/shellyplug-s-6A5CE5/relay/0/energy":"shelly sonos front",
"shellies/shellyplug-s-6A5DCF/relay/0/energy":"shelly ethernet repeater",
"shellies/shellyplug-s-B85CCA/relay/0/energy":"shelly dell pc",
"shellies/shellyplug-s-B85D90/relay/0/energy":"shelly sonos sat",
"shellies/shellyplug-s-021700/relay/0/energy":"shelly entrance",
"shellies/shellyswitch25-B8A4EE/relay/0/energy":"shelly bathroom light",
"shellies/shellyswitch25-B8A4EE/relay/1/energy":"shelly bathroom fan",
"shellies/shelly1pm-C45303/relay/0/energy":"shelly bed"
}
}
216 changes: 106 additions & 110 deletions py/influx/config_lifo.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,123 +4,119 @@
"port":1883,
"keepalive":60,
"client_id":"influx2mqtt",
"subscriptions":[ "lzig/living heat",
"lzig/kitchen heat",
"lzig/bedroom heat",
"lzig/office heat",
"lzig/bathroom heat",
"lzig/office heat weather",
"lzig/living heat weather",
"lzig/bedroom heat weather",
"lzig/fridge weather",
"lzig/freezer weather",
"lzig/servers weather",
"lzig/office weather",
"lzig/office weather aaa",
"lzig/bedroom switch",
"lzig/living double switch",
"lzig/office switch",
"lzig/hallway entrance switch",
"lzig/hallway corridor switch",
"lzig/hallway living switch",
"lzig/toilet switch",
"lzig/bedroom window",
"lzig/kitchen window",
"lzig/balcony window left",
"lzig/balcony window right",
"lzig/office window left",
"lzig/office window right",
"nrf/livingroom window tag",
"lzig/bedroom roll",
"lzig/balcony door",
"lzig/day light",
"miflora/Flora1",
"nrf/hallway tag",
"nrf/balcony tag",
"nrf/bathroom tag",
"nrf/livingroom tag",
"nrf/office tag",
"nrf/bedroom tag",
"nrf/kitchen tag",
"shellies/#",
"lzig/office pc power",
"lzig/pc socket",
"lzig/poster socket",
"lzig/sonos front socket",
"lzig/sonos rear socket",
"lzig/poster socket",
"lzig/lifx socket",
"lzig/wifi mesh socket",
"lzig/floody",
"thread_tags/#"
],
"names":{
"shellies/shellyplug-s-01E2B5/relay/0/power":"shelly dryer",
"shellies/shellyplug-s-B86655/relay/0/power":"shelly fridge",
"shellies/shellyplug-s-B86BAA/relay/0/power":"shelly freezer",
"shellies/shellyplug-s-51D82E/relay/0/power":"shelly washing machine",
"shellies/shellyplug-s-B86270/relay/0/power":"shelly micro wave",
"shellies/shellyplug-s-B85D8C/relay/0/power":"shelly dish washer",
"shellies/shellyplug-s-B85CA1/relay/0/power":"shelly routers servers",
"shellies/shellyplug-s-1697DA/relay/0/power":"shelly tv",
"shellies/shellyplug-s-6A5CE5/relay/0/power":"shelly sonos front",
"shellies/shellyplug-s-6A5DCF/relay/0/power":"shelly ethernet repeater",
"shellies/shellyplug-s-B85CCA/relay/0/power":"shelly dell pc",
"shellies/shellyplug-s-B85D90/relay/0/power":"shelly sonos sat",
"shellies/shellyplug-s-021700/relay/0/power":"shelly entrance",
"shellies/shellyswitch25-B8A4EE/relay/0/power":"shelly bathroom light",
"shellies/shellyswitch25-B8A4EE/relay/1/power":"shelly bathroom fan",
"shellies/shelly1pm-C45303/relay/0/power":"shelly bed",
"shellies/shellyplug-s-01E2B5/relay/0/energy":"shelly dryer",
"shellies/shellyplug-s-B86655/relay/0/energy":"shelly fridge",
"shellies/shellyplug-s-B86BAA/relay/0/energy":"shelly freezer",
"shellies/shellyplug-s-51D82E/relay/0/energy":"shelly washing machine",
"shellies/shellyplug-s-B86270/relay/0/energy":"shelly micro wave",
"shellies/shellyplug-s-B85D8C/relay/0/energy":"shelly dish washer",
"shellies/shellyplug-s-B85CA1/relay/0/energy":"shelly routers servers",
"shellies/shellyplug-s-1697DA/relay/0/energy":"shelly tv",
"shellies/shellyplug-s-6A5CE5/relay/0/energy":"shelly sonos front",
"shellies/shellyplug-s-6A5DCF/relay/0/energy":"shelly ethernet repeater",
"shellies/shellyplug-s-B85CCA/relay/0/energy":"shelly dell pc",
"shellies/shellyplug-s-B85D90/relay/0/energy":"shelly sonos sat",
"shellies/shellyplug-s-021700/relay/0/energy":"shelly entrance",
"shellies/shellyswitch25-B8A4EE/relay/0/energy":"shelly bathroom light",
"shellies/shellyswitch25-B8A4EE/relay/1/energy":"shelly bathroom fan",
"shellies/shelly1pm-C45303/relay/0/energy":"shelly bed"
},
"publish" :false,
"subscribe" :true,
"types":{
"energy" :"float",
"power" :"float",
"current" :"float",
"light" :"float",
"pressure" :"float",
"temperature" :"float",
"humidity" :"float",
"voltage" :"float",
"battery" :"int",
"moisture" :"int",
"conductivity" :"int",
"current_heating_setpoint" :"float",
"occupied_heating_setpoint":"float",
"unoccupied_heating_setpoint":"float",
"pi_heating_demand" :"int"
},
"discard":[
"path",
"eurotronic_host_flags",
"occupancy",
"update"
]
"subscriptions":[
"nrf/#",
"lzig/#",
"thread_tags/#",
"shellies/#"
]
},
"influxdb":{
"host":"localhost",
"port":8086,
"db":"mqtt"
"url":"http://10.0.0.91:8086",
"org":"hsm",
"bucket":"mqtt",
"mqtt_client_id":"py_influx"
},
"log":{
"logfile":"/home/pi/share/influx_client_(date).log",
"level":"Info"
},
"allow":{
"energy" :"float",
"power" :"float",
"current" :"float",
"light" :"float",
"light_red" :"float",
"light_green" :"float",
"light_blue" :"float",
"light_ir" :"float",
"pressure" :"float",
"temperature" :"float",
"humidity" :"float",
"voltage" :"float",
"battery" :"int",
"moisture" :"int",
"conductivity" :"int",
"current_heating_setpoint" :"float",
"occupied_heating_setpoint":"float",
"unoccupied_heating_setpoint":"float",
"pi_heating_demand" :"int",
"rssi":"int",
"alive":"int",
"breath_voc":"float",
"co2_eq": "float",
"gas0":"float",
"iaq":"float",
"iaq_accuracy":"float",
"stabilization":"bool",
"runin":"bool",
"linkquality":"int",
"state":"boolstring"
},
"topics_names":{
"shellies/shellyplug-s-01E2B5/relay/0/power":"shelly dryer",
"shellies/shellyplug-s-B86655/relay/0/power":"shelly fridge",
"shellies/shellyplug-s-B86BAA/relay/0/power":"shelly freezer",
"shellies/shellyplug-s-51D82E/relay/0/power":"shelly washing machine",
"shellies/shellyplug-s-B86270/relay/0/power":"shelly micro wave",
"shellies/shellyplug-s-B85D8C/relay/0/power":"shelly dish washer",
"shellies/shellyplug-s-B85CA1/relay/0/power":"shelly routers servers",
"shellies/shellyplug-s-1697DA/relay/0/power":"shelly tv",
"shellies/shellyplug-s-6A5CE5/relay/0/power":"shelly sonos front",
"shellies/shellyplug-s-6A5DCF/relay/0/power":"shelly ethernet repeater",
"shellies/shellyplug-s-B85CCA/relay/0/power":"shelly dell pc",
"shellies/shellyplug-s-B85D90/relay/0/power":"shelly sonos sat",
"shellies/shellyplug-s-021700/relay/0/power":"shelly entrance",
"shellies/shellyswitch25-B8A4EE/relay/0/power":"shelly bathroom light",
"shellies/shellyswitch25-B8A4EE/relay/1/power":"shelly bathroom fan",
"shellies/shelly1pm-C45303/relay/0/power":"shelly bed",
"shellies/shellyplug-s-01E2B5/relay/0/energy":"shelly dryer",
"shellies/shellyplug-s-B86655/relay/0/energy":"shelly fridge",
"shellies/shellyplug-s-B86BAA/relay/0/energy":"shelly freezer",
"shellies/shellyplug-s-51D82E/relay/0/energy":"shelly washing machine",
"shellies/shellyplug-s-B86270/relay/0/energy":"shelly micro wave",
"shellies/shellyplug-s-B85D8C/relay/0/energy":"shelly dish washer",
"shellies/shellyplug-s-B85CA1/relay/0/energy":"shelly routers servers",
"shellies/shellyplug-s-1697DA/relay/0/energy":"shelly tv",
"shellies/shellyplug-s-6A5CE5/relay/0/energy":"shelly sonos front",
"shellies/shellyplug-s-6A5DCF/relay/0/energy":"shelly ethernet repeater",
"shellies/shellyplug-s-B85CCA/relay/0/energy":"shelly dell pc",
"shellies/shellyplug-s-B85D90/relay/0/energy":"shelly sonos sat",
"shellies/shellyplug-s-021700/relay/0/energy":"shelly entrance",
"shellies/shellyswitch25-B8A4EE/relay/0/energy":"shelly bathroom light",
"shellies/shellyswitch25-B8A4EE/relay/1/energy":"shelly bathroom fan",
"shellies/shelly1pm-C45303/relay/0/energy":"shelly bed"
},
"rooms":{
"livingroom":[
"shelly routers servers",
"shelly tv",
"sonos rear socket",
"sonos front socket",
"wifi mesh socket"
],
"hallway":[
"shelly entrance",
"cupboard light"
],
"kitchen":[
"shelly fridge",
"shelly freezer",
"shelly micro wave",
"shelly dish washer"
],
"bathroom":[
"shelly dryer",
"shelly washing machine",
"shelly bathroom light",
"shelly bathroom fan"
],
"office":[
"tester",
"lifx socket",
"pc socket"
]
}
}
Loading

0 comments on commit 85e3d84

Please sign in to comment.