Skip to content

Commit 7958f15

Browse files
Andrea Spaccaendorama
Andrea Spacca
and
endorama
authored
Aws.ec2 metrics.schema.b (#54)
* aws.sqs assets, first draft * no need to split fields and conf file * split back conf and fields, update to new cardinality/fuzziness/range format, change template extensions to .tpl * fix fuzziness * remove cardinality from metrics fields (values will be repeated) * fix templates * follow naming convetion * aws.ec2_metrics schema-b * comments * instance types with core and thread * match instance type with core and thread * remove cardinality from fields in config where a value is defined: they are ignored * Update assets/templates/aws.ec2_metrics/schema-b/configs.yml Co-authored-by: Edoardo Tenani <[email protected]> * remove AvailabilitZone* fields --------- Co-authored-by: Edoardo Tenani <[email protected]>
1 parent 2dfe504 commit 7958f15

File tree

4 files changed

+330
-7
lines changed

4 files changed

+330
-7
lines changed

‎assets/templates/aws.ec2_metrics/schema-b/configs.yml‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
- name: dimensionType
2+
# no dimension: 2.5%, AutoScalingGroupName: 10%, ImageId: 5%, InstanceType: 2.5%, InstanceId: 80%
3+
enum: ["", "AutoScalingGroupName", "AutoScalingGroupName", "AutoScalingGroupName", "AutoScalingGroupName", "ImageId", "ImageId", "InstanceType", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId", "InstanceId"]
4+
cardinality:
5+
numerator: 1
6+
# we want every single different "dimension identifier", regardless of its type, to have always the same generated fixed "metadata" once the cardinality kicks in
7+
# for this we must take the ordered highest enum length appending one by one the ones that does not have a 0 module between each others.
8+
# we start from the first two, multiple between their values and exclude from the order list the ones that have a 0 module on the result of the multiplication.
9+
# we end up with the list of enum lengths whose value, multiplied, define the least common multiple: this is the value we must use for the denominator of all fields.
10+
# in this case the remaining enum are two: `dimensionType` (40) and `region` (15), resulting in denominator `600`
11+
denominator: 600
12+
- name: Region
13+
enum: ["ap-south-1", "eu-north-1", "eu-west-3", "eu-west-2", "eu-west-1", "ap-northeast-3", "ap-northeast-2", "ap-northeast-1", "ap-southeast-1", "ap-southeast-2", "eu-central-1", "us-east-1", "us-east-2", "us-west-1", "us-west-2"]
14+
cardinality:
15+
numerator: 1
16+
denominator: 600
17+
- name: AutoScalingGroupName
18+
cardinality:
19+
numerator: 1
20+
denominator: 600
21+
- name: ImageId
22+
cardinality:
23+
numerator: 1
24+
denominator: 600
25+
- name: InstanceId
26+
cardinality:
27+
numerator: 1
28+
denominator: 600
29+
- name: instanceTypeIdx
30+
# we generate and index for the instance type enums, so that all the information related to a given type are properly matched
31+
range:
32+
min: 0
33+
max: 19
34+
cardinality:
35+
numerator: 1
36+
denominator: 600
37+
- name: InstanceType
38+
value: ["a1.medium", "c3.2xlarge", "c4.4xlarge", "c5.9xlarge", "c5a.12xlarge", "c5ad.16xlarge", "c5d.24xlarge", "c6a.32xlarge", "g5.48xlarge", "d2.2xlarge", "d3.xlarge", "t2.medium", "t2.micro", "t2.nano", "t2.small", "t3.large", "t3.medium", "t3.micro", "t3.nano", "t3.small"]
39+
- name: instanceCoreCount
40+
# they map instance types
41+
value: ["1", "4", "8", "18", "24", "32", "48", "64", "96", "4", "2", "2", "1", "1", "1", "1", "1", "1", "1", "1"]
42+
- name: instanceThreadPerCore
43+
# they map instance types
44+
value: ["1", "2", "2", " 2", " 2", " 2", " 2", " 2", " 2", "2", "2", "1", "1", "1", "1", "2", "2", "2", "2", "2"]
45+
- name: instanceImageId
46+
cardinality:
47+
numerator: 1
48+
denominator: 600
49+
- name: instanceMonitoringState
50+
# enable: 10%, disabled: 90%
51+
enum: ["enabled", "disabled", "disabled", "disabled", "disabled", "disabled", "disabled", "disabled", "disabled", "disabled"]
52+
cardinality:
53+
numerator: 1
54+
denominator: 600
55+
- name: instancePrivateIP
56+
cardinality:
57+
numerator: 1
58+
denominator: 600
59+
- name: instancePrivateDnsEmpty
60+
# without private dns entry: 10%, with private dns entry: 90%
61+
enum: ["empty", "fromPrivateIP", "fromPrivateIP", "fromPrivateIP", "fromPrivateIP", "fromPrivateIP", "fromPrivateIP", "fromPrivateIP", "fromPrivateIP", "fromPrivateIP"]
62+
cardinality:
63+
numerator: 1
64+
denominator: 600
65+
- name: instancePublicIP
66+
cardinality:
67+
numerator: 1
68+
denominator: 600
69+
- name: instancePublicDnsEmpty
70+
# without public dns entry: 20%, with public dns entry: 80%
71+
enum: ["empty", "fromPublicIP", "fromPublicIP", "fromPublicIP", "fromPublicIP"]
72+
cardinality:
73+
numerator: 1
74+
denominator: 600
75+
- name: instanceStateName
76+
# terminated: 10%, running: 90%
77+
enum: ["terminated", "running", "running", "running", "running", "running", "running", "running", "running", "running"]
78+
cardinality:
79+
numerator: 1
80+
denominator: 600
81+
- name: cloudInstanceName
82+
cardinality:
83+
numerator: 1
84+
denominator: 600
85+
- name: StatusCheckFailed_InstanceAvg
86+
range:
87+
min: 0
88+
max: 10
89+
fuzziness:
90+
numerator: 1
91+
denominator: 20
92+
- name: StatusCheckFailed_SystemAvg
93+
range:
94+
min: 0
95+
max: 10
96+
fuzziness:
97+
numerator: 1
98+
denominator: 20
99+
- name: StatusCheckFailedAvg
100+
range:
101+
min: 0
102+
max: 10
103+
fuzziness:
104+
numerator: 1
105+
denominator: 20
106+
- name: CPUUtilizationAvg
107+
range:
108+
min: 0
109+
max: 100
110+
fuzziness:
111+
numerator: 1
112+
denominator: 20
113+
- name: NetworkPacketsInSum
114+
range:
115+
min: 0
116+
max: 1500000
117+
fuzziness:
118+
numerator: 1
119+
denominator: 20
120+
- name: NetworkPacketsOutSum
121+
range:
122+
min: 0
123+
max: 1500000
124+
fuzziness:
125+
numerator: 1
126+
denominator: 20
127+
- name: CPUCreditBalanceAvg
128+
range:
129+
min: 0
130+
max: 5000
131+
fuzziness:
132+
numerator: 1
133+
denominator: 20
134+
- name: CPUSurplusCreditBalanceAvg
135+
range:
136+
min: 0
137+
max: 5000
138+
fuzziness:
139+
numerator: 1
140+
denominator: 20
141+
- name: CPUSurplusCreditsChargedAvg
142+
range:
143+
min: 0
144+
max: 5000
145+
fuzziness:
146+
numerator: 1
147+
denominator: 20
148+
- name: CPUCreditUsageAvg
149+
range:
150+
min: 0
151+
max: 10
152+
fuzziness:
153+
numerator: 1
154+
denominator: 20
155+
- name: DiskReadBytesSum
156+
- name: DiskReadOpsSum
157+
- name: DiskWriteBytesSum
158+
- name: DiskWriteOpsSum
159+
- name: EventDuration
160+
range:
161+
min: 1
162+
max: 1000
163+
- name: partOfAutoScalingGroup
164+
# we dived this value by 20 in the template, giving 20% chance to be part of an autoscaling group: in this case we append the related aws.tags
165+
range:
166+
min: 1
167+
max: 100

‎assets/templates/aws.ec2_metrics/schema-b/fields.yml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
- name: dimensionType
2+
type: keyword
3+
- name: Region
4+
type: keyword
5+
- name: AutoScalingGroupName
6+
type: keyword
7+
example: eks-standard-workers-22c2aa67-05ef-ad12-6406-b992651f6024
8+
- name: ImageId
9+
type: keyword
10+
example: ami-099ccc441b2ef41ec
11+
- name: InstanceId
12+
type: keyword
13+
example: i-0af20a3fedc456530
14+
- name: InstanceType
15+
type: keyword
16+
- name: instanceTypeIdx
17+
type: long
18+
- name: instanceCoreCount
19+
type: keyword
20+
- name: instanceThreadPerCore
21+
type: keyword
22+
- name: instanceImageId
23+
type: keyword
24+
example: ami-099ccc441b2ef41ec
25+
- name: instanceMonitoringState
26+
type: keyword
27+
- name: instancePrivateIP
28+
type: ip
29+
- name: instancePrivateDnsEmpty
30+
type: keyword
31+
- name: instancePublicIP
32+
type: ip
33+
- name: instancePublicDnsEmpty
34+
type: keyword
35+
- name: instanceStateName
36+
type: keyword
37+
- name: cloudInstanceName
38+
type: keyword
39+
example: an-instance-name
40+
- name: StatusCheckFailed_InstanceAvg
41+
type: double
42+
- name: StatusCheckFailed_SystemAvg
43+
type: double
44+
- name: StatusCheckFailedAvg
45+
type: double
46+
- name: CPUUtilizationAvg
47+
type: double
48+
- name: NetworkPacketsInSum
49+
type: double
50+
- name: NetworkPacketsOutSum
51+
type: double
52+
- name: CPUCreditBalanceAvg
53+
type: double
54+
- name: CPUSurplusCreditBalanceAvg
55+
type: double
56+
- name: CPUSurplusCreditsChargedAvg
57+
type: double
58+
- name: CPUCreditUsageAvg
59+
type: double
60+
- name: DiskReadBytesSum
61+
type: double
62+
- name: DiskReadOpsSum
63+
type: double
64+
- name: DiskWriteBytesSum
65+
type: double
66+
- name: DiskWriteOpsSum
67+
type: double
68+
- name: EventDuration
69+
type: long
70+
- name: EventIngested
71+
type: date
72+
- name: partOfAutoScalingGroup
73+
type: long

‎assets/templates/aws.ec2_metrics/schema-b/gotext.tpl‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
{{- /* metadata */ -}}
2+
{{- $Region := generate "Region" }}
3+
{{- $eventIngested := generate "EventIngested" }}
4+
{{- $eventDuration := generate "EventDuration" }}
5+
{{- /* availability zone */ -}}
6+
{{- $AvailabilityZone := awsAZFromRegion $Region }}
7+
{{- /* dimensions */ -}}
8+
{{- $AutoScalingGroupName := generate "AutoScalingGroupName" }}
9+
{{- $ImageId := generate "ImageId" }}
10+
{{- $InstanceId := generate "InstanceId" }}
11+
{{- $instanceTypeIdx := generate "instanceTypeIdx" }}
12+
{{- $InstanceTypeValues := generate "InstanceType" }}
13+
{{- $InstanceType := index $InstanceTypeValues $instanceTypeIdx }}
14+
{{- /* metrics */ -}}
15+
{{- $StatusCheckFailed_InstanceAvg := generate "StatusCheckFailed_InstanceAvg" }}
16+
{{- $StatusCheckFailed_SystemAvg := generate "StatusCheckFailed_SystemAvg" }}
17+
{{- $StatusCheckFailedAvg := generate "StatusCheckFailedAvg" }}
18+
{{- $CPUUtilizationAvg := generate "CPUUtilizationAvg" }}
19+
{{- $NetworkPacketsInSum := generate "NetworkPacketsInSum" }}
20+
{{- $NetworkPacketsOutSum := generate "NetworkPacketsOutSum" }}
21+
{{- $NetworkInSum := mul $NetworkPacketsInSum 15 }}
22+
{{- $NetworkOutSum := mul $NetworkPacketsOutSum 15 }}
23+
{{- $CPUCreditBalanceAvg := generate "CPUCreditBalanceAvg" }}
24+
{{- $CPUSurplusCreditBalanceAvg := generate "CPUSurplusCreditBalanceAvg" }}
25+
{{- $CPUSurplusCreditsChargedAvg := generate "CPUSurplusCreditsChargedAvg" }}
26+
{{- $CPUCreditUsageAvg := generate "CPUCreditUsageAvg" }}
27+
{{- $DiskReadBytesSum := generate "DiskReadBytesSum" }}
28+
{{- $DiskReadOpsSum := generate "DiskReadOpsSum" }}
29+
{{- $DiskWriteBytesSum := generate "DiskWriteBytesSum" }}
30+
{{- $DiskWriteOpsSum := generate "DiskWriteOpsSum" }}
31+
{{- /* instance data */ -}}
32+
{{- $instanceCoreCountValues := generate "instanceCoreCount" }}
33+
{{- $instanceCoreCount := index $instanceCoreCountValues $instanceTypeIdx }}
34+
{{- $instanceThreadPerCoreValues := generate "instanceThreadPerCore" }}
35+
{{- $instanceThreadPerCore := index $instanceThreadPerCoreValues $instanceTypeIdx }}
36+
{{- $instanceImageId := generate "instanceImageId" }}
37+
{{- $instanceMonitoringState := generate "instanceMonitoringState" }}
38+
{{- $instancePrivateIP := generate "instancePrivateIP" }}
39+
{{- $instancePrivateDnsEmpty := generate "instancePrivateDnsEmpty" }}
40+
{{- $instancePublicIP := generate "instancePublicIP" }}
41+
{{- $instancePublicDnsEmpty := generate "instancePublicDnsEmpty" }}
42+
{{- $instanceStateName := generate "instanceStateName" }}
43+
{{- $instanceStateCode := 16 }}
44+
{{- if eq $instanceStateName "running" }}
45+
{{- $instanceStateCode = 48 }}
46+
{{- end}}
47+
{{- $cloudInstanceName := generate "cloudInstanceName" }}
48+
{{- /* rate period */ -}}
49+
{{- $period := 60. }}
50+
{{- if eq $instanceMonitoringState "disabled" }}
51+
{{- $period = 300. }}
52+
{{- end}}
53+
{{- /* ip */ -}}
54+
{{- $instancePrivateDns := "" }}
55+
{{- if eq $instancePrivateDnsEmpty "fromPrivateIP" }}
56+
{{- $instancePrivateDnsPrefix := $instancePrivateIP | replace "." "-" }}
57+
{{- $instancePrivateDns = printf "%s.%s.compute.internal" $instancePrivateDnsPrefix $Region }}
58+
{{- end}}
59+
{{- $instancePublicDns := "" }}
60+
{{- if eq $instancePublicDnsEmpty "fromPublicIP" }}
61+
{{- $instancePublicDnsPrefix := $instancePublicIP | replace "." "-" }}
62+
{{- $instancePublicDns = printf "e2-%s.compute-1.amazonaws.com" $instancePublicDnsPrefix }}
63+
{{- end}}
64+
{{- /* tags */ -}}
65+
{{- $autoScalingGroupTag := "" }}
66+
{{- $partOfAutoScalingGroup := generate "partOfAutoScalingGroup" | mod 20 }}{{- /* 5% chance the instance is part of an autoscaling group */ -}}
67+
{{- if eq $partOfAutoScalingGroup 0 }}
68+
{{- $autoScalingGroupTag = cat "\"aws.tags.aws:autoscaling:groupName\":" "\"" $AutoScalingGroupName "\"," | nospace }}
69+
{{- end}}
70+
{{- /* events */ -}}
71+
{ "@timestamp": "{{ $eventIngested.Format "2006-01-02T15:04:05.999999Z07:00" }}", "ecs.version": "8.0.0", "agent": { "name": "docker-fleet-agent", "id": "2d4b09d0-cdb6-445e-ac3f-6415f87b9864", "type": "metricbeat", "ephemeral_id": "cdaaaabb-be7e-432f-816b-bda019fd7c15", "version": "8.3.2" }, "elastic_agent": { "id": "2d4b09d0-cdb6-445e-ac3f-6415f87b9864", "version": "8.3.2", "snapshot": false }, "cloud": { "provider": "aws", "region": "{{ $Region }}", "account": { "name": "elastic-beats", "id": "000000000000" } }, "ecs": { "version": "8.0.0" }, "service": { "type": "aws" }, "data_stream": { "namespace": "default", "type": "metrics", "dataset": "aws.ec2_metrics" }, "metricset": { "period": 3600000, "name": "cloudwatch" }, "event": { "duration": {{ $eventDuration }}, "agent_id_status": "verified", "ingested": "{{ $eventIngested.Format "2006-01-02T15:04:05.999999Z07:00" }}", "module": "aws", "dataset": "aws.ec2_metrics" }, "aws": { "cloudwatch": { "namespace": "AWS/EC2" } },
72+
{{- $dimensionType := generate "dimensionType" -}}
73+
{{- if eq $dimensionType "AutoScalingGroupName" -}}
74+
"aws.dimensions.AutoScalingGroupName": "{{ $AutoScalingGroupName }}", "aws.ec2.metrics.CPUCreditBalance.avg": {{ $CPUCreditBalanceAvg }}, "aws.ec2.metrics.CPUCreditUsage.avg": {{ $CPUCreditUsageAvg }}, "aws.ec2.metrics.CPUSurplusCreditBalance.avg": {{ $CPUSurplusCreditBalanceAvg }}, "aws.ec2.metrics.CPUSurplusCreditsCharged.avg": {{ $CPUSurplusCreditsChargedAvg }}, "aws.ec2.metrics.CPUUtilization.avg": {{ $CPUUtilizationAvg }}, "aws.ec2.metrics.NetworkIn.sum": {{ $NetworkInSum }}, "aws.ec2.metrics.NetworkOut.sum": {{ $NetworkOutSum }}, "aws.ec2.metrics.NetworkPacketsIn.sum": {{ $NetworkPacketsInSum }}, "aws.ec2.metrics.NetworkPacketsOut.sum": {{ $NetworkPacketsOutSum }}, "aws.ec2.metrics.StatusCheckFailed_Instance.avg": {{ $StatusCheckFailed_InstanceAvg }}, "aws.ec2.metrics.StatusCheckFailed_System.avg": {{ $StatusCheckFailed_SystemAvg }}, "aws.ec2.metrics.StatusCheckFailed.avg": {{ $StatusCheckFailedAvg }} }
75+
{{- else if eq $dimensionType "ImageId" -}}
76+
"aws.dimensions.ImageId": "{{ $ImageId }}", "aws.ec2.metrics.CPUUtilization.avg": {{ $CPUUtilizationAvg }}, "aws.ec2.metrics.DiskReadBytes.sum": {{ $DiskReadBytesSum }}, "aws.ec2.metrics.DiskReadOps.sum": {{ $DiskReadOpsSum }}, "aws.ec2.metrics.DiskWriteBytes.sum": {{ $DiskWriteBytesSum }}, "aws.ec2.metrics.DiskWriteOps.sum": {{ $DiskWriteOpsSum }}, "aws.ec2.metrics.NetworkIn.sum": {{ $NetworkInSum }}, "aws.ec2.metrics.NetworkOut.sum": {{ $NetworkOutSum }} }
77+
{{- else if eq $dimensionType "InstanceId" -}}
78+
"aws.dimensions.InstanceId": "{{ $InstanceId }}", "aws.ec2.instance.core.count": {{ $instanceCoreCount }}, "aws.ec2.instance.image.id": "{{ $instanceImageId }}", "aws.ec2.instance.monitoring.state": "{{ $instanceMonitoringState }}", "aws.ec2.instance.private.dns_name": "{{ $instancePrivateDns }}", "aws.ec2.instance.private.ip": "{{ $instancePrivateIP }}", "aws.ec2.instance.public.dns_name": "{{ $instancePublicDns }}", "aws.ec2.instance.public.ip": "{{ $instancePublicIP }}", "aws.ec2.instance.state.code": {{ $instanceStateCode }}, "aws.ec2.instance.state.name": "{{ $instanceStateName }}", "aws.ec2.instance.threads_per_core": {{ $instanceThreadPerCore }}, "aws.ec2.metrics.CPUCreditBalance.avg": {{ $CPUCreditBalanceAvg }}, "aws.ec2.metrics.CPUCreditUsage.avg": {{ $CPUCreditUsageAvg }}, "aws.ec2.metrics.CPUSurplusCreditBalance.avg": {{ $CPUSurplusCreditBalanceAvg }}, "aws.ec2.metrics.CPUSurplusCreditsCharged.avg": {{ $CPUSurplusCreditsChargedAvg }}, "aws.ec2.metrics.CPUUtilization.avg": {{ $CPUUtilizationAvg }}, "aws.ec2.metrics.DiskReadBytes.rate": {{ divf $DiskReadBytesSum $period }}, "aws.ec2.metrics.DiskReadBytes.sum": {{ $DiskReadBytesSum }}, "aws.ec2.metrics.DiskReadOps.rate": {{ divf $DiskReadOpsSum $period }}, "aws.ec2.metrics.DiskReadOps.sum": {{ $DiskReadOpsSum }}, "aws.ec2.metrics.DiskWriteBytes.rate": {{ divf $DiskWriteBytesSum $period }}, "aws.ec2.metrics.DiskWriteBytes.sum": {{ $DiskWriteBytesSum }}, "aws.ec2.metrics.DiskWriteOps.rate": {{ divf $DiskWriteOpsSum $period }}, "aws.ec2.metrics.DiskWriteOps.sum": {{ $DiskWriteOpsSum }}, "aws.ec2.metrics.NetworkIn.rate": {{ divf $NetworkInSum $period }}, "aws.ec2.metrics.NetworkIn.sum": {{ $NetworkInSum }}, "aws.ec2.metrics.NetworkOut.rate": {{ divf $NetworkOutSum $period }}, "aws.ec2.metrics.NetworkOut.sum": {{ $NetworkOutSum }}, "aws.ec2.metrics.NetworkPacketsIn.rate": {{ divf $NetworkPacketsInSum $period }}, "aws.ec2.metrics.NetworkPacketsIn.sum": {{ $NetworkPacketsInSum }}, "aws.ec2.metrics.NetworkPacketsOut.rate": {{ divf $NetworkPacketsOutSum $period }}, "aws.ec2.metrics.NetworkPacketsOut.sum": {{ $NetworkPacketsOutSum }}, "aws.ec2.metrics.StatusCheckFailed_Instance.avg": {{ $StatusCheckFailed_InstanceAvg }}, "aws.ec2.metrics.StatusCheckFailed_System.avg": {{ $StatusCheckFailed_SystemAvg }}, "aws.ec2.metrics.StatusCheckFailed.avg": {{ $StatusCheckFailedAvg }}, "aws.tags.Name": "{{ $cloudInstanceName }}", {{ $autoScalingGroupTag }} "cloud.availability_zone": "{{ $AvailabilityZone }}", "cloud.instance.id": "{{ $InstanceId }}", "cloud.instance.name": "{{ $cloudInstanceName }}", "cloud.machine.type": "{{ $InstanceType }}", "host.cpu.usage": {{ $CPUUtilizationAvg }}, "host.disk.read.bytes": {{ $DiskReadBytesSum }}, "host.disk.write.bytes": {{ $DiskWriteBytesSum }}, "host.id": "{{ $InstanceId }}", "host.name": "{{ $cloudInstanceName }}", "host.network.egress.bytes": {{ $NetworkOutSum }}, "host.network.egress.packets": {{ $NetworkPacketsOutSum }}, "host.network.ingress.bytes": {{ $NetworkInSum }}, "host.network.ingress.packets": {{ $NetworkPacketsInSum }} }
79+
{{- else if eq $dimensionType "InstanceType" -}}
80+
"aws.dimensions.InstanceType": "{{ $InstanceType }}", "aws.ec2.metrics.CPUUtilization.avg": {{ $CPUUtilizationAvg }}, "aws.ec2.metrics.DiskReadBytes.sum": {{ $DiskReadBytesSum }}, "aws.ec2.metrics.DiskReadOps.sum": {{ $DiskReadOpsSum }}, "aws.ec2.metrics.DiskWriteBytes.sum": {{ $DiskWriteBytesSum }}, "aws.ec2.metrics.DiskWriteOps.sum": {{ $DiskWriteOpsSum }}, "aws.ec2.metrics.NetworkIn.sum": {{ $NetworkInSum }}, "aws.ec2.metrics.NetworkOut.sum": {{ $NetworkOutSum }} }
81+
{{- else -}}
82+
"aws.ec2.metrics.CPUUtilization.avg": {{ $CPUUtilizationAvg }}, "aws.ec2.metrics.DiskReadBytes.sum": {{ $DiskReadBytesSum }}, "aws.ec2.metrics.DiskReadOps.sum": {{ $DiskReadOpsSum }}, "aws.ec2.metrics.DiskWriteBytes.sum": {{ $DiskWriteBytesSum }}, "aws.ec2.metrics.DiskWriteOps.sum": {{ $DiskWriteOpsSum }}, "aws.ec2.metrics.NetworkIn.sum": {{ $NetworkInSum }}, "aws.ec2.metrics.NetworkOut.sum": {{ $NetworkOutSum }} }
83+
{{- end -}}

‎pkg/genlib/config/config.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ type Config struct {
2121
}
2222

2323
type ConfigField struct {
24-
Name string `config:"name"`
25-
Fuzziness Ratio `config:"fuzziness"`
26-
Range Range `config:"range"`
27-
Cardinality Ratio `config:"cardinality"`
28-
Enum []string `config:"enum"`
29-
ObjectKeys []string `config:"object_keys"`
30-
Value interface{} `config:"value"`
24+
Name string `config:"name"`
25+
Fuzziness Ratio `config:"fuzziness"`
26+
Range Range `config:"range"`
27+
Cardinality Ratio `config:"cardinality"`
28+
Enum []string `config:"enum"`
29+
ObjectKeys []string `config:"object_keys"`
30+
Value any `config:"value"`
3131
}
3232

3333
func LoadConfig(configFile string) (Config, error) {

0 commit comments

Comments
 (0)