Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Telegraf adapter for commands and improve MQTT configuration #177

Merged
merged 4 commits into from
Aug 31, 2024
Merged

Telegraf adapter for commands and improve MQTT configuration #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52a58e3
Update Telegraf config to record commands
calvinmclean Aug 31, 2024
e9f7e9b
Move MQTT topics to const instead of config
calvinmclean Aug 31, 2024
be9b16e
Simplify topic configs for Telegraf
calvinmclean Aug 31, 2024
6e8abf6
Move topic-related controller configs to mqtt.h
calvinmclean Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 0 additions & 194 deletions deploy/Acornfile
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions deploy/base/configs/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ mqtt:
broker: "mosquitto"
port: 1883
client_id: "garden-app"
water_topic: "{{.Garden}}/command/water"
stop_topic: "{{.Garden}}/command/stop"
stop_all_topic: "{{.Garden}}/command/stop_all"
light_topic: "{{.Garden}}/command/light"
influxdb:
address: "http://influxdb:8086"
token: "my-secret-token"
Expand Down
24 changes: 19 additions & 5 deletions deploy/base/configs/telegraf.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,24 @@
[[inputs.mqtt_consumer]]
servers = ["tcp://mosquitto:1883"]
topics = [
"${MQTT_WATER_TOPIC}",
"${MQTT_LIGHT_TOPIC}",
"${MQTT_MOISTURE_TOPIC}",
"${MQTT_LOGGING_TOPIC}",
"${MQTT_HEALTH_TOPIC}"
"+/data/water",
"+/data/light",
"+/data/moisture",
"+/data/temperature",
"+/data/humidity",
"+/data/logs",
"+/data/health"
]
data_format = "influx"
[[inputs.mqtt_consumer]]
servers = ["tcp://mosquitto:1883"]
topics = [
"+/command/+"
]
data_format = "json"
tag_keys = ["id", "position"]
json_string_fields = ["state", "for_duration"]
name_suffix = "_command"
[[inputs.mqtt_consumer.topic_parsing]]
topic = "+/command/+"
measurement = "_/_/measurement"
5 changes: 0 additions & 5 deletions deploy/base/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ configMapGenerator:
- INFLUXDB_TOKEN=my-secret-token
- INFLUXDB_ORG=garden
- INFLUXDB_BUCKET=garden
- MQTT_WATER_TOPIC="+/data/water"
- MQTT_LIGHT_TOPIC="+/data/light"
- MQTT_MOISTURE_TOPIC="+/data/moisture"
- MQTT_LOGGING_TOPIC="+/data/logs"
- MQTT_HEALTH_TOPIC="+/data/health"
- GF_PATHS_PROVISIONING=/etc/grafana/provisioning
resources:
- garden_app.yaml
Expand Down
25 changes: 0 additions & 25 deletions deploy/base/telegraf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,6 @@ spec:
- name: config
mountPath: /etc/telegraf
env:
- name: MQTT_WATER_TOPIC
valueFrom:
configMapKeyRef:
name: shared-environment
key: MQTT_WATER_TOPIC
- name: MQTT_LIGHT_TOPIC
valueFrom:
configMapKeyRef:
name: shared-environment
key: MQTT_LIGHT_TOPIC
- name: MQTT_MOISTURE_TOPIC
valueFrom:
configMapKeyRef:
name: shared-environment
key: MQTT_MOISTURE_TOPIC
- name: MQTT_LOGGING_TOPIC
valueFrom:
configMapKeyRef:
name: shared-environment
key: MQTT_LOGGING_TOPIC
- name: MQTT_HEALTH_TOPIC
valueFrom:
configMapKeyRef:
name: shared-environment
key: MQTT_HEALTH_TOPIC
- name: INFLUXDB_TOKEN
valueFrom:
configMapKeyRef:
Expand Down
4 changes: 0 additions & 4 deletions deploy/configs/garden-app/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ mqtt:
broker: "mqtt"
port: 1883
client_id: "garden-app-acorn"
water_topic: "{{.Garden}}/command/water"
stop_topic: "{{.Garden}}/command/stop"
stop_all_topic: "{{.Garden}}/command/stop_all"
light_topic: "{{.Garden}}/command/light"
influxdb:
address: "http://influxdb:8086"
token: "my-secret-token"
Expand Down
26 changes: 19 additions & 7 deletions deploy/configs/telegraf/telegraf.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,24 @@
[[inputs.mqtt_consumer]]
servers = ["tcp://mqtt:1883"]
topics = [
"${MQTT_WATER_TOPIC}",
"${MQTT_LIGHT_TOPIC}",
"${MQTT_MOISTURE_TOPIC}",
"${MQTT_TEMPERATURE_TOPIC}",
"${MQTT_HUMIDITY_TOPIC}",
"${MQTT_LOGGING_TOPIC}",
"${MQTT_HEALTH_TOPIC}"
"+/data/water",
"+/data/light",
"+/data/moisture",
"+/data/temperature",
"+/data/humidity",
"+/data/logs",
"+/data/health"
]
data_format = "influx"
[[inputs.mqtt_consumer]]
servers = ["tcp://mqtt:1883"]
topics = [
"+/command/+"
]
data_format = "json"
tag_keys = ["id", "position"]
json_string_fields = ["state", "for_duration"]
name_suffix = "_command"
[[inputs.mqtt_consumer.topic_parsing]]
topic = "+/command/+"
measurement = "_/_/measurement"
8 changes: 0 additions & 8 deletions deploy/env_file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ INFLUXDB_TOKEN="my-secret-token"
INFLUXDB_ORG="garden"
INFLUXDB_BUCKET="garden"

# Telegraf
MQTT_WATER_TOPIC="+/data/water"
MQTT_LIGHT_TOPIC="+/data/light"
MQTT_MOISTURE_TOPIC="+/data/moisture"
MQTT_TEMPERATURE_TOPIC="+/data/temperature"
MQTT_HUMIDITY_TOPIC="+/data/humidity"
MQTT_LOGGING_TOPIC="+/data/logs"
MQTT_HEALTH_TOPIC="+/data/health"
# Grafana
GF_SECURITY_ADMIN_USER="${ADMIN_USER}"
GF_SECURITY_ADMIN_PASSWORD="${ADMIN_PSWD}"
Expand Down
4 changes: 0 additions & 4 deletions deploy/overlays/dev/configs/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ mqtt:
broker: "mosquitto"
port: 1883
client_id: "garden-controller"
water_topic: "{{.Garden}}/command/water"
stop_topic: "{{.Garden}}/command/stop"
stop_all_topic: "{{.Garden}}/command/stop_all"
light_topic: "{{.Garden}}/command/light"
controller:
topic_prefix: "garden"
num_zones: 3
Expand Down
4 changes: 0 additions & 4 deletions docs/app_advanced.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ mqtt:
broker: "localhost"
port: 1883
client_id: "garden-app"
water_topic: "{{.Garden}}/command/water"
stop_topic: "{{.Garden}}/command/stop"
stop_all_topic: "{{.Garden}}/command/stop_all"
light_topic: "{{.Garden}}/command/light"
influxdb:
address: "http://localhost:8086"
token: "my-token"
Expand Down
4 changes: 0 additions & 4 deletions docs/hydroponics_example.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ mqtt:
broker: "mosquitto"
port: 1883
client_id: "garden-app"
water_topic: "{{.Garden}}/command/water"
stop_topic: "{{.Garden}}/command/stop"
stop_all_topic: "{{.Garden}}/command/stop_all"
light_topic: "{{.Garden}}/command/light"
influxdb:
address: "http://influxdb:8086"
token: "my-secret-token"
Expand Down
4 changes: 0 additions & 4 deletions docs/indoor_example.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ mqtt:
broker: "mosquitto"
port: 1883
client_id: "garden-app"
water_topic: "{{.Garden}}/command/water"
stop_topic: "{{.Garden}}/command/stop"
stop_all_topic: "{{.Garden}}/command/stop_all"
light_topic: "{{.Garden}}/command/light"
influxdb:
address: "http://influxdb:8086"
token: "my-secret-token"
Expand Down
4 changes: 0 additions & 4 deletions garden-app/config.yaml.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ mqtt:
broker: "localhost"
port: 1883
client_id: "garden-app"
water_topic: "{{.Garden}}/command/water"
stop_topic: "{{.Garden}}/command/stop"
stop_all_topic: "{{.Garden}}/command/stop_all"
light_topic: "{{.Garden}}/command/light"
influxdb:
address: "http://localhost:8086"
token: "my-token"
Expand Down
Loading
Loading