fix: merge conflict removed

CONTRIBUTING.md

@@ -106,28 +106,39 @@ Need to update [https://github.com/SigNoz/charts](https://github.com/SigNoz/char
   - [k3d](https://k3d.io/#installation)
   - [minikube](https://minikube.sigs.k8s.io/docs/start/)
 - create a k8s cluster and make sure `kubectl` points to the locally created k8s cluster
-- run `helm install -n platform --create-namespace my-release charts/signoz` to install SigNoz chart
-- run `kubectl -n platform port-forward svc/my-release-frontend 3301:3301` to make SigNoz UI available at [localhost:3301](http://localhost:3301)
+- run `make dev-install` to install SigNoz chart with `my-release` release name in `platform` namespace.
+- run `kubectl -n platform port-forward svc/my-release-signoz-frontend 3301:3301` to make SigNoz UI available at [localhost:3301](http://localhost:3301)
 
-**To load data with HotROD sample app:**
+**To install HotROD sample app:**
 
-```sh
-kubectl create ns sample-application
+```bash
+curl -sL https://github.com/SigNoz/signoz/raw/main/sample-apps/hotrod/hotrod-install.sh \
+  | HELM_RELEASE=my-release SIGNOZ_NAMESPACE=platform bash
+```
 
-kubectl -n sample-application apply -f https://raw.githubusercontent.com/SigNoz/signoz/main/sample-apps/hotrod/hotrod.yaml
+**To load data with HotROD sample app:**
 
+```bash
 kubectl -n sample-application run strzal --image=djbingham/curl \
---restart='OnFailure' -i --tty --rm --command -- curl -X POST -F \
-'locust_count=6' -F 'hatch_rate=2' http://locust-master:8089/swarm
+  --restart='OnFailure' -i --tty --rm --command -- curl -X POST -F \
+  'locust_count=6' -F 'hatch_rate=2' http://locust-master:8089/swarm
 ```
 
 **To stop the load generation:**
 
-```sh
+```bash
 kubectl -n sample-application run strzal --image=djbingham/curl \
- --restart='OnFailure' -i --tty --rm --command -- curl \
- http://locust-master:8089/stop
+  --restart='OnFailure' -i --tty --rm --command -- curl \
+  http://locust-master:8089/stop
 ```
+
+**To delete HotROD sample app:**
+
+```bash
+curl -sL https://github.com/SigNoz/signoz/raw/main/sample-apps/hotrod/hotrod-delete.sh \
+  | HOTROD_NAMESPACE=sample-application bash
+```
+
 ---
 
 ## General Instructions

deploy/docker-swarm/clickhouse-setup/docker-compose.yaml

@@ -39,8 +39,9 @@ services:
   query-service:
     image: signoz/query-service:0.8.0
     command: ["-config=/root/config/prometheus.yml"]
-    ports:
-      - "8080:8080"
+    # ports:
+    #   - "6060:6060"     # pprof port
+    #   - "8080:8080"     # query-service port
     volumes:
       - ./prometheus.yml:/root/config/prometheus.yml
       - ../dashboards:/root/config/dashboards
@@ -85,7 +86,7 @@ services:
       - "4317:4317"     # OTLP gRPC receiver
       - "4318:4318"     # OTLP HTTP receiver
       # - "8889:8889"     # Prometheus metrics exposed by the agent
-      # - "13133"         # health_check
+      # - "13133:13133"   # health_check
       # - "14268:14268"   # Jaeger receiver
       # - "55678:55678"   # OpenCensus receiver
       # - "55679:55679"   # zpages extension

deploy/docker-swarm/common/nginx-config.conf

@@ -12,13 +12,18 @@ server {
     gzip_http_version 1.1; 
 
     location / {
-        add_header Cache-Control "no-store, no-cache, must-revalidate, max-age=0";
-        add_header Last-Modified $date_gmt;
+        if ( $uri = '/index.html' ) {
+            add_header Cache-Control no-store always;
+        }
         root   /usr/share/nginx/html;
         index  index.html index.htm;
         try_files $uri $uri/ /index.html;
     }
 
+    location /api/alertmanager {
+        proxy_pass http://alertmanager:9093/api/v2;
+    }
+
     location /api {
         proxy_pass http://query-service:8080/api;
     }

deploy/docker/clickhouse-setup/docker-compose.arm.yaml

@@ -40,6 +40,9 @@ services:
     image: signoz/query-service:0.8.0
     container_name: query-service
     command: ["-config=/root/config/prometheus.yml"]
+    # ports:
+    #   - "6060:6060"     # pprof port
+    #   - "8080:8080"     # query-service port
     volumes:
       - ./prometheus.yml:/root/config/prometheus.yml
       - ../dashboards:/root/config/dashboards
@@ -82,7 +85,7 @@ services:
       - "4317:4317"     # OTLP gRPC receiver
       - "4318:4318"     # OTLP HTTP receiver
       # - "8889:8889"     # Prometheus metrics exposed by the agent
-      # - "13133"         # health_check
+      # - "13133:13133"   # health_check
       # - "14268:14268"   # Jaeger receiver
       # - "55678:55678"   # OpenCensus receiver
       # - "55679:55679"   # zpages extension

deploy/docker/clickhouse-setup/docker-compose.yaml

@@ -39,6 +39,9 @@ services:
     image: signoz/query-service:0.8.0
     container_name: query-service
     command: ["-config=/root/config/prometheus.yml"]
+    # ports:
+    #   - "6060:6060"     # pprof port
+    #   - "8080:8080"     # query-service port
     volumes:
       - ./prometheus.yml:/root/config/prometheus.yml
       - ../dashboards:/root/config/dashboards
@@ -80,7 +83,7 @@ services:
       - "4317:4317"     # OTLP gRPC receiver
       - "4318:4318"     # OTLP HTTP receiver
       # - "8889:8889"     # Prometheus metrics exposed by the agent
-      # - "13133"         # health_check
+      # - "13133:13133"   # health_check
       # - "14268:14268"   # Jaeger receiver
       # - "55678:55678"   # OpenCensus receiver
       # - "55679:55679"   # zpages extension

deploy/docker/common/nginx-config.conf

@@ -12,14 +12,15 @@ server {
     gzip_http_version 1.1; 
 
     location / {
-        add_header Cache-Control "no-store, no-cache, must-revalidate, max-age=0";
-        add_header Last-Modified $date_gmt;
+        if ( $uri = '/index.html' ) {
+            add_header Cache-Control no-store always;
+        }
         root   /usr/share/nginx/html;
         index  index.html index.htm;
         try_files $uri $uri/ /index.html;
     }
 
-    location /api/alertmanager{
+    location /api/alertmanager {
         proxy_pass http://alertmanager:9093/api/v2;
     }
 

frontend/.husky/commit-msg

+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+cd frontend && npm run commitlint

frontend/Dockerfile

@@ -12,6 +12,9 @@ WORKDIR /frontend
 # copy the package.json to install dependencies
 COPY package.json ./
 
+# configure node_env as production
+ENV NODE_ENV=production
+
 # Install the dependencies and make the folder
 RUN yarn install 
 

frontend/commitlint.config.js

+module.exports = { extends: ['@commitlint/config-conventional'] };

frontend/cypress/CustomFunctions/checkRouteDefaultGlobalTimeOptions.ts

+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import {
 	getDefaultOption,
 	getOptions,
-} from 'container/Header/DateTimeSelection/config';
-// import { AppState } from 'store/reducers';
+} from 'container/TopNav/DateTimeSelection/config';
 
 const CheckRouteDefaultGlobalTimeOptions = ({
 	route,

frontend/cypress/integration/channels/index.spec.ts

+/* eslint-disable @typescript-eslint/no-unused-expressions */
 /// <reference types="cypress" />
 
 import ROUTES from 'constants/routes';

frontend/cypress/integration/globalTime/metricsApplication.spec.ts

@@ -26,7 +26,7 @@ describe('Global Time Metrics Application', () => {
 
 		cy.wait('@defaultApps');
 
-		//clicking on frontend
+		// clicking on frontend
 		cy.get('tr:nth-child(1) > td:first-child').click();
 
 		cy
@@ -64,7 +64,7 @@ describe('Global Time Metrics Application', () => {
 
 				cy.wait('@topEndPoints');
 				cy.wait('@serviceOverview');
-				//TODO add errorPercentage also
+				// TODO add errorPercentage also
 				// cy.wait('@errorPercentage');
 				cy.wait('@requestPerSecond');
 

frontend/cypress/integration/metrics/index.spec.ts

@@ -58,6 +58,7 @@ describe('Metrics', () => {
 						parseFloat(errorRate.toString()).toFixed(2),
 					);
 					expect(rpsName).to.be.equals(callRate.toString());
+					return null;
 				});
 			});
 		});

frontend/cypress/integration/rules/index.spec.ts

@@ -16,7 +16,7 @@ describe('Alerts', () => {
 			})
 			.as('defaultRules');
 
-		cy.visit(Cypress.env('baseUrl') + `${ROUTES.LIST_ALL_ALERT}`);
+		cy.visit(`${Cypress.env('baseUrl')}${ROUTES.LIST_ALL_ALERT}`);
 
 		cy.wait('@defaultRules');
 	});
@@ -97,7 +97,7 @@ describe('Alerts', () => {
 
 						const defaultLabels = defaultRules.data.rules[index].labels;
 
-						expect(label).to.be.equals(defaultLabels['severity']);
+						expect(label).to.be.equals(defaultLabels.severity);
 					});
 				});
 			});

frontend/cypress/integration/trace/index.spec.ts

+/* eslint-disable @typescript-eslint/no-unused-expressions */
 /* eslint-disable sonarjs/no-duplicate-string */
 import ROUTES from 'constants/routes';
 import { AppState } from 'store/reducers';
@@ -33,7 +34,7 @@ describe('Trace', () => {
 			})
 			.as('Filters');
 
-		cy.visit(Cypress.env('baseUrl') + `${ROUTES.TRACE}`);
+		cy.visit(`${Cypress.env('baseUrl')}${ROUTES.TRACE}`);
 	});
 
 	it('First Initial Load should go with 3 AJAX request', () => {

frontend/cypress/tsconfig.json

@@ -4,9 +4,6 @@
 	"lib": ["es5", "dom"],
 	"compilerOptions": {
 		"noEmit": true,
-		// be explicit about types included
-		// to avoid clashing with Jest types
-		"types": ["cypress", "@testing-library/cypress", "node"],
 		"isolatedModules": false
 	},
 	"include": ["../node_modules/cypress", "./**/*.ts"]

frontend/package.json

@@ -15,7 +15,8 @@
 		"jest:coverage": "jest --coverage",
 		"jest:watch": "jest --watch",
 		"postinstall": "yarn husky:configure",
-		"husky:configure": "cd .. && husky install frontend/.husky"
+		"husky:configure": "cd .. && husky install frontend/.husky && cd frontend && chmod ug+x .husky/*",
+		"commitlint": "commitlint --edit $1"
 	},
 	"engines": {
 		"node": ">=12.13.0"
@@ -109,6 +110,8 @@
 		"@babel/preset-env": "^7.12.17",
 		"@babel/preset-react": "^7.12.13",
 		"@babel/preset-typescript": "^7.12.17",
+		"@commitlint/cli": "^16.2.4",
+		"@commitlint/config-conventional": "^16.2.4",
 		"@jest/globals": "^27.5.1",
 		"@testing-library/cypress": "^8.0.0",
 		"@testing-library/react-hooks": "^7.0.2",

frontend/src/AppRoutes/Private.tsx

@@ -2,6 +2,7 @@
 import { notification } from 'antd';
 import getLocalStorageApi from 'api/browser/localstorage/get';
 import loginApi from 'api/user/login';
+import { Logout } from 'api/utils';
 import Spinner from 'components/Spinner';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import ROUTES from 'constants/routes';
@@ -103,7 +104,7 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 									history.push(ROUTES.UN_AUTHORIZED);
 								}
 							} else {
-								history.push(ROUTES.SOMETHING_WENT_WRONG);
+								Logout();
 
 								notification.error({
 									message: response.error || t('something_went_wrong'),

frontend/src/api/utils.ts

@@ -5,6 +5,7 @@ import history from 'lib/history';
 import store from 'store';
 import {
 	LOGGED_IN,
+	UPDATE_ORG,
 	UPDATE_USER,
 	UPDATE_USER_ACCESS_REFRESH_ACCESS_TOKEN,
 	UPDATE_USER_ORG_ROLE,
@@ -51,5 +52,12 @@ export const Logout = (): void => {
 		},
 	});
 
+	store.dispatch({
+		type: UPDATE_ORG,
+		payload: {
+			org: [],
+		},
+	});
+
 	history.push(ROUTES.LOGIN);
 };

frontend/src/constants/env.ts

@@ -3,4 +3,5 @@ export const ENVIRONMENT = {
 		process?.env?.FRONTEND_API_ENDPOINT ||
 		process?.env?.GITPOD_WORKSPACE_URL?.replace('://', '://8080-') ||
 		'',
+	NODE_ENV: process?.env?.NODE_ENV,
 };