Add the civiform version to our prometheus metrics (#276)

civiform · Dec 7, 2023 · ef53299 · ef53299
1 parent cae455d
commit ef53299
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cloud/aws/metrics/otel-config.yaml b/cloud/aws/metrics/otel-config.yaml
@@ -11,6 +11,8 @@ receivers:
  - job_name: 'civiform_scraper'
  static_configs:
  - targets: [0.0.0.0:9000]
+ labels:
+ civiform_version: '${CIVIFORM_VERSION}'
  awsecscontainermetrics:
  collection_interval: 10s
 

diff --git a/cloud/aws/templates/aws_oidc/app.tf b/cloud/aws/templates/aws_oidc/app.tf
@@ -137,10 +137,10 @@ module "civiform_metrics_scraper_container_def" {
  container_memory = 2048
  container_memory_reservation = 1024
 
- map_environment = {
+ map_environment = merge({
  PROMETHEUS_WRITE_ENDPOINT = var.monitoring_stack_enabled ? "${aws_prometheus_workspace.metrics[0].prometheus_endpoint}api/v1/remote_write" : ""
  AWS_REGION = var.aws_region
- }
+ }, var.civiform_server_environment_variables)
 
  log_configuration = {
  logDriver = "awslogs"