admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix jaeger api endpoint bug (#2140)

Browse Source
This commit is contained in:
zryfish
2020-05-30 23:54:21 +08:00
committed by GitHub
parent 5509f6483b
commit b9c2ebc97c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/ks-apiserver/app/server.go
View File

@@ -26,6 +26,8 @@ import (
apiserverconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
"kubesphere.io/kubesphere/pkg/utils/signals"
"kubesphere.io/kubesphere/pkg/utils/term"
tracing "kubesphere.io/kubesphere/pkg/kapis/servicemesh/metrics/v1alpha2"
)
func NewAPIServerCommand() *cobra.Command {
@@ -90,7 +92,10 @@ func initializeServicemeshConfig(s *options.ServerRunOptions) {
// Initialize kiali config
config := kconfig.NewConfig()
//tracing.JaegerQueryUrl = s.ServiceMeshOptions.JaegerQueryHost
// Config jaeger query endpoint address
if s.ServiceMeshOptions != nil && len(s.ServiceMeshOptions.JaegerQueryHost) != 0 {
tracing.JaegerQueryUrl = s.ServiceMeshOptions.JaegerQueryHost
}
// Exclude system namespaces
config.API.Namespaces.Exclude = []string{"istio-system", "kubesphere*", "kube*"}

6
pkg/kapis/servicemesh/metrics/v1alpha2/handler.go
View File

@@ -10,7 +10,8 @@ import (
"net/http"
)
var JaegerQueryUrl = "http://jaeger-query.istio-system.svc:16686/jaeger"
// default jaeger query api endpoint address
var JaegerQueryUrl = "http://jaeger-query.istio-system.svc:16686"
// Get app metrics
func getAppMetrics(request *restful.Request, response *restful.Response) {
@@ -84,9 +85,10 @@ func getServiceTracing(request *restful.Request, response *restful.Response) {
url := fmt.Sprintf("%s/api/traces?%s&service=%s", JaegerQueryUrl, request.Request.URL.RawQuery, serviceName)
resp, err := http.Get(url)
klog.V(4).Infof("Proxy trace request to %s", url)
if err != nil {
klog.Errorf("query jaeger faile with err %v", err)
klog.Errorf("query jaeger failed with err %v", err)
api.HandleInternalError(response, nil, err)
return
}