Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cur2 consistency #1073

Merged
merged 2 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cid/builtin/core/data/queries/cid/summary_view.sql
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,5 @@
WHERE
(("bill_billing_period_start_date" >= ("date_trunc"('month', current_timestamp) - INTERVAL '7' MONTH))
AND (CAST("concat"("billing_period", '-01') AS date) >= ("date_trunc"('month', current_date) - INTERVAL '7' MONTH))
AND "line_item_operation" NOT IN ('EKSPod-EC2','ECSTask-EC2'))
AND coalesce("line_item_operation", '') NOT IN ('EKSPod-EC2','ECSTask-EC2'))
GROUP BY 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34
2 changes: 1 addition & 1 deletion cid/builtin/core/data/queries/cudos/hourly_view.sql
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ CREATE OR REPLACE VIEW hourly_view AS
WHERE
(((current_date - INTERVAL '30' DAY) <= line_item_usage_start_date)
AND ((("line_item_line_item_type" = 'Usage') OR ("line_item_line_item_type" = 'SavingsPlanCoveredUsage')) OR ("line_item_line_item_type" = 'DiscountedUsage'))
AND "line_item_operation" NOT IN ('EKSPod-EC2','ECSTask-EC2'))
AND coalesce("line_item_operation", '') NOT IN ('EKSPod-EC2','ECSTask-EC2'))
GROUP BY 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
2 changes: 1 addition & 1 deletion cid/builtin/core/data/queries/cudos/resource_view.sql
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ CREATE OR REPLACE VIEW resource_view AS
WHERE
(((current_date - INTERVAL '30' DAY) <= line_item_usage_start_date)
AND (line_item_resource_id <> '')
AND "line_item_operation" NOT IN ('EKSPod-EC2','ECSTask-EC2'))
AND coalesce("line_item_operation", '') NOT IN ('EKSPod-EC2','ECSTask-EC2'))
GROUP BY 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29
Loading