Remove docker hack around prometheus service (#28985)

* Remove uneeded hack in docker-compose now that problem is solved

* Remove obsolete attribute `version` in docker compose configuration files

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Nicolas Le Cam 2025-02-12 19:18:53 +01:00 committed by GitHub
parent 55bb6c51eb
commit 4a44d23095
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 18 deletions

View File

@ -8,15 +8,6 @@ else
PLATFORM := $(shell uname) PLATFORM := $(shell uname)
endif endif
# Set an environment variable on Linux used to resolve `docker.host.internal` inconsistencies with
# docker. This can be reworked once https://github.com/docker/for-linux/issues/264 is resolved
# satisfactorily.
ifeq ($(PLATFORM),Linux)
export IS_LINUX = -linux
else
export IS_LINUX =
endif
# Detect Apple Silicon and set a flag. # Detect Apple Silicon and set a flag.
ifeq ($(shell uname)/$(shell uname -m),Darwin/arm64) ifeq ($(shell uname)/$(shell uname -m),Darwin/arm64)
ARM_BASED_MAC = true ARM_BASED_MAC = true

View File

@ -144,10 +144,12 @@ services:
image: "prom/prometheus:v2.46.0" image: "prom/prometheus:v2.46.0"
user: root user: root
volumes: volumes:
- "./docker/prometheus${IS_LINUX}.yml:/etc/prometheus/prometheus.yml" - "./docker/prometheus.yml:/etc/prometheus/prometheus.yml"
- "/var/run/docker.sock:/var/run/docker.sock" - "/var/run/docker.sock:/var/run/docker.sock"
networks: networks:
- mm-test - mm-test
extra_hosts:
- "host.docker.internal:host-gateway"
grafana: grafana:
image: "grafana/grafana:10.4.2" image: "grafana/grafana:10.4.2"
volumes: volumes:

View File

@ -1,8 +0,0 @@
global:
scrape_interval: 5s
evaluation_interval: 60s
scrape_configs:
- job_name: 'mattermost'
static_configs:
- targets: ['172.17.0.1:8067']