Validate Proxmox observations, evaluate scheduled backups and link VMs to their Proxmox host
Rust development slice / linux (push) Failing after 15s
Rust development slice / linux (push) Failing after 15s
linux.proxmox gets a strict validator and a 128 KiB scope budget. Device details expose guests, backup jobs with ok/failed/missed/running status and linked devices. Base snapshots reconcile unique guest MACs into assets.hypervisor_asset_id with hypervisor_source='proxmox'; manual choices are kept and can be handed back to automatic detection. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -261,6 +261,12 @@ pub async fn detail(
|
||||
.ok_or(Error(StatusCode::NOT_FOUND, "NOT_FOUND"))?;
|
||||
let hosts = assigned_hosts(&mut tx, tenant, now, std::slice::from_ref(&row)).await?;
|
||||
let mut item = project(&row, now, true, &hosts);
|
||||
if item["proxmox"]["data"].is_object() {
|
||||
let rows: Vec<(Uuid, Uuid, Option<String>, Option<String>, Value)> =
|
||||
sqlx::query_as(include_str!("proxmox_guest_devices.sql"))
|
||||
.bind(tenant).bind(asset).fetch_all(&mut *tx).await?;
|
||||
item["proxmox"]["guest_devices"] = proxmox_guest_devices(&item["proxmox"]["data"], &rows);
|
||||
}
|
||||
item["recent_jobs"] = if p.permits_scope("operations:read")
|
||||
&& crate::permissions::allowed(&mut tx, &p.name, "operations:read").await?
|
||||
{
|
||||
@@ -282,6 +288,25 @@ pub async fn detail(
|
||||
Ok(Json(item))
|
||||
}
|
||||
|
||||
/// Linked devices per reported guest, matched by the MACs both sides report.
|
||||
fn proxmox_guest_devices(
|
||||
data: &Value,
|
||||
rows: &[(Uuid, Uuid, Option<String>, Option<String>, Value)],
|
||||
) -> Value {
|
||||
let mut result = Vec::new();
|
||||
for guest in data["guests"].as_array().into_iter().flatten() {
|
||||
let macs: Vec<&str> = guest["macs"].as_array().into_iter().flatten()
|
||||
.filter_map(Value::as_str).collect();
|
||||
let linked = rows.iter().find(|(_, _, _, _, device)| device.as_array().into_iter().flatten()
|
||||
.filter_map(Value::as_str).any(|m| macs.contains(&m)));
|
||||
if let (Some(vmid), Some((asset_id, agent_id, source, hostname, _))) = (guest["vmid"].as_u64(), linked) {
|
||||
result.push(json!({"vmid":vmid,"asset_id":asset_id,"agent_id":agent_id,
|
||||
"hostname":hostname,"source":source}));
|
||||
}
|
||||
}
|
||||
Value::Array(result)
|
||||
}
|
||||
|
||||
fn observed<'a>(data: &'a Value, scope: &str) -> &'a Value {
|
||||
data["observations"]
|
||||
.as_array()
|
||||
@@ -569,12 +594,33 @@ fn project(row: &PgRow, now: DateTime<Utc>, full: bool, hosts: &HashMap<Uuid, Ho
|
||||
} else { Value::Null };
|
||||
item["disks_truncated"] = json!(scope["truncated"] == true);
|
||||
}
|
||||
if let Some(scope) = data["observations"].as_array().and_then(|scopes|
|
||||
scopes.iter().find(|s| s["scope"] == "linux.proxmox")) {
|
||||
let status = (scope["quality"] == "valid")
|
||||
.then(|| rmm_domain::inventory_document::proxmox::backup_status(&scope["data"]))
|
||||
.flatten();
|
||||
item["proxmox_backup"] = status.as_ref().map_or(Value::Null, |s| json!({
|
||||
"all_scheduled_backups_ran":s["all_scheduled_backups_ran"],
|
||||
"problem_jobs":s["problem_jobs"],"enabled_jobs":s["enabled_jobs"]}));
|
||||
if full {
|
||||
item["proxmox"] = json!({
|
||||
"quality":scope["quality"],"error_code":scope["error_code"],
|
||||
"observed_at":scope["observed_at"],"truncated":scope["truncated"],
|
||||
"data":if scope["quality"] == "valid" { scope["data"].clone() } else { Value::Null },
|
||||
"backup_status":status,"guest_devices":[]});
|
||||
}
|
||||
}
|
||||
if device_type == Some(DeviceType::Virtual) && row.get::<String, _>("lifecycle") == "current" {
|
||||
let assigned_id: Option<Uuid> = row.get("hypervisor_asset_id");
|
||||
let assigned = assigned_id.and_then(|id| hosts.get(&id));
|
||||
item["hypervisor"] = hypervisor_display(&data, assigned);
|
||||
let source = row.get::<Option<String>, _>("hypervisor_source");
|
||||
if item["hypervisor"]["kind"] == "device" {
|
||||
item["hypervisor"]["source"] = json!(source);
|
||||
}
|
||||
if full {
|
||||
item["assigned_hypervisor_asset_id"] = json!(assigned_id);
|
||||
item["hypervisor_source"] = json!(source);
|
||||
}
|
||||
}
|
||||
if full {
|
||||
@@ -668,6 +714,94 @@ mod tests {
|
||||
assert!(hypervisor_display(&data, None).is_null());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore = "requires the disposable RLS database from tests/local_access_database.py"]
|
||||
async fn proxmox_guest_macs_link_vms_automatically_but_never_override_people() {
|
||||
let admin = sqlx::PgPool::connect(&std::env::var("RMM_TEST_REPAIR_ADMIN_URL").unwrap())
|
||||
.await.unwrap();
|
||||
let app = sqlx::PgPool::connect(&std::env::var("RMM_TEST_REPAIR_APP_URL").unwrap())
|
||||
.await.unwrap();
|
||||
let (tenant, other) = (Uuid::new_v4(), Uuid::new_v4());
|
||||
let (host, vm, manual_vm, foreign_vm, twin_a, twin_b) =
|
||||
(Uuid::new_v4(), Uuid::new_v4(), Uuid::new_v4(), Uuid::new_v4(), Uuid::new_v4(), Uuid::new_v4());
|
||||
for customer in [tenant, other] {
|
||||
sqlx::query("INSERT INTO tenants(tenant_id,name) VALUES($1,'Proxmox link test')")
|
||||
.bind(customer).execute(&admin).await.unwrap();
|
||||
}
|
||||
let guests = |macs: &[&str]| json!({"node":"pve","guests":macs.iter().enumerate().map(|(i, m)|
|
||||
json!({"vmid":100 + i,"macs":[m]})).collect::<Vec<_>>()});
|
||||
let device = |kind: &str, mac: &str, proxmox: Option<Value>| {
|
||||
let mut scopes = vec![
|
||||
json!({"scope":"linux.hardware","quality":"valid","data":{"device_type":kind}}),
|
||||
json!({"scope":"linux.interfaces","quality":"valid","data":[{"name":"eth0","mac":mac}]}),
|
||||
];
|
||||
if let Some(data) = proxmox {
|
||||
scopes.push(json!({"scope":"linux.proxmox","quality":"valid","data":data}));
|
||||
}
|
||||
json!({"hostname":"h","os":"Debian","root_available_bytes":1,"root_total_bytes":2,"observations":scopes})
|
||||
};
|
||||
let insert = |customer: Uuid, id: Uuid, data: Value, sequence: i64| {
|
||||
let admin = admin.clone();
|
||||
async move {
|
||||
sqlx::query("INSERT INTO observations(tenant_id,agent_id,message_id,boot_id,sequence,observed_at,source_id,quality,completeness,snapshot_id,data,payload_sha256) VALUES($1,$2,$3,$4,$5,now(),'linux.base','valid','partial',$6,$7,$8)")
|
||||
.bind(customer).bind(id).bind(Uuid::new_v4()).bind(Uuid::new_v4()).bind(sequence)
|
||||
.bind(Uuid::new_v4()).bind(data).bind("0".repeat(64)).execute(&admin).await.unwrap();
|
||||
}
|
||||
};
|
||||
let all = ["bc:24:11:00:00:01", "bc:24:11:00:00:02", "bc:24:11:00:00:03", "bc:24:11:00:00:04"];
|
||||
for (customer, id, data) in [
|
||||
(tenant, host, device("hypervisor", "52:54:00:00:00:99", Some(guests(&all)))),
|
||||
(tenant, vm, device("virtual", "BC:24:11:00:00:01", None)),
|
||||
(tenant, manual_vm, device("virtual", "bc:24:11:00:00:02", None)),
|
||||
(other, foreign_vm, device("virtual", "bc:24:11:00:00:03", None)),
|
||||
(tenant, twin_a, device("virtual", "bc:24:11:00:00:04", None)),
|
||||
(tenant, twin_b, device("virtual", "bc:24:11:00:00:04", None)),
|
||||
] {
|
||||
sqlx::query("INSERT INTO assets(tenant_id,asset_id) VALUES($1,$2)")
|
||||
.bind(customer).bind(id).execute(&admin).await.unwrap();
|
||||
sqlx::query("INSERT INTO agent_installations(tenant_id,asset_id,agent_id,certificate_sha256,last_contact_at,last_authenticated_at,last_authenticated_certificate_sha256) VALUES($1,$2,$2,$3,now(),now(),$3)")
|
||||
.bind(customer).bind(id).bind(rmm_domain::jobs::hash(format!("{customer}:{id}").as_bytes()))
|
||||
.execute(&admin).await.unwrap();
|
||||
insert(customer, id, data, 1).await;
|
||||
}
|
||||
sqlx::query("UPDATE assets SET hypervisor_source='manual' WHERE asset_id=$1")
|
||||
.bind(manual_vm).execute(&admin).await.unwrap();
|
||||
let link = |id: Uuid| {
|
||||
let admin = admin.clone();
|
||||
async move {
|
||||
sqlx::query_as::<_, (Option<Uuid>, Option<String>)>(
|
||||
"SELECT hypervisor_asset_id,hypervisor_source FROM assets WHERE asset_id=$1")
|
||||
.bind(id).fetch_one(&admin).await.unwrap()
|
||||
}
|
||||
};
|
||||
|
||||
let mut tx = rmm_persistence::tenant_tx(&app, tenant).await.unwrap();
|
||||
crate::proxmox_links::reconcile(&mut tx, tenant).await;
|
||||
tx.commit().await.unwrap();
|
||||
assert_eq!(link(vm).await, (Some(host), Some("proxmox".into())));
|
||||
assert_eq!(link(manual_vm).await, (None, Some("manual".into())));
|
||||
assert_eq!(link(foreign_vm).await, (None, None));
|
||||
assert_eq!(link(twin_a).await, (None, None), "duplicate MACs are ambiguous");
|
||||
let audits: i64 = sqlx::query_scalar("SELECT count(*) FROM audit_events WHERE tenant_id=$1 AND event_type='device_hypervisor_detected'")
|
||||
.bind(tenant).fetch_one(&admin).await.unwrap();
|
||||
assert_eq!(audits, 1);
|
||||
|
||||
// Idempotent: a second pass changes nothing.
|
||||
let mut tx = rmm_persistence::tenant_tx(&app, tenant).await.unwrap();
|
||||
crate::proxmox_links::reconcile(&mut tx, tenant).await;
|
||||
tx.commit().await.unwrap();
|
||||
let audits: i64 = sqlx::query_scalar("SELECT count(*) FROM audit_events WHERE tenant_id=$1")
|
||||
.bind(tenant).fetch_one(&admin).await.unwrap();
|
||||
assert_eq!(audits, 1);
|
||||
|
||||
// The guest left the host: the automatic link is released.
|
||||
insert(tenant, host, device("hypervisor", "52:54:00:00:00:99", Some(guests(&all[1..]))), 2).await;
|
||||
let mut tx = rmm_persistence::tenant_tx(&app, tenant).await.unwrap();
|
||||
crate::proxmox_links::reconcile(&mut tx, tenant).await;
|
||||
tx.commit().await.unwrap();
|
||||
assert_eq!(link(vm).await, (None, None));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore = "requires the disposable RLS database from tests/local_access_database.py"]
|
||||
async fn host_links_resolve_outside_the_page_and_stay_inside_the_customer() {
|
||||
|
||||
Reference in New Issue
Block a user