Skip to content

Commit a96edc3

Browse files
committed
docker: Update config path to comply with helm chart
1 parent 6f758fa commit a96edc3

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

.gitlab/ci/e2e/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ OPEN5GS_VERSION=2.7.0
99
FLEXRIC_VERSION=br-flexric
1010
NTN_CHANNEL_EMULATOR_VERSION=0.1
1111
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
12-
SRS_TELEGRAF_VERSION=0.14.0
12+
SRS_TELEGRAF_VERSION=0.16.0
1313
DPDK_VERSION=24.11.2
1414
ZMQ_HOSTLABEL_0=kubernetes.io/hostname=hp-generic-2
1515
ZMQ_HOSTLABEL_1=kubernetes.io/hostname=ci-buildmaster

docker/.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ TELEGRAF_BUFFER_LIMIT=10000
99
# TELEGRAF_DEBUG=true
1010
# TELEGRAF_LOG_FILE=/var/log/telegraf.log
1111
# TELEGRAF_DUMP_FILE=/var/log/telegraf/metrics.txt
12-
# TELEGRAF_LOAD_FILE=/etc/telegraf/metrics.txt
13-
# TELEGRAF_CLI_EXTRA_ARGS=--config /etc/telegraf/dump_metrics.conf
14-
# --config /etc/telegraf/load_metrics.conf
12+
# TELEGRAF_LOAD_FILE=/etc/srs/metrics.txt
13+
# TELEGRAF_CLI_EXTRA_ARGS=--config /etc/srs/dump_metrics.conf
14+
# --config /etc/srs/load_metrics.conf
1515

1616
## InfluxDB
1717

docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ services:
8686
env_file:
8787
- .env
8888
# volumes:
89-
# - /tmp/metrics.txt:/etc/telegraf/metrics.txt:ro # Uncomment to use an input metrics file
89+
# - /tmp/metrics.txt:/etc/srs/metrics.txt:ro # Uncomment to use an input metrics file
9090
networks:
9191
metrics:
9292
ipv4_address: 172.19.1.4

docker/telegraf/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARG TELEGRAF_VERSION=1.35.0
1010
FROM telegraf:${TELEGRAF_VERSION}
1111
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends python3-websocket socat
1212

13-
ADD *.conf /etc/telegraf/
13+
ADD *.conf /etc/srs/
1414
ADD entrypoint.sh ws_adapter.py /usr/local/bin/
1515

1616
ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]

docker/telegraf/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ -n "$RETINA_PORTS" ]; then
1313
# In this mode, we expect to receive data over UDP, telling websocket ip/port of the server.
1414
export WS_URL=$(socat -u UDP-RECVFROM:"${RETINA_PORTS}",reuseaddr STDOUT)
1515
fi
16-
telegraf --config /etc/telegraf/telegraf.conf $TELEGRAF_CLI_EXTRA_ARGS &
16+
telegraf --config /etc/srs/telegraf.conf $TELEGRAF_CLI_EXTRA_ARGS &
1717
child=$!
1818

1919
health_code=0

docker/telegraf/load_metrics.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
#
88

99
[[inputs.file]]
10-
files = ["${TELEGRAF_LOAD_FILE:-/etc/telegraf/metrics.txt}"]
10+
files = ["${TELEGRAF_LOAD_FILE:-/etc/srs/metrics.txt}"]
1111
data_format = "influx"

docker/telegraf/version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# the distribution.
77
#
88

9-
SRS_TELEGRAF_VERSION: "0.14.0"
9+
SRS_TELEGRAF_VERSION: "0.16.0"

0 commit comments

Comments
 (0)