Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
SigNoz
Commits
9e65350c
Unverified
Commit
9e65350c
authored
2 years ago
by
Srikanth Chekuri
Committed by
GitHub
2 years ago
Browse files
Options
Download
Plain Diff
Merge branch 'develop' into issue-1583
parents
b5e5c4b5
6b6f4945
issue-1583
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
README.md
+1
-1
README.md
deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
+2
-2
deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
deploy/docker-swarm/common/nginx-config.conf
+1
-1
deploy/docker-swarm/common/nginx-config.conf
deploy/docker/common/nginx-config.conf
+1
-1
deploy/docker/common/nginx-config.conf
frontend/conf/default.conf
+1
-1
frontend/conf/default.conf
pkg/query-service/tests/test-deploy/docker-compose.yaml
+2
-2
pkg/query-service/tests/test-deploy/docker-compose.yaml
with
8 additions
and
8 deletions
+8
-8
README.md
+
1
-
1
View file @
9e65350c
...
...
@@ -116,7 +116,7 @@ Our goal is to provide an integrated UI between metrics & traces - similar to wh
### SigNoz vs Jaeger
Jaeger only does distributed tracing. SigNoz
does both
metrics
and
traces
,
and
we also have log management in our roadmap
.
Jaeger only does distributed tracing. SigNoz
supports
metrics
,
traces and
logs - all the 3 pillars of observability
.
Moreover, SigNoz has few more advanced features wrt Jaeger:
...
...
This diff is collapsed.
Click to expand it.
deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
+
2
-
2
View file @
9e65350c
...
...
@@ -83,7 +83,7 @@ services:
-
../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector
:
image
:
signoz-otel-collector:0.55.1
image
:
signoz/
signoz-otel-collector:0.55.1
command
:
[
"
--config=/etc/otel-collector-config.yaml"
]
user
:
root
# required for reading docker container logs
volumes
:
...
...
@@ -111,7 +111,7 @@ services:
-
clickhouse
otel-collector-metrics
:
image
:
signoz-otel-collector:0.55.1
image
:
signoz/
signoz-otel-collector:0.55.1
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-swarm/common/nginx-config.conf
+
1
-
1
View file @
9e65350c
...
...
@@ -13,7 +13,7 @@ server {
# to handle uri issue 414 from nginx
client_max_body_size
24
M
;
large_client_header_buffers
8
1
6
k
;
large_client_header_buffers
8
1
28
k
;
location
/ {
if
( $
uri
=
'/index.html'
) {
...
...
This diff is collapsed.
Click to expand it.
deploy/docker/common/nginx-config.conf
+
1
-
1
View file @
9e65350c
...
...
@@ -13,7 +13,7 @@ server {
# to handle uri issue 414 from nginx
client_max_body_size
24
M
;
large_client_header_buffers
8
1
6
k
;
large_client_header_buffers
8
1
28
k
;
location
/ {
if
( $
uri
=
'/index.html'
) {
...
...
This diff is collapsed.
Click to expand it.
frontend/conf/default.conf
+
1
-
1
View file @
9e65350c
...
...
@@ -13,7 +13,7 @@ server {
# to handle uri issue 414 from nginx
client_max_body_size
24
M
;
large_client_header_buffers
8
1
6
k
;
large_client_header_buffers
8
1
28
k
;
location
/ {
root
/
usr
/
share
/
nginx
/
html
;
...
...
This diff is collapsed.
Click to expand it.
pkg/query-service/tests/test-deploy/docker-compose.yaml
+
2
-
2
View file @
9e65350c
...
...
@@ -61,7 +61,7 @@ services:
condition
:
service_healthy
otel-collector
:
image
:
signoz-otel-collector:0.55.1
image
:
signoz/
signoz-otel-collector:0.55.1
command
:
[
"
--config=/etc/otel-collector-config.yaml"
]
user
:
root
# required for reading docker container logs
volumes
:
...
...
@@ -77,7 +77,7 @@ services:
condition
:
service_healthy
otel-collector-metrics
:
image
:
signoz-otel-collector:0.55.1
image
:
signoz/
signoz-otel-collector:0.55.1
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
Menu
Projects
Groups
Snippets
Help