Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: time series data request exceeding limit #6

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: time series data request exceeding limit #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22a42f0
Fix request for time series data exceeding limit
lim-yoona Oct 10, 2023
4ec4184
Fix request for time series data exceeding limit
lim-yoona Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/metrics/bsmetric/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ func GetClusterSpace(start, end, interval uint64) ([]metricomm.SpaceTrend, error
results := make(chan metricomm.MetricResult, requestSize)
totalName := fmt.Sprintf("%s&start=%d&end=%d&step=%d", CLUSTER_LOGICAL_CAPACITY, start, end, interval)
usedName := fmt.Sprintf("%s&start=%d&end=%d&step=%d", CLUSTER_LOGICAL_ALLOC, start, end, interval)
go metricomm.QueryRangeMetric(totalName, &results)
go metricomm.QueryRangeMetric(usedName, &results)
go metricomm.QueryRangeMetric(totalName, start, end, interval, &results)
go metricomm.QueryRangeMetric(usedName, start, end, interval, &results)

count := 0
for res := range results {
Expand Down
52 changes: 40 additions & 12 deletions internal/metrics/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,10 +400,38 @@ func QueryInstantMetric(name string, results *chan MetricResult) {
}
}

func QueryRangeMetric(name string, results *chan MetricResult) {
func MergeQueryResponseOfMatrix(matrix *QueryResponseOfMatrix, ofMatrix *QueryResponseOfMatrix) {
matrix.Status = ofMatrix.Status
matrix.Data.ResultType = ofMatrix.Data.ResultType
for _, v := range ofMatrix.Data.Result {
matrix.Data.Result = append(matrix.Data.Result, v)
}
}

func QueryRangeMetric(name string, start, end, interval uint64, results *chan MetricResult) {
var res QueryResponseOfMatrix
err := core.GMetricClient.GetMetricFromPrometheus(
RANGE_METRIC_PATH, VECTOR_METRIC_QUERY_KEY, name, &res)
var err error
if (end-start)/interval <= 11000 {
err = core.GMetricClient.GetMetricFromPrometheus(
RANGE_METRIC_PATH, VECTOR_METRIC_QUERY_KEY, name, &res)
} else {
num := ((end-start)/interval)/11000 + 1
for i := uint64(0); i < num; i++ {
var tempRes QueryResponseOfMatrix
seg := interval * 11000
intervalStart := start + i*seg
intervalEnd := start + (i+1)*seg
if intervalEnd > end {
intervalEnd = end
}
str := strings.Split(name,"&")[0]
splitName := fmt.Sprintf("%s&start=%d&end=%d&step=%d", str, intervalStart, intervalEnd, interval)
err = core.GMetricClient.GetMetricFromPrometheus(
RANGE_METRIC_PATH, VECTOR_METRIC_QUERY_KEY, splitName, &tempRes)
MergeQueryResponseOfMatrix(&res, &tempRes)
}
}

*results <- MetricResult{
Key: name,
Err: err,
Expand All @@ -416,7 +444,7 @@ func GetUtilization(name string, start, end, interval uint64) (map[string][]Rang
utilization := make(map[string][]RangeMetricItem)
requestSize := 1
results := make(chan MetricResult, requestSize)
QueryRangeMetric(metricName, &results)
QueryRangeMetric(metricName, start, end, interval, &results)
count := 0
for res := range results {
if res.Err != nil {
Expand All @@ -443,10 +471,10 @@ func GetPerformance(name string, start, end, interval uint64) ([]Performance, er
readIOPSName := fmt.Sprintf("%s%s&start=%d&end=%d&step=%ds", name, READ_IOPS, start, end, interval)
readBPSName := fmt.Sprintf("%s%s&start=%d&end=%d&step=%ds", name, READ_REAT, start, end, interval)

go QueryRangeMetric(writeIOPSName, &results)
go QueryRangeMetric(writeBPSName, &results)
go QueryRangeMetric(readIOPSName, &results)
go QueryRangeMetric(readBPSName, &results)
go QueryRangeMetric(writeIOPSName, start, end, interval, &results)
go QueryRangeMetric(writeBPSName, start, end, interval, &results)
go QueryRangeMetric(readIOPSName, start, end, interval, &results)
go QueryRangeMetric(readBPSName, start, end, interval, &results)

count := 0
for res := range results {
Expand Down Expand Up @@ -517,10 +545,10 @@ func GetUserPerformance(name string, start, end, interval uint64) ([]UserPerform
readQPSName := fmt.Sprintf("%s%s&start=%d&end=%d&step=%ds", name, READ_QPS, start, end, interval)
readBPSName := fmt.Sprintf("%s%s&start=%d&end=%d&step=%ds", name, READ_BPS, start, end, interval)

go QueryRangeMetric(writeQPSName, &results)
go QueryRangeMetric(writeBPSName, &results)
go QueryRangeMetric(readQPSName, &results)
go QueryRangeMetric(readBPSName, &results)
go QueryRangeMetric(writeQPSName, start, end, interval, &results)
go QueryRangeMetric(writeBPSName, start, end, interval, &results)
go QueryRangeMetric(readQPSName, start, end, interval, &results)
go QueryRangeMetric(readBPSName, start, end, interval, &results)

count := 0
for res := range results {
Expand Down
8 changes: 4 additions & 4 deletions internal/metrics/common/disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ func GetDiskPerformance(instance string, start, end, interval uint64) (interface
readBPSName := fmt.Sprintf("%s&start=%d&end=%d&step=%ds",
GetNodeDiskPerformanceName(NODE_DISK_READ_BYTES_TOTAL, instance, interval), start, end, interval)

go QueryRangeMetric(writeIOPSName, &results)
go QueryRangeMetric(writeBPSName, &results)
go QueryRangeMetric(readIOPSName, &results)
go QueryRangeMetric(readBPSName, &results)
go QueryRangeMetric(writeIOPSName,start,end,interval, &results)
go QueryRangeMetric(writeBPSName,start,end,interval, &results)
go QueryRangeMetric(readIOPSName,start,end,interval, &results)
go QueryRangeMetric(readBPSName,start,end,interval, &results)

count := 0
for res := range results {
Expand Down
4 changes: 2 additions & 2 deletions internal/metrics/common/host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ func GetNetWorkTraffic(instance string, start, end, interval uint64) (interface{
transmitName := fmt.Sprintf("%s&start=%d&end=%d&step=%ds",
GetNodeNetWorkReveiveName(NODE_NETWORK_TRANSMIT_BYTES_TOTAL, instance, interval), start, end, interval)

go QueryRangeMetric(receiveName, &results)
go QueryRangeMetric(transmitName, &results)
go QueryRangeMetric(receiveName,start,end,interval, &results)
go QueryRangeMetric(transmitName,start,end,interval, &results)

count := 0
for res := range results {
Expand Down