From 4733a886a887392f1f7be43e285a059ad2ee2544 Mon Sep 17 00:00:00 2001 From: Alex Pickering Date: Tue, 10 Dec 2024 13:39:00 -0800 Subject: [PATCH] revert changes Signed-off-by: Alex Pickering --- README.md | 7 +++++++ cf/batch.yaml | 3 +-- cf/rds-agent.yaml | 3 +-- infra/cf-route53.yaml | 7 +------ infra/config/account-config.yaml | 3 +++ infra/config/cluster/cluster-template.yaml | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 80d898d0e1..c6619bebf3 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,13 @@ Some secrets are required to deploy infrastructure into AWS and configure the in The AWS ACM ARN for the SSL certificate for the Cellenics domain name. +- DATADOG_API_KEY + + The [Datadog API key](https://docs.datadoghq.com/account_management/api-app-keys/#api-keys) of the Datadog account. + +- DATADOG_APP_KEY + + The [Datadog application](https://docs.datadoghq.com/account_management/api-app-keys/#application-keys) key created for the Datadog account for AWS Batch monitoring. This can be created in the Organization Settings submenu inside the Datadog account. #### Changing base infrastructure The github workflow that triggers an update to the base infrastructure with the files in `infra/` is [deploy-infra.yaml](https://github.com/hms-dbmi-cellenics/iac/blob/master/.github/workflows/deploy-infra.yaml). At the moment, this workflow has to be manually triggered for the update to happen. To trigger an update, you have to: diff --git a/cf/batch.yaml b/cf/batch.yaml index aecf6c5551..7c81162e9a 100644 --- a/cf/batch.yaml +++ b/cf/batch.yaml @@ -75,5 +75,4 @@ Resources: ComputeEnvironmentOrder: - ComputeEnvironment: !Sub "compute-env-${Environment}" Order: 1 - State: ENABLED - \ No newline at end of file + State: ENABLED \ No newline at end of file diff --git a/cf/rds-agent.yaml b/cf/rds-agent.yaml index 71867261de..f0834ffb57 100644 --- a/cf/rds-agent.yaml +++ b/cf/rds-agent.yaml @@ -103,5 +103,4 @@ Resources: ' Tags: - Key: "Name" - Value: !Sub "rds-${Environment}-ssm-agent" - \ No newline at end of file + Value: !Sub "rds-${Environment}-ssm-agent" \ No newline at end of file diff --git a/infra/cf-route53.yaml b/infra/cf-route53.yaml index 69de06cf1f..8bc0fbe154 100644 --- a/infra/cf-route53.yaml +++ b/infra/cf-route53.yaml @@ -50,9 +50,4 @@ Resources: Type: A AliasTarget: DNSName: !Ref DNSName - HostedZoneId: !Ref HostedZoneId - - - - - + HostedZoneId: !Ref HostedZoneId \ No newline at end of file diff --git a/infra/config/account-config.yaml b/infra/config/account-config.yaml index 5c6e687321..3e2f6f3c51 100644 --- a/infra/config/account-config.yaml +++ b/infra/config/account-config.yaml @@ -6,4 +6,7 @@ myAccount: publicFacing: FILLED_IN_BY_CI acmCertificate: FILLED_IN_BY_CI selfSignedCertificate: FILLED_IN_BY_CI + datadogEnabled: FILLED_IN_BY_CI + datadogApiKey: FILLED_IN_BY_CI + datadogAppKey: FILLED_IN_BY_CI #FILLED IN BY IAC CI diff --git a/infra/config/cluster/cluster-template.yaml b/infra/config/cluster/cluster-template.yaml index a1e039e714..40d82086a4 100644 --- a/infra/config/cluster/cluster-template.yaml +++ b/infra/config/cluster/cluster-template.yaml @@ -27,7 +27,7 @@ iam: # if you add or remove items under managedNodeGroups, make sure you update customized cluster # config for each of the Github environments under infra/config/cluster managedNodeGroups: - - name: nodegroup-post-scaling-x86-v4 + - name: nodegroup-post-scaling-x86-v3 instanceType: r6i.large desiredCapacity: 2 minSize: 2