Adding **configuration** support for metricDefaults.scraping.inteval

fixes #tomkerkhove#259
brandonh-msft · Mar 26, 2019 · 48540e2 · 48540e2
1 parent 1f54551
commit 48540e2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/Promitor.Core.Scraping/Configuration/Model/MetricDefaults.cs b/src/Promitor.Core.Scraping/Configuration/Model/MetricDefaults.cs
@@ -1,7 +1,11 @@
-namespace Promitor.Core.Scraping.Configuration.Model
+using System;
+
+namespace Promitor.Core.Scraping.Configuration.Model
 {
     public class MetricDefaults
     {
         public Aggregation Aggregation { get; set; } = new Aggregation();
+
+        public TimeSpan ScrapingInterval { get; set; }
     }
 }
diff --git a/src/Promitor.Core.Scraping/Configuration/Serialization/Core/MetricDefaultsDeserializer.cs b/src/Promitor.Core.Scraping/Configuration/Serialization/Core/MetricDefaultsDeserializer.cs
@@ -1,4 +1,5 @@
-using GuardNet;
+using System;
+using GuardNet;
 using Microsoft.Extensions.Logging;
 using Promitor.Core.Scraping.Configuration.Model;
 using YamlDotNet.RepresentationModel;
@@ -15,18 +16,29 @@ internal override MetricDefaults Deserialize(YamlMappingNode node)
         {
             Guard.NotNull(node, nameof(node));
 
-            Aggregation aggregation = null;
+            var metricDefaults = new MetricDefaults();
+
             if (node.Children.ContainsKey("aggregation"))
             {
-                var metricDefaultsNode = (YamlMappingNode) node.Children[new YamlScalarNode("aggregation")];
+                var metricDefaultsNode = (YamlMappingNode)node.Children[new YamlScalarNode("aggregation")];
                 var metricDefaultsSerializer = new AggregationDeserializer(Logger);
-                aggregation = metricDefaultsSerializer.Deserialize(metricDefaultsNode);
+                var aggregation = metricDefaultsSerializer.Deserialize(metricDefaultsNode);
+                metricDefaults.Aggregation = aggregation;
             }
 
-            return new MetricDefaults
+            if (node.Children.ContainsKey(@"scraping"))
             {
-                Aggregation = aggregation
-            };
+                var scrapingNode =(YamlMappingNode) node.Children[new YamlScalarNode(@"scraping")] ;
+                var scrapingIntervalNode = scrapingNode.Children[new YamlScalarNode(@"interval")];
+
+                if (scrapingIntervalNode != null)
+                {
+                    var scrapingIntervalTimeSpan = TimeSpan.Parse(scrapingIntervalNode.ToString());
+                    metricDefaults.ScrapingInterval = scrapingIntervalTimeSpan;
+                }
+            }
+
+            return metricDefaults;
         }
     }
 }