Filter accounts by matching criteria during subs processing to preven…

…t unnecessary SQL from running (#5184)
project-koku · Jul 9, 2024 · 8cbfd22 · 8cbfd22
1 parent e29e407
commit 8cbfd22
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/koku/subs/trino_sql/aws/determine_ids_for_provider.sql b/koku/subs/trino_sql/aws/determine_ids_for_provider.sql
@@ -3,6 +3,8 @@ FROM hive.{{schema | sqlsafe}}.aws_line_items
 WHERE source={{source_uuid}}
   AND year={{year}}
   AND month={{month}}
+  AND lineitem_productcode = 'AmazonEC2'
+  AND strpos(lower(resourcetags), 'com_redhat_rhel') > 0
   {% if excluded_ids %}
     AND lineitem_usageaccountid NOT IN {{excluded_ids | inclause}}
   {% endif %}
diff --git a/koku/subs/trino_sql/azure/determine_ids_for_provider.sql b/koku/subs/trino_sql/azure/determine_ids_for_provider.sql
@@ -3,6 +3,9 @@ FROM hive.{{schema | sqlsafe}}.azure_line_items
 WHERE source={{source_uuid}}
   AND year={{year}}
   AND month={{month}}
+  AND metercategory = 'Virtual Machines'
+  AND json_extract_scalar(lower(additionalinfo), '$.vcpus') IS NOT NULL
+  AND json_extract_scalar(lower(tags), '$.com_redhat_rhel') IS NOT NULL
   {% if excluded_ids %}
     AND COALESCE(NULLIF(subscriptionid, ''), subscriptionguid) NOT IN {{excluded_ids | inclause}}
   {% endif %}