@@ -29,7 +29,6 @@ var validSumologicMetadata = map[string]string{
29
29
"unsafeSsl" : "false" ,
30
30
"query" : "fakeQuery" ,
31
31
"queryType" : "logs" ,
32
- "dimension" : "fakeDimension" ,
33
32
"timerange" : "5" ,
34
33
"resultField" : "fakeResultField" ,
35
34
"timezone" : "UTC" ,
@@ -44,7 +43,6 @@ var validSumologicMetricsMetadata = map[string]string{
44
43
"unsafeSsl" : "false" ,
45
44
"query" : "fakeQuery" ,
46
45
"queryType" : "metrics" ,
47
- "dimension" : "fakeDimension" ,
48
46
"timerange" : "5" ,
49
47
"timezone" : "UTC" ,
50
48
"quantization" : "1" ,
@@ -54,11 +52,30 @@ var validSumologicMetricsMetadata = map[string]string{
54
52
"rollup" : "Sum" ,
55
53
}
56
54
55
+ var validSumologicMultiMetricsMetadata = map [string ]string {
56
+ "host" : "https://api.sumologic.com" ,
57
+ "unsafeSsl" : "false" ,
58
+ "queryType" : "metrics" ,
59
+ "timerange" : "5" ,
60
+ "timezone" : "UTC" ,
61
+ "quantization" : "1" ,
62
+ "activationThreshold" : "5" ,
63
+ "threshold" : "1" ,
64
+ "queryAggregator" : "Avg" ,
65
+ "rollup" : "Sum" ,
66
+ "query.A" : "fakeQueryA" ,
67
+ "query.B" : "fakeQueryB" ,
68
+ "query.C" : "fakeQueryC" ,
69
+ "resultQueryRowId" : "C" ,
70
+ }
71
+
57
72
var testSumologicMetadata = []parseSumologicMetadataTestData {
58
73
// Valid metadata, pass.
59
74
{validSumologicMetadata , validSumologicAuthParams , false },
60
75
// Valid metrics metadata with rollup, pass.
61
76
{validSumologicMetricsMetadata , validSumologicAuthParams , false },
77
+ // Valid multi-metrics metadata, pass.
78
+ {validSumologicMultiMetricsMetadata , validSumologicAuthParams , false },
62
79
// Missing host, fail.
63
80
{map [string ]string {"query" : "fakeQuery" }, validSumologicAuthParams , true },
64
81
// Missing accessID, fail.
@@ -69,8 +86,6 @@ var testSumologicMetadata = []parseSumologicMetadataTestData{
69
86
{map [string ]string {"host" : "https://api.sumologic.com" , "query" : "fakeQuery" , "queryType" : "invalid" }, validSumologicAuthParams , true },
70
87
// Missing query, fail.
71
88
{map [string ]string {"host" : "https://api.sumologic.com" , "queryType" : "logs" }, validSumologicAuthParams , true },
72
- // Missing query, fail.
73
- {map [string ]string {"host" : "https://api.sumologic.com" , "queryType" : "metrics" }, validSumologicAuthParams , true },
74
89
// Missing timerange, fail.
75
90
{map [string ]string {"host" : "https://api.sumologic.com" , "query" : "fakeQuery" , "queryType" : "logs" }, validSumologicAuthParams , true },
76
91
// Invalid timerange, fail.
@@ -86,13 +101,14 @@ var testSumologicMetadata = []parseSumologicMetadataTestData{
86
101
var sumologicMetricIdentifiers = []sumologicMetricIdentifier {
87
102
{& testSumologicMetadata [0 ], 0 , "s0-sumologic-logs" },
88
103
{& testSumologicMetadata [1 ], 0 , "s0-sumologic-metrics" },
104
+ {& testSumologicMetadata [2 ], 0 , "s0-sumologic-metrics" },
89
105
}
90
106
91
107
func TestSumologicParseMetadata (t * testing.T ) {
92
108
for _ , testData := range testSumologicMetadata {
93
109
_ , err := parseSumoMetadata (& scalersconfig.ScalerConfig {TriggerMetadata : testData .metadata , AuthParams : testData .authParams })
94
110
if err != nil && ! testData .isError {
95
- t .Error ("Expected success but got error" , err )
111
+ t .Errorf ("Expected success but got error: %v " , err )
96
112
} else if testData .isError && err == nil {
97
113
t .Error ("Expected error but got success" )
98
114
}
@@ -104,7 +120,7 @@ func TestSumologicGetMetricSpecForScaling(t *testing.T) {
104
120
ctx := context .Background ()
105
121
meta , err := parseSumoMetadata (& scalersconfig.ScalerConfig {TriggerMetadata : testData .metadataTestData .metadata , AuthParams : validSumologicAuthParams , TriggerIndex : testData .triggerIndex })
106
122
if err != nil {
107
- t .Fatal ("Could not parse metadata:" , err )
123
+ t .Fatalf ("Could not parse metadata: %v " , err )
108
124
}
109
125
mockSumologicScaler := sumologicScaler {
110
126
metadata : meta ,
@@ -113,7 +129,7 @@ func TestSumologicGetMetricSpecForScaling(t *testing.T) {
113
129
metricSpec := mockSumologicScaler .GetMetricSpecForScaling (ctx )
114
130
metricName := metricSpec [0 ].External .Metric .Name
115
131
if metricName != testData .name {
116
- t .Error ("Wrong External metric source name:" , metricName )
132
+ t .Errorf ("Wrong External metric source name: got %s, expected %s " , metricName , testData . name )
117
133
}
118
134
}
119
135
}
0 commit comments