diff --git a/dev/scripts/nise_ymls/ocp_on_azure/azure_static_data.yml b/dev/scripts/nise_ymls/ocp_on_azure/azure_static_data.yml index c67d5307d6..353e5daf46 100644 --- a/dev/scripts/nise_ymls/ocp_on_azure/azure_static_data.yml +++ b/dev/scripts/nise_ymls/ocp_on_azure/azure_static_data.yml @@ -85,6 +85,7 @@ generators: end_date: {{end_date}} meter_id: 55555555-4444-3333-2222-111111111120 resource_location: "US North Central" + instance_id: '/subscriptions/99999999-9999-9999-9999-999999999999/resourceGroups/koku-99hqd-rg/providers/Microsoft.Compute/disks/azure_compute1_OSDisk' amount: 10 rate: 0.01 tags: diff --git a/koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql b/koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql index f5acfa6182..e629734806 100644 --- a/koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql +++ b/koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql @@ -371,6 +371,8 @@ SELECT azure.uuid as azure_uuid, (azure.resource_id = ocp.node AND ocp.data_source = 'Pod') OR (strpos(azure.resource_id, ocp.persistentvolume) > 0 AND ocp.data_source = 'Storage') + OR + (LOWER(CONCAT(ocp.node, '_OSDisk')) = LOWER(azure.resource_id)) ) WHERE ocp.source = {{ocp_source_uuid}} AND ocp.year = {{year}}