Release 2.17.65 #1757
Merged
Release 2.17.65 #1757
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
production: eks✅ Terraform Init: Plan: 0 to add, 1 to change, 0 to destroyShow summary
Show planResource actions are indicated with the following symbols:
~ update in-place
Terraform will perform the following actions:
# module.sentinel_forwarder.aws_lambda_function.sentinel_forwarder will be updated in-place
~ resource "aws_lambda_function" "sentinel_forwarder" {
id = "sentinel-cloud-watch-forwarder"
~ layers = [
~ (sensitive value),
]
tags = {
"CostCentre" = "notification-canada-ca-production"
}
# (28 unchanged attributes hidden)
# (4 unchanged blocks hidden)
}
Plan: 0 to add, 1 to change, 0 to destroy.
─────────────────────────────────────────────────────────────────────────────
Saved the plan to: plan.tfplan
To perform exactly these actions, run the following command to apply:
terraform apply "plan.tfplan"
Show Conftest resultsWARN - plan.json - main - Cloudwatch log metric pattern is invalid: ["aws_cloudwatch_log_metric_filter.celery-error[0]"]
WARN - plan.json - main - Cloudwatch log metric pattern is invalid: ["aws_cloudwatch_log_metric_filter.scanfiles-timeout[0]"]
WARN - plan.json - main - Missing Common Tags: ["aws_acm_certificate.client_vpn"]
WARN - plan.json - main - Missing Common Tags: ["aws_acm_certificate.notification-canada-ca"]
WARN - plan.json - main - Missing Common Tags: ["aws_acm_certificate.notification-canada-ca-alt[0]"]
WARN - plan.json - main - Missing Common Tags: ["aws_alb.notification-canada-ca"]
WARN - plan.json - main - Missing Common Tags: ["aws_alb_listener.internal_alb_tls"]
WARN - plan.json - main - Missing Common Tags: ["aws_alb_listener.notification-canada-ca"]
WARN - plan.json - main - Missing Common Tags: ["aws_alb_target_group.internal_nginx_http"]
WARN - plan.json - main - Missing Common Tags: ["aws_alb_target_group.notification-canada-ca-admin"]
WARN - plan.json - main - Missing Common Tags: ["aws_alb_target_group.notification-canada-ca-api"]
WARN - plan.json - main - Missing Common Tags: ["aws_alb_target_group.notification-canada-ca-document"]
WARN - plan.json - main - Missing Common Tags: ["aws_alb_target_group.notification-canada-ca-document-api"]
WARN - plan.json - main - Missing Common Tags: ["aws_alb_target_group.notification-canada-ca-documentation"]
WARN - plan.json - main - Missing Common Tags: ["aws_cloudwatch_log_group.blazer[0]"]
WARN - plan.json - main - Missing Common Tags: ["aws_cloudwatch_log_group.notification-canada-ca-eks-application-logs[0]"]
WARN - plan.json - main - Missing Common Tags: ["aws_cloudwatch_log_group.notification-canada-ca-eks-cluster-logs[0]"]
WARN - plan.json - main - Missing Common Tags: ["aws_cloudwatch_log_group.notification-canada-ca-eks-prometheus-logs[0]"]
WARN - plan.json - main - Missing Common Tags: ["aws_cloudwatch_metric_alarm.admin-evicted-pods[0]"]
WARN - plan.json - main - Missing Common Tags:... |
production: quicksight✅ Terraform Init: Plan: 2 to add, 0 to change, 0 to destroyShow summary
Show planResource actions are indicated with the following symbols:
+ create
Terraform will perform the following actions:
# aws_quicksight_data_set.dashboard-notification-counts will be created
+ resource "aws_quicksight_data_set" "dashboard-notification-counts" {
+ arn = (known after apply)
+ aws_account_id = (known after apply)
+ data_set_id = "dashboard-notification-counts"
+ id = (known after apply)
+ import_mode = "SPICE"
+ name = "Dashboard notification counts"
+ output_columns = (known after apply)
+ tags_all = (known after apply)
+ data_set_usage_configuration (known after apply)
+ logical_table_map (known after apply)
+ permissions {
+ actions = [
+ "quicksight:CancelIngestion",
+ "quicksight:CreateIngestion",
+ "quicksight:DeleteDataSet",
+ "quicksight:DescribeDataSet",
+ "quicksight:DescribeDataSetPermissions",
+ "quicksight:DescribeIngestion",
+ "quicksight:ListIngestions",
+ "quicksight:PassDataSet",
+ "quicksight:UpdateDataSet",
+ "quicksight:UpdateDataSetPermissions",
]
+ principal = "arn:aws:quicksight:ca-central-1:296255494825:group/default/quicksight-dataset-owners"
}
+ permissions {
+ actions = [
+ "quicksight:DescribeDataSet",
+ "quicksight:DescribeDataSetPermissions",
+ "quicksight:DescribeIngestion",
+ "quicksight:ListIngestions",
+ "quicksight:PassDataSet",
]
+ principal = "arn:aws:quicksight:ca-central-1:296255494825:group/default/quicksight-dataset-viewers"
}
+ physical_table_map {
+ physical_table_map_id = "notification-counts"
+ custom_sql {
+ data_source_arn = "arn:aws:quicksight:ca-central-1:296255494825:datasource/NotificationCanadaCaproduction"
+ name = "dashboard-notification-counts"
+ sql_query = <<-EOT
WITH n AS (
SELECT
service_id,
COUNT(id) AS n_count,
DATE_PART('day', created_at) AS day
FROM notifications
WHERE
created_at >= DATE_TRUNC('day', NOW()) - interval '14 days'
AND created_at <= (DATE_TRUNC('day', NOW()) + interval '1 day' - interval '1 second')
AND key_type <> 'test'
GROUP BY
DATE_PART('day', created_at),
service_id
ORDER BY day
),
nh AS (
SELECT
service_id,
COUNT(id) AS nh_count,
DATE_PART('day', created_at) AS day
FROM notification_history
WHERE
created_at >= DATE_TRUNC('day', NOW()) - interval '14 days'
AND created_at <= (DATE_TRUNC('day', NOW()) + interval '1 day' - interval '1 second')
AND key_type <> 'test'
GROUP BY
DATE_PART('day', created_at),
service_id
ORDER BY day, service_id
),
ft AS (
SELECT
service_id,
SUM(notification_count) AS ft_count,
DATE_PART('day', bst_date) AS day
FROM ft_notification_status
WHERE
bst_date >= DATE_TRUNC('day', NOW()) - interval '14 days'
AND bst_date <= (DATE_TRUNC('day', NOW()) + interval '1 day' - interval '1 second')
AND key_type <> 'test'
GROUP BY
DATE_PART('day', bst_date),
service_id
ORDER BY day
)
SELECT
COALESCE(n.service_id, nh.service_id, ft.service_id) AS service_id,
COALESCE(n.day, nh.day, ft.day) AS day,
n.n_count,
nh.nh_count,
ft.ft_count,
CASE
WHEN nh.nh_count IS NOT NULL AND ft.ft_count IS NOT NULL AND nh.nh_count <> ft.ft_count THEN '❌'
ELSE '✅'
END AS count_comparison
FROM n
FULL OUTER JOIN nh
ON n.day = nh.day AND n.service_id = nh.service_id
FULL OUTER JOIN ft
ON COALESCE(n.day, nh.day) = ft.day
AND COALESCE(n.service_id, nh.service_id) = ft.service_id
ORDER BY day, service_id
EOT
+ columns {
+ name = "service_id"
+ type = "STRING"
}
+ columns {
+ name = "day"
+ type = "INTEGER"
}
+ columns {
+ name = "n_count"
+ type = "INTEGER"
}
+ columns {
+ name = "nh_count"
+ type = "INTEGER"
}
+ columns {
+ name = "ft_count"
+ type = "INTEGER"
}
+ columns {
+ name = "count_comparison"
+ type = "STRING"
}
}
+ s3_source (known after apply)
}
}
# aws_quicksight_refresh_schedule.dashboard-notification-counts will be created
+ resource "aws_quicksight_refresh_schedule" "dashboard-notification-counts" {
+ arn = (known after apply)
+ aws_account_id = (known after apply)
+ data_set_id = "dashboard-notification-counts"
+ id = (known after apply)
+ schedule_id = "schedule-dashboard-notification-counts"
+ schedule {
+ refresh_type = "FULL_REFRESH"
+ start_after_date_time = (known after apply)
+ schedule_frequency {
+ interval = "DAILY"
+ time_of_the_day = "01:00"
+ timezone = (known after apply)
}
}
}
Plan: 2 to add, 0 to change, 0 to destroy.
─────────────────────────────────────────────────────────────────────────────
Saved the plan to: plan.tfplan
To perform exactly these actions, run the following command to apply:
terraform apply "plan.tfplan"
Show Conftest resultsWARN - plan.json - main - Missing Common Tags: ["aws_cloudformation_stack.sms-usage-notifications"]
WARN - plan.json - main - Missing Common Tags: ["aws_iam_policy.quicksight-rds"]
WARN - plan.json - main - Missing Common Tags: ["aws_iam_policy.quicksight-s3-usage"]
WARN - plan.json - main - Missing Common Tags: ["aws_iam_policy.quicksight_vpc_connection_ec2"]
WARN - plan.json - main - Missing Common Tags: ["aws_iam_policy.quicksight_vpc_connection_iam"]
WARN - plan.json - main - Missing Common Tags: ["aws_iam_role.quicksight"]
WARN - plan.json - main - Missing Common Tags: ["aws_iam_role.vpc_connection_role"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_set.dashboard-notification-counts"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_set.jobs"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_set.login_events"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_set.notifications"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_set.organisation"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_set.services"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_set.sms_usage"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_set.template-category-history"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_set.templates"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_set.users"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_source.rds"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_data_source.s3_sms_usage"]
WARN - plan.json - main - Missing Common Tags: ["aws_quicksight_vpc_connection.rds"]
WARN - plan.json - main - Missing Common Tags: ["aws_s3_object.manifest_file"]
40 tests, 19 passed, 21 warnings, 0 failures, 0 exceptions
|
production: manifest_secrets✅ Terraform Init: Plan: 4 to add, 0 to change, 0 to destroyShow summary
Show planResource actions are indicated with the following symbols:
+ create
Terraform will perform the following actions:
# aws_secretsmanager_secret.manifest_new_relic_account_id will be created
+ resource "aws_secretsmanager_secret" "manifest_new_relic_account_id" {
+ arn = (known after apply)
+ force_overwrite_replica_secret = false
+ id = (known after apply)
+ name = "MANIFEST_NEW_RELIC_ACCOUNT_ID"
+ name_prefix = (known after apply)
+ policy = (known after apply)
+ recovery_window_in_days = 0
+ tags_all = (known after apply)
+ replica (known after apply)
}
# aws_secretsmanager_secret.manifest_new_relic_api_key will be created
+ resource "aws_secretsmanager_secret" "manifest_new_relic_api_key" {
+ arn = (known after apply)
+ force_overwrite_replica_secret = false
+ id = (known after apply)
+ name = "MANIFEST_NEW_RELIC_API_KEY"
+ name_prefix = (known after apply)
+ policy = (known after apply)
+ recovery_window_in_days = 0
+ tags_all = (known after apply)
+ replica (known after apply)
}
# aws_secretsmanager_secret_version.manifest_new_relic_account_id_version will be created
+ resource "aws_secretsmanager_secret_version" "manifest_new_relic_account_id_version" {
+ arn = (known after apply)
+ id = (known after apply)
+ secret_id = (known after apply)
+ secret_string = (sensitive value)
+ version_id = (known after apply)
+ version_stages = (known after apply)
}
# aws_secretsmanager_secret_version.manifest_new_relic_api_key_version will be created
+ resource "aws_secretsmanager_secret_version" "manifest_new_relic_api_key_version" {
+ arn = (known after apply)
+ id = (known after apply)
+ secret_id = (known after apply)
+ secret_string = (sensitive value)
+ version_id = (known after apply)
+ version_stages = (known after apply)
}
Plan: 4 to add, 0 to change, 0 to destroy.
─────────────────────────────────────────────────────────────────────────────
Saved the plan to: plan.tfplan
To perform exactly these actions, run the following command to apply:
terraform apply "plan.tfplan"
Show Conftest resultsWARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_admin_client_secret"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_auth_tokens"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_aws_pinpoint_default_pool_id"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_aws_pinpoint_sc_pool_id"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_aws_pinpoint_sc_template_ids"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_aws_route53_zone"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_aws_ses_access_key"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_aws_ses_secret_key"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_cache_clear_client_secret"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_crm_github_personal_access_token"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_cypress_auth_client_secret"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_cypress_user_pw_secret"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_dangerous_salt"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_debug_key"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_document_download_api_key"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_fresh_desk_api_key"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_fresh_desk_product_id"]
WARN - plan.json - main - Missing Common Tags: ["aws_secretsmanager_secret.manifest_gc_articles_api_auth_password"]
WARN - plan.json - main - Missing Common Tags:... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary | Résumé
#1754 Multiple paramater stores @P0NDER0SA
#1553 Add dashboard notificaton count dataset @whabanks
#1753 Adding new relic secrets for manifests @P0NDER0SA
Related Issues | Cartes liées
Release
Release Instructions | Instructions pour le déploiement
None.
Reviewer checklist | Liste de vérification du réviseur