From fff61379fe56e421df219fedc54a9b8fce9680fb Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Fri, 2 Aug 2024 16:06:21 +0530 Subject: [PATCH] fix: mount root path in /hostfs for hostmetrics (#5534) Signed-off-by: Prashant Shahi --- deploy/docker-swarm/clickhouse-setup/docker-compose.yaml | 1 + deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml | 1 + deploy/docker/clickhouse-setup/docker-compose-core.yaml | 2 ++ deploy/docker/clickhouse-setup/docker-compose.testing.yaml | 1 + deploy/docker/clickhouse-setup/docker-compose.yaml | 1 + deploy/docker/clickhouse-setup/otel-collector-config.yaml | 1 + pkg/query-service/tests/test-deploy/docker-compose.yaml | 1 + pkg/query-service/tests/test-deploy/otel-collector-config.yaml | 1 + 8 files changed, 9 insertions(+) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index de7ab6655e..c584bb50e7 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -211,6 +211,7 @@ services: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml - ./otel-collector-opamp-config.yaml:/etc/manager-config.yaml - /var/lib/docker/containers:/var/lib/docker/containers:ro + - /:/hostfs:ro environment: - OTEL_RESOURCE_ATTRIBUTES=host.name={{.Node.Hostname}},os.type={{.Node.Platform.OS}},dockerswarm.service.name={{.Service.Name}},dockerswarm.task.name={{.Task.Name}} - DOCKER_MULTI_NODE_CLUSTER=false diff --git a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml index 13ab19ca2c..091d4f504b 100644 --- a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml @@ -36,6 +36,7 @@ receivers: # endpoint: 0.0.0.0:6832 hostmetrics: collection_interval: 30s + root_path: /hostfs scrapers: cpu: {} load: {} diff --git a/deploy/docker/clickhouse-setup/docker-compose-core.yaml b/deploy/docker/clickhouse-setup/docker-compose-core.yaml index 73b862ea6e..17f7c3e4a3 100644 --- a/deploy/docker/clickhouse-setup/docker-compose-core.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose-core.yaml @@ -93,6 +93,8 @@ services: volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml - ./otel-collector-opamp-config.yaml:/etc/manager-config.yaml + - /var/lib/docker/containers:/var/lib/docker/containers:ro + - /:/hostfs:ro environment: - OTEL_RESOURCE_ATTRIBUTES=host.name=signoz-host,os.type=linux ports: diff --git a/deploy/docker/clickhouse-setup/docker-compose.testing.yaml b/deploy/docker/clickhouse-setup/docker-compose.testing.yaml index 849a536c27..8d4564af31 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.testing.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.testing.yaml @@ -244,6 +244,7 @@ services: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml - ./otel-collector-opamp-config.yaml:/etc/manager-config.yaml - /var/lib/docker/containers:/var/lib/docker/containers:ro + - /:/hostfs:ro environment: - OTEL_RESOURCE_ATTRIBUTES=host.name=signoz-host,os.type=linux - DOCKER_MULTI_NODE_CLUSTER=false diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 6528a1826f..17a975e5a6 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -243,6 +243,7 @@ services: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml - ./otel-collector-opamp-config.yaml:/etc/manager-config.yaml - /var/lib/docker/containers:/var/lib/docker/containers:ro + - /:/hostfs:ro environment: - OTEL_RESOURCE_ATTRIBUTES=host.name=signoz-host,os.type=linux - DOCKER_MULTI_NODE_CLUSTER=false diff --git a/deploy/docker/clickhouse-setup/otel-collector-config.yaml b/deploy/docker/clickhouse-setup/otel-collector-config.yaml index 85e89498be..e6d4c2418e 100644 --- a/deploy/docker/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker/clickhouse-setup/otel-collector-config.yaml @@ -36,6 +36,7 @@ receivers: # endpoint: 0.0.0.0:6832 hostmetrics: collection_interval: 30s + root_path: /hostfs scrapers: cpu: {} load: {} diff --git a/pkg/query-service/tests/test-deploy/docker-compose.yaml b/pkg/query-service/tests/test-deploy/docker-compose.yaml index 19d088dc7a..05c3cddf15 100644 --- a/pkg/query-service/tests/test-deploy/docker-compose.yaml +++ b/pkg/query-service/tests/test-deploy/docker-compose.yaml @@ -219,6 +219,7 @@ services: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml - ./otel-collector-opamp-config.yaml:/etc/manager-config.yaml - /var/lib/docker/containers:/var/lib/docker/containers:ro + - /:/hostfs:ro environment: - OTEL_RESOURCE_ATTRIBUTES=host.name=signoz-host,os.type=linux - DOCKER_MULTI_NODE_CLUSTER=false diff --git a/pkg/query-service/tests/test-deploy/otel-collector-config.yaml b/pkg/query-service/tests/test-deploy/otel-collector-config.yaml index d7b9f357fb..589598c383 100644 --- a/pkg/query-service/tests/test-deploy/otel-collector-config.yaml +++ b/pkg/query-service/tests/test-deploy/otel-collector-config.yaml @@ -40,6 +40,7 @@ receivers: # endpoint: 0.0.0.0:6832 hostmetrics: collection_interval: 30s + root_path: /hostfs scrapers: cpu: {} load: {}