opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(monitor): sore reture info：resourceType,measurement

Browse Source 
1.对资源类型和对应的measurement进行排序输出
This commit is contained in:
--global
2020-12-28 21:37:27 +08:00
parent 79e6d163d2
commit 567fc991cb
5 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/monitor/metric.go
+15 -4
View File
@@ -24,10 +24,20 @@ const (
METRIC_DATABASE_METER = "meter_db"
)
var MetricResType = []string{METRIC_RES_TYPE_GUEST, METRIC_RES_TYPE_HOST, METRIC_RES_TYPE_REDIS, METRIC_RES_TYPE_OSS,
METRIC_RES_TYPE_RDS, METRIC_RES_TYPE_CLOUDACCOUNT}
var MetricUnit = []string{METRIC_UNIT_PERCENT, METRIC_UNIT_BPS, METRIC_UNIT_MBPS, METRIC_UNIT_BYTEPS, "count/s",
METRIC_UNIT_COUNT, METRIC_UNIT_MS, METRIC_UNIT_BYTE, METRIC_UNIT_RMB}
var (
MetricResType = []string{METRIC_RES_TYPE_GUEST, METRIC_RES_TYPE_HOST, METRIC_RES_TYPE_REDIS, METRIC_RES_TYPE_OSS,
METRIC_RES_TYPE_RDS, METRIC_RES_TYPE_CLOUDACCOUNT}
MetricUnit = []string{METRIC_UNIT_PERCENT, METRIC_UNIT_BPS, METRIC_UNIT_MBPS, METRIC_UNIT_BYTEPS, "count/s",
METRIC_UNIT_COUNT, METRIC_UNIT_MS, METRIC_UNIT_BYTE, METRIC_UNIT_RMB}
ResTypeScoreMap = map[string]int{
METRIC_RES_TYPE_HOST: 1,
METRIC_RES_TYPE_GUEST: 2,
METRIC_RES_TYPE_OSS: 3,
METRIC_RES_TYPE_RDS: 4,
METRIC_RES_TYPE_REDIS: 5,
METRIC_RES_TYPE_CLOUDACCOUNT: 6,
}
)
type MetricMeasurementCreateInput struct {
apis.StandaloneResourceCreateInput
@@ -36,6 +46,7 @@ type MetricMeasurementCreateInput struct {
ResType string `json:"res_type"`
DisplayName string `json:"display_name"`
Database string `json:"database"`
Score int `json:"score"`
}
type MetricMeasurementUpdateInput struct {
pkg/apis/monitor/suggestsysrule.go
+1
View File
@@ -47,6 +47,7 @@ type InfluxMeasurement struct {
Measurement string
MeasurementDisplayName string
ResType string
Score int
TagKey []string
TagValue map[string][]string
FieldKey []string
pkg/monitor/dbinit/metric_dbinit.go
+29 -28
View File
@@ -10,7 +10,7 @@ import (
var MetricNeedDeleteDescriptions = []string{}
var metricInitInputMap map[string]monitor.MetricCreateInput
func RegistryMetricCreateInput(name, displayName, resType, database string,
func RegistryMetricCreateInput(name, displayName, resType, database string, score int,
fields []monitor.MetricFieldCreateInput) {
if metricInitInputMap == nil {
metricInitInputMap = make(map[string]monitor.MetricCreateInput)
@@ -25,6 +25,7 @@ func RegistryMetricCreateInput(name, displayName, resType, database string,
ResType: resType,
DisplayName: displayName,
Database: database,
Score: score,
},
MetricFields: fields,
}
@@ -55,7 +56,7 @@ func newMetricFieldCreateInput(name, displayName, unit string, score int) monito
func init() {
// cpu
RegistryMetricCreateInput("cpu", "CPU usage", monitor.METRIC_RES_TYPE_HOST, monitor.METRIC_DATABASE_TELE,
RegistryMetricCreateInput("cpu", "CPU usage", monitor.METRIC_RES_TYPE_HOST, monitor.METRIC_DATABASE_TELE, 1,
[]monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("usage_active", "CPU active state utilization rate", monitor.METRIC_UNIT_PERCENT, 1),
newMetricFieldCreateInput("usage_idle", "CPU idle state utilization rate", monitor.METRIC_UNIT_PERCENT, 2),
@@ -70,7 +71,7 @@ func init() {
// disk
RegistryMetricCreateInput("disk", "Disk usage", monitor.METRIC_RES_TYPE_HOST,
monitor.METRIC_DATABASE_TELE,
monitor.METRIC_DATABASE_TELE, 3,
[]monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_percent", "Percentage of used disks", monitor.METRIC_UNIT_PERCENT, 1),
newMetricFieldCreateInput("free", "Free space size", monitor.METRIC_UNIT_BYTE, 2),
@@ -83,7 +84,7 @@ func init() {
// diskio
RegistryMetricCreateInput("diskio", "Disk traffic and timing",
monitor.METRIC_RES_TYPE_HOST, monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_RES_TYPE_HOST, monitor.METRIC_DATABASE_TELE, 4, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("read_bps", "Disk read rate", monitor.METRIC_UNIT_BPS, 1),
newMetricFieldCreateInput("write_bps", "Disk write rate", monitor.METRIC_UNIT_BPS, 2),
newMetricFieldCreateInput("read_iops", "Disk read operate rate", monitor.METRIC_UNIT_COUNT, 3),
@@ -100,7 +101,7 @@ func init() {
// mem
RegistryMetricCreateInput("mem", "Memory", monitor.METRIC_RES_TYPE_HOST,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 3, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_percent", "Used memory rate", monitor.METRIC_UNIT_PERCENT, 1),
newMetricFieldCreateInput("available_percent", "Available memory rate", monitor.METRIC_UNIT_PERCENT, 2),
newMetricFieldCreateInput("used", "Used memory", monitor.METRIC_UNIT_BYTE, 3),
@@ -116,7 +117,7 @@ func init() {
// net
RegistryMetricCreateInput("net", "Network interface and protocol usage",
monitor.METRIC_RES_TYPE_HOST, monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_RES_TYPE_HOST, monitor.METRIC_DATABASE_TELE, 5, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("bytes_sent", "The total number of bytes sent by the network interface", monitor.METRIC_UNIT_BYTE, 1),
newMetricFieldCreateInput("bytes_recv", "The total number of bytes received by the network interface", monitor.METRIC_UNIT_BYTE, 2),
newMetricFieldCreateInput("packets_sent", "The total number of packets sent by the network interface", monitor.METRIC_UNIT_COUNT, 3),
@@ -129,7 +130,7 @@ func init() {
// vm_cpu
RegistryMetricCreateInput("vm_cpu", "Guest CPU usage", monitor.METRIC_RES_TYPE_GUEST,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 1, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("usage_active", "CPU active state utilization rate", monitor.METRIC_UNIT_PERCENT, 1),
newMetricFieldCreateInput("cpu_usage_pcore", "CPU utilization rate per core", monitor.METRIC_UNIT_PERCENT, 2),
newMetricFieldCreateInput("cpu_usage_idle_pcore", "CPU idle rate per core", monitor.METRIC_UNIT_PERCENT, 3),
@@ -140,7 +141,7 @@ func init() {
// vm_diskio
RegistryMetricCreateInput("vm_diskio", "Guest disk traffic", monitor.METRIC_RES_TYPE_GUEST,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 3, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("read_bps", "Disk read rate", monitor.METRIC_UNIT_BYTEPS, 1),
newMetricFieldCreateInput("write_bps", "Disk write rate", monitor.METRIC_UNIT_BYTEPS, 2),
newMetricFieldCreateInput("read_iops", "Disk read operate rate", monitor.METRIC_UNIT_COUNT, 3),
@@ -151,7 +152,7 @@ func init() {
// vm_mem
RegistryMetricCreateInput("vm_mem", "Guest memory", monitor.METRIC_RES_TYPE_GUEST,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 2, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_percent", "Used memory rate", monitor.METRIC_UNIT_PERCENT, 1),
newMetricFieldCreateInput("vms", "Virtual memory consumption", monitor.METRIC_UNIT_BYTE, 2),
newMetricFieldCreateInput("rss", "Actual use of physical memory", monitor.METRIC_UNIT_BYTE, 3),
@@ -159,110 +160,110 @@ func init() {
// vm_netio
RegistryMetricCreateInput("vm_netio", "Guest network traffic", monitor.METRIC_RES_TYPE_GUEST,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 4, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("bps_recv", "Received traffic per second", monitor.METRIC_UNIT_BPS, 1),
newMetricFieldCreateInput("bps_sent", "Send traffic per second", monitor.METRIC_UNIT_BPS, 2),
})
// oss_latency
RegistryMetricCreateInput("oss_latency", "Object storage latency",
monitor.METRIC_RES_TYPE_OSS, monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_RES_TYPE_OSS, monitor.METRIC_DATABASE_TELE, 1, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("req_late", "Request average E2E delay", monitor.METRIC_UNIT_MS, 1),
})
// oss_netio
RegistryMetricCreateInput("oss_netio", "Object storage network traffic",
monitor.METRIC_RES_TYPE_OSS, monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_RES_TYPE_OSS, monitor.METRIC_DATABASE_TELE, 2, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("bps_recv", "Receive byte", monitor.METRIC_UNIT_BYTE, 1),
newMetricFieldCreateInput("bps_sent", "Send byte", monitor.METRIC_UNIT_BYTE, 2),
})
// oss_req
RegistryMetricCreateInput("oss_req", "Object store request", monitor.METRIC_RES_TYPE_OSS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 3, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("req_count", "request count", monitor.METRIC_UNIT_COUNT, 1),
})
// rds_conn
RegistryMetricCreateInput("rds_conn", "Rds connect", monitor.METRIC_RES_TYPE_RDS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 5, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_percent", "Connection usage", monitor.METRIC_UNIT_PERCENT, 1),
})
// rds_cpu
RegistryMetricCreateInput("rds_cpu", "Rds CPU usage", monitor.METRIC_RES_TYPE_RDS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 1, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_percent", "Connection usage", monitor.METRIC_UNIT_PERCENT, 1),
newMetricFieldCreateInput("usage_active", "CPU active state utilization rate", monitor.METRIC_UNIT_PERCENT, 2),
})
// rds_mem
RegistryMetricCreateInput("rds_mem", "Rds memory", monitor.METRIC_RES_TYPE_RDS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 2, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_percent", "Connection usage", monitor.METRIC_UNIT_PERCENT, 1),
})
// rds_netio
RegistryMetricCreateInput("rds_netio", "Rds network traffic", monitor.METRIC_RES_TYPE_RDS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 4, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("bps_recv", "Received traffic per second", monitor.METRIC_UNIT_BPS, 1),
newMetricFieldCreateInput("bps_sent", "Send traffic per second", monitor.METRIC_UNIT_BPS, 2),
})
// rds_disk
RegistryMetricCreateInput("rds_disk", "Rds disk usage", monitor.METRIC_RES_TYPE_RDS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_percent", "disk usage", monitor.METRIC_UNIT_PERCENT, 1),
monitor.METRIC_DATABASE_TELE, 3, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_percent", "Percentage of used disks", monitor.METRIC_UNIT_PERCENT, 1),
})
// dcs_cpu
RegistryMetricCreateInput("dcs_cpu", "Redis CPU usage", monitor.METRIC_RES_TYPE_REDIS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 1, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_percent", "CPU active state utilization rate", monitor.METRIC_UNIT_PERCENT, 1),
})
// dcs_mem
RegistryMetricCreateInput("dcs_mem", "Redis memory", monitor.METRIC_RES_TYPE_REDIS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 2, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_percent", "memory usage", monitor.METRIC_UNIT_PERCENT, 1),
})
// dcs_netio
RegistryMetricCreateInput("dcs_netio", "Redis network traffic",
monitor.METRIC_RES_TYPE_REDIS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 4, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("bps_recv", "Received traffic per second", monitor.METRIC_UNIT_BPS, 1),
newMetricFieldCreateInput("bps_sent", "Send traffic per second", monitor.METRIC_UNIT_BPS, 2),
})
// dcs_conn
RegistryMetricCreateInput("dcs_conn", "Redis connect", monitor.METRIC_RES_TYPE_REDIS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 5, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_percent", "Connection usage", monitor.METRIC_UNIT_PERCENT, 1),
})
// dcs_instantopt
RegistryMetricCreateInput("dcs_instantopt", "Redis operator",
monitor.METRIC_RES_TYPE_REDIS, monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_RES_TYPE_REDIS, monitor.METRIC_DATABASE_TELE, 5, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("opt_sec", "Number of commands processed per second", monitor.METRIC_UNIT_COUNT, 1),
})
// dcs_cachekeys
RegistryMetricCreateInput("dcs_cachekeys", "Redis keys", monitor.METRIC_RES_TYPE_REDIS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_TELE, 6, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("key_count", "Number of cache keys", monitor.METRIC_UNIT_COUNT, 1),
})
// dcs_datamem
RegistryMetricCreateInput("dcs_datamem", "Redis keys", monitor.METRIC_RES_TYPE_REDIS,
monitor.METRIC_DATABASE_TELE, []monitor.MetricFieldCreateInput{
RegistryMetricCreateInput("dcs_datamem", "Redis data memory", monitor.METRIC_RES_TYPE_REDIS,
monitor.METRIC_DATABASE_TELE, 3, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("used_byte", "Data node memory usage", monitor.METRIC_UNIT_BYTE, 1),
})
// cloudaccount_balance
RegistryMetricCreateInput("cloudaccount_balance", "Cloud account balance",
monitor.METRIC_RES_TYPE_CLOUDACCOUNT,
monitor.METRIC_DATABASE_METER, []monitor.MetricFieldCreateInput{
monitor.METRIC_DATABASE_METER, 1, []monitor.MetricFieldCreateInput{
newMetricFieldCreateInput("balance", "balance", monitor.METRIC_UNIT_RMB, 1),
})
pkg/monitor/models/datasource.go
+13 -5
View File
@@ -283,11 +283,6 @@ func (self *SDataSourceManager) GetMeasurementsWithDescriptionInfos(query jsonut
rtnMeasurements = append(rtnMeasurements, filterMeasurements...)
}
sort.Slice(rtnMeasurements, func(i, j int) bool {
m1 := rtnMeasurements[i]
m2 := rtnMeasurements[j]
return strings.Compare(m1.Measurement, m2.Measurement) < 0
})
ret.Add(jsonutils.Marshal(&rtnMeasurements), "measurements")
resTypeMap := make(map[string][]monitor.InfluxMeasurement, 0)
resTypes := make([]string, 0)
@@ -299,6 +294,16 @@ func (self *SDataSourceManager) GetMeasurementsWithDescriptionInfos(query jsonut
resTypes = append(resTypes, measurement.ResType)
resTypeMap[measurement.ResType] = []monitor.InfluxMeasurement{measurement}
}
sort.Slice(resTypes, func(i, j int) bool {
r1 := resTypes[i]
r2 := resTypes[j]
return monitor.ResTypeScoreMap[r1] < monitor.ResTypeScoreMap[r2]
})
for _, measures := range resTypeMap {
sort.Slice(measures, func(i, j int) bool {
return measures[i].Score < measures[j].Score
})
}
ret.Add(jsonutils.Marshal(&resTypes), "res_types")
ret.Add(jsonutils.Marshal(&resTypeMap), "res_type_measurements")
return ret, nil
@@ -382,6 +387,9 @@ func (self *SDataSourceManager) getMetricDescriptions(influxdbMeasurements []mon
if len(measureDes.ResType) != 0 {
influxdbMeasurements[j].ResType = measureDes.ResType
}
if measureDes.Score != 0 {
influxdbMeasurements[j].Score = measureDes.Score
}
fieldDesMap := make(map[string]monitor.MetricFieldDetail, 0)
fields := make([]string, 0)
fieldKeys := stringutils2.NewSortedStrings(influxdbMeasurements[j].FieldKey)
pkg/monitor/models/metric.go
+4
View File
@@ -58,6 +58,7 @@ type SMetricMeasurement struct {
ResType string `width:"32" list:"user" update:"user"`
Database string `width:"32" list:"user" update:"user"`
DisplayName string `width:"256" list:"user" update:"user"`
Score int `width:"32" list:"user" update:"user" default:"99"`
}
type IMetricMeasurementCache interface {
@@ -547,6 +548,9 @@ func (self *SMetricMeasurement) insertOrUpdateMetric(userCred mcclient.TokenCred
if len(createInput.Measurement.Database) != 0 {
self.Database = createInput.Measurement.Database
}
if createInput.Measurement.Score != 0 {
self.Score = createInput.Measurement.Score
}
return nil
})
if err != nil {