support grafana configuration (#108)

apache · Dec 12, 2023 · 49cbe64 · 49cbe64
1 parent e39d7bb
commit 49cbe64
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 0 deletions.
diff --git a/conf/admin.yml b/conf/admin.yml
@@ -19,6 +19,8 @@ admin:
     address: zookeeper://127.0.0.1:2181
   registry:
     address: zookeeper://127.0.0.1:2181
+  grafana:
+    address: 127.0.0.1:3000
   prometheus:
     address: 127.0.0.1:9090
     monitorPort: 22222

diff --git a/pkg/admin/bootstrap.go b/pkg/admin/bootstrap.go
@@ -68,6 +68,7 @@ func RegisterDatabase(rt core_runtime.Runtime) error {
 
 func RegisterOther(rt core_runtime.Runtime) error {
 	config.AdminPort = rt.Config().Admin.AdminPort
+	config.GrafanaAddress = rt.Config().Admin.Grafana.Address
 	config.PrometheusAddress = rt.Config().Admin.Prometheus.Address
 	config.PrometheusMonitorPort = rt.Config().Admin.Prometheus.MonitorPort
 	address := rt.Config().Admin.ConfigCenter

diff --git a/pkg/admin/config/config.go b/pkg/admin/config/config.go
@@ -39,4 +39,5 @@ var (
 	PrometheusAddress     string
 	PrometheusMonitorPort string
 	AdminPort             int
+	GrafanaAddress        string
 )
diff --git a/pkg/admin/model/monitor.go b/pkg/admin/model/monitor.go
@@ -33,6 +33,8 @@ type Metadata struct {
 	ConfigCenter   string        `json:"configCenter"`
 	Registry       string        `json:"registry"`
 	MetadataCenter string        `json:"metadataCenter"`
+	Grafana        string        `json:"grafana"`
+	Prometheus     string        `json:"prometheus"`
 	Protocols      []interface{} `json:"protocols"`
 	Rules          []string      `json:"rules"`
 }
diff --git a/pkg/admin/services/prometheus_service_impl.go b/pkg/admin/services/prometheus_service_impl.go
@@ -231,6 +231,8 @@ func (p *PrometheusServiceImpl) Metadata() (model.Metadata, error) {
 	metadata.Registry = config.RegistryCenter.GetURL().Location
 	metadata.MetadataCenter = config.RegistryCenter.GetURL().Location
 	metadata.ConfigCenter = config.RegistryCenter.GetURL().Location
+	metadata.Grafana = config.GrafanaAddress
+	metadata.Prometheus = config.PrometheusAddress
 
 	// rules
 	rules, err := GetRules("", "*")