From c7ffac46f527fc3e60111aedf4f6c8e256869453 Mon Sep 17 00:00:00 2001 From: Pranay Prateek Date: Sun, 30 Jan 2022 22:46:01 +0530 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f3f9a11c2..9cbbfd4431 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ SigNoz helps developers monitor applications and troubleshoot problems in their ## Join our Slack community -Come say Hi to us on [Slack](https://join.slack.com/t/signoz-community/shared_invite/zt-lrjknbbp-J_mI13rlw8pGF4EWBnorJA) 👋 +Come say Hi to us on [Slack](https://signoz.io/slack) 👋

From e3c4bfce528eec2e5a6441608165baf9e1b46388 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Mon, 31 Jan 2022 19:07:45 +0530 Subject: [PATCH 2/4] =?UTF-8?q?ci(k3s):=20=F0=9F=92=9A=20fix=20correct=20r?= =?UTF-8?q?aw=20github=20URL=20for=20hotrod=20(#661)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi (cherry picked from commit d92a3e64f58477af46fc56781489a4be05ec42f0) --- .github/workflows/e2e-k3s.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-k3s.yaml b/.github/workflows/e2e-k3s.yaml index 41bea93c8e..8bc96056e1 100644 --- a/.github/workflows/e2e-k3s.yaml +++ b/.github/workflows/e2e-k3s.yaml @@ -58,7 +58,7 @@ jobs: kubectl create ns sample-application # apply hotrod k8s manifest file - kubectl -n sample-application apply -f https://github.com/SigNoz/signoz/blob/main/sample-apps/hotrod/hotrod.yaml + kubectl -n sample-application apply -f https://raw.githubusercontent.com/SigNoz/signoz/main/sample-apps/hotrod/hotrod.yaml # wait for all deployments in sample-application namespace to be READY kubectl -n sample-application get deploy --output name | xargs -r -n1 -t kubectl -n sample-application rollout status --timeout=300s From 57992134bc6cd90ebb4a6e04c9c4cec1d6672403 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Mon, 7 Feb 2022 12:52:10 +0530 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=F0=9F=9A=9A=20rename=20config=20.?= =?UTF-8?q?yaml=20to=20yml=20for=20behaviorbot=20(#673)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi (cherry picked from commit cd04a39d3dcc1579dc5807ad9cece4eed4437f0d) --- .github/{config.yaml => config.yml} | 2 ++ 1 file changed, 2 insertions(+) rename .github/{config.yaml => config.yml} (96%) diff --git a/.github/config.yaml b/.github/config.yml similarity index 96% rename from .github/config.yaml rename to .github/config.yml index 9105934e67..d31bb878b4 100644 --- a/.github/config.yaml +++ b/.github/config.yml @@ -27,3 +27,5 @@ firstPRMergeComment: > # Comment to be posted in issues or pull requests, when no description is provided. requestInfoReplyComment: > We would appreciate it if you could provide us with more info about this issue/pr! + +requestInfoLabelToAdd: request-more-info From 07183d518923016473f956d3ecc8c7b3ee462ad8 Mon Sep 17 00:00:00 2001 From: Siddhant Khare Date: Tue, 8 Feb 2022 10:27:52 +0530 Subject: [PATCH 4/4] Gitpodify the Signoz (#634) * chore(docs): updated lines of frontend & query sec * fix: update baseURL for local & gitpod * chore: allow all for dev to run on https * chore(docs): add maintainer note at docker-compose * chore: update gitignore to ignore .db & logs * chore: upd lines of fe & query-service & notes * feat: gitpodify the signoz with all envs. & ports * fix: relative path of .scripts dir * chore(ci): distribute tasks in gitpod.yml * fix: run docker image while init * fix: add empty url option for `baseURL` --- .gitpod.yml | 36 +++++++++++++++++++ .scripts/commentLinesForSetup.sh | 7 ++++ CONTRIBUTING.md | 20 +++++++++-- .../clickhouse-setup/docker-compose.yaml | 3 ++ frontend/src/constants/env.ts | 2 +- frontend/webpack.config.js | 1 + 6 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 .gitpod.yml create mode 100644 .scripts/commentLinesForSetup.sh diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000000..db4801ba35 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,36 @@ +# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file) +# and commit this file to your remote git repository to share the goodness with others. + + +tasks: + - name: Run Script to Comment ut required lines + init: | + cd ./.scripts + sh commentLinesForSetup.sh + + - name: Run Docker Images + init: | + cd ./deploy + sudo docker-compose --env-file ./docker/clickhouse-setup/env/x86_64.env -f docker/clickhouse-setup/docker-compose.yaml up -d + # command: + + - name: Run Frontend + init: | + cd ./frontend + yarn install + command: + yarn dev + +ports: + - port: 3000 + onOpen: open-browser + - port: 8080 + onOpen: ignore + - port: 9000 + onOpen: ignore + - port: 8123 + onOpen: ignore + - port: 8089 + onOpen: ignore + - port: 9093 + onOpen: ignore diff --git a/.scripts/commentLinesForSetup.sh b/.scripts/commentLinesForSetup.sh new file mode 100644 index 0000000000..7ea6b468ad --- /dev/null +++ b/.scripts/commentLinesForSetup.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# It Comments out the Line Query-Service & Frontend Section of deploy/docker/clickhouse-setup/docker-compose.yaml +# Update the Line Numbers when deploy/docker/clickhouse-setup/docker-compose.yaml chnages. +# Docs Ref.: https://github.com/SigNoz/signoz/blob/main/CONTRIBUTING.md#contribute-to-frontend-with-docker-installation-of-signoz + +sed -i 38,70's/.*/# &/' .././deploy/docker/clickhouse-setup/docker-compose.yaml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 99764e34fd..aa6f728b2f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,7 +18,7 @@ Need to update [https://github.com/SigNoz/signoz/tree/main/frontend](https://git ### Contribute to Frontend with Docker installation of SigNoz - `git clone https://github.com/SigNoz/signoz.git && cd signoz` -- comment out frontend service section at `deploy/docker/clickhouse-setup/docker-compose.yaml#L38` +- 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 - If you are using x86_64 processors (All Intel/AMD processors) run `sudo docker-compose --env-file ./docker/clickhouse-setup/env/x86_64.env -f docker/clickhouse-setup/docker-compose.yaml up -d` @@ -27,6 +27,8 @@ Need to update [https://github.com/SigNoz/signoz/tree/main/frontend](https://git - `yarn install` - `yarn dev` +> Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` + ### Contribute to Frontend without installing SigNoz backend If you don't want to install SigNoz backend just for doing frontend development, we can provide you with test environments which you can use as the backend. Please ping us in #contributing channel in our [slack community](https://join.slack.com/t/signoz-community/shared_invite/zt-lrjknbbp-J_mI13rlw8pGF4EWBnorJA) and we will DM you with `` @@ -46,16 +48,28 @@ Need to update [https://github.com/SigNoz/signoz/tree/main/pkg/query-service](ht - git clone https://github.com/SigNoz/signoz.git - run `sudo make dev-setup` to configure local setup to run query-service -- comment out frontend service section at `deploy/docker/clickhouse-setup/docker-compose.yaml#L38` -- comment out query-service section at `deploy/docker/clickhouse-setup/docker-compose.yaml#L22` +- comment out frontend service section at `docker/clickhouse-setup/docker-compose.yaml#L59` +- comment out query-service section at `docker/clickhouse-setup/docker-compose.yaml#L38` - 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` +> 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`_** > 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. + +Click the button below. A workspace with all required environments will be created. + +[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/SigNoz/signoz) + +> To use it on your forked repo, edit the 'Open in Gitpod' button url to `https://gitpod.io/#https://github.com//signoz` + +--- ## General Instructions diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 2a9d3db67a..8defcf6956 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -32,6 +32,9 @@ services: ports: - 9093:9093 +# 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.5.4 container_name: query-service diff --git a/frontend/src/constants/env.ts b/frontend/src/constants/env.ts index 9ec41e25c2..6e12260df1 100644 --- a/frontend/src/constants/env.ts +++ b/frontend/src/constants/env.ts @@ -1,3 +1,3 @@ export const ENVIRONMENT = { - baseURL: process?.env?.FRONTEND_API_ENDPOINT || '', + baseURL: process?.env?.FRONTEND_API_ENDPOINT || process.env.GITPOD_WORKSPACE_URL.replace('://','://8080-') ||'http://localhost:8080'|| '', }; diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js index 4e27524146..824b3e75b8 100644 --- a/frontend/webpack.config.js +++ b/frontend/webpack.config.js @@ -41,6 +41,7 @@ const config = { publicPath: '/', watch: true, }, + allowedHosts: 'all', }, target: 'web', output: {