Skip to content

Commit 7dd5195

Browse files
authored
chore: update telemetry (#17119)
2 parents f11d8da + 9cf22ee commit 7dd5195

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

spartan/metrics/grafana/alerts/policies.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ policies:
1111
- - k8s_namespace_name
1212
- =~
1313
- $PRODUCTION_NAMESPACES_REGEX
14-
- receiver: 'Slack #network-alerts channel'
15-
object_matchers:
16-
- - k8s_namespace_name
17-
- =~
18-
- $STAGING_NAMESPACES_REGEX
1914
- receiver: 'Slack #network-alerts channel'
2015
object_matchers:
2116
- - k8s_namespace_name

spartan/metrics/values.tmp.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,8 @@ grafana:
116116
server:
117117
domain:
118118
env:
119-
PRODUCTION_NAMESPACES_REGEX: "testnet"
120-
STAGING_NAMESPACES_REGEX: "staging-testnet"
121-
NIGHTLY_NAMESPACES_REGEX: "staging-rc-1|next-rc-1"
119+
PRODUCTION_NAMESPACES_REGEX: "testnet|v2-testnet|staging-public|staging-ignition"
120+
NIGHTLY_NAMESPACES_REGEX: "next-rc-1"
122121
SLACK_WEBHOOK_URL: "http://127.0.0.1" # dummy value
123122
datasources:
124123
datasources.yaml:

spartan/terraform/deploy-telemetry/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ resource "kubernetes_manifest" "otel_ingress_backend" {
9191

9292
locals {
9393
prefixes = jsondecode(file("../../../yarn-project/cli/public_include_metric_prefixes.json"))
94-
registries = ["0xec4156431d0f3df66d4e24ba3d30dcb4c85fa309", "0x6c04b1c116ec1ea0f918e3cc91e87b0af3e23b73", "0x2e48addca360da61e4d6c21ff2b1961af56eb83b", "0x3946727059698390de46be93f3c04b16ac731de6"]
94+
registries = ["0xec4156431d0f3df66d4e24ba3d30dcb4c85fa309", "0xf299347e765cfb27f913bde8e4983fd0f195676f", "0x2e48addca360da61e4d6c21ff2b1961af56eb83b", "0xc2f24280f5c7f4897370dfdeb30f79ded14f1c81"]
9595
roles = ["sequencer"]
9696

9797
otel_metric_allowlist = join(" or ", formatlist("HasPrefix(name, %q)", local.prefixes))

spartan/terraform/deploy-telemetry/values/public-otel-collector.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ ports:
139139
protocol: TCP
140140
service:
141141
enabled: true
142-
type: LoadBalancer
143142
annotations:
144143
cloud.google.com/backend-config: "{\"default\":\"otel-ingress-backend\"}"
144+
cloud.google.com/neg: "{\"ingress\": true}"
145145

146146
ingress:
147147
enabled: true

0 commit comments

Comments
 (0)