Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
SigNoz
Commits
469254e9
Unverified
Commit
469254e9
authored
3 years ago
by
Ankit Nayan
Committed by
GitHub
3 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1266 from SigNoz/release/v0.8.2
Release/v0.8.2
parents
7b315c67
1f2ec0d7
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
+4
-4
deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
deploy/docker/clickhouse-setup/docker-compose.arm.yaml
+4
-4
deploy/docker/clickhouse-setup/docker-compose.arm.yaml
deploy/docker/clickhouse-setup/docker-compose.yaml
+4
-4
deploy/docker/clickhouse-setup/docker-compose.yaml
pkg/query-service/app/clickhouseReader/reader.go
+1
-1
pkg/query-service/app/clickhouseReader/reader.go
pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
+2
-2
pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
pkg/query-service/tests/test-deploy/docker-compose.yaml
+2
-2
pkg/query-service/tests/test-deploy/docker-compose.yaml
with
17 additions
and
17 deletions
+17
-17
deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
+
4
-
4
View file @
469254e9
...
...
@@ -37,7 +37,7 @@ services:
condition
:
on-failure
query-service
:
image
:
signoz/query-service:0.8.
1
image
:
signoz/query-service:0.8.
2
command
:
[
"
-config=/root/config/prometheus.yml"
]
# ports:
# - "6060:6060" # pprof port
...
...
@@ -65,7 +65,7 @@ services:
-
clickhouse
frontend
:
image
:
signoz/frontend:0.8.
1
image
:
signoz/frontend:0.8.
2
deploy
:
restart_policy
:
condition
:
on-failure
...
...
@@ -78,7 +78,7 @@ services:
-
../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector
:
image
:
signoz/otelcontribcol:0.45.1-0.
2
image
:
signoz/otelcontribcol:0.45.1-0.
3
command
:
[
"
--config=/etc/otel-collector-config.yaml"
]
volumes
:
-
./otel-collector-config.yaml:/etc/otel-collector-config.yaml
...
...
@@ -104,7 +104,7 @@ services:
-
clickhouse
otel-collector-metrics
:
image
:
signoz/otelcontribcol:0.45.1-0.
2
image
:
signoz/otelcontribcol:0.45.1-0.
3
command
:
[
"
--config=/etc/otel-collector-metrics-config.yaml"
]
volumes
:
-
./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml
...
...
This diff is collapsed.
Click to expand it.
deploy/docker/clickhouse-setup/docker-compose.arm.yaml
+
4
-
4
View file @
469254e9
...
...
@@ -37,7 +37,7 @@ services:
query-service
:
image
:
signoz/query-service:0.8.
1
image
:
signoz/query-service:0.8.
2
container_name
:
query-service
command
:
[
"
-config=/root/config/prometheus.yml"
]
# ports:
...
...
@@ -64,7 +64,7 @@ services:
condition
:
service_healthy
frontend
:
image
:
signoz/frontend:0.8.
1
image
:
signoz/frontend:0.8.
2
container_name
:
frontend
restart
:
on-failure
depends_on
:
...
...
@@ -76,7 +76,7 @@ services:
-
../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector
:
image
:
signoz/otelcontribcol:0.45.1-0.
2
image
:
signoz/otelcontribcol:0.45.1-0.
3
command
:
[
"
--config=/etc/otel-collector-config.yaml"
]
volumes
:
-
./otel-collector-config.yaml:/etc/otel-collector-config.yaml
...
...
@@ -97,7 +97,7 @@ services:
condition
:
service_healthy
otel-collector-metrics
:
image
:
signoz/otelcontribcol:0.45.1-0.
2
image
:
signoz/otelcontribcol:0.45.1-0.
3
command
:
[
"
--config=/etc/otel-collector-metrics-config.yaml"
]
volumes
:
-
./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml
...
...
This diff is collapsed.
Click to expand it.
deploy/docker/clickhouse-setup/docker-compose.yaml
+
4
-
4
View file @
469254e9
...
...
@@ -36,7 +36,7 @@ services:
# Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
query-service
:
image
:
signoz/query-service:0.8.
1
image
:
signoz/query-service:0.8.
2
container_name
:
query-service
command
:
[
"
-config=/root/config/prometheus.yml"
]
# ports:
...
...
@@ -63,7 +63,7 @@ services:
condition
:
service_healthy
frontend
:
image
:
signoz/frontend:0.8.
1
image
:
signoz/frontend:0.8.
2
container_name
:
frontend
restart
:
on-failure
depends_on
:
...
...
@@ -75,7 +75,7 @@ services:
-
../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector
:
image
:
signoz/otelcontribcol:0.45.1-0.
2
image
:
signoz/otelcontribcol:0.45.1-0.
3
command
:
[
"
--config=/etc/otel-collector-config.yaml"
]
volumes
:
-
./otel-collector-config.yaml:/etc/otel-collector-config.yaml
...
...
@@ -96,7 +96,7 @@ services:
condition
:
service_healthy
otel-collector-metrics
:
image
:
signoz/otelcontribcol:0.45.1-0.
2
image
:
signoz/otelcontribcol:0.45.1-0.
3
command
:
[
"
--config=/etc/otel-collector-metrics-config.yaml"
]
volumes
:
-
./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml
...
...
This diff is collapsed.
Click to expand it.
pkg/query-service/app/clickhouseReader/reader.go
+
1
-
1
View file @
469254e9
...
...
@@ -1188,7 +1188,7 @@ func (r *ClickHouseReader) GetServices(ctx context.Context, queryParams *model.G
m4xx
:=
make
(
map
[
string
]
uint64
)
for
j
:=
range
service4xxItems
{
m
5
xx
[
service4xxItems
[
j
]
.
ServiceName
]
=
service4xxItems
[
j
]
.
Num4XX
m
4
xx
[
service4xxItems
[
j
]
.
ServiceName
]
=
service4xxItems
[
j
]
.
Num4XX
}
for
i
:=
range
serviceItems
{
...
...
This diff is collapsed.
Click to expand it.
pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
+
2
-
2
View file @
469254e9
...
...
@@ -51,7 +51,7 @@ services:
condition
:
service_healthy
otel-collector
:
image
:
signoz/otelcontribcol:0.45.1-0.
2
image
:
signoz/otelcontribcol:0.45.1-0.
3
command
:
[
"
--config=/etc/otel-collector-config.yaml"
]
volumes
:
-
./otel-collector-config.yaml:/etc/otel-collector-config.yaml
...
...
@@ -64,7 +64,7 @@ services:
condition
:
service_healthy
otel-collector-metrics
:
image
:
signoz/otelcontribcol:0.45.1-0.
2
image
:
signoz/otelcontribcol:0.45.1-0.
3
command
:
[
"
--config=/etc/otel-collector-metrics-config.yaml"
]
volumes
:
-
./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml
...
...
This diff is collapsed.
Click to expand it.
pkg/query-service/tests/test-deploy/docker-compose.yaml
+
2
-
2
View file @
469254e9
...
...
@@ -56,7 +56,7 @@ services:
condition
:
service_healthy
otel-collector
:
image
:
signoz/otelcontribcol:0.45.1-0.
2
image
:
signoz/otelcontribcol:0.45.1-0.
3
command
:
[
"
--config=/etc/otel-collector-config.yaml"
]
volumes
:
-
./otel-collector-config.yaml:/etc/otel-collector-config.yaml
...
...
@@ -69,7 +69,7 @@ services:
condition
:
service_healthy
otel-collector-metrics
:
image
:
signoz/otelcontribcol:0.45.1-0.
2
image
:
signoz/otelcontribcol:0.45.1-0.
3
command
:
[
"
--config=/etc/otel-collector-metrics-config.yaml"
]
volumes
:
-
./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment