Skip to content

Commit

Permalink
fix SFDP stats
Browse files Browse the repository at this point in the history
  • Loading branch information
Rossignolskier committed Dec 13, 2023
1 parent 3300f3b commit 02e2fa9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions roles/monitoring/files/measurement_validator_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def load_data(config: ValidatorConfig):
identity_account_balance_data = default
leader_schedule_data = default
block_production_data = default
# tds_data = default
tds_data = default

vote_account_balance_data = default
vote_accounts_data = default
Expand All @@ -262,7 +262,7 @@ def load_data(config: ValidatorConfig):
identity_account_balance_data = rpc.load_identity_account_balance(config, identity_account_pubkey)
leader_schedule_data = rpc.load_leader_schedule(config, identity_account_pubkey)
block_production_data = rpc.load_block_production(config, identity_account_pubkey)
# tds_data = tds.load_tds_info(config, identity_account_pubkey)
tds_data = tds.load_tds_info(config, identity_account_pubkey)

if vote_account_pubkey is not None:
vote_account_balance_data = rpc.load_vote_account_balance(config, vote_account_pubkey)
Expand All @@ -283,7 +283,7 @@ def load_data(config: ValidatorConfig):
'solana_version_data': solana_version_data,
'stakes_data': stakes_data,
'validators_data': validators_data,
# 'tds_data': tds_data,
'tds_data': tds_data,
'cpu_model': rpc.load_cpu_model(config)
}

Expand Down Expand Up @@ -321,7 +321,7 @@ def calculate_influx_fields(data):
result.update(get_current_stake_metric(data['stakes_data']))
result.update(get_validators_metric(data['validators_data'], identity_account_pubkey))
result.update(get_block_production_cli_metrics(data['load_block_production_cli'], identity_account_pubkey))
# result.update(data['tds_data'])
result.update(data['tds_data'])
result.update({"cpu_model": data['cpu_model']})

return result
Expand Down
10 changes: 5 additions & 5 deletions roles/monitoring/files/tds_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ def load_tds_info(config: ValidatorConfig, identity_account_pubkey: str):
tds_data = tds_rpc_call(config, identity_account_pubkey)
result = {}
if tds_data != [] and tds_data != {}:
if 'tn_calculated_stats' in tds_data[0] and tds_data[0]['tn_calculated_stats'] is not None:
if 'tnCalculatedStats' in tds_data[0] and tds_data[0]['tnCalculatedStats'] is not None:
result = {
'tds': tds_data[0]['tn_calculated_stats'],
'tds': tds_data[0]['tnCalculatedStats'],
}
if 'onboarding_number' in tds_data[0]:
result['tds']['onboarding_number'] = tds_data[0]['onboarding_number']
result['tds']['onboarding_group'] = tds_data[0]['tds_onboarding_group']
if 'onboardingNumber' in tds_data[0]:
result['tds']['onboardingNumber'] = tds_data[0]['onboardingNumber']
result['tds']['tdsOnboardingGroup'] = tds_data[0]['tdsOnboardingGroup']

debug(config, result)

Expand Down

0 comments on commit 02e2fa9

Please sign in to comment.