revert changes

Signed-off-by: Alex Pickering <[email protected]>

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:

cf/batch.yaml

@@ -75,5 +75,4 @@ Resources:
       ComputeEnvironmentOrder:
         - ComputeEnvironment: !Sub "compute-env-${Environment}"
           Order: 1
-      State: ENABLED
-
+      State: ENABLED

cf/rds-agent.yaml

@@ -103,5 +103,4 @@ Resources:
           '
       Tags:
         - Key: "Name"
-          Value: !Sub "rds-${Environment}-ssm-agent"
-
+          Value: !Sub "rds-${Environment}-ssm-agent"

infra/cf-route53.yaml

@@ -50,9 +50,4 @@ Resources:
         Type: A
         AliasTarget:
           DNSName: !Ref DNSName
-          HostedZoneId: !Ref HostedZoneId
-
-
-
-
-
+          HostedZoneId: !Ref HostedZoneId

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

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