From b8a6a27fad91bbd8dede88404c4c965da934261b Mon Sep 17 00:00:00 2001 From: Ankit Nayan Date: Fri, 4 Mar 2022 13:23:30 +0530 Subject: [PATCH 01/11] release: v0.7.1 --- deploy/docker/clickhouse-setup/docker-compose.arm.yaml | 4 ++-- deploy/docker/clickhouse-setup/docker-compose.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml index 66dbcec949..defed773e8 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml @@ -23,7 +23,7 @@ services: - '--storage.path=/data' query-service: - image: signoz/query-service:0.7.0 + image: signoz/query-service:0.7.1 container_name: query-service command: ["-config=/root/config/prometheus.yml"] volumes: @@ -40,7 +40,7 @@ services: condition: service_healthy frontend: - image: signoz/frontend:0.7.0 + image: signoz/frontend:0.7.1 container_name: frontend depends_on: - query-service diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 96b27e6ca8..fff3535dd7 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -26,7 +26,7 @@ services: query-service: - image: signoz/query-service:0.7.0 + image: signoz/query-service:0.7.1 container_name: query-service command: ["-config=/root/config/prometheus.yml"] volumes: @@ -43,7 +43,7 @@ services: condition: service_healthy frontend: - image: signoz/frontend:0.7.0 + image: signoz/frontend:0.7.1 container_name: frontend depends_on: - query-service From 3fe3bde0c72a320fb7aa8bcd41f21c63b6c5605a Mon Sep 17 00:00:00 2001 From: Axay sagathiya <40173579+axaysagathiya@users.noreply.github.com> Date: Sat, 5 Mar 2022 23:51:48 +0530 Subject: [PATCH 02/11] Fix: Update Documentation to configure front-end and run back-end. (#815) * fix: add all the steps to run query-service * fix: add step to add configuration to run frontend --- CONTRIBUTING.md | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7b63015435..9b921b084d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,6 +21,12 @@ Need to update [https://github.com/SigNoz/signoz/tree/main/frontend](https://git - comment out frontend service section at `deploy/docker/clickhouse-setup/docker-compose.yaml#L59` - run `cd deploy` to move to deploy directory - Install signoz locally without the frontend + - Add below configuration to query-service section at `docker/clickhouse-setup/docker-compose.yaml#L36` + + ```docker + ports: + - "8080:8080" + ``` - If you are using x86_64 processors (All Intel/AMD processors) run `sudo docker-compose -f docker/clickhouse-setup/docker-compose.yaml up -d` - If you are on arm64 processors (Apple M1 Macbooks) run `sudo docker-compose -f docker/clickhouse-setup/docker-compose.arm.yaml up -d` - `cd ../frontend` and change baseURL to `http://localhost:8080` in file `src/constants/env.ts` @@ -47,20 +53,32 @@ Need to update [https://github.com/SigNoz/signoz/tree/main/pkg/query-service](ht ### To run ClickHouse setup (recommended for local development) - git clone https://github.com/SigNoz/signoz.git +- run `cd signoz` to move to signoz directory - run `sudo make dev-setup` to configure local setup to run query-service - comment out frontend service section at `docker/clickhouse-setup/docker-compose.yaml#L45` - comment out query-service section at `docker/clickhouse-setup/docker-compose.yaml#L28` -- add below configuration to clickhouse section at `docker/clickhouse-setup/docker-compose.yaml` -``` +- add below configuration to clickhouse section at `docker/clickhouse-setup/docker-compose.yaml#L6` +```docker expose: - 9000 ports: - 9001:9000 ``` + +- run `cd pkg/query-service/` to move to query-service directory +- Open ./constants/constants.go + - Replace ```const RELATIONAL_DATASOURCE_PATH = "/var/lib/signoz/signoz.db"``` \ + with ```const RELATIONAL_DATASOURCE_PATH = "./signoz.db".``` + - Install signoz locally without the frontend and query-service - If you are using x86_64 processors (All Intel/AMD processors) run `sudo make run-x86` - If you are on arm64 processors (Apple M1 Macbooks) run `sudo make run-arm` +#### Run locally +```console +ClickHouseUrl=tcp://localhost:9001 STORAGE=clickhouse go run main.go +``` + > Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` **_Query Service should now be available at `http://localhost:8080`_** From 8e4f987cf6d62fdd5753e943c9fd02cf829a2aae Mon Sep 17 00:00:00 2001 From: Palash gupta Date: Sun, 6 Mar 2022 12:02:21 +0530 Subject: [PATCH 03/11] bug: timeline interval is updated --- frontend/src/container/Timeline/index.tsx | 36 ++++++++++------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/frontend/src/container/Timeline/index.tsx b/frontend/src/container/Timeline/index.tsx index c729ac15f0..0c20e35a60 100644 --- a/frontend/src/container/Timeline/index.tsx +++ b/frontend/src/container/Timeline/index.tsx @@ -1,36 +1,25 @@ -import React, { useState, useMemo } from 'react'; -import { isEqual } from 'lodash-es'; +import React, { useState, useMemo, useEffect } from 'react'; import styles from './style.module.css'; import { useMeasure } from 'react-use'; -import { toFixed } from 'utils/toFixed'; -import { - INTERVAL_UNITS, - resolveTimeFromInterval, -} from 'container/TraceDetail/utils'; +import { INTERVAL_UNITS } from 'container/TraceDetail/utils'; import useThemeMode from 'hooks/useThemeMode'; import { Interval } from './types'; import { getIntervalSpread, getIntervals } from './utils'; -interface TimelineProps { - traceMetaData: object; - globalTraceMetadata: object; - intervalUnit: object; - setIntervalUnit: Function; -} + +const Timeline_Height = 22; +const Timeline_H_Spacing = 0; + const Timeline = ({ traceMetaData, globalTraceMetadata, - intervalUnit, setIntervalUnit, }: TimelineProps) => { const [ref, { width }] = useMeasure(); const { isDarkMode } = useThemeMode(); - const Timeline_Height = 22; - const Timeline_H_Spacing = 0; - const [intervals, setIntervals] = useState(null); - useMemo(() => { + useEffect(() => { const { baseInterval, baseSpread, @@ -44,7 +33,7 @@ const Timeline = ({ for (const idx in INTERVAL_UNITS) { const standard_interval = INTERVAL_UNITS[idx]; if (baseSpread * standard_interval.multiplier < 1) { - intervalUnit = INTERVAL_UNITS[idx - 1]; + intervalUnit = INTERVAL_UNITS[idx]; break; } } @@ -58,7 +47,7 @@ const Timeline = ({ intervalUnit, }), ); - }, [traceMetaData, globalTraceMetadata]); + }, []); return (
@@ -102,4 +91,11 @@ const Timeline = ({ ); }; +interface TimelineProps { + traceMetaData: object; + globalTraceMetadata: object; + intervalUnit: object; + setIntervalUnit: Function; +} + export default Timeline; From 79576b476f0e428b3929a07611349430b8e9d2ed Mon Sep 17 00:00:00 2001 From: Pranay Prateek Date: Sun, 6 Mar 2022 13:22:37 +0530 Subject: [PATCH 04/11] Create repo-stats.yml (#829) --- .github/workflows/repo-stats.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/repo-stats.yml diff --git a/.github/workflows/repo-stats.yml b/.github/workflows/repo-stats.yml new file mode 100644 index 0000000000..ae3d33c098 --- /dev/null +++ b/.github/workflows/repo-stats.yml @@ -0,0 +1,25 @@ +on: + schedule: + # Run this once per day, towards the end of the day for keeping the most + # recent data point most meaningful (hours are interpreted in UTC). + - cron: "0 23 * * *" + workflow_dispatch: # Allow for running this manually. + +jobs: + j1: + name: repostats + runs-on: ubuntu-latest + steps: + - name: run-ghrs + uses: jgehrcke/github-repo-stats@v1.1.0 + with: + # Define the stats repository (the repo to fetch + # stats for and to generate the report for). + # Remove the parameter when the stats repository + # and the data repository are the same. + repository: signoz/signoz + # Set a GitHub API token that can read the stats + # repository, and that can push to the data + # repository (which this workflow file lives in), + # to store data and the report files. + ghtoken: ${{ github.token }} From e070ba61cdafafe404d8fde2a12a5144ddc7e33d Mon Sep 17 00:00:00 2001 From: Pranay Prateek Date: Sun, 6 Mar 2022 13:23:49 +0530 Subject: [PATCH 05/11] Update repo-stats.yml --- .github/workflows/repo-stats.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/repo-stats.yml b/.github/workflows/repo-stats.yml index ae3d33c098..926bb2118d 100644 --- a/.github/workflows/repo-stats.yml +++ b/.github/workflows/repo-stats.yml @@ -2,7 +2,7 @@ on: schedule: # Run this once per day, towards the end of the day for keeping the most # recent data point most meaningful (hours are interpreted in UTC). - - cron: "0 23 * * *" + - cron: "0 8 * * *" workflow_dispatch: # Allow for running this manually. jobs: From 239cdad57b1d8513a995ce68455d451ba1c4a7cd Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Mon, 7 Mar 2022 16:07:38 +0530 Subject: [PATCH 06/11] =?UTF-8?q?ci:=20=F0=9F=92=9A=20fix=20e2e-k3s=20work?= =?UTF-8?q?flow=20with=20chart=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi --- .github/workflows/e2e-k3s.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/e2e-k3s.yaml b/.github/workflows/e2e-k3s.yaml index 16b02cc943..f25b8afdbe 100644 --- a/.github/workflows/e2e-k3s.yaml +++ b/.github/workflows/e2e-k3s.yaml @@ -52,14 +52,11 @@ jobs: helm install my-release signoz/signoz -n platform \ --wait \ --timeout 10m0s \ - --set cloud=null \ --set frontend.service.type=LoadBalancer \ - --set query-service.image.tag=$DOCKER_TAG \ + --set queryService.image.tag=$DOCKER_TAG \ --set frontend.image.tag=$DOCKER_TAG # get pods, services and the container images - kubectl describe deploy/my-release-frontend -n platform | grep Image - kubectl describe statefulset/my-release-query-service -n platform | grep Image kubectl get pods -n platform kubectl get svc -n platform From c04c0284dcb230a7b8793d4f5344b90c8c450715 Mon Sep 17 00:00:00 2001 From: Pranshu Chittora Date: Mon, 7 Mar 2022 16:08:37 +0530 Subject: [PATCH 07/11] fix: add if condition for timeline interval --- frontend/src/container/Timeline/index.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frontend/src/container/Timeline/index.tsx b/frontend/src/container/Timeline/index.tsx index 0c20e35a60..8f25f5c290 100644 --- a/frontend/src/container/Timeline/index.tsx +++ b/frontend/src/container/Timeline/index.tsx @@ -33,7 +33,7 @@ const Timeline = ({ for (const idx in INTERVAL_UNITS) { const standard_interval = INTERVAL_UNITS[idx]; if (baseSpread * standard_interval.multiplier < 1) { - intervalUnit = INTERVAL_UNITS[idx]; + if (idx > 1) intervalUnit = INTERVAL_UNITS[idx - 1]; break; } } @@ -68,10 +68,9 @@ const Timeline = ({ {intervals && intervals.map((interval, index) => ( From 1112ff7e7a305cf99598b5984785eeaf05428fc0 Mon Sep 17 00:00:00 2001 From: Vishal Sharma Date: Tue, 8 Mar 2022 19:55:19 +0530 Subject: [PATCH 08/11] Remove gitpod support temporarily (#834) Gitpod environment has issues which has to be resolved before adding to contributing docs. --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9b921b084d..d0e7a7169b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -86,13 +86,13 @@ ClickHouseUrl=tcp://localhost:9001 STORAGE=clickhouse go run main.go > If you want to see how, frontend plays with query service, you can run frontend also in you local env with the baseURL changed to `http://localhost:8080` in file `src/constants/env.ts` as the query-service is now running at port `8080` --- -Instead of configuring a local setup, you can also use [Gitpod](https://www.gitpod.io/), a VSCode-based Web IDE. + # Contribute to SigNoz Helm Chart From 12970d6975a51b1967678ee90563e611c17d1d5c Mon Sep 17 00:00:00 2001 From: Pranay Prateek Date: Tue, 8 Mar 2022 20:56:59 +0530 Subject: [PATCH 09/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6bc8fec353..edbbb81c44 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

License - Downloads + Downloads GitHub issues tweet From 24a4177a73947ce607ff60282a8c5f0c898ef996 Mon Sep 17 00:00:00 2001 From: Pranay Prateek Date: Fri, 11 Mar 2022 18:53:37 +0530 Subject: [PATCH 10/11] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index edbbb81c44..3d031f0ec6 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,12 @@ SigNoz helps developers monitor applications and troubleshoot problems in their ![screenzy-1644432902955](https://user-images.githubusercontent.com/504541/153270713-1b2156e6-ec03-42de-975b-3c02b8ec1836.png) - +
![screenzy-1644432986784](https://user-images.githubusercontent.com/504541/153270725-0efb73b3-06ed-4207-bf13-9b7e2e17c4b8.png) +
+ + +![trace-detail](https://user-images.githubusercontent.com/504541/157875257-b60a275f-8987-4aef-b694-c64f3d6c4473.png)

From 988ce36047ee24b3de2a4b88803eab74500fc353 Mon Sep 17 00:00:00 2001 From: Pranay Prateek Date: Fri, 11 Mar 2022 18:54:28 +0530 Subject: [PATCH 11/11] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 3d031f0ec6..f9c7d1e816 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,7 @@ SigNoz helps developers monitor applications and troubleshoot problems in their
![screenzy-1644432986784](https://user-images.githubusercontent.com/504541/153270725-0efb73b3-06ed-4207-bf13-9b7e2e17c4b8.png)
- - -![trace-detail](https://user-images.githubusercontent.com/504541/157875257-b60a275f-8987-4aef-b694-c64f3d6c4473.png) +![screenzy-1647005040573](https://user-images.githubusercontent.com/504541/157875938-a3d57904-ea6d-4278-b929-bd1408d7f94c.png)