-
-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
1 parent
f869ba9
commit 222e5a6
Showing
25 changed files
with
80 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
....Scraping/Configuration/Serialization/v1/Providers/ContainerInstanceMetricDeserializer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
....Scraping/Configuration/Serialization/v1/Providers/ContainerRegistryMetricDeserializer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...itor.Core.Scraping/Configuration/Serialization/v1/Providers/CosmosDbMetricDeserializer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...e.Scraping/Configuration/Serialization/v1/Providers/NetworkInterfaceMetricDeserializer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...or.Core.Scraping/Configuration/Serialization/v1/Providers/PostgreSqlMetricDeserializer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...or.Core.Scraping/Configuration/Serialization/v1/Providers/RedisCacheMetricDeserializer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...re.Scraping/Configuration/Serialization/v1/Providers/ServiceBusQueueMetricDeserializer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...ore.Scraping/Configuration/Serialization/v1/Providers/VirtualMachineMetricDeserializer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 37 additions & 36 deletions
73
src/Promitor.Core.Scraping/Factories/MetricDeserializerFactory.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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."); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.