fix jaeger api endpoint bug (#2140)
This commit is contained in:
@@ -26,6 +26,8 @@ import (
|
|||||||
apiserverconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
|
apiserverconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
|
||||||
"kubesphere.io/kubesphere/pkg/utils/signals"
|
"kubesphere.io/kubesphere/pkg/utils/signals"
|
||||||
"kubesphere.io/kubesphere/pkg/utils/term"
|
"kubesphere.io/kubesphere/pkg/utils/term"
|
||||||
|
|
||||||
|
tracing "kubesphere.io/kubesphere/pkg/kapis/servicemesh/metrics/v1alpha2"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewAPIServerCommand() *cobra.Command {
|
func NewAPIServerCommand() *cobra.Command {
|
||||||
@@ -90,7 +92,10 @@ func initializeServicemeshConfig(s *options.ServerRunOptions) {
|
|||||||
// Initialize kiali config
|
// Initialize kiali config
|
||||||
config := kconfig.NewConfig()
|
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
|
// Exclude system namespaces
|
||||||
config.API.Namespaces.Exclude = []string{"istio-system", "kubesphere*", "kube*"}
|
config.API.Namespaces.Exclude = []string{"istio-system", "kubesphere*", "kube*"}
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ import (
|
|||||||
"net/http"
|
"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
|
// Get app metrics
|
||||||
func getAppMetrics(request *restful.Request, response *restful.Response) {
|
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)
|
url := fmt.Sprintf("%s/api/traces?%s&service=%s", JaegerQueryUrl, request.Request.URL.RawQuery, serviceName)
|
||||||
|
|
||||||
resp, err := http.Get(url)
|
resp, err := http.Get(url)
|
||||||
|
klog.V(4).Infof("Proxy trace request to %s", url)
|
||||||
|
|
||||||
if err != nil {
|
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)
|
api.HandleInternalError(response, nil, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user