GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-12 16:19:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

introduce env for dashboards path in query-service (#1593)

Browse Source 
* chore: 🔧 fetch dashboards path from DASHBOARDS_PATH env
* chore: 🚀 update docker files to include DASHBOARDS_PATH env
This commit is contained in:
Prashant Shahi 2022-10-03 05:48:54 +05:30 committed by GitHub
parent dcf2ac15b0
commit a94bd9b99b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,12 +52,12 @@ services:
environment: environment:
- ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces - ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces
- ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/ - ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/
- SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db
- DASHBOARDS_PATH=/root/config/dashboards
- STORAGE=clickhouse - STORAGE=clickhouse
- GODEBUG=netdns=go - GODEBUG=netdns=go
- TELEMETRY_ENABLED=true - TELEMETRY_ENABLED=true
- DEPLOYMENT_TYPE=docker-swarm - DEPLOYMENT_TYPE=docker-swarm
- SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db
healthcheck: healthcheck:
test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"] test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"]
interval: 30s interval: 30s

3
deploy/docker/clickhouse-setup/docker-compose-local.yaml
View File

@ -13,10 +13,11 @@ services:
environment: environment:
- ClickHouseUrl=tcp://clickhouse:9000 - ClickHouseUrl=tcp://clickhouse:9000
- ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/ - ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/
- SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db
- DASHBOARDS_PATH=/root/config/dashboards
- STORAGE=clickhouse - STORAGE=clickhouse
- GODEBUG=netdns=go - GODEBUG=netdns=go
- TELEMETRY_ENABLED=true - TELEMETRY_ENABLED=true
- SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db
volumes: volumes:
- ./prometheus.yml:/root/config/prometheus.yml - ./prometheus.yml:/root/config/prometheus.yml
- ../dashboards:/root/config/dashboards - ../dashboards:/root/config/dashboards

3
deploy/docker/clickhouse-setup/docker-compose-prod.yaml
View File

@ -15,11 +15,12 @@ services:
environment: environment:
- ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces - ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces
- ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/ - ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/
- SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db
- DASHBOARDS_PATH=/root/config/dashboards
- STORAGE=clickhouse - STORAGE=clickhouse
- GODEBUG=netdns=go - GODEBUG=netdns=go
- TELEMETRY_ENABLED=true - TELEMETRY_ENABLED=true
- DEPLOYMENT_TYPE=docker-standalone-amd - DEPLOYMENT_TYPE=docker-standalone-amd
- SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db
restart: on-failure restart: on-failure
healthcheck: healthcheck:
test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"] test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"]

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

@ -53,6 +53,7 @@ services:
- ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces - ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces
- ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/ - ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/
- SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db - SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db
- DASHBOARDS_PATH=/root/config/dashboards
- STORAGE=clickhouse - STORAGE=clickhouse
- GODEBUG=netdns=go - GODEBUG=netdns=go
- TELEMETRY_ENABLED=true - TELEMETRY_ENABLED=true

4
pkg/query-service/app/dashboards/provision.go
View File

@ -5,6 +5,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"go.signoz.io/query-service/constants"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -53,5 +54,6 @@ func readCurrentDir(dir string) error {
} }
func LoadDashboardFiles() error { func LoadDashboardFiles() error {
return readCurrentDir("./config/dashboards") dashboardsPath := constants.GetOrDefaultEnv("DASHBOARDS_PATH", "./config/dashboards")
return readCurrentDir(dashboardsPath)
} }

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

@ -47,10 +47,11 @@ services:
environment: environment:
- ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces - ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces
- ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/ - ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/
- SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db
- DASHBOARDS_PATH=/root/config/dashboards
- STORAGE=clickhouse - STORAGE=clickhouse
- GODEBUG=netdns=go - GODEBUG=netdns=go
- TELEMETRY_ENABLED=true - TELEMETRY_ENABLED=true
- SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db
healthcheck: healthcheck:
test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"] test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"]
interval: 30s interval: 30s