Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions spartan/metrics/grafana/alerts/policies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions spartan/metrics/values.tmp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion spartan/terraform/deploy-telemetry/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading