Fix various things

Makefile

@@ -292,7 +292,7 @@ packer: supervisor # Build and publish a new webserver AMI
 
 deploy-alerts: # Deploy alerting configuration to Grafana Cloud
 	envsubst < grafana/alertmanager.yaml > grafana/alertmanager.yaml.out
-	cortextool rules load grafana/alerts.yaml --address=https://prometheus-blocks-prod-us-central1.grafana.net --id=$(GRAFANA_PROMETHEUS_USERNAME) --key=$(GRAFANA_API_KEY)
+	cortextool rules load grafana/alerts.yaml --address=https://$(GRAFANA_PROMETHEUS_HOSTNAME) --id=$(GRAFANA_PROMETHEUS_USERNAME) --key=$(GRAFANA_API_KEY)
 	cortextool alertmanager load grafana/alertmanager.yaml.out --address=https://alertmanager-us-central1.grafana.net --id=$(GRAFANA_ALERTMANAGER_USERNAME) --key=$(GRAFANA_API_KEY)
 
 ### Miscellaneous

packer/prometheus.yaml

@@ -15,7 +15,7 @@ scrape_configs:
       - targets: ["localhost:9090"]
 
 remote_write:
-  - url: "https://prometheus-blocks-prod-us-central1.grafana.net/api/prom/push"
+  - url: "$GRAFANA_PROMETHEUS_HOSTNAME"
     basic_auth:
       username: "$GRAFANA_PROMETHEUS_USERNAME"
       password: "$GRAFANA_API_KEY"

packer/promtail.yaml

@@ -7,7 +7,7 @@ positions:
   filename: /tmp/positions.yaml
 
 client:
-  url: https://$GRAFANA_LOKI_USERNAME:$GRAFANA_API_KEY@logs-prod-us-central1.grafana.net/api/prom/push
+  url: https://$GRAFANA_LOKI_USERNAME:$GRAFANA_API_KEY@$GRAFANA_LOKI_HOSTNAME/api/prom/push
 
 scrape_configs:
   - job_name: kernel

packer/provision.bash

@@ -98,8 +98,12 @@ if [[ -n "${GRAFANA_API_KEY:-}" ]]; then
 
     sudo sed -Ei "s/\\\$GRAFANA_API_KEY/${GRAFANA_API_KEY}/" \
          /etc/prometheus/config.yaml /etc/promtail/config.yaml
+    sudo sed -Ei "s/\\\$GRAFANA_LOKI_HOSTNAME/${GRAFANA_LOKI_HOSTNAME}/" \
+         /etc/promtail/config.yaml
     sudo sed -Ei "s/\\\$GRAFANA_LOKI_USERNAME/${GRAFANA_LOKI_USERNAME}/" \
          /etc/promtail/config.yaml
+    sudo sed -Ei "s/\\\$GRAFANA_PROMETHEUS_HOSTNAME/${GRAFANA_PROMETHEUS_HOSTNAME}/" \
+         /etc/prometheus/config.yaml
     sudo sed -Ei "s/\\\$GRAFANA_PROMETHEUS_USERNAME/${GRAFANA_PROMETHEUS_USERNAME}/" \
          /etc/prometheus/config.yaml
 

packer/web.pkr.hcl

@@ -13,11 +13,21 @@ variable "analytics_tag" {
   default = "${env("ANALYTICS_TAG")}"
 }
 
+variable "grafana_loki_hostname" {
+  type    = string
+  default = "${env("GRAFANA_LOKI_HOSTNAME")}"
+}
+
 variable "grafana_loki_username" {
   type    = string
   default = "${env("GRAFANA_LOKI_USERNAME")}"
 }
 
+variable "grafana_prometheus_hostname" {
+  type    = string
+  default = "${env("GRAFANA_PROMETHEUS_HOSTNAME")}"
+}
+
 variable "grafana_prometheus_username" {
   type    = string
   default = "${env("GRAFANA_PROMETHEUS_USERNAME")}"
@@ -142,7 +152,9 @@ build {
       "ADMIN_PASSWORD=${var.admin_password}",
       "AWS_REGION=${var.aws_region}",
       "ANALYTICS_TAG=${var.analytics_tag}",
+      "GRAFANA_LOKI_HOSTNAME=${var.grafana_loki_hostname}",
       "GRAFANA_LOKI_USERNAME=${var.grafana_loki_username}",
+      "GRAFANA_PROMETHEUS_HOSTNAME=${var.grafana_prometheus_hostname}",
       "GRAFANA_PROMETHEUS_USERNAME=${var.grafana_prometheus_username}",
       "GRAFANA_API_KEY=${var.grafana_api_key}",
       "S3_BUCKET=${var.s3_bucket}",

tools/packer-build-ci.bash

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-packer build ci.pkr.hcl