diff --git a/src/main/java/ai/asserts/aws/exporter/ResourceRelationExporter.java b/src/main/java/ai/asserts/aws/exporter/ResourceRelationExporter.java index 5d602d7f..5c8ce0b2 100644 --- a/src/main/java/ai/asserts/aws/exporter/ResourceRelationExporter.java +++ b/src/main/java/ai/asserts/aws/exporter/ResourceRelationExporter.java @@ -16,6 +16,8 @@ import java.util.SortedMap; import java.util.TreeMap; +import static ai.asserts.aws.MetricNameUtil.SITE; + @Component @Slf4j public class ResourceRelationExporter extends Collector implements MetricProvider { @@ -62,6 +64,8 @@ public void update() { relations.forEach(relation -> { String name = "aws_resource_relation"; SortedMap labels = new TreeMap<>(); + // Default site to from resource's region + labels.put(SITE, relation.getFrom().getRegion()); relation.getFrom().addLabels(labels, "from"); relation.getTo().addLabels(labels, "to"); labels.put("rel_name", relation.getName()); diff --git a/src/test/java/ai/asserts/aws/exporter/ResourceRelationExporterTest.java b/src/test/java/ai/asserts/aws/exporter/ResourceRelationExporterTest.java index e8c92e5a..42991f53 100644 --- a/src/test/java/ai/asserts/aws/exporter/ResourceRelationExporterTest.java +++ b/src/test/java/ai/asserts/aws/exporter/ResourceRelationExporterTest.java @@ -56,6 +56,7 @@ public void setup() { @Test public void update() { + expect(fromResource.getRegion()).andReturn("us-west-2").anyTimes(); expect(lbToECSRoutingBuilder.getRouting()).andReturn(ImmutableSet.of(ResourceRelation.builder() .from(fromResource) .to(toResource) @@ -87,19 +88,29 @@ public void update() { )); expect(sampleBuilder.buildSingleSample( - "aws_resource_relation", ImmutableSortedMap.of("rel_name", "name1"), 1.0D)) + "aws_resource_relation", ImmutableSortedMap.of( + "asserts_site", "us-west-2", + "rel_name", "name1"), 1.0D)) .andReturn(Optional.of(sample)); expect(sampleBuilder.buildSingleSample( - "aws_resource_relation", ImmutableSortedMap.of("rel_name", "name2"), 1.0D)) + "aws_resource_relation", ImmutableSortedMap.of( + "asserts_site", "us-west-2", + "rel_name", "name2"), 1.0D)) .andReturn(Optional.of(sample)); expect(sampleBuilder.buildSingleSample( - "aws_resource_relation", ImmutableSortedMap.of("rel_name", "name3"), 1.0D)) + "aws_resource_relation", ImmutableSortedMap.of( + "asserts_site", "us-west-2", + "rel_name", "name3"), 1.0D)) .andReturn(Optional.of(sample)); expect(sampleBuilder.buildSingleSample( - "aws_resource_relation", ImmutableSortedMap.of("rel_name", "name4"), 1.0D)) + "aws_resource_relation", ImmutableSortedMap.of( + "asserts_site", "us-west-2", + "rel_name", "name4"), 1.0D)) .andReturn(Optional.of(sample)); expect(sampleBuilder.buildSingleSample( - "aws_resource_relation", ImmutableSortedMap.of("rel_name", "name5"), 1.0D)) + "aws_resource_relation", ImmutableSortedMap.of( + "asserts_site", "us-west-2", + "rel_name", "name5"), 1.0D)) .andReturn(Optional.of(sample)); expect(sampleBuilder.buildFamily(ImmutableList.of(sample, sample, sample, sample, sample))) .andReturn(Optional.of(familySamples));