Fix HostId field in the testnet dashboard

This commit is contained in:
Michael Vines 2019-06-13 14:37:12 -07:00
parent ed05aeaef8
commit 8628f33d0b
2 changed files with 21 additions and 4 deletions

View File

@ -17,7 +17,7 @@ use crate::service::Service;
use crate::storage_stage::StorageState; use crate::storage_stage::StorageState;
use crate::tpu::Tpu; use crate::tpu::Tpu;
use crate::tvu::{Sockets, Tvu}; use crate::tvu::{Sockets, Tvu};
use solana_metrics::inc_new_counter_info; use solana_metrics::datapoint_info;
use solana_sdk::genesis_block::GenesisBlock; use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::poh_config::PohConfig; use solana_sdk::poh_config::PohConfig;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
@ -264,7 +264,7 @@ impl Validator {
&exit, &exit,
); );
inc_new_counter_info!("fullnode-new", 1); datapoint_info!("validator-new");
Self { Self {
id, id,
gossip_service, gossip_service,

View File

@ -46,7 +46,24 @@ if channel == 'local':
'text': 'testnet', 'text': 'testnet',
'value': 'testnet'}], 'value': 'testnet'}],
'query': 'testnet', 'query': 'testnet',
'type': 'custom'}] 'type': 'custom'},
{'allValue': ".*",
'datasource': '$datasource',
'hide': 0,
'includeAll': True,
'label': 'HostID',
'multi': False,
'name': 'hostid',
'options': [],
'query': 'SELECT DISTINCT(\"host_id\") FROM \"$testnet\".\"autogen\".\"validator-new\" ',
'refresh': 2,
'regex': '',
'sort': 1,
'tagValuesQuery': '',
'tags': [],
'tagsQuery': '',
'type': 'query',
'useTags': False}]
elif channel == 'stable': elif channel == 'stable':
# Stable dashboard only allows the user to select between the stable # Stable dashboard only allows the user to select between the stable
@ -121,7 +138,7 @@ else:
'multi': False, 'multi': False,
'name': 'hostid', 'name': 'hostid',
'options': [], 'options': [],
'query': 'SELECT DISTINCT(\"host_id\") FROM \"$testnet\".\"autogen\".\"counter-fullnode-new\" ', 'query': 'SELECT DISTINCT(\"host_id\") FROM \"$testnet\".\"autogen\".\"validator-new\" ',
'refresh': 2, 'refresh': 2,
'regex': '', 'regex': '',
'sort': 1, 'sort': 1,