diff --git a/terraform/cos-lite/main.tf b/terraform/cos-lite/main.tf index 0714ab7f..933f5bb7 100644 --- a/terraform/cos-lite/main.tf +++ b/terraform/cos-lite/main.tf @@ -109,7 +109,6 @@ resource "juju_integration" "alertmanager_loki" { } } - resource "juju_integration" "grafana_source_alertmanager" { model = var.model @@ -140,7 +139,6 @@ resource "juju_integration" "grafana_self_monitoring_prometheus" { } } - # Provided by Prometheus resource "juju_integration" "prometheus_grafana_dashboards_provider" { @@ -171,9 +169,6 @@ resource "juju_integration" "prometheus_grafana_source" { } } - - - # Provided by Loki resource "juju_integration" "loki_grafana_dashboards_provider" { @@ -218,7 +213,6 @@ resource "juju_integration" "loki_self_monitoring_prometheus" { } } - # Provided by Catalogue resource "juju_integration" "catalogue_alertmanager" { @@ -263,7 +257,6 @@ resource "juju_integration" "catalogue_prometheus" { } } - # Provided by Traefik resource "juju_integration" "alertmanager_ingress" { @@ -280,7 +273,6 @@ resource "juju_integration" "alertmanager_ingress" { } } - resource "juju_integration" "catalogue_ingress" { model = var.model @@ -351,30 +343,122 @@ resource "juju_integration" "traefik_self_monitoring_prometheus" { } } +# Provided by Self-Signed-Certificates + +resource "juju_integration" "alertmanager_certificates" { + count = var.use_tls ? 1 : 0 + model = var.model + + application { + name = module.ssc[0].app_name + endpoint = module.ssc[0].provides.certificates + } + + application { + name = module.alertmanager.app_name + endpoint = module.alertmanager.endpoints.certificates + } +} + +resource "juju_integration" "catalogue_certificates" { + count = var.use_tls ? 1 : 0 + model = var.model + + application { + name = module.ssc[0].app_name + endpoint = module.ssc[0].provides.certificates + } + + application { + name = module.catalogue.app_name + endpoint = module.catalogue.endpoints.certificates + } +} + +resource "juju_integration" "grafana_certificates" { + count = var.use_tls ? 1 : 0 + model = var.model + + application { + name = module.ssc[0].app_name + endpoint = module.ssc[0].provides.certificates + } + + application { + name = module.grafana.app_name + endpoint = module.grafana.endpoints.certificates + } +} + +resource "juju_integration" "loki_certificates" { + count = var.use_tls ? 1 : 0 + model = var.model + + application { + name = module.ssc[0].app_name + endpoint = module.ssc[0].provides.certificates + } + + application { + name = module.loki.app_name + endpoint = module.loki.endpoints.certificates + } +} + +resource "juju_integration" "prometheus_certificates" { + count = var.use_tls ? 1 : 0 + model = var.model + + application { + name = module.ssc[0].app_name + endpoint = module.ssc[0].provides.certificates + } + + application { + name = module.prometheus.app_name + endpoint = module.prometheus.endpoints.certificates + } +} + +resource "juju_integration" "traefik_certificates" { + count = var.use_tls ? 1 : 0 + model = var.model + + application { + name = module.ssc[0].app_name + endpoint = module.ssc[0].provides.certificates + } + + application { + name = module.traefik.app_name + endpoint = module.traefik.endpoints.certificates + } +} + # -------------- # Offers -------------- -resource "juju_offer" "alertmanager-karma-dashboard" { +resource "juju_offer" "alertmanager_karma_dashboard" { name = "alertmanager-karma-dashboard" model = var.model application_name = module.alertmanager.app_name endpoint = "karma-dashboard" } -resource "juju_offer" "grafana-dashboards" { +resource "juju_offer" "grafana_dashboards" { name = "grafana-dashboards" model = var.model application_name = module.grafana.app_name endpoint = "grafana-dashboard" } -resource "juju_offer" "loki-logging" { +resource "juju_offer" "loki_logging" { name = "loki-logging" model = var.model application_name = module.loki.app_name endpoint = "logging" } -resource "juju_offer" "prometheus-receive-remote-write" { +resource "juju_offer" "prometheus_receive_remote_write" { name = "prometheus-receive-remote-write" model = var.model application_name = module.prometheus.app_name diff --git a/terraform/cos-lite/outputs.tf b/terraform/cos-lite/outputs.tf index 3e9fed61..ddce7ec8 100644 --- a/terraform/cos-lite/outputs.tf +++ b/terraform/cos-lite/outputs.tf @@ -2,10 +2,10 @@ output "offers" { value = { - alertmanager_karma_dashboard = juju_offer.alertmanager-karma-dashboard - grafana_dashboards = juju_offer.grafana-dashboards - loki_logging = juju_offer.loki-logging - prometheus_receive_remote_write = juju_offer.prometheus-receive-remote-write + alertmanager_karma_dashboard = juju_offer.alertmanager_karma_dashboard + grafana_dashboards = juju_offer.grafana_dashboards + loki_logging = juju_offer.loki_logging + prometheus_receive_remote_write = juju_offer.prometheus_receive_remote_write } } diff --git a/terraform/cos/main.tf b/terraform/cos/main.tf index f6ff85d7..dc59cd13 100644 --- a/terraform/cos/main.tf +++ b/terraform/cos/main.tf @@ -578,28 +578,28 @@ resource "juju_integration" "grafana_tracing_grafana_agent_traicing_provider" { # -------------- # Offers -------------- -resource "juju_offer" "alertmanager-karma-dashboard" { +resource "juju_offer" "alertmanager_karma_dashboard" { name = "alertmanager-karma-dashboard" model = var.model application_name = module.alertmanager.app_name endpoint = "karma-dashboard" } -resource "juju_offer" "grafana-dashboards" { +resource "juju_offer" "grafana_dashboards" { name = "grafana-dashboards" model = var.model application_name = module.grafana.app_name endpoint = "grafana-dashboard" } -resource "juju_offer" "loki-logging" { +resource "juju_offer" "loki_logging" { name = "loki-logging" model = var.model application_name = module.loki.app_names.loki_coordinator endpoint = "logging" } -resource "juju_offer" "mimir-receive-remote-write" { +resource "juju_offer" "mimir_receive_remote_write" { name = "mimir-receive-remote-write" model = var.model application_name = module.mimir.app_names.mimir_coordinator diff --git a/terraform/cos/outputs.tf b/terraform/cos/outputs.tf index ab886241..58e1ff83 100644 --- a/terraform/cos/outputs.tf +++ b/terraform/cos/outputs.tf @@ -2,10 +2,10 @@ output "offers" { value = { - alertmanager_karma_dashboard = juju_offer.alertmanager-karma-dashboard - grafana_dashboards = juju_offer.grafana-dashboards - loki_logging = juju_offer.loki-logging - mimir_receive_remote_write = juju_offer.mimir-receive-remote-write + alertmanager_karma_dashboard = juju_offer.alertmanager_karma_dashboard + grafana_dashboards = juju_offer.grafana_dashboards + loki_logging = juju_offer.loki_logging + mimir_receive_remote_write = juju_offer.mimir_receive_remote_write } }