Skip to content

Commit 9f8a3f6

Browse files
authored
Merge pull request #335 from ooni/add-clickhouse-write-ooniprobe
Add write access to clickhouse to the ooniprobe service
2 parents f0beec1 + bc05c9d commit 9f8a3f6

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

tf/environments/dev/main.tf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,10 @@ data "aws_ssm_parameter" "clickhouse_readonly_test_url" {
240240
name = "/oonidevops/secrets/clickhouse_readonly_test_url"
241241
}
242242

243+
data "aws_ssm_parameter" "clickhouse_write_url" {
244+
name = "/oonidevops/secrets/clickhouse_write_password"
245+
}
246+
243247
data "aws_ssm_parameter" "account_id_hashing_key" {
244248
name = "/oonidevops/secrets/ooni_services/account_id_hashing_key"
245249
}
@@ -582,7 +586,7 @@ module "ooniapi_ooniprobe" {
582586
POSTGRESQL_URL = data.aws_ssm_parameter.oonipg_url.arn
583587
JWT_ENCRYPTION_KEY = data.aws_ssm_parameter.jwt_secret_legacy.arn
584588
PROMETHEUS_METRICS_PASSWORD = data.aws_ssm_parameter.prometheus_metrics_password.arn
585-
CLICKHOUSE_URL = data.aws_ssm_parameter.clickhouse_readonly_url.arn
589+
CLICKHOUSE_URL = data.aws_ssm_parameter.clickhouse_write_url.arn
586590
ANONC_SECRET_KEY = data.aws_ssm_parameter.anonc_secret_key.arn
587591
}
588592

tf/environments/prod/main.tf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,10 @@ data "aws_ssm_parameter" "clickhouse_readonly_url" {
237237
name = "/oonidevops/secrets/clickhouse_readonly_url"
238238
}
239239

240+
data "aws_ssm_parameter" "clickhouse_write_url" {
241+
name = "/oonidevops/secrets/clickhouse_write_password"
242+
}
243+
240244
data "aws_ssm_parameter" "account_id_hashing_key" {
241245
name = "/oonidevops/secrets/ooni_services/account_id_hashing_key"
242246
}
@@ -803,7 +807,7 @@ module "ooniapi_ooniprobe" {
803807
POSTGRESQL_URL = data.aws_ssm_parameter.oonipg_url.arn
804808
JWT_ENCRYPTION_KEY = data.aws_ssm_parameter.jwt_secret.arn
805809
PROMETHEUS_METRICS_PASSWORD = data.aws_ssm_parameter.prometheus_metrics_password.arn
806-
CLICKHOUSE_URL = data.aws_ssm_parameter.clickhouse_readonly_url.arn
810+
CLICKHOUSE_URL = data.aws_ssm_parameter.clickhouse_write_url.arn
807811
ANONC_SECRET_KEY = data.aws_ssm_parameter.anonc_secret_key.arn
808812
}
809813

0 commit comments

Comments
 (0)