Skip to content
Draft
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
2 changes: 1 addition & 1 deletion .github/actions/c-chain-reexecution-benchmark/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ runs:
prometheus_push_url: ${{ inputs.prometheus-push-url }}
prometheus_username: ${{ inputs.prometheus-username }}
prometheus_password: ${{ inputs.prometheus-password }}
grafana_dashboard_id: 'Gl1I20mnk/c-chain'
grafana_dashboard_id: 'ma424s6/c-chain'
runtime: "" # Set runtime input to empty string to disable log collection

- name: Compare Benchmark Results
Expand Down
9 changes: 4 additions & 5 deletions .github/actions/run-monitored-tmpnet-cmd/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ inputs:
default: ${{ github.job }}
grafana_dashboard_id:
description: 'The identifier of the Grafana dashboard to use, in the format <UID>/<dashboard-name>.'
default: 'kBQpRdWnk/avalanche-main-dashboard'
default: 'mabpvtq/avalanche-main-dashboard'

runs:
using: composite
Expand All @@ -72,7 +72,7 @@ runs:
echo "Grafana: ${metrics_url}"
echo "🔗 [View Grafana Dashboard](${metrics_url})" >> "$GITHUB_STEP_SUMMARY"
env:
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 }}
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 }}
GH_JOB_ID: ${{ inputs.job }}
FILTER_BY_OWNER: ${{ inputs.filter_by_owner }}
- name: Warn that collection of metrics and logs will not be performed
Expand All @@ -88,9 +88,8 @@ runs:
TMPNET_START_METRICS_COLLECTOR: ${{ inputs.prometheus_username != '' }}
# Skip local log collection when nodes are running in kube since collection will occur in-cluster.
TMPNET_START_LOGS_COLLECTOR: ${{ inputs.loki_username != '' && inputs.runtime == 'process' }}
# TODO(marun) Re-enable these checks as part of a PR updating the metrics links
# TMPNET_CHECK_METRICS_COLLECTED: ${{ inputs.prometheus_username != '' }}
# TMPNET_CHECK_LOGS_COLLECTED: ${{ inputs.loki_username != '' }}
TMPNET_CHECK_METRICS_COLLECTED: ${{ inputs.prometheus_username != '' }}
TMPNET_CHECK_LOGS_COLLECTED: ${{ inputs.loki_username != '' }}
LOKI_URL: ${{ inputs.loki_url }}
LOKI_PUSH_URL: ${{ inputs.loki_push_url }}
LOKI_USERNAME: ${{ inputs.loki_username }}
Expand Down
2 changes: 1 addition & 1 deletion scripts/configure-local-metrics-collection.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ echo "Wrote promtail configuration to ${PROMTAIL_CONFIG_FILE}"
echo "Metrics collection by prometheus can be started with ./bin/tmpnetctl start-metrics-collector"
echo "Log collection by promtail can be started with ./bin/tmpnetctl start-logs-collector"

GRAFANA_URI="${GRAFANA_URI:-https://grafana-poc.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard}"
GRAFANA_URI="${GRAFANA_URI:-https://avalabs.grafana.net/d/mabpvtq/avalanche-main-dashboard}"
GRAFANA_LINK="${GRAFANA_URI}?var-filter=network_uuid%7C%3D%7C${METRICS_UUID}"
METRICS_PATH="${HOME}/.avalanchego/metrics.txt"
echo "${GRAFANA_LINK}" > "${METRICS_PATH}"
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,6 @@ Once started, the collectors will continue to run in the background
until stopped by `tmpnetctl stop-metrics-collector` and `tmpnetctl stop-logs-collector`.

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

For more detail, see the [tmpnet docs](../fixture/tmpnet/README.md##monitoring).
2 changes: 1 addition & 1 deletion tests/fixture/tmpnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ Example usage:
[Top](#table-of-contents)

When a network is started with tmpnet, a link to the [default grafana
instance](https://grafana-poc.avax-dev.network) will be
instance](https://avalabs.grafana.net) will be
emitted. The dashboards will only be populated if prometheus and
promtail are running locally (as per previous sections) to collect
metrics and logs.
Expand Down
2 changes: 1 addition & 1 deletion tests/fixture/tmpnet/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const (
HardHatKeyStr = "56289e99c94b6912bfc12adc093c9b51124f0dc54ac7a766b2bc5ccf558d8027"

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

var (
Expand Down
2 changes: 1 addition & 1 deletion tests/load/main/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ wallets which will send transactions to the network for the lifetime of the test
To enable viewing the state of the test network, `tmpnet` will log a Grafana URL:

```
[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"}
[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"}
```

Clicking on this link will open the main AvalancheGo dashboard in Grafana
Expand Down
4 changes: 2 additions & 2 deletions tests/reexecute/c/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ AvalancheGo provides a [Taskfile](https://taskfile.dev/) with commands to manage

## Metrics

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

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).
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).

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.

Expand Down