Skip to content

Commit 2b6922f

Browse files
committed
[ci] Migrate monitoring to grafana cloud
1 parent 533da7a commit 2b6922f

File tree

8 files changed

+12
-13
lines changed

8 files changed

+12
-13
lines changed

.github/actions/c-chain-reexecution-benchmark/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ runs:
9696
prometheus_push_url: ${{ inputs.prometheus-push-url }}
9797
prometheus_username: ${{ inputs.prometheus-username }}
9898
prometheus_password: ${{ inputs.prometheus-password }}
99-
grafana_dashboard_id: 'Gl1I20mnk/c-chain'
99+
grafana_dashboard_id: 'ma424s6/c-chain'
100100
runtime: "" # Set runtime input to empty string to disable log collection
101101

102102
- name: Compare Benchmark Results

.github/actions/run-monitored-tmpnet-cmd/action.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ inputs:
5050
default: ${{ github.job }}
5151
grafana_dashboard_id:
5252
description: 'The identifier of the Grafana dashboard to use, in the format <UID>/<dashboard-name>.'
53-
default: 'kBQpRdWnk/avalanche-main-dashboard'
53+
default: 'mabpvtq/avalanche-main-dashboard'
5454

5555
runs:
5656
using: composite
@@ -72,7 +72,7 @@ runs:
7272
echo "Grafana: ${metrics_url}"
7373
echo "🔗 [View Grafana Dashboard](${metrics_url})" >> "$GITHUB_STEP_SUMMARY"
7474
env:
75-
GRAFANA_URL: https://grafana-poc.avax-dev.network/d/${{ inputs.grafana_dashboard_id }}?orgId=1&refresh=10s&var-filter=is_ephemeral_node%7C%3D%7Cfalse&var-filter=gh_repo%7C%3D%7C${{ inputs.repository_owner }}%2F${{ inputs.repository_name }}&var-filter=gh_run_id%7C%3D%7C${{ inputs.run_id }}&var-filter=gh_run_attempt%7C%3D%7C${{ inputs.run_attempt }}
75+
GRAFANA_URL: https://avalabs.grafana.net/d/${{ inputs.grafana_dashboard_id }}?orgId=1&refresh=10s&var-filter=is_ephemeral_node%7C%3D%7Cfalse&var-filter=gh_repo%7C%3D%7C${{ inputs.repository_owner }}%2F${{ inputs.repository_name }}&var-filter=gh_run_id%7C%3D%7C${{ inputs.run_id }}&var-filter=gh_run_attempt%7C%3D%7C${{ inputs.run_attempt }}
7676
GH_JOB_ID: ${{ inputs.job }}
7777
FILTER_BY_OWNER: ${{ inputs.filter_by_owner }}
7878
- name: Warn that collection of metrics and logs will not be performed
@@ -88,9 +88,8 @@ runs:
8888
TMPNET_START_METRICS_COLLECTOR: ${{ inputs.prometheus_username != '' }}
8989
# Skip local log collection when nodes are running in kube since collection will occur in-cluster.
9090
TMPNET_START_LOGS_COLLECTOR: ${{ inputs.loki_username != '' && inputs.runtime == 'process' }}
91-
# TODO(marun) Re-enable these checks as part of a PR updating the metrics links
92-
# TMPNET_CHECK_METRICS_COLLECTED: ${{ inputs.prometheus_username != '' }}
93-
# TMPNET_CHECK_LOGS_COLLECTED: ${{ inputs.loki_username != '' }}
91+
TMPNET_CHECK_METRICS_COLLECTED: ${{ inputs.prometheus_username != '' }}
92+
TMPNET_CHECK_LOGS_COLLECTED: ${{ inputs.loki_username != '' }}
9493
LOKI_URL: ${{ inputs.loki_url }}
9594
LOKI_PUSH_URL: ${{ inputs.loki_push_url }}
9695
LOKI_USERNAME: ${{ inputs.loki_username }}

scripts/configure-local-metrics-collection.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ echo "Wrote promtail configuration to ${PROMTAIL_CONFIG_FILE}"
5252
echo "Metrics collection by prometheus can be started with ./bin/tmpnetctl start-metrics-collector"
5353
echo "Log collection by promtail can be started with ./bin/tmpnetctl start-logs-collector"
5454

55-
GRAFANA_URI="${GRAFANA_URI:-https://grafana-poc.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard}"
55+
GRAFANA_URI="${GRAFANA_URI:-https://avalabs.grafana.net/d/mabpvtq/avalanche-main-dashboard}"
5656
GRAFANA_LINK="${GRAFANA_URI}?var-filter=network_uuid%7C%3D%7C${METRICS_UUID}"
5757
METRICS_PATH="${HOME}/.avalanchego/metrics.txt"
5858
echo "${GRAFANA_LINK}" > "${METRICS_PATH}"

tests/e2e/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,6 @@ Once started, the collectors will continue to run in the background
138138
until stopped by `tmpnetctl stop-metrics-collector` and `tmpnetctl stop-logs-collector`.
139139

140140
The results of collection will be viewable at
141-
https://grafana-poc.avax-dev.network.
141+
https://avalabs.grafana.net.
142142

143143
For more detail, see the [tmpnet docs](../fixture/tmpnet/README.md##monitoring).

tests/fixture/tmpnet/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ Example usage:
501501
[Top](#table-of-contents)
502502
503503
When a network is started with tmpnet, a link to the [default grafana
504-
instance](https://grafana-poc.avax-dev.network) will be
504+
instance](https://avalabs.grafana.net) will be
505505
emitted. The dashboards will only be populated if prometheus and
506506
promtail are running locally (as per previous sections) to collect
507507
metrics and logs.

tests/fixture/tmpnet/network.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const (
6161
HardHatKeyStr = "56289e99c94b6912bfc12adc093c9b51124f0dc54ac7a766b2bc5ccf558d8027"
6262

6363
// Default grafana URI used to construct metrics links. Can be overridden by setting GRAFANA_URI env var.
64-
defaultGrafanaURI = "https://grafana-poc.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard"
64+
defaultGrafanaURI = "https://avalabs.grafana.net/d/mabpvtq/avalanche-main-dashboard"
6565
)
6666

6767
var (

tests/load/main/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ wallets which will send transactions to the network for the lifetime of the test
3333
To enable viewing the state of the test network, `tmpnet` will log a Grafana URL:
3434

3535
```
36-
[07-25|13:47:36.137] INFO tmpnet/network.go:410 metrics and logs available via grafana (collectors must be running) {"url": "https://grafana-poc.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard?&var-filter=network_uuid%7C%3D%7Ce1b9dd69-5204-4c24-8b98-d3aea14c0eeb&var-filter=is_ephemeral_node%7C%3D%7Cfalse&from=1753465644564&to=now"}
36+
[07-25|13:47:36.137] INFO tmpnet/network.go:410 metrics and logs available via grafana (collectors must be running) {"url": "https://avalabs.grafana.net/d/mabpvtq/avalanche-main-dashboard?&var-filter=network_uuid%7C%3D%7Ce1b9dd69-5204-4c24-8b98-d3aea14c0eeb&var-filter=is_ephemeral_node%7C%3D%7Cfalse&from=1753465644564&to=now"}
3737
```
3838

3939
Clicking on this link will open the main AvalancheGo dashboard in Grafana

tests/reexecute/c/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ AvalancheGo provides a [Taskfile](https://taskfile.dev/) with commands to manage
66

77
## Metrics
88

9-
The C-Chain benchmarks export VM metrics to the same Grafana instance as AvalancheGo CI: https://grafana-poc.avax-dev.network/.
9+
The C-Chain benchmarks export VM metrics to the same Grafana instance as AvalancheGo CI: https://avalabs.grafana.net/.
1010

11-
You can view granular C-Chain processing metrics with the label attached to this job (job="c-chain-reexecution") [here](https://grafana-poc.avax-dev.network/d/Gl1I20mnk/c-chain?orgId=1&from=now-5m&to=now&timezone=browser&var-datasource=P1809F7CD0C75ACF3&var-filter=job%7C%3D%7Cc-chain-reexecution&var-chain=C&refresh=10s).
11+
You can view granular C-Chain processing metrics with the label attached to this job (job="c-chain-reexecution") [here](https://avalabs.grafana.net/d/ma424s6/c-chain?orgId=1&from=now-5m&to=now&timezone=browser&var-datasource=P1809F7CD0C75ACF3&var-filter=job%7C%3D%7Cc-chain-reexecution&var-chain=C&refresh=10s).
1212

1313
Note: to ensure Prometheus gets a final scrape at the end of a run, the test will sleep for 2s greater than the 10s Prometheus scrape interval, which will cause short-running tests to appear to take much longer than expected. Additionally, the linked dashboard displays most metrics using a 1min rate, which means that very short running tests will not produce a very useful visualization.
1414

0 commit comments

Comments
 (0)