diff --git a/spartan/metrics/grafana/alerts/policies.yaml b/spartan/metrics/grafana/alerts/policies.yaml index 764936017b8d..a2aa1b0edcf9 100644 --- a/spartan/metrics/grafana/alerts/policies.yaml +++ b/spartan/metrics/grafana/alerts/policies.yaml @@ -11,11 +11,6 @@ policies: - - k8s_namespace_name - =~ - $PRODUCTION_NAMESPACES_REGEX - - receiver: 'Slack #network-alerts channel' - object_matchers: - - - k8s_namespace_name - - =~ - - $STAGING_NAMESPACES_REGEX - receiver: 'Slack #network-alerts channel' object_matchers: - - k8s_namespace_name diff --git a/spartan/metrics/values.tmp.yaml b/spartan/metrics/values.tmp.yaml index 29ccb40983fb..4ff4068bcee0 100644 --- a/spartan/metrics/values.tmp.yaml +++ b/spartan/metrics/values.tmp.yaml @@ -116,9 +116,8 @@ grafana: server: domain: env: - PRODUCTION_NAMESPACES_REGEX: "testnet" - STAGING_NAMESPACES_REGEX: "staging-testnet" - NIGHTLY_NAMESPACES_REGEX: "staging-rc-1|next-rc-1" + PRODUCTION_NAMESPACES_REGEX: "testnet|v2-testnet|staging-public|staging-ignition" + NIGHTLY_NAMESPACES_REGEX: "next-rc-1" SLACK_WEBHOOK_URL: "http://127.0.0.1" # dummy value datasources: datasources.yaml: diff --git a/spartan/terraform/deploy-telemetry/main.tf b/spartan/terraform/deploy-telemetry/main.tf index d3388f902237..b44f1bc0cc28 100644 --- a/spartan/terraform/deploy-telemetry/main.tf +++ b/spartan/terraform/deploy-telemetry/main.tf @@ -91,7 +91,7 @@ resource "kubernetes_manifest" "otel_ingress_backend" { locals { prefixes = jsondecode(file("../../../yarn-project/cli/public_include_metric_prefixes.json")) - registries = ["0xec4156431d0f3df66d4e24ba3d30dcb4c85fa309", "0x6c04b1c116ec1ea0f918e3cc91e87b0af3e23b73", "0x2e48addca360da61e4d6c21ff2b1961af56eb83b", "0x3946727059698390de46be93f3c04b16ac731de6"] + registries = ["0xec4156431d0f3df66d4e24ba3d30dcb4c85fa309", "0xf299347e765cfb27f913bde8e4983fd0f195676f", "0x2e48addca360da61e4d6c21ff2b1961af56eb83b", "0xc2f24280f5c7f4897370dfdeb30f79ded14f1c81"] roles = ["sequencer"] otel_metric_allowlist = join(" or ", formatlist("HasPrefix(name, %q)", local.prefixes)) diff --git a/spartan/terraform/deploy-telemetry/values/public-otel-collector.yaml b/spartan/terraform/deploy-telemetry/values/public-otel-collector.yaml index eae335e17667..2e18a2d16667 100644 --- a/spartan/terraform/deploy-telemetry/values/public-otel-collector.yaml +++ b/spartan/terraform/deploy-telemetry/values/public-otel-collector.yaml @@ -139,9 +139,9 @@ ports: protocol: TCP service: enabled: true - type: LoadBalancer annotations: cloud.google.com/backend-config: "{\"default\":\"otel-ingress-backend\"}" + cloud.google.com/neg: "{\"ingress\": true}" ingress: enabled: true