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.

Sign up for GitHub

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

Jump to bottom

terraform: pin module versions and update grafana-agent #110

Merged
merged 6 commits into from
Feb 6, 2024
Merged

terraform: pin module versions and update grafana-agent #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d27727
terraform: pin module versions and update grafana-agent
ns4plabs Jan 19, 2024
82202d3
chore: terraform fmt
ns4plabs Jan 19, 2024
8417bf5
terraform: update GrafanaAgentConfigURL
ns4plabs Jan 19, 2024
00bc69b
thunderdome: update grafana-agent
ns4plabs Jan 19, 2024
510330f
gofmt
guillaumemichel Feb 6, 2024
4bdfe7b
Merge branch 'main' into tf-update
guillaumemichel Feb 6, 2024
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 cmd/thunderdome/infra/dealgood.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ func (d *Dealgood) createTaskDefinition() Task {
},
{
Name: aws.String("grafana-agent"),
Image: aws.String("grafana/agent:v0.26.1"),
Image: aws.String("grafana/agent:v0.39.1"),
Command: []*string{
aws.String("-metrics.wal-directory=/data/grafana-agent"),
aws.String("-config.expand-env"),
Expand Down
2 changes: 1 addition & 1 deletion cmd/thunderdome/infra/target.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ func (t *Target) createTaskDefinition() Task {
},
{
Name: aws.String("grafana-agent"),
Image: aws.String("grafana/agent:v0.26.1"),
Image: aws.String("grafana/agent:v0.39.1"),
Command: []*string{
aws.String("-metrics.wal-directory=/data/grafana-agent"),
aws.String("-config.expand-env"),
Expand Down
58 changes: 31 additions & 27 deletions tf/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tf/.tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
terraform 1.2.6
terraform 1.7.0
tflint 0.39.1
6 changes: 3 additions & 3 deletions tf/dynamodb.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resource "aws_dynamodb_table" "experiments" {
name = "experiments"
billing_mode = "PROVISIONED"
hash_key = "name"
name = "experiments"
billing_mode = "PROVISIONED"
hash_key = "name"

read_capacity = 1
write_capacity = 1
Expand Down
2 changes: 1 addition & 1 deletion tf/ecs-asg.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ module "autoscaling" {
instance_type = "i3en.2xlarge"
}

io_medium = {
io_medium = {
# 32GB RAM, 4 CPU, Up to 25 Gigabit, $0.31 hourly
instance_type = "i3en.xlarge"
}
Expand Down
2 changes: 1 addition & 1 deletion tf/grafana.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,6 @@ module "grafana_agent_config" {

file_source = "./files/grafana-agent-config/${each.key}.yaml"
# ensure changes to local file are detected and then uploaded
etag = "${filemd5("./files/grafana-agent-config/${each.key}.yaml")}"
etag = filemd5("./files/grafana-agent-config/${each.key}.yaml")
}

128 changes: 64 additions & 64 deletions tf/iam.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,33 +155,33 @@ resource "aws_iam_role" "ironbar" {
inline_policy {
name = "ironbar_inline"
policy = jsonencode({
"Version": "2012-10-17",
"Statement": [
{
"Sid": "ironbar",
"Effect": "Allow",
"Action": [
"dynamodb:BatchGetItem",
"dynamodb:BatchWriteItem",
"dynamodb:PutItem",
"dynamodb:DescribeTable",
"dynamodb:DeleteItem",
"dynamodb:GetItem",
"dynamodb:Scan",
"dynamodb:Query",
"dynamodb:UpdateItem",
"dynamodb:UpdateTable",
"ecs:DescribeTasks",
"ecs:DescribeTaskDefinition",
"ecs:DeregisterTaskDefinition",
"sns:GetSubscriptionAttributes",
"ecs:StopTask",
"sns:Unsubscribe",
"sqs:DeleteQueue",
"sqs:GetQueueAttributes"
],
"Resource": "*"
}
"Version" : "2012-10-17",
"Statement" : [
{
"Sid" : "ironbar",
"Effect" : "Allow",
"Action" : [
"dynamodb:BatchGetItem",
"dynamodb:BatchWriteItem",
"dynamodb:PutItem",
"dynamodb:DescribeTable",
"dynamodb:DeleteItem",
"dynamodb:GetItem",
"dynamodb:Scan",
"dynamodb:Query",
"dynamodb:UpdateItem",
"dynamodb:UpdateTable",
"ecs:DescribeTasks",
"ecs:DescribeTaskDefinition",
"ecs:DeregisterTaskDefinition",
"sns:GetSubscriptionAttributes",
"ecs:StopTask",
"sns:Unsubscribe",
"sqs:DeleteQueue",
"sqs:GetQueueAttributes"
],
"Resource" : "*"
}
]
})
}
Expand Down Expand Up @@ -220,50 +220,50 @@ resource "aws_iam_group" "deployers" {

resource "aws_iam_user_group_membership" "deployer" {
for_each = aws_iam_user.deployer
user = each.value.name
user = each.value.name

groups = [
aws_iam_group.deployers.name,
]
}

resource "aws_iam_group_policy" "deployers" {
name = "deployers"
name = "deployers"
group = aws_iam_group.deployers.name
policy = jsonencode({
"Version": "2012-10-17",
"Statement": [
{
"Sid": "ironbar",
"Effect": "Allow",
"Action": [
"ec2:DescribeInstances",
"ecr:BatchCheckLayerAvailability",
"ecr:CompleteLayerUpload",
"ecr:DescribeImages",
"ecr:GetAuthorizationToken",
"ecr:UploadLayerPart",
"ecr:InitiateLayerUpload",
"ecr:PutImage",
"ecs:DeregisterTaskDefinition",
"ecs:DescribeClusters",
"ecs:DescribeTasks",
"ecs:DescribeTaskDefinition",
"ecs:DescribeContainerInstances",
"ecs:RegisterTaskDefinition",
"ecs:RunTask",
"ecs:StopTask",
"s3:GetObject",
"sns:GetSubscriptionAttributes",
"sns:Subscribe",
"sns:Unsubscribe",
"sqs:CreateQueue",
"sqs:DeleteQueue",
"sqs:GetQueueAttributes",
"sqs:SetQueueAttributes"
],
"Resource": "*"
}
"Version" : "2012-10-17",
"Statement" : [
{
"Sid" : "ironbar",
"Effect" : "Allow",
"Action" : [
"ec2:DescribeInstances",
"ecr:BatchCheckLayerAvailability",
"ecr:CompleteLayerUpload",
"ecr:DescribeImages",
"ecr:GetAuthorizationToken",
"ecr:UploadLayerPart",
"ecr:InitiateLayerUpload",
"ecr:PutImage",
"ecs:DeregisterTaskDefinition",
"ecs:DescribeClusters",
"ecs:DescribeTasks",
"ecs:DescribeTaskDefinition",
"ecs:DescribeContainerInstances",
"ecs:RegisterTaskDefinition",
"ecs:RunTask",
"ecs:StopTask",
"s3:GetObject",
"sns:GetSubscriptionAttributes",
"sns:Subscribe",
"sns:Unsubscribe",
"sqs:CreateQueue",
"sqs:DeleteQueue",
"sqs:GetQueueAttributes",
"sqs:SetQueueAttributes"
],
"Resource" : "*"
}
]
})
}
Expand Down Expand Up @@ -335,8 +335,8 @@ resource "aws_iam_role_policy_attachment" "testbox_sqs_subscribe" {
}

resource "aws_iam_instance_profile" "testbox_profile" {
name = "testbox-profile"
role = aws_iam_role.testbox_role.name
name = "testbox-profile"
role = aws_iam_role.testbox_role.name
}


Expand Down
22 changes: 11 additions & 11 deletions tf/ironbar.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ resource "aws_ecs_service" "ironbar" {
}

load_balancer {
target_group_arn = "${aws_lb_target_group.ironbar.id}"
target_group_arn = aws_lb_target_group.ironbar.id
container_name = "ironbar"
container_port = "${local.ironbar_port_number}"
container_port = local.ironbar_port_number
}

capacity_provider_strategy {
Expand All @@ -25,7 +25,7 @@ resource "aws_ecs_service" "ironbar" {
}

resource "aws_service_discovery_service" "ironbar" {
name = "ironbar"
name = "ironbar"

dns_config {
namespace_id = aws_service_discovery_private_dns_namespace.main.id
Expand All @@ -43,16 +43,16 @@ resource "aws_lb_target_group" "ironbar" {
name = "ironbar"
port = local.ironbar_port_number
protocol = "TCP"
vpc_id = "${module.vpc.vpc_id}"
vpc_id = module.vpc.vpc_id
target_type = "ip"
}

resource "aws_lb_listener" "front_end" {
load_balancer_arn = "${aws_lb.ecs.id}"
port = "${local.ironbar_port_number}"
load_balancer_arn = aws_lb.ecs.id
port = local.ironbar_port_number
protocol = "TCP"
default_action {
target_group_arn = "${aws_lb_target_group.ironbar.id}"
target_group_arn = aws_lb_target_group.ironbar.id
type = "forward"
}
}
Expand Down Expand Up @@ -118,12 +118,12 @@ resource "aws_ecs_task_definition" "ironbar" {
{
name = "grafana-agent"
cpu = 0
image = "grafana/agent:v0.26.1"
image = "grafana/agent:v0.39.1"
command = [
"-metrics.wal-directory=/data/grafana-agent",
"-config.expand-env",
"-enable-features=remote-configs",
"-config.file=http://${module.s3_bucket_public.s3_bucket_bucket_domain_name}/${module.grafana_agent_config["ironbar"].s3_object_id}"
"-config.file=https://${module.s3_bucket_public.s3_bucket_bucket_domain_name}/${module.grafana_agent_config["ironbar"].s3_object_id}"
]
environment = [
]
Expand All @@ -143,12 +143,12 @@ resource "aws_ecs_task_definition" "ironbar" {
},
]
portMappings = []
secrets = [
secrets = [
{ name = "PROMETHEUS_URL", valueFrom = "${data.aws_secretsmanager_secret.prometheus-secret.arn}:url::" },
{ name = "PROMETHEUS_USER", valueFrom = "${data.aws_secretsmanager_secret.prometheus-secret.arn}:username::" },
{ name = "PROMETHEUS_PASS", valueFrom = "${data.aws_secretsmanager_secret.prometheus-secret.arn}:password::" }
]
volumesFrom = []
volumesFrom = []
}
])
}
Expand Down
36 changes: 18 additions & 18 deletions tf/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ locals {

skyfish_image_tag = "2023-12-13-60b3d1f"

ironbar_image_tag = "2023-02-27-c7b617d"
ironbar_image_tag = "2023-02-27-c7b617d"
ironbar_port_number = 8321

infra_json = jsonencode({
AwsRegion = data.aws_region.current.name
DealgoodGrafanaAgentConfigURL = "http://${module.s3_bucket_public.s3_bucket_bucket_domain_name}/${module.grafana_agent_config["dealgood"].s3_object_id}"
DealgoodImage = "${aws_ecr_repository.dealgood.repository_url}:${local.dealgood_image_tag}"
DealgoodSecurityGroup = aws_security_group.dealgood.id
DealgoodTaskRoleArn = aws_iam_role.dealgood.arn
EcrBaseURL = aws_ecr_repository.thunderdome.repository_url
EcsClusterArn = module.ecs-asg.cluster_id
EcsExecutionRoleArn = aws_iam_role.ecsTaskExecutionRole.arn
EfsFileSystemID = aws_efs_file_system.thunderdome.id
ExperimentsTableName = aws_dynamodb_table.experiments.name
PrometheusSecretArn = data.aws_secretsmanager_secret.prometheus-secret.arn
IronbarAddr = "${aws_eip.ecs[0].public_ip}:${local.ironbar_port_number}"
LogGroupName = aws_cloudwatch_log_group.logs.name
RequestSNSTopicArn = aws_sns_topic.gateway_requests.arn
TargetGrafanaAgentConfigURL = "http://${module.s3_bucket_public.s3_bucket_bucket_domain_name}/${module.grafana_agent_config["target"].s3_object_id}"
TargetTaskRoleArn = aws_iam_role.target.arn
VpcPublicSubnet = module.vpc.public_subnets[0]
AwsRegion = data.aws_region.current.name
DealgoodGrafanaAgentConfigURL = "https://${module.s3_bucket_public.s3_bucket_bucket_domain_name}/${module.grafana_agent_config["dealgood"].s3_object_id}"
DealgoodImage = "${aws_ecr_repository.dealgood.repository_url}:${local.dealgood_image_tag}"
DealgoodSecurityGroup = aws_security_group.dealgood.id
DealgoodTaskRoleArn = aws_iam_role.dealgood.arn
EcrBaseURL = aws_ecr_repository.thunderdome.repository_url
EcsClusterArn = module.ecs-asg.cluster_id
EcsExecutionRoleArn = aws_iam_role.ecsTaskExecutionRole.arn
EfsFileSystemID = aws_efs_file_system.thunderdome.id
ExperimentsTableName = aws_dynamodb_table.experiments.name
PrometheusSecretArn = data.aws_secretsmanager_secret.prometheus-secret.arn
IronbarAddr = "${aws_eip.ecs[0].public_ip}:${local.ironbar_port_number}"
LogGroupName = aws_cloudwatch_log_group.logs.name
RequestSNSTopicArn = aws_sns_topic.gateway_requests.arn
TargetGrafanaAgentConfigURL = "https://${module.s3_bucket_public.s3_bucket_bucket_domain_name}/${module.grafana_agent_config["target"].s3_object_id}"
TargetTaskRoleArn = aws_iam_role.target.arn
VpcPublicSubnet = module.vpc.public_subnets[0]
})
}
Loading
Loading