Fix ingestion pipeline to identify scope (#1025)

microsoft · Oct 2, 2024 · 695e12f · 695e12f
1 parent 1e6be3d
commit 695e12f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/docs/_reporting/power-bi/rate-optimization.md b/docs/_reporting/power-bi/rate-optimization.md
@@ -147,6 +147,10 @@ There are 2 charts on the page that offer a breakdown of location, instance size
 The table below the charts shows the recommended reservations based on the specified lookback period.
 
 <blockquote class="important" markdown="1">
+  _The reservation recommendations page utilizes Cost Management exports either directly in storage (via the **Export Storage URL** parameter) or as part of FinOps hubs. If you do not see recommendations, confirm that you have configured exports and the filters at the top of the page align to the recommendations you exported (e.g., term, lookback, scope)._
+</blockquote>
+
+<blockquote class="note" markdown="1">
   _Potential savings and contracted cost estimations are only available for VM reservation recommendations. This page has not been tested for non-VM recommendations. You can view savings plan and reservation recommendations for other services in the Azure portal._
 </blockquote>
 

diff --git a/docs/deploy/finops-hub-0.6.json b/docs/deploy/finops-hub-0.6.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.24.24.22086",
-      "templateHash": "6086027768135226924"
+      "templateHash": "2663349633229182576"
     }
   },
   "parameters": {
@@ -132,7 +132,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.24.24.22086",
-              "templateHash": "8283603935740018840"
+              "templateHash": "6613119753589229935"
             }
           },
           "parameters": {
@@ -639,7 +639,7 @@
                     "_generator": {
                       "name": "bicep",
                       "version": "0.24.24.22086",
-                      "templateHash": "4613582767835961191"
+                      "templateHash": "1110313222495299332"
                     }
                   },
                   "functions": [
@@ -2653,7 +2653,7 @@
                             "userProperties": [],
                             "typeProperties": {
                               "on": {
-                                "value": "@if(empty(variables('mcaColumnToCheck')), 'ignore', last(array(activity('Read Manifest').output.firstRow.blobs[0].blobName)))",
+                                "value": "@if(empty(variables('mcaColumnToCheck')), 'ignore', last(array(split(activity('Read Manifest').output.firstRow.blobs[0].blobName, '.'))))",
                                 "type": "Expression"
                               },
                               "cases": [

diff --git a/docs/deploy/finops-hub-latest.json b/docs/deploy/finops-hub-latest.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.24.24.22086",
-      "templateHash": "6086027768135226924"
+      "templateHash": "2663349633229182576"
     }
   },
   "parameters": {
@@ -132,7 +132,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.24.24.22086",
-              "templateHash": "8283603935740018840"
+              "templateHash": "6613119753589229935"
             }
           },
           "parameters": {
@@ -639,7 +639,7 @@
                     "_generator": {
                       "name": "bicep",
                       "version": "0.24.24.22086",
-                      "templateHash": "4613582767835961191"
+                      "templateHash": "1110313222495299332"
                     }
                   },
                   "functions": [
@@ -2653,7 +2653,7 @@
                             "userProperties": [],
                             "typeProperties": {
                               "on": {
-                                "value": "@if(empty(variables('mcaColumnToCheck')), 'ignore', last(array(activity('Read Manifest').output.firstRow.blobs[0].blobName)))",
+                                "value": "@if(empty(variables('mcaColumnToCheck')), 'ignore', last(array(split(activity('Read Manifest').output.firstRow.blobs[0].blobName, '.'))))",
                                 "type": "Expression"
                               },
                               "cases": [

diff --git a/src/templates/finops-hub/modules/dataFactory.bicep b/src/templates/finops-hub/modules/dataFactory.bicep
@@ -1946,7 +1946,7 @@ resource pipeline_ExecuteETL 'Microsoft.DataFactory/factories/pipelines@2018-06-
         userProperties: []
         typeProperties: {
           on: {
-            value: '@if(empty(variables(\'mcaColumnToCheck\')), \'ignore\', last(array(activity(\'Read Manifest\').output.firstRow.blobs[0].blobName)))'
+            value: '@if(empty(variables(\'mcaColumnToCheck\')), \'ignore\', last(array(split(activity(\'Read Manifest\').output.firstRow.blobs[0].blobName, \'.\'))))'
             type: 'Expression'
           }
           cases: [