diff --git a/conf/admin.yml b/conf/admin.yml index 49ec33af3..a7380c85d 100644 --- 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 index a950adc75..b95e46fc7 100644 --- 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 index b0e2cb8e0..9ff545fff 100644 --- 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 index 759e90a35..cf6878d19 100644 --- 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 index 8b23b5e93..1154f7108 100644 --- 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("", "*")