Skip to content

Commit

Permalink
terraform: cleanup AWS Athena attempt to acquire billing data
Browse files Browse the repository at this point in the history
  • Loading branch information
consideRatio committed Sep 20, 2024
1 parent 25f3584 commit 3933a23
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 120 deletions.
3 changes: 0 additions & 3 deletions config/clusters/openscapes/support.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ grafana:
- secretName: grafana-tls
hosts:
- grafana.openscapes.2i2c.cloud
serviceAccount:
annotations:
eks.amazonaws.com/role-arn: arn:aws:iam::783616723547:role/openscapeshub-grafana-athena-iam-role
grafana.ini:
server:
root_url: https://grafana.openscapes.2i2c.cloud/
Expand Down
93 changes: 0 additions & 93 deletions terraform/aws/grafana-athena-iam.tf

This file was deleted.

3 changes: 0 additions & 3 deletions terraform/aws/projects/openscapes.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ default_budget_alert = {
"enabled" : false,
}

enable_grafana_athena_iam = true
enable_aws_ce_grafana_backend_iam = true
athena_write_storage_bucket = "openscapes-cost-usage-report"
athena_read_storage_bucket = "openscapes-2i2c-cur"

# The initial EFS is now used by the prod hub only
# So we tag it appropriately for costs purposes
Expand Down
21 changes: 0 additions & 21 deletions terraform/aws/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,6 @@ variable "user_buckets" {
}


variable "athena_write_storage_bucket" {
type = string
description = "The name of the S3 bucket where Grafana query results from Athena will be stored"
default = ""
}

variable "athena_read_storage_bucket" {
type = string
description = "The name of the S3 bucket where Athena tables and data is stored"
default = ""
}

variable "hub_cloud_permissions" {
type = map(
map(
Expand Down Expand Up @@ -297,15 +285,6 @@ variable "active_cost_allocation_tags" {
EOT
}

variable "enable_grafana_athena_iam" {
type = bool
default = false
description = <<-EOT
Create an IAM role with attached policy to permit a connection between a
Grafana instance and AWS Athena service.
EOT
}

variable "enable_aws_ce_grafana_backend_iam" {
type = bool
default = false
Expand Down

0 comments on commit 3933a23

Please sign in to comment.