diff --git a/graphite.dockerfile b/graphite.dockerfile deleted file mode 100644 index 97253d6..0000000 --- a/graphite.dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM graphiteapp/graphite-statsd AS onlyoffice-graphite -LABEL maintainer Ascensio System SIA - -RUN rm -rf /etc/service/statsd \ - && sed 's|\#\?\(DASHBOARD_REQUIRE_AUTHENTICATION = \).*|\1True|g' \ - -i /opt/graphite/webapp/graphite/local_settings.py \ - && sed '26s|\(retentions = \).*|\160s:90d|g' \ - -i /opt/graphite/conf/storage-schemas.conf diff --git a/tests/graphite.yaml b/tests/graphite.yaml index bca856f..910c0d6 100644 --- a/tests/graphite.yaml +++ b/tests/graphite.yaml @@ -8,24 +8,25 @@ services: - onlyoffice-graphite environment: - METRICS_ENABLED=${METRICS_ENABLED:-true} - - METRICS_HOST="${METRICS_HOST:-localhost}" - - METRICS_PORT="${METRICS_PORT:-8125}" - - METRICS_PREFIX="${METRICS_PREFIX:-ds.}" + - METRICS_HOST=${METRICS_HOST:-localhost} + - METRICS_PORT=${METRICS_PORT:-8125} + - METRICS_PREFIX=${METRICS_PREFIX:-ds.} stdin_open: true restart: always + expose: + - '2003' ports: - '80:80' - expose: - - '8125' + volumes: + - ./graphite/statsd:/var/www/onlyoffice/documentserver/server/Metrics/config onlyoffice-graphite: container_name: onlyoffice-graphite - build: - context: ../. - dockerfile: graphite.dockerfile + image: graphiteapp/graphite-statsd environment: + - GRAPHITE_STATSD_HOST=${GRAPHITE_STATSD_HOST:-onlyoffice-documentserver} - GRAPHITE_TIME_ZONE=${GRAPHITE_TIME_ZONE:-Europe/Moscow} ports: - - '9999:80' + - '8888:80' stdin_open: true restart: always diff --git a/tests/graphite/statsd/config.js b/tests/graphite/statsd/config.js index 68eea4e..2ce559e 100644 --- a/tests/graphite/statsd/config.js +++ b/tests/graphite/statsd/config.js @@ -1,5 +1,5 @@ { - "graphiteHost": "127.0.0.1", + "graphiteHost": "onlyoffice-graphite", "graphitePort": 2003, "port": 8125, "flushInterval": 3000,