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

Improve AWS Cloudwatch Scaler metric exporting logic #2243

Merged
merged 7 commits into from
Nov 4, 2021
Merged

Improve AWS Cloudwatch Scaler metric exporting logic #2243

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6ef7c7
improve aws cloudwatch scaler metrics pulling logic
fivesheep Nov 1, 2021
adc95b4
add additional checks and unit test
fivesheep Nov 2, 2021
2ccc901
fix formatting
fivesheep Nov 3, 2021
d5c2437
fix linting
fivesheep Nov 3, 2021
fad0143
fix linting
fivesheep Nov 3, 2021
540df89
refactor parseAwsCloudwatchMetadata to reduce cyclomatic complexity
fivesheep Nov 3, 2021
92f94b2
update CHANGELOG
fivesheep Nov 4, 2021
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
36 changes: 34 additions & 2 deletions pkg/scalers/aws_cloudwatch_scaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ import (
const (
defaultMetricCollectionTime = 300
defaultMetricStat = "Average"
defaultMetricUnit = ""
defaultMetricStatPeriod = 300
defaultMetricEndTimeOffset = 0
)

type awsCloudwatchScaler struct {
Expand All @@ -44,7 +46,9 @@ type awsCloudwatchMetadata struct {

metricCollectionTime int64
metricStat string
metricUnit string
metricStatPeriod int64
metricEndTimeOffset int64

awsRegion string

Expand Down Expand Up @@ -178,6 +182,24 @@ func parseAwsCloudwatchMetadata(config *ScalerConfig) (*awsCloudwatchMetadata, e
}
}

if val, ok := config.TriggerMetadata["metricEndTimeOffset"]; ok && val != "" {
metricEndTimeOffset, err := strconv.Atoi(val)
if err != nil {
cloudwatchLog.Error(err, "Error parsing metricEndTimeOffset metadata")
JorTurFer marked this conversation as resolved.
Show resolved Hide resolved
} else {
meta.metricEndTimeOffset = int64(metricEndTimeOffset)
}
} else {
meta.metricEndTimeOffset = defaultMetricEndTimeOffset
}


if val, ok := config.TriggerMetadata["metricUnit"]; ok && val != "" {
meta.metricUnit = val
} else {
meta.metricUnit = defaultMetricUnit
}

if val, ok := config.TriggerMetadata["awsRegion"]; ok && val != "" {
meta.awsRegion = val
} else {
Expand Down Expand Up @@ -273,9 +295,18 @@ func (c *awsCloudwatchScaler) GetCloudwatchMetrics() (float64, error) {
})
}

endTime := time.Now().Add(time.Second * -1 * time.Duration(c.metadata.metricEndTimeOffset)).Truncate(time.Duration(c.metadata.metricStatPeriod) * time.Second)
startTime := endTime.Add(time.Second * -1 * time.Duration(c.metadata.metricCollectionTime))

var metricUnit *string
if c.metadata.metricUnit != "" {
metricUnit = aws.String(c.metadata.metricUnit)
}

input := cloudwatch.GetMetricDataInput{
StartTime: aws.Time(time.Now().Add(time.Second * -1 * time.Duration(c.metadata.metricCollectionTime))),
EndTime: aws.Time(time.Now()),
StartTime: aws.Time(startTime),
EndTime: aws.Time(endTime),
ScanBy: aws.String(cloudwatch.ScanByTimestampDescending),
MetricDataQueries: []*cloudwatch.MetricDataQuery{
{
Id: aws.String("c1"),
Expand All @@ -287,6 +318,7 @@ func (c *awsCloudwatchScaler) GetCloudwatchMetrics() (float64, error) {
},
Period: aws.Int64(c.metadata.metricStatPeriod),
Stat: aws.String(c.metadata.metricStat),
Unit: metricUnit,
},
ReturnData: aws.Bool(true),
},
Expand Down