Skip to content

Commit b666aca

Browse files
lcouzenslcouzens
authored
Merge pull request #129 from project-koku/cost-mgmt-fix-manifest-field-changes
fix manifest field references in sql
2 parents 799dc51 + 99d2be4 commit b666aca

12 files changed

+34
-36
lines changed

‎kokudaily/sql/active_providers.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ WITH cte_manifest_temp AS (
22
SELECT DISTINCT ON(provider_id)
33
provider_id,
44
id,
5-
manifest_completed_datetime
5+
completed_datetime
66
FROM PUBLIC.reporting_common_costusagereportmanifest
77
ORDER BY provider_id,
88
id
@@ -21,6 +21,6 @@ JOIN cte_manifest_temp AS status
2121
ON t.uuid = status.provider_id
2222
JOIN PUBLIC.api_customer AS cust
2323
ON t.customer_id = cust.id
24-
WHERE status.manifest_completed_datetime >= now() - interval '48 HOURS'
24+
WHERE status.completed_datetime >= now() - interval '48 HOURS'
2525
AND sources.koku_uuid IS NOT NULL
2626
;

‎kokudaily/sql/count_active_providers.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ WITH cte_manifest_temp AS (
22
SELECT DISTINCT ON(provider_id)
33
provider_id,
44
id,
5-
manifest_completed_datetime
5+
completed_datetime
66
FROM PUBLIC.reporting_common_costusagereportmanifest
77
ORDER BY provider_id,
88
id
@@ -20,7 +20,7 @@ JOIN cte_manifest_temp AS status
2020
ON t.uuid = status.provider_id
2121
JOIN PUBLIC.api_customer AS cust
2222
ON t.customer_id = cust.id
23-
WHERE status.manifest_completed_datetime >= now() - interval '48 HOURS'
23+
WHERE status.completed_datetime >= now() - interval '48 HOURS'
2424
AND sources.koku_uuid IS NOT NULL
2525
GROUP BY cust.account_id, cust.org_id, t.type, status.provider_id
2626
;

‎kokudaily/sql/count_airgapped_clusters.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SELECT count (*) as "count",
88
c.org_id
99
FROM
1010
(SELECT provider_id,
11-
row_number() OVER (PARTITION BY provider_id ORDER BY manifest_creation_datetime DESC) as row_number,
11+
row_number() OVER (PARTITION BY provider_id ORDER BY creation_datetime DESC) as row_number,
1212
max(assembly_id) as assembly_id,
1313
operator_airgapped,
1414
max(operator_version) as operator_version,
@@ -18,7 +18,7 @@ SELECT count (*) as "count",
1818
operator_airgapped,
1919
operator_version,
2020
cluster_id,
21-
manifest_creation_datetime
21+
creation_datetime
2222
) as rm
2323
JOIN public.api_provider AS p
2424
ON p.uuid = rm.provider_id

‎kokudaily/sql/count_certified_clusters.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SELECT count (*) as "count",
88
c.org_id
99
FROM
1010
(SELECT provider_id,
11-
row_number() OVER (PARTITION BY provider_id ORDER BY manifest_creation_datetime DESC) as row_number,
11+
row_number() OVER (PARTITION BY provider_id ORDER BY creation_datetime DESC) as row_number,
1212
max(assembly_id) as assembly_id,
1313
operator_certified,
1414
max(operator_version) as operator_version,
@@ -18,7 +18,7 @@ SELECT count (*) as "count",
1818
operator_certified,
1919
operator_version,
2020
cluster_id,
21-
manifest_creation_datetime
21+
creation_datetime
2222
) as rm
2323
JOIN public.api_provider AS p
2424
ON p.uuid = rm.provider_id

‎kokudaily/sql/count_community_clusters.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SELECT count (*) as "count",
88
c.org_id
99
FROM
1010
(SELECT provider_id,
11-
row_number() OVER (PARTITION BY provider_id ORDER BY manifest_creation_datetime DESC) as row_number,
11+
row_number() OVER (PARTITION BY provider_id ORDER BY creation_datetime DESC) as row_number,
1212
max(assembly_id) as assembly_id,
1313
operator_certified,
1414
max(operator_version) as operator_version,
@@ -18,7 +18,7 @@ SELECT count (*) as "count",
1818
operator_certified,
1919
operator_version,
2020
cluster_id,
21-
manifest_creation_datetime
21+
creation_datetime
2222
) as rm
2323
JOIN public.api_provider AS p
2424
ON p.uuid = rm.provider_id

‎kokudaily/sql/count_connected_clusters.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SELECT count (*) as "count",
88
c.org_id
99
FROM
1010
(SELECT provider_id,
11-
row_number() OVER (PARTITION BY provider_id ORDER BY manifest_creation_datetime DESC) as row_number,
11+
row_number() OVER (PARTITION BY provider_id ORDER BY creation_datetime DESC) as row_number,
1212
max(assembly_id) as assembly_id,
1313
operator_airgapped,
1414
max(operator_version) as operator_version,
@@ -18,7 +18,7 @@ SELECT count (*) as "count",
1818
operator_airgapped,
1919
operator_version,
2020
cluster_id,
21-
manifest_creation_datetime
21+
creation_datetime
2222
) as rm
2323
JOIN public.api_provider AS p
2424
ON p.uuid = rm.provider_id

‎kokudaily/sql/count_errored_clusters.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SELECT count (*) as "count",
88
c.org_id
99
FROM
1010
(SELECT provider_id,
11-
row_number() OVER (PARTITION BY provider_id ORDER BY manifest_creation_datetime DESC) as row_number,
11+
row_number() OVER (PARTITION BY provider_id ORDER BY creation_datetime DESC) as row_number,
1212
max(assembly_id) as assembly_id,
1313
operator_errors,
1414
max(operator_version) as operator_version,
@@ -18,7 +18,7 @@ SELECT count (*) as "count",
1818
operator_errors,
1919
operator_version,
2020
cluster_id,
21-
manifest_creation_datetime
21+
creation_datetime
2222
) as rm
2323
JOIN public.api_provider AS p
2424
ON p.uuid = rm.provider_id

‎kokudaily/sql/count_incomplete_manifests.sql

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ JOIN public.api_customer AS c
99
ON p.customer_id = c.id
1010
JOIN (
1111
SELECT rm.id,
12-
count(rs.*) FILTER (WHERE last_completed_datetime IS NOT NULL) AS num_processed_files,
12+
count(rs.*) FILTER (WHERE rs.completed_datetime IS NOT NULL) AS num_processed_files,
1313
count(rs.*) AS num_total_files,
14-
max(rs.last_completed_datetime) as manifest_updated_datetime
14+
max(rs.completed_datetime) as updated_datetime
1515
FROM public.reporting_common_costusagereportmanifest AS rm
1616
JOIN public.reporting_common_costusagereportstatus AS rs
1717
ON rm.id = rs.manifest_id
1818
GROUP BY rm.id
1919
) AS counts
2020
ON rm.id = counts.id
2121
WHERE counts.num_processed_files != counts.num_total_files
22-
AND rm.manifest_creation_datetime >= current_date - INTERVAL '1 day'
23-
AND counts.manifest_updated_datetime < now() - INTERVAL '10 min' -- It has been longer than 10 minutes since we processed anything
22+
AND rm.creation_datetime >= current_date - INTERVAL '1 day'
23+
AND counts.updated_datetime < now() - INTERVAL '10 min' -- It has been longer than 10 minutes since we processed anything
2424
GROUP BY c.account_id,
2525
c.org_id,
2626
p.type,
27-
rm.manifest_creation_datetime
27+
rm.creation_datetime
2828
;

‎kokudaily/sql/count_stale_providers.sql

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ WITH cte_manifest_temp AS (
22
SELECT DISTINCT ON(provider_id)
33
provider_id,
44
id,
5-
manifest_completed_datetime,
6-
manifest_updated_datetime
5+
completed_datetime
76
FROM PUBLIC.reporting_common_costusagereportmanifest
87
ORDER BY provider_id,
98
id
@@ -20,8 +19,7 @@ JOIN cte_manifest_temp AS status
2019
ON t.uuid = status.provider_id
2120
JOIN PUBLIC.api_customer AS cust
2221
ON t.customer_id = cust.id
23-
WHERE status.manifest_completed_datetime <= now() - interval '48 HOURS'
24-
AND status.manifest_updated_datetime <= now() - interval '48 HOURS'
22+
WHERE status.completed_datetime <= now() - interval '48 HOURS'
2523
AND sources.koku_uuid IS NOT NULL
2624
GROUP BY cust.account_id, cust.org_id, t.type, status.provider_id
2725
;

‎kokudaily/sql/cust_providers.sql

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ filtered_customers AS (
2727
),
2828
cost_report_manifest AS (
2929
SELECT provider_id,
30-
row_number() OVER (PARTITION BY provider_id ORDER BY manifest_creation_datetime DESC) AS row_number,
30+
row_number() OVER (PARTITION BY provider_id ORDER BY creation_datetime DESC) AS row_number,
3131
assembly_id,
3232
operator_airgapped,
3333
operator_version,
3434
cluster_id,
35-
manifest_completed_datetime
35+
completed_datetime
3636
FROM public.reporting_common_costusagereportmanifest
3737
)
3838
SELECT fc.account_id,
3939
p.uuid,
4040
p.type,
41-
CASE WHEN crm.manifest_completed_datetime >= now() - interval '48 HOURS'
41+
CASE WHEN crm.completed_datetime >= now() - interval '48 HOURS'
4242
THEN true
4343
ELSE false
4444
END AS is_active,

‎kokudaily/sql/incomplete_manifests.sql

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ SELECT c.id as customer_id,
33
p.uuid as provider_uuid,
44
p.type as source_type,
55
rm.assembly_id,
6-
rm.manifest_creation_datetime,
7-
counts.manifest_updated_datetime,
8-
rm.manifest_completed_datetime,
6+
rm.creation_datetime,
7+
counts.updated_datetime,
8+
rm.completed_datetime,
99
rm.billing_period_start_datetime,
1010
counts.num_processed_files,
1111
counts.num_total_files
@@ -16,19 +16,19 @@ JOIN public.api_customer AS c
1616
ON p.customer_id = c.id
1717
JOIN (
1818
SELECT rm.id,
19-
count(rs.*) FILTER (WHERE last_completed_datetime IS NOT NULL) AS num_processed_files,
19+
count(rs.*) FILTER (WHERE rs.completed_datetime IS NOT NULL) AS num_processed_files,
2020
count(rs.*) AS num_total_files,
21-
max(rs.last_completed_datetime) as manifest_updated_datetime
21+
max(rs.completed_datetime) as updated_datetime
2222
FROM public.reporting_common_costusagereportmanifest AS rm
2323
JOIN public.reporting_common_costusagereportstatus AS rs
2424
ON rm.id = rs.manifest_id
2525
GROUP BY rm.id
2626
) AS counts
2727
ON rm.id = counts.id
2828
WHERE counts.num_processed_files != counts.num_total_files
29-
AND rm.manifest_creation_datetime >= current_date - INTERVAL '1 day'
30-
AND counts.manifest_updated_datetime < now() - INTERVAL '10 min' -- It has been longer than 10 minutes since we processed anything
29+
AND rm.creation_datetime >= current_date - INTERVAL '1 day'
30+
AND counts.updated_datetime < now() - INTERVAL '10 min' -- It has been longer than 10 minutes since we processed anything
3131
ORDER BY c.id,
3232
p.type,
33-
rm.manifest_creation_datetime
33+
rm.creation_datetime
3434
;

‎kokudaily/sql/stale_providers.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ WITH cte_manifest_temp AS (
22
SELECT DISTINCT ON(provider_id)
33
provider_id,
44
id,
5-
manifest_completed_datetime
5+
completed_datetime
66
FROM PUBLIC.reporting_common_costusagereportmanifest
77
ORDER BY provider_id,
88
id
@@ -18,6 +18,6 @@ JOIN cte_manifest_temp AS status
1818
ON t.uuid = status.provider_id
1919
JOIN PUBLIC.api_customer AS cust
2020
ON t.customer_id = cust.id
21-
WHERE status.manifest_completed_datetime <= now() - interval '48 HOURS'
21+
WHERE status.completed_datetime <= now() - interval '48 HOURS'
2222
AND sources.koku_uuid IS NOT NULL
2323
;

0 commit comments

Comments
 (0)