Mise à jour Telegraf 1.29.2 #1

Open
Ghost wants to merge 3 commits from (deleted):main into main
3 changed files with 23 additions and 37 deletions

View File

@@ -1,4 +1,4 @@
FROM telegraf:1.27.1 FROM telegraf:1.29.2
# Install required packages # Install required packages
RUN apt-get update \ RUN apt-get update \
@@ -10,12 +10,15 @@ RUN apt-get update \
gnupg-agent \ gnupg-agent \
software-properties-common \ software-properties-common \
python3-distutils \ python3-distutils \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ python3-pip \
&& python3 get-pip.py --prefix=/usr/local \ python3-full
&& python3 -m pip install requests \
&& pip install unidecode \ # Installation module necessaire pour le script python
RUN pip3 install requests --break-system-packages \
&& pip3 install unidecode --break-system-packages \
&& rm /entrypoint.sh && rm /entrypoint.sh
ADD --chmod=1755 entrypoint.sh / ADD --chmod=1755 entrypoint.sh /
ADD freebox-monit.py /usr/local/py/ ADD freebox-monit.py /usr/local/py/
ADD telegraf.conf /etc/telegraf/ ADD telegraf.conf /etc/telegraf/

View File

@@ -1,29 +1,18 @@
version: "3" version: "3"
services: services:
influxdb:
image: influxdb:1.8
hostname: influxdb_test
restart: always
environment:
INFLUX_DB: fbx
INFLUXDB_USER: fbx
INFLUXDB_PASSWORD: fbx
fbx_telegraf: fbx_telegraf:
image: uzurka/freebox-telegraf image: freebox-exporter-telegraf:latest
container_name: container_name container_name: freebox-exporter
hostname: hostname hostname: hostname
environment: 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 - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/bin:/sbin:/usr/local:/usr/src
- TZ=CET - TZ=CET
- INFLUXDB_URL=http://influxdb_container_name:port - INFLUXDB_URL=http://url_or_ip_infludb:8086
- INFLUXDB_DATABASE=fbx - INFLUXDB_TOKEN=token_of_the_bucket
- INFLUXDB_SKIP_DATABASE_CREATION=false - INFLUXDB_SKIP_DATABASE_CREATION=true
- INFLUXDB_USERNAME=fbx - INFLUXDB_ORG=Organisation_of_your_influ
- INFLUXDB_PASSWORD=fbx - INFLUXDB_BUCKET=Name_of_the_bucket
- ARGS=SPHDIWX4 - ARGS=
ports:
- 9125:8125/udp
- 9092:8092/udp
- 9094:8094
restart: unless-stopped restart: unless-stopped

View File

@@ -19,17 +19,11 @@
# Configuration for sending metrics to InfluxDB # Configuration for sending metrics to InfluxDB
[[outputs.influxdb]] [[outputs.influxdb_v2]]
urls = ["${INFLUXDB_URL}"] urls = ["${INFLUXDB_URL}"]
database = "${INFLUXDB_DATABASE}" token = "${INFLUXDB_TOKEN}"
database_tag = "" organization = "${INFLUXDB_ORG}"
skip_database_creation = $INFLUXDB_SKIP_DATABASE_CREATION bucket = "${INFLUXDB_BUCKET}"
retention_policy = ""
write_consistency = "any"
timeout = "30s"
username = "${INFLUXDB_USERNAME}"
password = "${INFLUXDB_PASSWORD}"
############################################################################### ###############################################################################
# INPUT PLUGINS # # INPUT PLUGINS #
############################################################################### ###############################################################################