github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-02-09 15:27:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib/promscrape/discovery/ec2: expose __meta_ec2_ami like the next Prometheus release will do

Browse source 
See b5d61fb66c for details
This commit is contained in:
Aliaksandr Valialkin 2020-06-20 17:40:47 +03:00
parent 2fc2679a3f
commit 1f2826bae2
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/promscrape/discovery/ec2/instance.go
View file

@ -72,6 +72,7 @@ type Instance struct {
PrivateIPAddress string `xml:"privateIpAddress"`
Architecture string `xml:"architecture"`
Placement Placement `xml:"placement"`
ImageID string `xml:"imageId"`
ID string `xml:"instanceId"`
Lifecycle string `xml:"instanceLifecycle"`
State InstanceState `xml:"instanceState"`
@ -134,6 +135,7 @@ func (inst *Instance) appendTargetLabels(ms []map[string]string, ownerID string,
m := map[string]string{
"__address__": addr,
"__meta_ec2_architecture": inst.Architecture,
"__meta_ec2_ami": inst.ImageID,
"__meta_ec2_availability_zone": inst.Placement.AvailabilityZone,
"__meta_ec2_instance_id": inst.ID,
"__meta_ec2_instance_lifecycle": inst.Lifecycle,

2
lib/promscrape/discovery/ec2/instance_test.go
View file

@ -146,6 +146,7 @@ func TestParseInstancesResponse(t *testing.T) {
AvailabilityZone: "eu-west-2c",
},
ID: "i-0e730b692d9c15460",
ImageID: "ami-0eb89db7593b5d434",
Lifecycle: "spot",
State: InstanceState{
Name: "running",
@ -197,6 +198,7 @@ func TestParseInstancesResponse(t *testing.T) {
"__address__": "172.31.11.152:423",
"__meta_ec2_architecture": "x86_64",
"__meta_ec2_availability_zone": "eu-west-2c",
"__meta_ec2_ami": "ami-0eb89db7593b5d434",
"__meta_ec2_instance_id": "i-0e730b692d9c15460",
"__meta_ec2_instance_lifecycle": "spot",
"__meta_ec2_instance_state": "running",