Filtering by dimensions which include / in name does not work in gene…

…ric scraper (#1273)
tomkerkhove · Sep 11, 2020 · a53b997 · a53b997
1 parent 18c5a96
commit a53b997
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/config/promitor/scraper/metrics.yaml b/config/promitor/scraper/metrics.yaml
@@ -128,7 +128,7 @@ metrics:
         type: Total
     resourceDiscoveryGroups:
     - name: service-bus-landscape
-  - name: promitor_demo_app_insights
+  - name: promitor_demo_app_insights_dependency_duration
     description: "Average dependency duration per dependency type"
     resourceType: Generic
     azureMetricConfiguration:
@@ -139,4 +139,15 @@ metrics:
         type: Average
     resources:
     - resourceUri: Microsoft.Insights/Components/docker-hub-metrics
-      resourceGroupName: docker-hub-metrics
+      resourceGroupName: docker-hub-metrics
+  - name: promitor_demo_app_insights_dependency_duration_200_OK
+    description: "Average dependency duration per dependency type"
+    resourceType: Generic
+    azureMetricConfiguration:
+      metricName: dependencies/duration
+      aggregation:
+        type: Average
+    resources:
+    - resourceUri: Microsoft.Insights/Components/docker-hub-metrics
+      resourceGroupName: docker-hub-metrics
+      filter: dependency/resultCode eq '200'
diff --git a/src/Promitor.Core.Scraping/ResourceTypes/GenericScraper.cs b/src/Promitor.Core.Scraping/ResourceTypes/GenericScraper.cs
@@ -17,5 +17,10 @@ protected override string BuildResourceUri(string subscriptionId, ScrapeDefiniti
         {
             return string.Format(ResourceUriTemplate, subscriptionId, scrapeDefinition.ResourceGroupName, resource.ResourceUri);
         }
+
+        protected override string DetermineMetricFilter(GenericAzureResourceDefinition resourceDefinition)
+        {
+            return resourceDefinition.Filter;
+        }
     }
 }
diff --git a/src/Promitor.Integrations.AzureMonitor/AzureMonitorClient.cs b/src/Promitor.Integrations.AzureMonitor/AzureMonitorClient.cs
@@ -206,7 +206,8 @@ private IWithMetricsQueryExecute CreateMetricsQuery(AggregationType metricAggreg
 
             if (string.IsNullOrWhiteSpace(metricFilter) == false)
             {
-                metricQuery.WithOdataFilter(metricFilter);
+                var filter = metricFilter.Replace("/", "%2F");
+                metricQuery.WithOdataFilter(filter);
             }
 
             if (string.IsNullOrWhiteSpace(metricDimension) == false)