Skip to content

Commit

Permalink
[tmpnet] Update monitoring urls from *-experimental to *-poc (#3306)
Browse files Browse the repository at this point in the history
  • Loading branch information
marun authored Aug 21, 2024
1 parent f71b8d7 commit 35c66e3
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/actions/run-monitored-tmpnet-cmd/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ runs:
shell: bash
run: ${{ github.action_path }}/notify-metrics-availability.sh
env:
GRAFANA_URL: https://grafana-experimental.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard?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://grafana-poc.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard?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: Run command
Expand Down
2 changes: 1 addition & 1 deletion scripts/run_prometheus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if pgrep --pidfile="${PIDFILE}" -f 'prometheus.*enable-feature=agent' &> /dev/nu
exit 0
fi

PROMETHEUS_URL="${PROMETHEUS_URL:-https://prometheus-experimental.avax-dev.network}"
PROMETHEUS_URL="${PROMETHEUS_URL:-https://prometheus-poc.avax-dev.network}"
if [[ -z "${PROMETHEUS_URL}" ]]; then
echo "Please provide a value for PROMETHEUS_URL"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion scripts/run_promtail.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if pgrep --pidfile="${PIDFILE}" &> /dev/null; then
exit 0
fi

LOKI_URL="${LOKI_URL:-https://loki-experimental.avax-dev.network}"
LOKI_URL="${LOKI_URL:-https://loki-poc.avax-dev.network}"
if [[ -z "${LOKI_URL}" ]]; then
echo "Please provide a value for LOKI_URL"
exit 1
Expand Down
6 changes: 3 additions & 3 deletions tests/fixture/tmpnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ configured to scrape metrics from configured nodes and forward the
metrics to a persistent prometheus instance. The script requires that
the `PROMETHEUS_ID` and `PROMETHEUS_PASSWORD` env vars be set. By
default the prometheus instance at
https://prometheus-experimental.avax-dev.network will be targeted and
https://prometheus-poc.avax-dev.network will be targeted and
this can be overridden via the `PROMETHEUS_URL` env var.

### Log collection
Expand All @@ -300,7 +300,7 @@ The `scripts/run_promtail.sh` script starts promtail configured to
collect logs from configured nodes and forward the results to loki. The
script requires that the `LOKI_ID` and `LOKI_PASSWORD` env vars be
set. By default the loki instance at
https://loki-experimental.avax-dev.network will be targeted and this
https://loki-poc.avax-dev.network will be targeted and this
can be overridden via the `LOKI_URL` env var.

### Labels
Expand Down Expand Up @@ -336,7 +336,7 @@ https://docs.github.com/en/actions/learn-github-actions/contexts#github-context.
#### Local networks

When a network is started with tmpnet, a link to the [default grafana
instance](https://grafana-experimental.avax-dev.network) will be
instance](https://grafana-poc.avax-dev.network) 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 @@ -373,7 +373,7 @@ func (n *Network) StartNodes(ctx context.Context, w io.Writer, nodesToStart ...*
return err
}
// Provide a link to the main dashboard filtered by the uuid and showing results from now till whenever the link is viewed
if _, err := fmt.Fprintf(w, "\nMetrics: https://grafana-experimental.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard?&var-filter=network_uuid%%7C%%3D%%7C%s&var-filter=is_ephemeral_node%%7C%%3D%%7Cfalse&from=%d&to=now\n", n.UUID, startTime.UnixMilli()); err != nil {
if _, err := fmt.Fprintf(w, "\nMetrics: https://grafana-poc.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard?&var-filter=network_uuid%%7C%%3D%%7C%s&var-filter=is_ephemeral_node%%7C%%3D%%7Cfalse&from=%d&to=now\n", n.UUID, startTime.UnixMilli()); err != nil {
return err
}

Expand Down

0 comments on commit 35c66e3

Please sign in to comment.