Skip to content

Marblerun prometheus integration fixes #1189

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Mar 3, 2023
Merged

Marblerun prometheus integration fixes #1189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
762b0ae
service: fix register_quotes_from_marblerun after refactor
OverOrion Feb 27, 2023
749fb55
service: change marblerun prometheus endpoint poll interval to 5 minutes
OverOrion Feb 27, 2023
965d80e
enclave-runtime: attestation.rs: fix typo
OverOrion Feb 27, 2023
55f1adf
enclave-runtime: move enclave call log to trace level in attestation.rs
OverOrion Feb 27, 2023
5dbd925
fixup! service: change marblerun prometheus endpoint poll interval to…
OverOrion Feb 28, 2023
99c131b
fixup! enclave-runtime: attestation.rs: fix typo
OverOrion Feb 28, 2023
7abc2eb
fixup! enclave-runtime: move enclave call log to trace level in attes…
OverOrion Feb 28, 2023
5dff35f
Makefile: remove hardcoded dcap flag
OverOrion Feb 28, 2023
0af9699
Makefile: WORKER_FEATURES should not overwrite user supplied value
OverOrion Feb 28, 2023
333d4e7
fixup! Makefile: WORKER_FEATURES should not overwrite user supplied v…
OverOrion Mar 3, 2023
42e7f4e
Merge branch 'master' into szp/dcap-refactor-fix_pr
OverOrion Mar 3, 2023
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ ifeq ($(SGX_PRODUCTION), 1)
SGX_ENCLAVE_MODE = "Production Mode"
SGX_ENCLAVE_CONFIG = "enclave-runtime/Enclave.config.production.xml"
SGX_SIGN_KEY = $(SGX_COMMERCIAL_KEY)
WORKER_FEATURES = --features=production,$(WORKER_MODE),$(ADDITIONAL_FEATURES)
WORKER_FEATURES := --features=production,$(WORKER_MODE),$(WORKER_FEATURES),$(ADDITIONAL_FEATURES)
else
SGX_ENCLAVE_MODE = "Development Mode"
SGX_ENCLAVE_CONFIG = "enclave-runtime/Enclave.config.xml"
SGX_SIGN_KEY = "enclave-runtime/Enclave_private.pem"
WORKER_FEATURES = --features=default,$(WORKER_MODE),$(ADDITIONAL_FEATURES)
WORKER_FEATURES := --features=default,$(WORKER_MODE),$(WORKER_FEATURES),$(ADDITIONAL_FEATURES)
endif

CLIENT_FEATURES = --features=$(WORKER_MODE),$(ADDITIONAL_FEATURES)
Expand Down
3 changes: 1 addition & 2 deletions enclave-runtime/src/attestation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,14 +272,13 @@ pub fn generate_dcap_ra_extrinsic_from_quote_internal(
) -> EnclaveResult<OpaqueExtrinsic> {
let extrinsics_factory = get_extrinsic_factory_from_solo_or_parachain()?;
let node_metadata_repo = get_node_metadata_repository_from_solo_or_parachain()?;
info!(" [Enclave] Compose register enclave gettins callIDs:");
info!(" [Enclave] Compose register enclave getting callIDs:");

let call_ids = node_metadata_repo
.get_from_metadata(|m| m.register_dcap_enclave_call_indexes())?
.map_err(MetadataProviderError::MetadataError)?;
info!(" [Enclave] Compose register enclave call DCAP IDs: {:?}", call_ids);
let call = OpaqueCall::from_tuple(&(call_ids, quote, url));
info!(" [Enclave] Compose register enclave got call: {:#?}", &call);

let extrinsic = extrinsics_factory.create_extrinsics(&[call], None)?;
info!(" [Enclave] Compose register enclave got extrinsic, returning");
Expand Down
10 changes: 6 additions & 4 deletions service/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ fn fetch_marblerun_events_every_hour<E>(
{
let enclave = enclave.clone();
let handle = thread::spawn(move || {
const POLL_INTERVAL_1_HOUR_IN_SECS: u64 = 1 * 30;
const POLL_INTERVAL_5_MINUTES_IN_SECS: u64 = 5 * 60;
loop {
info!("Polling marblerun events for quotes to register");
register_quotes_from_marblerun(
Expand All @@ -741,7 +741,7 @@ fn fetch_marblerun_events_every_hour<E>(
marblerun_base_url.clone(),
);

thread::sleep(Duration::from_secs(POLL_INTERVAL_1_HOUR_IN_SECS));
thread::sleep(Duration::from_secs(POLL_INTERVAL_5_MINUTES_IN_SECS));
}
});

Expand All @@ -763,9 +763,11 @@ fn register_quotes_from_marblerun(

for quote in quotes {
match enclave.generate_dcap_ra_extrinsic_from_quote(url.clone(), &quote) {
Ok(xts) => send_extrinsic(&xts, api, accountid, is_development_mode),
Ok(xts) => {
send_extrinsic(&xts, api, accountid, is_development_mode);
},
Err(e) => {
error!("Extracting information from quote failed: {}", e.into())
error!("Extracting information from quote failed: {}", e)
},
}
}
Expand Down