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

Merge branch 'develop' into pranshuchittora/fix/custom-legend-for-empty-metrics

Browse Source
This commit is contained in:
Palash 2022-06-30 00:38:08 +05:30 committed by GitHub
commit 276b26b170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ services:
condition: on-failure condition: on-failure
query-service: query-service:
image: signoz/query-service:0.8.2 image: signoz/query-service:0.9.0
command: ["-config=/root/config/prometheus.yml"] command: ["-config=/root/config/prometheus.yml"]
# ports: # ports:
# - "6060:6060" # pprof port # - "6060:6060" # pprof port
@ -67,7 +67,7 @@ services:
- clickhouse - clickhouse
frontend: frontend:
image: signoz/frontend:0.8.2 image: signoz/frontend:0.9.0
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@ -80,7 +80,7 @@ services:
- ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector: otel-collector:
image: signoz/otelcontribcol:0.45.1-0.3 image: signoz/otelcontribcol:0.45.1-1.0
command: ["--config=/etc/otel-collector-config.yaml"] command: ["--config=/etc/otel-collector-config.yaml"]
volumes: volumes:
- ./otel-collector-config.yaml:/etc/otel-collector-config.yaml - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
@ -106,7 +106,7 @@ services:
- clickhouse - clickhouse
otel-collector-metrics: otel-collector-metrics:
image: signoz/otelcontribcol:0.45.1-0.3 image: signoz/otelcontribcol:0.45.1-1.0
command: ["--config=/etc/otel-collector-metrics-config.yaml"] command: ["--config=/etc/otel-collector-metrics-config.yaml"]
volumes: volumes:
- ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml

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

@ -38,7 +38,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` # 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: query-service:
image: signoz/query-service:0.8.2 image: signoz/query-service:0.9.0
container_name: query-service container_name: query-service
command: ["-config=/root/config/prometheus.yml"] command: ["-config=/root/config/prometheus.yml"]
# ports: # ports:
@ -65,7 +65,7 @@ services:
condition: service_healthy condition: service_healthy
frontend: frontend:
image: signoz/frontend:0.8.2 image: signoz/frontend:0.9.0
container_name: frontend container_name: frontend
restart: on-failure restart: on-failure
depends_on: depends_on:
@ -77,7 +77,7 @@ services:
- ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector: otel-collector:
image: signoz/otelcontribcol:0.45.1-0.3 image: signoz/otelcontribcol:0.45.1-1.0
command: ["--config=/etc/otel-collector-config.yaml"] command: ["--config=/etc/otel-collector-config.yaml"]
volumes: volumes:
- ./otel-collector-config.yaml:/etc/otel-collector-config.yaml - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
@ -98,7 +98,7 @@ services:
condition: service_healthy condition: service_healthy
otel-collector-metrics: otel-collector-metrics:
image: signoz/otelcontribcol:0.45.1-0.3 image: signoz/otelcontribcol:0.45.1-1.0
command: ["--config=/etc/otel-collector-metrics-config.yaml"] command: ["--config=/etc/otel-collector-metrics-config.yaml"]
volumes: volumes:
- ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml

3
frontend/src/container/SideNav/index.tsx
View File

@ -15,7 +15,6 @@ import AppReducer from 'types/reducer/app';
import menus from './menuItems'; import menus from './menuItems';
import Slack from './Slack'; import Slack from './Slack';
import { import {
Name,
RedDot, RedDot,
Sider, Sider,
SlackButton, SlackButton,
@ -105,7 +104,7 @@ function SideNav(): JSX.Element {
onClick={(): void => onClickHandler(to)} onClick={(): void => onClickHandler(to)}
> >
<Space> <Space>
<Name ellipsis>{name}</Name> <div>{name}</div>
{tags && {tags &&
tags.map((e) => ( tags.map((e) => (
<Tags style={{ lineHeight: '1rem' }} color="#177DDC" key={e}> <Tags style={{ lineHeight: '1rem' }} color="#177DDC" key={e}>

6
frontend/src/container/SideNav/styles.ts
View File

@ -83,9 +83,3 @@ export const Tags = styled(Tag)`
border-radius: 0.5rem; border-radius: 0.5rem;
} }
`; `;
export const Name = styled(Typography.Paragraph)`
&&& {
margin: 0;
}
`;

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

@ -58,7 +58,7 @@ services:
condition: service_healthy condition: service_healthy
otel-collector: otel-collector:
image: signoz/otelcontribcol:0.45.1-0.3 image: signoz/otelcontribcol:0.45.1-1.0
command: ["--config=/etc/otel-collector-config.yaml"] command: ["--config=/etc/otel-collector-config.yaml"]
volumes: volumes:
- ./otel-collector-config.yaml:/etc/otel-collector-config.yaml - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
@ -71,7 +71,7 @@ services:
condition: service_healthy condition: service_healthy
otel-collector-metrics: otel-collector-metrics:
image: signoz/otelcontribcol:0.45.1-0.3 image: signoz/otelcontribcol:0.45.1-1.0
command: ["--config=/etc/otel-collector-metrics-config.yaml"] command: ["--config=/etc/otel-collector-metrics-config.yaml"]
volumes: volumes:
- ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml