Merge branch 'main' into pranay

deploy/kubernetes/platform/Chart.lock

@@ -16,6 +16,6 @@ dependencies:
   version: 0.1.1
 - name: frontend
   repository: file://./signoz-charts/frontend
-  version: 0.1.4
-digest: sha256:f29f2d0a5e58617075b0e1fd513bf7699138e20dfb94f1cddcfc8ff6a9bcb371
-generated: "2021-01-02T01:14:15.321064+05:30"
+  version: 0.1.6
+digest: sha256:1acfbd4b86e7ca6b70101f7dc3b2ab26aa5e72df2f454800f6dda7e645580978
+generated: "2021-01-07T17:50:04.227534+05:30"

deploy/kubernetes/platform/Chart.yaml

@@ -40,4 +40,4 @@ dependencies:
     version: 0.1.1
   - name: frontend
     repository: "file://./signoz-charts/frontend"
-    version: 0.1.4
+    version: 0.1.6

deploy/kubernetes/platform/signoz-charts/frontend/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.4
+version: 0.1.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.1.4
+appVersion: 0.1.6

deploy/kubernetes/platform/signoz-charts/frontend/values.yaml

@@ -12,8 +12,7 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-configVars:
-  REACT_APP_QUERY_SERVICE_URL: http://localhost:3000/api/v1/
+configVars: {}
 
 config:
   name: signoz-nginx-config

deploy/kubernetes/platform/signoz-charts/query-service/Chart.yaml

@@ -18,4 +18,4 @@ version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.1.1
+appVersion: 0.1.2

deploy/kubernetes/platform/values.yaml

@@ -35,7 +35,3 @@ query-service:
     configVars:
         DruidClientUrl: http://signoz-druid-router:8888
         DruidDatasource: flattened_spans
-
-frontend:
-    configVars:
-        REACT_APP_QUERY_SERVICE_URL: http://localhost:3000/api/v1/

frontend/.dockerignore

@@ -0,0 +1,3 @@
+node_modules
+.vscode
+build

frontend/src/api/metricsAPI.js

@@ -1,9 +1,16 @@
 import axios from 'axios';
 
 export default axios.create({
-     baseURL: 'http://104.211.113.204:8080/api/v1/',
+
+     // baseURL: 'http://104.211.113.204:8080/api/v1/',
     
     // baseURL: 'http://localhost:3000/api/v1/',
     
+
+    // baseURL: 'http://104.211.113.204:8080/api/v1/',
+    // baseURL: process.env.REACT_APP_QUERY_SERVICE_URL,
+    baseURL: 'api/v1/',
+    // console.log('in metrics API', process.env.QUERY_SERVICE_URL)
+
 }
 );

frontend/src/api/tracesAPI.js

@@ -4,8 +4,11 @@ import axios from 'axios';
 export default axios.create({
   // baseURL: 'http://104.211.113.204:8080/api/v1/'
   
-  baseURL: 'http://localhost:3000/api/v1/', // toggle to this before pushing
-
+  // baseURL: 'http://localhost:3000/api/v1/', // toggle to this before pushing
 
+  // baseURL: process.env.QUERY_SERVICE_URL,
+  // console.log('in traces API', process.env.QUERY_SERVICE_URL)
+  baseURL: 'api/v1/',
+  
 });
 

pkg/query-service/app/server.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 
 	"github.com/gorilla/handlers"
-	"github.com/rs/cors"
 	"github.com/soheilhy/cmux"
 	"go.signoz.io/query-service/druidQuery"
 	"go.signoz.io/query-service/godruid"
@@ -92,14 +91,14 @@ func createHTTPServer(druidClientUrl string) *http.Server {
 
 	apiHandler.RegisterRoutes(r)
 
-	c := cors.New(cors.Options{
-		AllowedOrigins: []string{"http://localhost:3000"},
-		// AllowCredentials: true,
-		// AllowedMethods:   []string{"GET", "DELETE", "POST", "PUT"},
-	})
+	// c := cors.New(cors.Options{
+	// 	AllowedOrigins: []string{"http://localhost:3000"},
+	// 	// AllowCredentials: true,
+	// 	// AllowedMethods:   []string{"GET", "DELETE", "POST", "PUT"},
+	// })
 
-	handler := c.Handler(r)
-	// var handler http.Handler = r
+	// handler := c.Handler(r)
+	var handler http.Handler = r
 
 	handler = handlers.CompressHandler(handler)