From f6b5a5d3c4f3d4d95741e103b16448ab3bfaded4 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Mon, 7 Aug 2023 00:32:51 +0800 Subject: [PATCH] fix(monitor): remove cloudaccount_balance unit --- pkg/apis/monitor/metric.go | 4 ++-- pkg/monitor/dbinit/metric_dbinit.go | 2 +- pkg/monitor/models/commonalert.go | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/apis/monitor/metric.go b/pkg/apis/monitor/metric.go index 16793f57c0..e4ae6c6cb1 100644 --- a/pkg/apis/monitor/metric.go +++ b/pkg/apis/monitor/metric.go @@ -47,8 +47,8 @@ const ( METRIC_UNIT_MS = "ms" METRIC_UNIT_SEC = "s" METRIC_UNIT_BYTE = "byte" - METRIC_UNIT_RMB = "RMB" METRIC_UNIT_MB = "Mb" + METRIC_UNIT_NULL = "NULL" METRIC_DATABASE_TELE = "telegraf" METRIC_DATABASE_METER = "meter_db" @@ -58,7 +58,7 @@ 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} + METRIC_UNIT_COUNT, METRIC_UNIT_MS, METRIC_UNIT_BYTE, METRIC_UNIT_NULL} ResTypeScoreMap = map[string]float64{ METRIC_RES_TYPE_GUEST: 1, METRIC_RES_TYPE_AGENT: 1.1, diff --git a/pkg/monitor/dbinit/metric_dbinit.go b/pkg/monitor/dbinit/metric_dbinit.go index 77c042f45a..34f042cb13 100644 --- a/pkg/monitor/dbinit/metric_dbinit.go +++ b/pkg/monitor/dbinit/metric_dbinit.go @@ -292,7 +292,7 @@ func init() { RegistryMetricCreateInput("cloudaccount_balance", "Cloud account balance", monitor.METRIC_RES_TYPE_CLOUDACCOUNT, monitor.METRIC_DATABASE_METER, 1, []monitor.MetricFieldCreateInput{ - newMetricFieldCreateInput("balance", "balance", monitor.METRIC_UNIT_RMB, 1), + newMetricFieldCreateInput("balance", "balance", monitor.METRIC_UNIT_NULL, 1), }) // haproxy diff --git a/pkg/monitor/models/commonalert.go b/pkg/monitor/models/commonalert.go index 176084ac27..4f967571d0 100644 --- a/pkg/monitor/models/commonalert.go +++ b/pkg/monitor/models/commonalert.go @@ -884,7 +884,10 @@ func getMetricDescriptionDetails(metricDetails *monitor.CommonAlertMetricDetails } if fieldDes, ok := influxdbMeasurements[0].FieldDescriptions[field]; ok { metricDetails.FieldDescription = fieldDes - if metricDetails.FieldDescription.Unit == monitor.METRIC_UNIT_COUNT { + if utils.IsInStringArray(metricDetails.FieldDescription.Unit, []string{ + monitor.METRIC_UNIT_COUNT, + monitor.METRIC_UNIT_NULL, + }) { metricDetails.FieldDescription.Unit = "" } if len(metricDetails.FieldOpt) != 0 {