Fix resource group overriding

The ability to override the resource group per metric was broken for all resource types other than the Generic resource type.

This commit:

- Fixes the tests for all resource types to test for this by removing the `Ignore()` method calls for the `ResourceGroupName` property and added an extra assert to check for the resource group.
- Alters the deserializers to inherit directly from `MetricDeserializer` rather than `GenericAzureMetricDeserializer`. They weren't actually using any of the functionality from the generic type.
- Fixes a few Scraper implementations to actually use the overridden group name.

Fixes #655

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/MetricDeserializer.cs

@@ -28,6 +28,7 @@ protected virtual TMetricDefinition DeserializeMetricDefinition<TMetricDefinitio
 
             var name = metricNode.Children[new YamlScalarNode("name")];
             var description = metricNode.Children[new YamlScalarNode("description")];
+
             var azureMetricConfigurationNode = (YamlMappingNode)metricNode.Children[new YamlScalarNode("azureMetricConfiguration")];
 
             var azureMetricConfigurationDeserializer = new AzureMetricConfigurationDeserializer(Logger);
@@ -37,7 +38,8 @@ protected virtual TMetricDefinition DeserializeMetricDefinition<TMetricDefinitio
             {
                 Name = name?.ToString(),
                 Description = description?.ToString(),
-                AzureMetricConfiguration = azureMetricConfiguration
+                AzureMetricConfiguration = azureMetricConfiguration,
+                ResourceGroupName = GetResourceGroupName(metricNode)
             };
 
             DeserializeScraping(metricNode, metricDefinition);
@@ -46,6 +48,16 @@ protected virtual TMetricDefinition DeserializeMetricDefinition<TMetricDefinitio
             return metricDefinition;
         }
 
+        private static string GetResourceGroupName(YamlMappingNode metricNode)
+        {
+            if (metricNode.Children.TryGetValue("resourceGroupName", out var resourceGroupNode))
+            {
+                return resourceGroupNode.ToString();
+            }
+
+            return null;
+        }
+
         private static void DeserializeScraping<TMetricDefinition>(YamlMappingNode metricNode, TMetricDefinition metricDefinition) where TMetricDefinition : MetricDefinition, new()
         {
             if (metricNode.Children.ContainsKey(@"scraping") == false)

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Providers/ContainerInstanceMetricDeserializer.cs

@@ -1,10 +1,11 @@
 using Promitor.Core.Scraping.Configuration.Model.Metrics;
 using Promitor.Core.Scraping.Configuration.Model.Metrics.ResourceTypes;
+using Promitor.Core.Scraping.Configuration.Serialization.v1.Core;
 using YamlDotNet.RepresentationModel;
 
 namespace Promitor.Core.Scraping.Configuration.Serialization.v1.Providers
 {
-    internal class ContainerInstanceMetricDeserializer : GenericAzureMetricDeserializer
+    internal class ContainerInstanceMetricDeserializer : MetricDeserializer
     {
         /// <summary>Deserializes the specified Container Instances metric node from the YAML configuration file.</summary>
         /// <param name="metricNode">The metric node to deserialize to Container Instances configuration</param>

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Providers/ContainerRegistryMetricDeserializer.cs

@@ -1,10 +1,11 @@
 using Promitor.Core.Scraping.Configuration.Model.Metrics;
 using Promitor.Core.Scraping.Configuration.Model.Metrics.ResourceTypes;
+using Promitor.Core.Scraping.Configuration.Serialization.v1.Core;
 using YamlDotNet.RepresentationModel;
 
 namespace Promitor.Core.Scraping.Configuration.Serialization.v1.Providers
 {
-    internal class ContainerRegistryMetricDeserializer : GenericAzureMetricDeserializer
+    internal class ContainerRegistryMetricDeserializer : MetricDeserializer
     {
         /// <summary>Deserializes the specified Container Registry metric node from the YAML configuration file.</summary>
         /// <param name="metricNode">The metric node to deserialize to Container Registry configuration</param>

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Providers/CosmosDbMetricDeserializer.cs

@@ -1,10 +1,11 @@
 using Promitor.Core.Scraping.Configuration.Model.Metrics;
 using Promitor.Core.Scraping.Configuration.Model.Metrics.ResourceTypes;
+using Promitor.Core.Scraping.Configuration.Serialization.v1.Core;
 using YamlDotNet.RepresentationModel;
 
 namespace Promitor.Core.Scraping.Configuration.Serialization.v1.Providers
 {
-    internal class CosmosDbMetricDeserializer : GenericAzureMetricDeserializer
+    internal class CosmosDbMetricDeserializer : MetricDeserializer
     {
         /// <summary>Deserializes the specified Cosmos DB metric node from the YAML configuration file.</summary>
         /// <param name="metricNode">The metric node to deserialize to Cosmos DB configuration</param>

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Providers/GenericAzureMetricDeserializer.cs

@@ -18,10 +18,6 @@ internal override MetricDefinition Deserialize(YamlMappingNode metricNode)
             {
                 metricDefinition.Filter = filterNode?.ToString();
             }
-            if (metricNode.Children.TryGetValue(new YamlScalarNode("resourceGroupName"), out var resourceGroupName))
-            {
-                metricDefinition.ResourceGroupName = resourceGroupName?.ToString();
-            }
 
             var resourceUri = metricNode.Children[new YamlScalarNode(value: "resourceUri")];
 

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Providers/NetworkInterfaceMetricDeserializer.cs

@@ -1,10 +1,11 @@
 using Promitor.Core.Scraping.Configuration.Model.Metrics;
 using Promitor.Core.Scraping.Configuration.Model.Metrics.ResourceTypes;
+using Promitor.Core.Scraping.Configuration.Serialization.v1.Core;
 using YamlDotNet.RepresentationModel;
 
 namespace Promitor.Core.Scraping.Configuration.Serialization.v1.Providers
 {
-    internal class NetworkInterfaceMetricDeserializer : GenericAzureMetricDeserializer
+    internal class NetworkInterfaceMetricDeserializer : MetricDeserializer
     {
         /// <summary>Deserializes the specified Network Interface metric node from the YAML configuration file.</summary>
         /// <param name="metricNode">The metric node containing 'networkInterfaceName' parameter pointing to an instance of a Network Interface</param>

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Providers/PostgreSqlMetricDeserializer.cs

@@ -1,13 +1,14 @@
 using Promitor.Core.Scraping.Configuration.Model.Metrics;
 using Promitor.Core.Scraping.Configuration.Model.Metrics.ResourceTypes;
+using Promitor.Core.Scraping.Configuration.Serialization.v1.Core;
 using YamlDotNet.RepresentationModel;
 
 namespace Promitor.Core.Scraping.Configuration.Serialization.v1.Providers
 {
     /// <summary>
     /// Defines a deserializer for the PostgreSQL Server resource type
     /// </summary>
-    internal class PostgreSqlMetricDeserializer : GenericAzureMetricDeserializer
+    internal class PostgreSqlMetricDeserializer : MetricDeserializer
     {
         /// <summary>
         /// Deserializes the specified PostgreSQL Server metric node from the YAML configuration file.

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Providers/RedisCacheMetricDeserializer.cs

@@ -1,13 +1,14 @@
 using Promitor.Core.Scraping.Configuration.Model.Metrics;
 using Promitor.Core.Scraping.Configuration.Model.Metrics.ResourceTypes;
+using Promitor.Core.Scraping.Configuration.Serialization.v1.Core;
 using YamlDotNet.RepresentationModel;
 
 namespace Promitor.Core.Scraping.Configuration.Serialization.v1.Providers
 {
     /// <summary>
     /// Defines a deserializer for the Redis Cache resource type
     /// </summary>
-    internal class RedisCacheMetricDeserializer : GenericAzureMetricDeserializer
+    internal class RedisCacheMetricDeserializer : MetricDeserializer
     {
         /// <summary>
         /// Deserializes the specified Redis Cache metric node from the YAML configuration file.

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Providers/ServiceBusQueueMetricDeserializer.cs

@@ -1,10 +1,11 @@
 using Promitor.Core.Scraping.Configuration.Model.Metrics;
 using Promitor.Core.Scraping.Configuration.Model.Metrics.ResourceTypes;
+using Promitor.Core.Scraping.Configuration.Serialization.v1.Core;
 using YamlDotNet.RepresentationModel;
 
 namespace Promitor.Core.Scraping.Configuration.Serialization.v1.Providers
 {
-    internal class ServiceBusQueueMetricDeserializer : GenericAzureMetricDeserializer
+    internal class ServiceBusQueueMetricDeserializer : MetricDeserializer
     {
         /// <summary>Deserializes the specified Service Bus Queue metric node from the YAML configuration file.</summary>
         /// <param name="metricNode">The metric node to deserialize to Service Bus queue</param>

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Providers/StorageQueueMetricDeserializer.cs

@@ -6,7 +6,7 @@
 
 namespace Promitor.Core.Scraping.Configuration.Serialization.v1.Providers
 {
-    internal class StorageQueueMetricDeserializer : GenericAzureMetricDeserializer
+    internal class StorageQueueMetricDeserializer : MetricDeserializer
     {
         /// <summary>Deserializes the specified Storage Queue metric node from the YAML configuration file.</summary>
         /// <param name="metricNode">The metric node to deserialize to Storage queue configuration</param>

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Providers/VirtualMachineMetricDeserializer.cs

@@ -1,10 +1,11 @@
 using Promitor.Core.Scraping.Configuration.Model.Metrics;
 using Promitor.Core.Scraping.Configuration.Model.Metrics.ResourceTypes;
+using Promitor.Core.Scraping.Configuration.Serialization.v1.Core;
 using YamlDotNet.RepresentationModel;
 
 namespace Promitor.Core.Scraping.Configuration.Serialization.v1.Providers
 {
-    internal class VirtualMachineMetricDeserializer : GenericAzureMetricDeserializer
+    internal class VirtualMachineMetricDeserializer : MetricDeserializer
     {
         /// <summary>Deserializes the specified Virtual Machine metric node from the YAML configuration file.</summary>
         /// <param name="metricNode">The metric node containing 'virtualMachineName' parameter pointing to an instance of a Virtual Machine</param>

src/Promitor.Core.Scraping/Factories/MetricDeserializerFactory.cs

@@ -1,37 +1,38 @@
-using System;
-using Promitor.Core.Scraping.Configuration.Serialization.v1.Providers;
-
-namespace Promitor.Core.Scraping.Factories
-{
-    internal static class MetricDeserializerFactory
-    {
-        internal static GenericAzureMetricDeserializer GetDeserializerFor(Configuration.Model.ResourceType resource)
-        {
-            switch (resource)
-            {
-                case Configuration.Model.ResourceType.Generic:
-                    return new GenericAzureMetricDeserializer();
-                case Configuration.Model.ResourceType.ServiceBusQueue:
-                    return new ServiceBusQueueMetricDeserializer();
-                case Configuration.Model.ResourceType.StorageQueue:
-                    return new StorageQueueMetricDeserializer();
-                case Configuration.Model.ResourceType.ContainerInstance:
-                    return new ContainerInstanceMetricDeserializer();
-                case Configuration.Model.ResourceType.VirtualMachine:
-                    return new VirtualMachineMetricDeserializer();
-                case Configuration.Model.ResourceType.ContainerRegistry:
-                    return new ContainerRegistryMetricDeserializer();
-                case Configuration.Model.ResourceType.NetworkInterface:
-                    return new NetworkInterfaceMetricDeserializer();
-				case Configuration.Model.ResourceType.CosmosDb:
-                    return new CosmosDbMetricDeserializer();
-                case Configuration.Model.ResourceType.RedisCache:
+using System;
+using Promitor.Core.Scraping.Configuration.Serialization.v1.Core;
+using Promitor.Core.Scraping.Configuration.Serialization.v1.Providers;
+
+namespace Promitor.Core.Scraping.Factories
+{
+    internal static class MetricDeserializerFactory
+    {
+        internal static MetricDeserializer GetDeserializerFor(Configuration.Model.ResourceType resource)
+        {
+            switch (resource)
+            {
+                case Configuration.Model.ResourceType.Generic:
+                    return new GenericAzureMetricDeserializer();
+                case Configuration.Model.ResourceType.ServiceBusQueue:
+                    return new ServiceBusQueueMetricDeserializer();
+                case Configuration.Model.ResourceType.StorageQueue:
+                    return new StorageQueueMetricDeserializer();
+                case Configuration.Model.ResourceType.ContainerInstance:
+                    return new ContainerInstanceMetricDeserializer();
+                case Configuration.Model.ResourceType.VirtualMachine:
+                    return new VirtualMachineMetricDeserializer();
+                case Configuration.Model.ResourceType.ContainerRegistry:
+                    return new ContainerRegistryMetricDeserializer();
+                case Configuration.Model.ResourceType.NetworkInterface:
+                    return new NetworkInterfaceMetricDeserializer();
+				case Configuration.Model.ResourceType.CosmosDb:
+                    return new CosmosDbMetricDeserializer();
+                case Configuration.Model.ResourceType.RedisCache:
                     return new RedisCacheMetricDeserializer();
-                case Configuration.Model.ResourceType.PostgreSql:
-                    return new PostgreSqlMetricDeserializer();
-            }
-
-            throw new ArgumentOutOfRangeException($@"Resource Type {resource} not supported.");
-        }
-    }
-}
+                case Configuration.Model.ResourceType.PostgreSql:
+                    return new PostgreSqlMetricDeserializer();
+            }
+
+            throw new ArgumentOutOfRangeException($@"Resource Type {resource} not supported.");
+        }
+    }
+}

src/Promitor.Core.Scraping/ResourceTypes/ContainerInstanceScraper.cs

@@ -16,7 +16,7 @@ public ContainerInstanceScraper(ScraperConfiguration scraperConfiguration)
 
         protected override async Task<ScrapeResult> ScrapeResourceAsync(string subscriptionId, string resourceGroupName, ContainerInstanceMetricDefinition metricDefinition, AggregationType aggregationType, TimeSpan aggregationInterval)
         {
-            var resourceUri = string.Format(ResourceUriTemplate, AzureMetadata.SubscriptionId, AzureMetadata.ResourceGroupName, metricDefinition.ContainerGroup);
+            var resourceUri = string.Format(ResourceUriTemplate, AzureMetadata.SubscriptionId, resourceGroupName, metricDefinition.ContainerGroup);
 
             var metricName = metricDefinition.AzureMetricConfiguration.MetricName;
             var foundMetricValue = await AzureMonitorClient.QueryMetricAsync(metricName, aggregationType, aggregationInterval, resourceUri);

src/Promitor.Core.Scraping/ResourceTypes/NetworkInterfaceScraper.cs

@@ -16,7 +16,7 @@ public NetworkInterfaceScraper(ScraperConfiguration scraperConfiguration)
 
         protected override async Task<ScrapeResult> ScrapeResourceAsync(string subscriptionId, string resourceGroupName, NetworkInterfaceMetricDefinition metricDefinition, AggregationType aggregationType, TimeSpan aggregationInterval)
         {
-            var resourceUri = string.Format(ResourceUriTemplate, AzureMetadata.SubscriptionId, AzureMetadata.ResourceGroupName, metricDefinition.NetworkInterfaceName);
+            var resourceUri = string.Format(ResourceUriTemplate, AzureMetadata.SubscriptionId, resourceGroupName, metricDefinition.NetworkInterfaceName);
 
             var metricName = metricDefinition.AzureMetricConfiguration.MetricName;
             var foundMetricValue = await AzureMonitorClient.QueryMetricAsync(metricName, aggregationType, aggregationInterval, resourceUri);

src/Promitor.Core.Scraping/ResourceTypes/VirtualMachineScraper.cs

@@ -16,7 +16,7 @@ public VirtualMachineScraper(ScraperConfiguration scraperConfiguration)
 
         protected override async Task<ScrapeResult> ScrapeResourceAsync(string subscriptionId, string resourceGroupName, VirtualMachineMetricDefinition metricDefinition, AggregationType aggregationType, TimeSpan aggregationInterval)
         {
-            var resourceUri = string.Format(ResourceUriTemplate, AzureMetadata.SubscriptionId, AzureMetadata.ResourceGroupName, metricDefinition.VirtualMachineName);
+            var resourceUri = string.Format(ResourceUriTemplate, AzureMetadata.SubscriptionId, resourceGroupName, metricDefinition.VirtualMachineName);
 
             var metricName = metricDefinition.AzureMetricConfiguration.MetricName;
             var foundMetricValue = await AzureMonitorClient.QueryMetricAsync(metricName, aggregationType, aggregationInterval, resourceUri);

src/Promitor.Scraper.Tests.Unit/Serialization/MetricsDeclaration/MetricsDeclarationWithAzureStorageQueueYamlSerializationTests.cs

@@ -88,8 +88,7 @@ private StorageQueueMetricDefinition GenerateBogusAzureStorageQueueMetricDefinit
                 .RuleFor(metricDefinition => metricDefinition.AzureMetricConfiguration, faker => bogusAzureMetricConfiguration)
                 .RuleFor(metricDefinition => metricDefinition.ResourceGroupName, faker => resourceGroupName)
                 .RuleFor(metricDefinition => metricDefinition.Scraping, faker => bogusScrapingInterval)
-                .RuleFor(metricDefinition => metricDefinition.Labels, faker => new Dictionary<string, string> { { faker.Name.FirstName(), faker.Random.Guid().ToString() } })
-                .Ignore(metricDefinition => metricDefinition.ResourceGroupName);
+                .RuleFor(metricDefinition => metricDefinition.Labels, faker => new Dictionary<string, string> { { faker.Name.FirstName(), faker.Random.Guid().ToString() } });
 
             return bogusGenerator.Generate();
         }

src/Promitor.Scraper.Tests.Unit/Serialization/MetricsDeclaration/MetricsDeclarationWithContainerInstanceYamlSerializationTests.cs

@@ -76,8 +76,7 @@ private ContainerInstanceMetricDefinition GenerateBogusContainerInstanceMetricDe
                 .RuleFor(metricDefinition => metricDefinition.AzureMetricConfiguration, faker => bogusAzureMetricConfiguration)
                 .RuleFor(metricDefinition => metricDefinition.ResourceGroupName, faker => resourceGroupName)
                 .RuleFor(metricDefinition => metricDefinition.Scraping, faker => bogusScrapingInterval)
-                .RuleFor(metricDefinition => metricDefinition.Labels, faker => new Dictionary<string, string> { { faker.Name.FirstName(), faker.Random.Guid().ToString() } })
-                .Ignore(metricDefinition => metricDefinition.ResourceGroupName);
+                .RuleFor(metricDefinition => metricDefinition.Labels, faker => new Dictionary<string, string> { { faker.Name.FirstName(), faker.Random.Guid().ToString() } });
 
             return bogusGenerator.Generate();
         }

src/Promitor.Scraper.Tests.Unit/Serialization/MetricsDeclaration/MetricsDeclarationWithContainerRegistryYamlSerializationTests.cs

@@ -72,8 +72,7 @@ private ContainerRegistryMetricDefinition GenerateBogusContainerRegistryMetricDe
                 .RuleFor(metricDefinition => metricDefinition.AzureMetricConfiguration, faker => bogusAzureMetricConfiguration)
                 .RuleFor(metricDefinition => metricDefinition.ResourceGroupName, faker => resourceGroupName)
                 .RuleFor(metricDefinition => metricDefinition.Scraping, faker => bogusScrapingInterval)
-                .RuleFor(metricDefinition => metricDefinition.Labels, faker => new Dictionary<string, string> { { faker.Name.FirstName(), faker.Random.Guid().ToString() } })
-                .Ignore(metricDefinition => metricDefinition.ResourceGroupName);
+                .RuleFor(metricDefinition => metricDefinition.Labels, faker => new Dictionary<string, string> { { faker.Name.FirstName(), faker.Random.Guid().ToString() } });
 
             return bogusGenerator.Generate();
         }

src/Promitor.Scraper.Tests.Unit/Serialization/MetricsDeclaration/MetricsDeclarationWithCosmosDbYamlSerializationTests.cs

@@ -72,8 +72,7 @@ private CosmosDbMetricDefinition GenerateBogusCosmosDbMetricDefinition(string re
                 .RuleFor(metricDefinition => metricDefinition.AzureMetricConfiguration, faker => bogusAzureMetricConfiguration)
                 .RuleFor(metricDefinition => metricDefinition.ResourceGroupName, faker => resourceGroupName)
                 .RuleFor(metricDefinition => metricDefinition.Scraping, faker => bogusScrapingInterval)
-                .RuleFor(metricDefinition => metricDefinition.Labels, faker => new Dictionary<string, string> { { faker.Name.FirstName(), faker.Random.Guid().ToString() } })
-                .Ignore(metricDefinition => metricDefinition.ResourceGroupName);
+                .RuleFor(metricDefinition => metricDefinition.Labels, faker => new Dictionary<string, string> { { faker.Name.FirstName(), faker.Random.Guid().ToString() } });
 
             return bogusGenerator.Generate();
         }

src/Promitor.Scraper.Tests.Unit/Serialization/MetricsDeclaration/MetricsDeclarationWithNetworkInterfaceYamlSerializationTests.cs

@@ -71,8 +71,7 @@ private NetworkInterfaceMetricDefinition GenerateBogusNetworkInterfaceMetricDefi
                 .RuleFor(metricDefinition => metricDefinition.AzureMetricConfiguration, faker => bogusAzureMetricConfiguration)
                 .RuleFor(metricDefinition => metricDefinition.ResourceGroupName, faker => resourceGroupName)
                 .RuleFor(metricDefinition => metricDefinition.Scraping, faker => bogusScrapingInterval)
-                .RuleFor(metricDefinition => metricDefinition.Labels, faker => new Dictionary<string, string> { { faker.Name.FirstName(), faker.Random.Guid().ToString() } })
-                .Ignore(metricDefinition => metricDefinition.ResourceGroupName);
+                .RuleFor(metricDefinition => metricDefinition.Labels, faker => new Dictionary<string, string> { { faker.Name.FirstName(), faker.Random.Guid().ToString() } });
 
             return bogusGenerator.Generate();
         }