Collect Proxmox VE guests, backup jobs and vzdump runs as a read-only linux.proxmox scope
Rust development slice / linux (push) Failing after 12s
Rust development slice / linux (push) Failing after 12s
The Linux agent queries the local PVE API with a PVEAuditor token from the systemd credential rmm-proxmox-token and the pinned cluster CA. Guests carry MAC addresses and SMBIOS UUIDs for hypervisor mapping; jobs carry covered guests and the scheduler's last expected run. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -7,6 +7,7 @@ mod certificate_rotation;
|
||||
mod helper_sync;
|
||||
mod https_channel;
|
||||
mod jobs;
|
||||
mod proxmox_api;
|
||||
mod reconcile;
|
||||
#[cfg(test)]
|
||||
mod runtime_tests;
|
||||
@@ -524,14 +525,21 @@ impl<C: reconcile::SyncClock> Agent<C> {
|
||||
let extended = env::var("RMM_EXTENDED_INVENTORY").unwrap_or_else(|_| "1".into()) == "1";
|
||||
let binding = self.binding.clone();
|
||||
let catalog = self.catalog.cached(Utc::now());
|
||||
let runtime = tokio::runtime::Handle::current();
|
||||
tokio::task::spawn_blocking(move || {
|
||||
let collected_at = Utc::now();
|
||||
let result = rmm_agent_linux::wire::snapshot(extended).and_then(|mut inventory| {
|
||||
if extended {
|
||||
inventory["observations"]
|
||||
let proxmox = runtime.block_on(proxmox_api::observation(
|
||||
rmm_agent_linux::inventory::proxmox_ve(),
|
||||
));
|
||||
let scopes = inventory["observations"]
|
||||
.as_array_mut()
|
||||
.context("INVENTORY_OBSERVATIONS")?
|
||||
.push(apt::planning_observation(binding.as_ref()));
|
||||
.context("INVENTORY_OBSERVATIONS")?;
|
||||
scopes.push(apt::planning_observation(binding.as_ref()));
|
||||
if let Some(observation) = proxmox {
|
||||
scopes.push(proxmox_api::wire(&observation)?);
|
||||
}
|
||||
inventory["collection_completed_at"] = serde_json::json!(Utc::now());
|
||||
}
|
||||
if let Some(report) = catalog {
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
//! Local, read-only Proxmox VE API client for the `linux.proxmox` observation.
|
||||
//!
|
||||
//! Only `https://127.0.0.1:8006` with the cluster CA copied by the installer. The
|
||||
//! PVEAuditor token arrives as the systemd credential `rmm-proxmox-token`; it is never
|
||||
//! logged, persisted by the agent or placed in an observation.
|
||||
use anyhow::{Context, Result, ensure};
|
||||
use reqwest::{Client, StatusCode};
|
||||
use rmm_agent_linux::inventory::{Observation, proxmox};
|
||||
use serde_json::Value;
|
||||
use std::{path::PathBuf, time::Duration};
|
||||
|
||||
const BASE: &str = "https://127.0.0.1:8006/api2/json";
|
||||
const CREDENTIAL: &str = "rmm-proxmox-token";
|
||||
const DEFAULT_CA: &str = "/etc/rmm/pve-ca.pem";
|
||||
const MAX_RESPONSE: usize = 2 * 1024 * 1024;
|
||||
const TOTAL_BUDGET: Duration = Duration::from_secs(45);
|
||||
|
||||
struct LocalApi {
|
||||
client: Client,
|
||||
authorization: String,
|
||||
}
|
||||
|
||||
impl proxmox::Api for LocalApi {
|
||||
async fn get(&self, path: &str) -> Result<Value> {
|
||||
ensure!(path.starts_with('/') && !path.contains(".."), "PROXMOX_PATH");
|
||||
let mut response = self.client.get(format!("{BASE}{path}"))
|
||||
.header(reqwest::header::AUTHORIZATION, &self.authorization)
|
||||
.send().await.map_err(|_| anyhow::anyhow!("PROXMOX_UNREACHABLE"))?;
|
||||
match response.status() {
|
||||
StatusCode::OK => (),
|
||||
StatusCode::UNAUTHORIZED => anyhow::bail!("PROXMOX_TOKEN_REJECTED"),
|
||||
StatusCode::FORBIDDEN => anyhow::bail!("PROXMOX_PERMISSION_DENIED"),
|
||||
status => anyhow::bail!("PROXMOX_HTTP_{}", status.as_u16()),
|
||||
}
|
||||
ensure!(response.content_length().is_none_or(|n| n <= MAX_RESPONSE as u64), "PROXMOX_RESPONSE_LIMIT");
|
||||
let mut body = Vec::new();
|
||||
while let Some(chunk) = response.chunk().await? {
|
||||
ensure!(chunk.len() <= MAX_RESPONSE.saturating_sub(body.len()), "PROXMOX_RESPONSE_LIMIT");
|
||||
body.extend_from_slice(&chunk);
|
||||
}
|
||||
let mut value: Value = serde_json::from_slice(&body).map_err(|_| anyhow::anyhow!("PROXMOX_API_SHAPE"))?;
|
||||
Ok(value["data"].take())
|
||||
}
|
||||
}
|
||||
|
||||
fn credential_path() -> Option<PathBuf> {
|
||||
std::env::var_os("CREDENTIALS_DIRECTORY").map(|d| PathBuf::from(d).join(CREDENTIAL))
|
||||
}
|
||||
|
||||
fn client(ca: &[u8]) -> Result<Client> {
|
||||
Ok(Client::builder()
|
||||
.https_only(true)
|
||||
.tls_built_in_root_certs(false)
|
||||
.add_root_certificate(reqwest::Certificate::from_pem(ca)?)
|
||||
.no_proxy()
|
||||
.redirect(reqwest::redirect::Policy::none())
|
||||
.connect_timeout(Duration::from_secs(5))
|
||||
.timeout(Duration::from_secs(15))
|
||||
.build()?)
|
||||
}
|
||||
|
||||
/// `None` on hosts without Proxmox VE: no scope is reported there at all.
|
||||
pub async fn observation(proxmox_ve: bool) -> Option<Observation<proxmox::Proxmox>> {
|
||||
if !proxmox_ve {
|
||||
return None;
|
||||
}
|
||||
let Some(token) = credential_path().and_then(|p| std::fs::read_to_string(p).ok()) else {
|
||||
return Some(proxmox::not_configured());
|
||||
};
|
||||
let Some(authorization) = proxmox::token_header(&token) else {
|
||||
return Some(proxmox::failed("PROXMOX_TOKEN_INVALID"));
|
||||
};
|
||||
let ca_path = std::env::var("RMM_PROXMOX_CA_FILE").unwrap_or_else(|_| DEFAULT_CA.into());
|
||||
let api = match std::fs::read(&ca_path).context("ca").and_then(|ca| client(&ca)) {
|
||||
Ok(client) => LocalApi { client, authorization },
|
||||
Err(_) => return Some(proxmox::failed("PROXMOX_CA_UNAVAILABLE")),
|
||||
};
|
||||
let now = chrono::Utc::now().timestamp();
|
||||
Some(tokio::time::timeout(TOTAL_BUDGET, proxmox::collect(&api, now)).await
|
||||
.unwrap_or_else(|_| proxmox::failed("PROXMOX_TIMEOUT")))
|
||||
}
|
||||
|
||||
/// Wire form with the scope label the server's `linux.base` validation expects.
|
||||
pub fn wire(observation: &Observation<proxmox::Proxmox>) -> Result<Value> {
|
||||
let mut value = serde_json::to_value(observation)?;
|
||||
value["scope"] = Value::String("linux.proxmox".into());
|
||||
Ok(value)
|
||||
}
|
||||
Reference in New Issue
Block a user