diff --git a/intern/docker_mqtt/tasks/main.yml b/intern/docker_mqtt/tasks/main.yml
index 5ec3addedfe1668ecc9be993d9e4f5a577080f42..7ea26060f50845b669359e79e98d6a8f97d6585b 100644
--- a/intern/docker_mqtt/tasks/main.yml
+++ b/intern/docker_mqtt/tasks/main.yml
@@ -22,7 +22,8 @@
with_items:
- docker-compose.yml
- mosquitto.conf
- - telegraf.conf
+ - telegraf_binary.conf
+ - telegraf_float.conf
- name: "start {{ servicename }} docker"
docker_compose:
diff --git a/intern/docker_mqtt/templates/docker-compose.yml b/intern/docker_mqtt/templates/docker-compose.yml
index 7e64dafa2cbbae152bdcfb5da22872c2b0b5be82..dcf69c9f8c91fd007a8d41db3974c7e2d1d65a78 100644
--- a/intern/docker_mqtt/templates/docker-compose.yml
+++ b/intern/docker_mqtt/templates/docker-compose.yml
@@ -32,7 +32,7 @@ services:
DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: {{ influxdb_token }}
- telegraf:
+ tgbinary:
image: telegraf:1.22.4
restart: always
@@ -40,4 +40,15 @@ services:
- app
- influxdb
volumes:
- - {{ basedir }}/telegraf.conf:/etc/telegraf/telegraf.conf:ro
+ - "{{ basedir }}/telegraf_binary.conf:/etc/telegraf/telegraf.conf:ro"
+
+
+ tgfloat:
+
+ image: telegraf:1.22.4
+ restart: always
+ depends_on:
+ - app
+ - influxdb
+ volumes:
+ - "{{ basedir }}/telegraf_float.conf:/etc/telegraf/telegraf.conf:ro"
diff --git a/intern/docker_mqtt/templates/telegraf.conf b/intern/docker_mqtt/templates/telegraf_binary.conf
similarity index 95%
rename from intern/docker_mqtt/templates/telegraf.conf
rename to intern/docker_mqtt/templates/telegraf_binary.conf
index e7fa03c2f0c8ce7b4c05ac62169047f6d7dd386d..deb91787822dd21ac65a6595781d8735229e9de5 100644
--- a/intern/docker_mqtt/templates/telegraf.conf
+++ b/intern/docker_mqtt/templates/telegraf_binary.conf
@@ -159,13 +159,16 @@
# INPUT PLUGINS #
###############################################################################
+#
+# Binäre Sensoren, die für InfluxDB auf Numerische Werte übersetzt werden
+#
+
[[inputs.mqtt_consumer]]
servers = ["tcp://app:1883"]
topics = [
"warpzone/door/status",
- "ESPHome/+/sensor/+/state",
"ESPHome/+/binary_sensor/+/state"
]
@@ -176,22 +179,15 @@ data_type = "string"
# https://github.com/influxdata/telegraf/blob/master/plugins/processors/enum/README.md
[[processors.enum]]
-
+
[[processors.enum.mapping]]
field = "value"
- default = 0
+ default = 0.0
[processors.enum.mapping.value_mappings]
- true = 1
- True = 1
- ON = 1
- OFF = 1
- OPEN = 1
-
-
-# https://github.com/influxdata/telegraf/blob/master/plugins/processors/converter/README.md
-[[processors.converter]]
-order = 2
+ true = 1.0
+ True = 1.0
+ ON = 1.0
+ OFF = 1.0
+ OPEN = 1.0
- [processors.converter.fields]
- float = ["value"]
diff --git a/intern/docker_mqtt/templates/telegraf_float.conf b/intern/docker_mqtt/templates/telegraf_float.conf
new file mode 100644
index 0000000000000000000000000000000000000000..068f6515d22b17ac3c13ed8c1cfd1b7f0797298b
--- /dev/null
+++ b/intern/docker_mqtt/templates/telegraf_float.conf
@@ -0,0 +1,177 @@
+# Telegraf Configuration
+#
+# Telegraf is entirely plugin driven. All metrics are gathered from the
+# declared inputs, and sent to the declared outputs.
+#
+# Plugins must be declared in here to be active.
+# To deactivate a plugin, comment out the name and any variables.
+#
+# Use 'telegraf -config telegraf.conf -test' to see what metrics a config
+# file would generate.
+#
+# Environment variables can be used anywhere in this config file, simply surround
+# them with ${}. For strings the variable must be within quotes (ie, "${STR_VAR}"),
+# for numbers and booleans they should be plain (ie, ${INT_VAR}, ${BOOL_VAR})
+
+
+# Global tags can be specified here in key="value" format.
+[global_tags]
+ # dc = "us-east-1" # will tag all metrics with dc=us-east-1
+ # rack = "1a"
+ ## Environment variables can be used as tags, and throughout the config file
+ # user = "$USER"
+
+# Configuration for telegraf agent
+[agent]
+ ## Default data collection interval for all inputs
+ interval = "5s"
+ ## Rounds collection interval to 'interval'
+ ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
+ round_interval = true
+
+ ## Telegraf will send metrics to outputs in batches of at most
+ ## metric_batch_size metrics.
+ ## This controls the size of writes that Telegraf sends to output plugins.
+ metric_batch_size = 100
+
+ ## Maximum number of unwritten metrics per output. Increasing this value
+ ## allows for longer periods of output downtime without dropping metrics at the
+ ## cost of higher maximum memory usage.
+ metric_buffer_limit = 10000
+
+ ## Collection jitter is used to jitter the collection by a random amount.
+ ## Each plugin will sleep for a random time within jitter before collecting.
+ ## This can be used to avoid many plugins querying things like sysfs at the
+ ## same time, which can have a measurable effect on the system.
+ collection_jitter = "0s"
+
+ ## Default flushing interval for all outputs. Maximum flush_interval will be
+ ## flush_interval + flush_jitter
+ flush_interval = "10s"
+ ## Jitter the flush interval by a random amount. This is primarily to avoid
+ ## large write spikes for users running a large number of telegraf instances.
+ ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
+ flush_jitter = "0s"
+
+ ## By default or when set to "0s", precision will be set to the same
+ ## timestamp order as the collection interval, with the maximum being 1s.
+ ## ie, when interval = "10s", precision will be "1s"
+ ## when interval = "250ms", precision will be "1ms"
+ ## Precision will NOT be used for service inputs. It is up to each individual
+ ## service input to set the timestamp at the appropriate precision.
+ ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
+ precision = ""
+
+ ## Log at debug level.
+ # debug = false
+ ## Log only error level messages.
+ # quiet = false
+
+ ## Log target controls the destination for logs and can be one of "file",
+ ## "stderr" or, on Windows, "eventlog". When set to "file", the output file
+ ## is determined by the "logfile" setting.
+ # logtarget = "file"
+
+ ## Name of the file to be logged to when using the "file" logtarget. If set to
+ ## the empty string then logs are written to stderr.
+ # logfile = ""
+
+ ## The logfile will be rotated after the time interval specified. When set
+ ## to 0 no time based rotation is performed. Logs are rotated only when
+ ## written to, if there is no log activity rotation may be delayed.
+ # logfile_rotation_interval = "0d"
+
+ ## The logfile will be rotated when it becomes larger than the specified
+ ## size. When set to 0 no size based rotation is performed.
+ # logfile_rotation_max_size = "0MB"
+
+ ## Maximum number of rotated archives to keep, any older logs are deleted.
+ ## If set to -1, no archives are removed.
+ # logfile_rotation_max_archives = 5
+
+ ## Pick a timezone to use when logging or type 'local' for local time.
+ ## Example: America/Chicago
+ # log_with_timezone = ""
+
+ ## Override default hostname, if empty use os.Hostname()
+ hostname = ""
+ ## If set to true, do no set the "host" tag in the telegraf agent.
+ omit_hostname = false
+
+###############################################################################
+# OUTPUT PLUGINS #
+###############################################################################
+
+# Configuration for sending metrics to InfluxDB 2.0
+[[outputs.influxdb_v2]]
+ ## The URLs of the InfluxDB cluster nodes.
+ ##
+ ## Multiple URLs can be specified for a single cluster, only ONE of the
+ ## urls will be written to each interval.
+ ## ex: urls = ["https://us-west-2-1.aws.cloud2.influxdata.com"]
+ urls = ["http://influxdb:8086"]
+
+ ## Token for authentication.
+ token = "{{ influxdb_token }}"
+
+ ## Organization is the name of the organization you wish to write to.
+ organization = "mqtt"
+
+ ## Destination bucket to write into.
+ bucket = "mqtt"
+
+ ## The value of this tag will be used to determine the bucket. If this
+ ## tag is not set the 'bucket' option is used as the default.
+ # bucket_tag = ""
+
+ ## If true, the bucket tag will not be added to the metric.
+ # exclude_bucket_tag = false
+
+ ## Timeout for HTTP messages.
+ # timeout = "5s"
+
+ ## Additional HTTP headers
+ # http_headers = {"X-Special-Header" = "Special-Value"}
+
+ ## HTTP Proxy override, if unset values the standard proxy environment
+ ## variables are consulted to determine which proxy, if any, should be used.
+ # http_proxy = "http://corporate.proxy:3128"
+
+ ## HTTP User-Agent
+ # user_agent = "telegraf"
+
+ ## Content-Encoding for write request body, can be set to "gzip" to
+ ## compress body or "identity" to apply no encoding.
+ # content_encoding = "gzip"
+
+ ## Enable or disable uint support for writing uints influxdb 2.0.
+ # influx_uint_support = false
+
+ ## Optional TLS Config for use on HTTP connections.
+ # tls_ca = "/etc/telegraf/ca.pem"
+ # tls_cert = "/etc/telegraf/cert.pem"
+ # tls_key = "/etc/telegraf/key.pem"
+ ## Use TLS but skip chain & host verification
+ # insecure_skip_verify = false
+
+
+###############################################################################
+# INPUT PLUGINS #
+###############################################################################
+
+#
+# Normale MQTT Sensoren, die Float Werte liefern
+#
+
+[[inputs.mqtt_consumer]]
+
+ servers = ["tcp://app:1883"]
+
+ topics = [
+ "ESPHome/+/sensor/+/state"
+ ]
+
+# https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+data_format = "value"
+data_type = "float"
+