Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix hostname part of queries in dashboard #3161

Merged
merged 1 commit into from
Mar 6, 2019
Merged
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
14 changes: 7 additions & 7 deletions metrics/testnet-monitor.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"gnetId": null,
"graphTooltip": 0,
"id": 251,
"iteration": 1549301870213,
"iteration": 1549301870214,
"links": [
{
"asDropdown": true,
Expand Down Expand Up @@ -2860,7 +2860,7 @@
"hide": false,
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT time, host,program,thread, message FROM \"$testnet\".\"autogen\".\"panic\" WHERE $timeFilter ORDER BY time DESC ",
"query": "SELECT time, host_id,program,thread, message FROM \"$testnet\".\"autogen\".\"panic\" WHERE $timeFilter ORDER BY time DESC ",
"rawQuery": true,
"refId": "A",
"resultFormat": "table",
Expand Down Expand Up @@ -5156,7 +5156,7 @@
"measurement": "counter-cluster_info-vote-count",
"orderByTime": "ASC",
"policy": "autogen",
"query": "SELECT mean(\"packets_received\") as \"packets_received\" FROM \"$testnet\".\"autogen\".\"net-stats\" WHERE host_id =~ /$hostid/ AND $timeFilter GROUP BY time(5s) fill(null)\n\n\n\n",
"query": "SELECT mean(\"packets_received\") as \"packets_received\" FROM \"$testnet\".\"autogen\".\"net-stats\" WHERE hostname =~ /$hostid/ AND $timeFilter GROUP BY time(5s) fill(null)\n\n\n\n",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about changing hostname to host_id in the net-stats and other scripts. That seems better approach, but it'll make older data format not parsable by the dashboard.

"rawQuery": true,
"refId": "A",
"resultFormat": "time_series",
Expand Down Expand Up @@ -5194,7 +5194,7 @@
"measurement": "counter-cluster_info-vote-count",
"orderByTime": "ASC",
"policy": "autogen",
"query": "SELECT mean(\"receive_errors\") as \"receive_errors\" FROM \"$testnet\".\"autogen\".\"net-stats\" WHERE host_id =~ /$hostid/ AND $timeFilter GROUP BY time(5s) fill(null)\n\n\n\n",
"query": "SELECT mean(\"receive_errors\") as \"receive_errors\" FROM \"$testnet\".\"autogen\".\"net-stats\" WHERE hostname =~ /$hostid/ AND $timeFilter GROUP BY time(5s) fill(null)\n\n\n\n",
"rawQuery": true,
"refId": "B",
"resultFormat": "time_series",
Expand Down Expand Up @@ -5232,7 +5232,7 @@
"measurement": "counter-cluster_info-vote-count",
"orderByTime": "ASC",
"policy": "autogen",
"query": "SELECT mean(\"rcvbuf_errors\") as \"rcvbuf_errors\" FROM \"$testnet\".\"autogen\".\"net-stats\" WHERE host_id =~ /$hostid/ AND $timeFilter GROUP BY time(5s) fill(null)\n\n\n\n",
"query": "SELECT mean(\"rcvbuf_errors\") as \"rcvbuf_errors\" FROM \"$testnet\".\"autogen\".\"net-stats\" WHERE hostname =~ /$hostid/ AND $timeFilter GROUP BY time(5s) fill(null)\n\n\n\n",
"rawQuery": true,
"refId": "C",
"resultFormat": "time_series",
Expand Down Expand Up @@ -5270,7 +5270,7 @@
"measurement": "counter-cluster_info-vote-count",
"orderByTime": "ASC",
"policy": "autogen",
"query": "SELECT mean(\"packets_sent\") as \"packets_sent\" FROM \"$testnet\".\"autogen\".\"net-stats\" WHERE host_id =~ /$hostid/ AND $timeFilter GROUP BY time(5s) fill(null)\n\n\n\n",
"query": "SELECT mean(\"packets_sent\") as \"packets_sent\" FROM \"$testnet\".\"autogen\".\"net-stats\" WHERE hostname =~ /$hostid/ AND $timeFilter GROUP BY time(5s) fill(null)\n\n\n\n",
"rawQuery": true,
"refId": "D",
"resultFormat": "time_series",
Expand Down Expand Up @@ -5701,5 +5701,5 @@
"timezone": "",
"title": "Testnet Monitor (edge)",
"uid": "testnet-edge",
"version": 115
"version": 116
}