GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-07-30 06:42:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prashant/deploy changes (#955)

Browse Source 
- set information log level in clickhouse logger config
- maximum logs size 150m (3 files each of 50m)

Signed-off-by: Prashant Shahi <prashant@signoz.io>
This commit is contained in:
Prashant Shahi 2022-04-06 00:05:05 +05:30 committed by GitHub
parent 064c3e0449
commit 8809105a8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 125 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -115,11 +115,9 @@ down-arm:
@docker-compose -f $(STANDALONE_DIRECTORY)/docker-compose.arm.yaml down -v @docker-compose -f $(STANDALONE_DIRECTORY)/docker-compose.arm.yaml down -v
clear-standalone-data: clear-standalone-data:
@cd $(STANDALONE_DIRECTORY) @docker run --rm -v "$(PWD)/$(STANDALONE_DIRECTORY)/data:/pwd" busybox \
@docker run --rm -v "data:/pwd" busybox \
sh -c "cd /pwd && rm -rf alertmanager/* clickhouse/* signoz/*" sh -c "cd /pwd && rm -rf alertmanager/* clickhouse/* signoz/*"
clear-swarm-data: clear-swarm-data:
@cd $(SWARM_DIRECTORY) @docker run --rm -v "$(PWD)/$(SWARM_DIRECTORY)/data:/pwd" busybox \
@docker run --rm -v "data:/pwd" busybox \
sh -c "cd /pwd && rm -rf alertmanager/* clickhouse/* signoz/*" sh -c "cd /pwd && rm -rf alertmanager/* clickhouse/* signoz/*"

35
deploy/docker-swarm/clickhouse-setup/clickhouse-config.xml
View File

@ -1,11 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<yandex> <yandex>
<logger> <logger>
<level>trace</level> <level>information</level>
<log>/var/log/clickhouse-server/clickhouse-server.log</log> <console>1</console>
<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
<size>1000M</size>
<count>10</count>
</logger> </logger>
<http_port>8123</http_port> <http_port>8123</http_port>
@ -45,6 +42,34 @@
</client> </client>
</openSSL> </openSSL>
<!-- Example config for tiered storage -->
<!-- <storage_configuration>
<disks>
<default>
<keep_free_space_bytes>10485760</keep_free_space_bytes>
</default>
<s3>
<type>s3</type>
<endpoint>https://BUCKET-NAME.s3.amazonaws.com/data/</endpoint>
<access_key_id>ACCESS-KEY-ID</access_key_id>
<secret_access_key>SECRET-ACCESS-KEY</secret_access_key>
</s3>
</disks>
<policies>
<tiered>
<volumes>
<default>
<disk>default</disk>
</default>
<s3>
<disk>s3</disk>
</s3>
</volumes>
</tiered>
</policies>
</storage_configuration> -->
<!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 --> <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->
<!-- <!--
<http_server_default_response><![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]></http_server_default_response> <http_server_default_response><![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]></http_server_default_response>

12
deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
View File

@ -3,12 +3,19 @@ version: "3.9"
services: services:
clickhouse: clickhouse:
image: yandex/clickhouse-server:21.12.3.32 image: yandex/clickhouse-server:21.12.3.32
# ports:
# - "9000:9000"
# - "8123:8123"
volumes: volumes:
- ./clickhouse-config.xml:/etc/clickhouse-server/config.xml - ./clickhouse-config.xml:/etc/clickhouse-server/config.xml
- ./data/clickhouse/:/var/lib/clickhouse/ - ./data/clickhouse/:/var/lib/clickhouse/
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
logging:
options:
max-size: 50m
max-file: "3"
healthcheck: healthcheck:
# "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'" # "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'"
test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"] test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"]
@ -45,6 +52,11 @@ services:
- TELEMETRY_ENABLED=true - TELEMETRY_ENABLED=true
- DEPLOYMENT_TYPE=docker-swarm - DEPLOYMENT_TYPE=docker-swarm
healthcheck:
test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"]
interval: 30s
timeout: 5s
retries: 3
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure

56
deploy/docker/clickhouse-setup/clickhouse-config.xml
View File

@ -1,11 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<yandex> <yandex>
<logger> <logger>
<level>trace</level> <level>information</level>
<log>/var/log/clickhouse-server/clickhouse-server.log</log> <console>1</console>
<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
<size>1000M</size>
<count>10</count>
</logger> </logger>
<http_port>8123</http_port> <http_port>8123</http_port>
@ -46,30 +43,31 @@
</openSSL> </openSSL>
<!-- Example config for tiered storage --> <!-- Example config for tiered storage -->
<!-- <storage_configuration> --> <!-- <storage_configuration>
<!-- <disks> --> <disks>
<!-- <default> --> <default>
<!-- </default> --> <keep_free_space_bytes>10485760</keep_free_space_bytes>
<!-- <s3> --> </default>
<!-- <type>s3</type> --> <s3>
<!-- <endpoint>http://172.17.0.1:9100/test/random/</endpoint> --> <type>s3</type>
<!-- <access_key_id>ash</access_key_id> --> <endpoint>https://BUCKET-NAME.s3.amazonaws.com/data/</endpoint>
<!-- <secret_access_key>password</secret_access_key> --> <access_key_id>ACCESS-KEY-ID</access_key_id>
<!-- </s3> --> <secret_access_key>SECRET-ACCESS-KEY</secret_access_key>
<!-- </disks> --> </s3>
<!-- <policies> --> </disks>
<!-- <tiered> --> <policies>
<!-- <volumes> --> <tiered>
<!-- <default> --> <volumes>
<!-- <disk>default</disk> --> <default>
<!-- </default> --> <disk>default</disk>
<!-- <s3> --> </default>
<!-- <disk>s3</disk> --> <s3>
<!-- </s3> --> <disk>s3</disk>
<!-- </volumes> --> </s3>
<!-- </tiered> --> </volumes>
<!-- </policies> --> </tiered>
<!-- </storage_configuration> --> </policies>
</storage_configuration> -->
<!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 --> <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->

16
deploy/docker/clickhouse-setup/docker-compose.arm.yaml
View File

@ -3,10 +3,17 @@ version: "2.4"
services: services:
clickhouse: clickhouse:
image: altinity/clickhouse-server:21.12.3.32.altinitydev.arm image: altinity/clickhouse-server:21.12.3.32.altinitydev.arm
# ports:
# - "9000:9000"
# - "8123:8123"
volumes: volumes:
- ./clickhouse-config.xml:/etc/clickhouse-server/config.xml - ./clickhouse-config.xml:/etc/clickhouse-server/config.xml
- ./data/clickhouse/:/var/lib/clickhouse/ - ./data/clickhouse/:/var/lib/clickhouse/
restart: on-failure restart: on-failure
logging:
options:
max-size: 50m
max-file: "3"
healthcheck: healthcheck:
# "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'" # "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'"
test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"] test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"]
@ -19,7 +26,9 @@ services:
volumes: volumes:
- ./data/alertmanager:/data - ./data/alertmanager:/data
depends_on: depends_on:
- query-service query-service:
condition: service_healthy
restart: on-failure
command: command:
- --queryService.url=http://query-service:8080 - --queryService.url=http://query-service:8080
- --storage.path=/data - --storage.path=/data
@ -40,6 +49,11 @@ services:
- DEPLOYMENT_TYPE=docker-standalone-arm - DEPLOYMENT_TYPE=docker-standalone-arm
restart: on-failure restart: on-failure
healthcheck:
test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"]
interval: 30s
timeout: 5s
retries: 3
depends_on: depends_on:
clickhouse: clickhouse:
condition: service_healthy condition: service_healthy

16
deploy/docker/clickhouse-setup/docker-compose.yaml
View File

@ -3,10 +3,17 @@ version: "2.4"
services: services:
clickhouse: clickhouse:
image: yandex/clickhouse-server:21.12.3.32 image: yandex/clickhouse-server:21.12.3.32
# ports:
# - "9000:9000"
# - "8123:8123"
volumes: volumes:
- ./clickhouse-config.xml:/etc/clickhouse-server/config.xml - ./clickhouse-config.xml:/etc/clickhouse-server/config.xml
- ./data/clickhouse/:/var/lib/clickhouse/ - ./data/clickhouse/:/var/lib/clickhouse/
restart: on-failure restart: on-failure
logging:
options:
max-size: 50m
max-file: "3"
healthcheck: healthcheck:
# "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'" # "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'"
test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"] test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"]
@ -19,7 +26,9 @@ services:
volumes: volumes:
- ./data/alertmanager:/data - ./data/alertmanager:/data
depends_on: depends_on:
- query-service query-service:
condition: service_healthy
restart: on-failure
command: command:
- --queryService.url=http://query-service:8080 - --queryService.url=http://query-service:8080
- --storage.path=/data - --storage.path=/data
@ -41,6 +50,11 @@ services:
- TELEMETRY_ENABLED=true - TELEMETRY_ENABLED=true
- DEPLOYMENT_TYPE=docker-standalone-amd - DEPLOYMENT_TYPE=docker-standalone-amd
restart: on-failure restart: on-failure
healthcheck:
test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"]
interval: 30s
timeout: 5s
retries: 3
depends_on: depends_on:
clickhouse: clickhouse:
condition: service_healthy condition: service_healthy

7
pkg/query-service/tests/test-deploy/clickhouse-config.xml
View File

@ -1,11 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<yandex> <yandex>
<logger> <logger>
<level>trace</level> <level>information</level>
<log>/var/log/clickhouse-server/clickhouse-server.log</log> <console>1</console>
<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
<size>1000M</size>
<count>10</count>
</logger> </logger>
<http_port>8123</http_port> <http_port>8123</http_port>

11
pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
View File

@ -5,6 +5,11 @@ services:
image: altinity/clickhouse-server:21.12.3.32.altinitydev.arm image: altinity/clickhouse-server:21.12.3.32.altinitydev.arm
volumes: volumes:
- ./clickhouse-config.xml:/etc/clickhouse-server/config.xml - ./clickhouse-config.xml:/etc/clickhouse-server/config.xml
restart: on-failure
logging:
options:
max-size: 50m
max-file: "3"
healthcheck: healthcheck:
# "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'" # "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'"
test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"] test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"]
@ -16,6 +21,7 @@ services:
image: signoz/alertmanager:0.6.0 image: signoz/alertmanager:0.6.0
depends_on: depends_on:
- query-service - query-service
restart: on-failure
command: command:
- --queryService.url=http://query-service:8080 - --queryService.url=http://query-service:8080
- --storage.path=/data - --storage.path=/data
@ -35,6 +41,11 @@ services:
- STORAGE=clickhouse - STORAGE=clickhouse
- GODEBUG=netdns=go - GODEBUG=netdns=go
- TELEMETRY_ENABLED=true - TELEMETRY_ENABLED=true
healthcheck:
test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"]
interval: 30s
timeout: 5s
retries: 3
depends_on: depends_on:
clickhouse: clickhouse:
condition: service_healthy condition: service_healthy

11
pkg/query-service/tests/test-deploy/docker-compose.yaml
View File

@ -5,6 +5,11 @@ services:
image: yandex/clickhouse-server:21.12.3.32 image: yandex/clickhouse-server:21.12.3.32
volumes: volumes:
- ./clickhouse-config.xml:/etc/clickhouse-server/config.xml - ./clickhouse-config.xml:/etc/clickhouse-server/config.xml
restart: on-failure
logging:
options:
max-size: 50m
max-file: "3"
healthcheck: healthcheck:
# "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'" # "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'"
test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"] test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"]
@ -16,6 +21,7 @@ services:
image: signoz/alertmanager:0.6.0 image: signoz/alertmanager:0.6.0
depends_on: depends_on:
- query-service - query-service
restart: on-failure
command: command:
- --queryService.url=http://query-service:8080 - --queryService.url=http://query-service:8080
- --storage.path=/data - --storage.path=/data
@ -37,6 +43,11 @@ services:
- STORAGE=clickhouse - STORAGE=clickhouse
- GODEBUG=netdns=go - GODEBUG=netdns=go
- TELEMETRY_ENABLED=true - TELEMETRY_ENABLED=true
healthcheck:
test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"]
interval: 30s
timeout: 5s
retries: 3
depends_on: depends_on:
clickhouse: clickhouse:
condition: service_healthy condition: service_healthy