monitor: set default influxdb datasource by endpoint type

yunionio · Oct 23, 2020 · 5d873dd · 5d873dd
1 parent 3c1cd88
commit 5d873dd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/pkg/monitor/models/datasource.go b/pkg/monitor/models/datasource.go
@@ -30,7 +30,6 @@ import (
 	"yunion.io/x/pkg/tristate"
 	"yunion.io/x/pkg/util/wait"
 
-	identityapi "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/apis/monitor"
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
 	"yunion.io/x/onecloud/pkg/httperrors"
@@ -87,25 +86,32 @@ func (man *SDataSourceManager) Run(ctx context.Context) error {
 
 func (man *SDataSourceManager) initDefaultDataSource(ctx context.Context) error {
 	region := options.Options.Region
+	epType := options.Options.SessionEndpointType
 	initF := func() {
 		ds, err := man.GetDefaultSource()
 		if err != nil && err != ErrDataSourceDefaultNotFound {
 			log.Errorf("Get default datasource: %v", err)
 			return
 		}
-		if ds != nil {
-			return
-		}
-		s := auth.GetAdminSessionWithPublic(ctx, region, "")
+		s := auth.GetAdminSession(ctx, region, "")
 		if s == nil {
 			log.Errorf("get empty public session for region %s", region)
 			return
 		}
-		url, err := s.GetServiceURL("influxdb", identityapi.EndpointInterfacePublic)
+		url, err := s.GetServiceURL("influxdb", epType)
 		if err != nil {
 			log.Errorf("get influxdb public url: %v", err)
 			return
 		}
+		if ds != nil {
+			if _, err := db.Update(ds, func() error {
+				ds.Url = url
+				return nil
+			}); err != nil {
+				log.Errorf("update datasource url error: %v", err)
+			}
+			return
+		}
 		ds = &SDataSource{
 			Type: monitor.DataSourceTypeInfluxdb,
 			Url:  url,

diff --git a/pkg/monitor/service/handlers.go b/pkg/monitor/service/handlers.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"net"
 	"net/http"
+	_ "net/http/pprof"
 	"strconv"
 
 	"github.com/gorilla/mux"
@@ -112,4 +113,13 @@ func addMiscHandlers(root *mux.Router) {
 		}
 	}
 	root.HandleFunc("/subscriptions/write", adapterF(performHandler))
+
+	// ref: pkg/appsrv/appsrv:addDefaultHandlers
+	root.HandleFunc("/version", adapterF(appsrv.VersionHandler))
+	root.HandleFunc("/stats", adapterF(appsrv.StatisticHandler))
+	root.HandleFunc("/ping", adapterF(appsrv.PingHandler))
+	root.HandleFunc("/worker_stats", adapterF(appsrv.WorkerStatsHandler))
+
+	// pprof handler
+	root.PathPrefix("/debug/pprof/").Handler(http.DefaultServeMux)
 }
diff --git a/pkg/webconsole/service/service.go b/pkg/webconsole/service/service.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"net"
 	"net/http"
-	"net/http/pprof"
+	_ "net/http/pprof"
 	"net/url"
 	"os"
 	"strconv"
@@ -133,9 +133,5 @@ func addMiscHandlers(root *mux.Router) {
 	root.HandleFunc("/worker_stats", adapterF(appsrv.WorkerStatsHandler))
 
 	// pprof handler
-	root.HandleFunc("/debug/pprof/", pprof.Index)
-	root.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline)
-	root.HandleFunc("/debug/pprof/profile", pprof.Profile)
-	root.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
-	root.HandleFunc("/debug/pprof/trace", pprof.Trace)
+	root.PathPrefix("/debug/pprof/").Handler(http.DefaultServeMux)
 }