diff --git a/Dockerfile b/Dockerfile index 9e1e727..301919a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM telegraf:1.27.1 +FROM telegraf:1.29.2 # Install required packages RUN apt-get update \ @@ -10,12 +10,15 @@ RUN apt-get update \ gnupg-agent \ software-properties-common \ python3-distutils \ - && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ - && python3 get-pip.py --prefix=/usr/local \ - && python3 -m pip install requests \ - && pip install unidecode \ + python3-pip \ + python3-full + +# Installation module necessaire pour le script python +RUN pip3 install requests --break-system-packages \ + && pip3 install unidecode --break-system-packages \ && rm /entrypoint.sh + ADD --chmod=1755 entrypoint.sh / ADD freebox-monit.py /usr/local/py/ ADD telegraf.conf /etc/telegraf/ diff --git a/docker-compose.yml b/docker-compose.yml index eb84dc0..1b65c79 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,29 +1,18 @@ version: "3" services: - influxdb: - image: influxdb:1.8 - hostname: influxdb_test - restart: always - environment: - INFLUX_DB: fbx - INFLUXDB_USER: fbx - INFLUXDB_PASSWORD: fbx - fbx_telegraf: - image: uzurka/freebox-telegraf - container_name: container_name + image: freebox-exporter-telegraf:latest + container_name: freebox-exporter hostname: hostname environment: + - TELEGRAF_AGENT_INTERVAL=10s + - TELEGRAF_SCRIPT_TIMEOUT=5s - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/bin:/sbin:/usr/local:/usr/src - TZ=CET - - INFLUXDB_URL=http://influxdb_container_name:port - - INFLUXDB_DATABASE=fbx - - INFLUXDB_SKIP_DATABASE_CREATION=false - - INFLUXDB_USERNAME=fbx - - INFLUXDB_PASSWORD=fbx - - ARGS=SPHDIWX4 - ports: - - 9125:8125/udp - - 9092:8092/udp - - 9094:8094 - restart: unless-stopped + - INFLUXDB_URL=http://url_or_ip_infludb:8086 + - INFLUXDB_TOKEN=token_of_the_bucket + - INFLUXDB_SKIP_DATABASE_CREATION=true + - INFLUXDB_ORG=Organisation_of_your_influ + - INFLUXDB_BUCKET=Name_of_the_bucket + - ARGS= + restart: unless-stopped \ No newline at end of file diff --git a/telegraf.conf b/telegraf.conf index e37f8cf..a954d97 100644 --- a/telegraf.conf +++ b/telegraf.conf @@ -19,17 +19,11 @@ # Configuration for sending metrics to InfluxDB -[[outputs.influxdb]] +[[outputs.influxdb_v2]] urls = ["${INFLUXDB_URL}"] - database = "${INFLUXDB_DATABASE}" - database_tag = "" - skip_database_creation = $INFLUXDB_SKIP_DATABASE_CREATION - retention_policy = "" - write_consistency = "any" - timeout = "30s" - username = "${INFLUXDB_USERNAME}" - password = "${INFLUXDB_PASSWORD}" - + token = "${INFLUXDB_TOKEN}" + organization = "${INFLUXDB_ORG}" + bucket = "${INFLUXDB_BUCKET}" ############################################################################### # INPUT PLUGINS # ###############################################################################