Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7fb47ffde8 | ||
|
|
3c15943e2e | ||
|
|
a9506a5505 | ||
|
|
ee5e8710a3 | ||
|
|
d715b452c1 |
Generated
+1
-1
@@ -248,7 +248,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nanometrics-agent"
|
name = "nanometrics-agent"
|
||||||
version = "0.1.12"
|
version = "0.1.17"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"rumqttc",
|
"rumqttc",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nanometrics-agent"
|
name = "nanometrics-agent"
|
||||||
version = "0.1.12"
|
version = "0.1.17"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
|
|||||||
+34
-26
@@ -2,17 +2,24 @@ use serde::Deserialize;
|
|||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
struct SmartJson {
|
struct SmartJson {
|
||||||
smart_status: SmartStatus,
|
#[serde(default)]
|
||||||
|
smart_status: Option<SmartStatus>,
|
||||||
temperature: Option<SmartTemp>,
|
temperature: Option<SmartTemp>,
|
||||||
ata_smart_attributes: Option<SmartAttrs>,
|
ata_smart_attributes: Option<SmartAttrs>,
|
||||||
nvme_smart_health_information_log: Option<NvmeHealth>,
|
nvme_smart_health_information_log: Option<NvmeHealth>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
struct SmartStatus { passed: bool }
|
struct SmartStatus {
|
||||||
|
#[serde(default)]
|
||||||
|
passed: bool,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
struct SmartTemp { current: i64 }
|
struct SmartTemp {
|
||||||
|
#[serde(default)]
|
||||||
|
current: Option<i64>,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
struct SmartAttrs { table: Vec<SmartAttr> }
|
struct SmartAttrs { table: Vec<SmartAttr> }
|
||||||
@@ -44,7 +51,7 @@ pub fn is_available() -> bool {
|
|||||||
pub fn parse_json(json: &str) -> Result<crate::payload::SmartMetrics, serde_json::Error> {
|
pub fn parse_json(json: &str) -> Result<crate::payload::SmartMetrics, serde_json::Error> {
|
||||||
let s: SmartJson = serde_json::from_str(json)?;
|
let s: SmartJson = serde_json::from_str(json)?;
|
||||||
|
|
||||||
let temperature = s.temperature.as_ref().map(|t| t.current)
|
let temperature = s.temperature.as_ref().and_then(|t| t.current)
|
||||||
.or_else(|| s.nvme_smart_health_information_log.as_ref()?.temperature);
|
.or_else(|| s.nvme_smart_health_information_log.as_ref()?.temperature);
|
||||||
|
|
||||||
let mut reallocated = None;
|
let mut reallocated = None;
|
||||||
@@ -72,7 +79,7 @@ pub fn parse_json(json: &str) -> Result<crate::payload::SmartMetrics, serde_json
|
|||||||
|
|
||||||
Ok(crate::payload::SmartMetrics {
|
Ok(crate::payload::SmartMetrics {
|
||||||
device: String::new(),
|
device: String::new(),
|
||||||
passed: s.smart_status.passed,
|
passed: s.smart_status.as_ref().map(|s| s.passed).unwrap_or(false),
|
||||||
temperature,
|
temperature,
|
||||||
reallocated_sectors: reallocated,
|
reallocated_sectors: reallocated,
|
||||||
power_on_hours: power_hours,
|
power_on_hours: power_hours,
|
||||||
@@ -85,23 +92,28 @@ pub fn collect() -> Option<Vec<crate::payload::SmartMetrics>> {
|
|||||||
eprintln!("[smart] smartctl introuvable dans PATH");
|
eprintln!("[smart] smartctl introuvable dans PATH");
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let mut devs: Vec<String> = std::fs::read_dir("/sys/block")
|
let mut set = std::collections::HashSet::new();
|
||||||
.into_iter()
|
|
||||||
.flatten()
|
// SATA/SAS : /sys/block/sd* → /dev/sda, /dev/sdb…
|
||||||
.flatten()
|
for e in std::fs::read_dir("/sys/block").into_iter().flatten().flatten() {
|
||||||
.map(|e| e.file_name().into_string().unwrap_or_default())
|
let n = e.file_name().into_string().unwrap_or_default();
|
||||||
.filter_map(|n| {
|
if n.starts_with("sd") {
|
||||||
if n.starts_with("sd") {
|
set.insert(format!("/dev/{}", n));
|
||||||
Some(format!("/dev/{}", n))
|
}
|
||||||
} else if n.starts_with("nvme") && n.contains('n') {
|
}
|
||||||
Some(format!("/dev/{}", n))
|
|
||||||
} else {
|
// NVMe : /sys/class/nvme/nvme* → /dev/nvme0, /dev/nvme1…
|
||||||
None
|
// On utilise le contrôleur (char device), pas le namespace (block device),
|
||||||
}
|
// car smartctl ne peut exécuter les commandes admin SMART que via le contrôleur.
|
||||||
})
|
// La règle udev 99-nanometrics-smart.rules lui donne l'accès groupe disk.
|
||||||
.collect::<std::collections::HashSet<_>>()
|
for e in std::fs::read_dir("/sys/class/nvme").into_iter().flatten().flatten() {
|
||||||
.into_iter()
|
let n = e.file_name().into_string().unwrap_or_default();
|
||||||
.collect();
|
if n.starts_with("nvme") {
|
||||||
|
set.insert(format!("/dev/{}", n));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut devs: Vec<String> = set.into_iter().collect();
|
||||||
devs.sort();
|
devs.sort();
|
||||||
eprintln!("[smart] disques détectés: {:?}", devs);
|
eprintln!("[smart] disques détectés: {:?}", devs);
|
||||||
|
|
||||||
@@ -114,12 +126,9 @@ pub fn collect() -> Option<Vec<crate::payload::SmartMetrics>> {
|
|||||||
Ok(o) => o,
|
Ok(o) => o,
|
||||||
Err(e) => { eprintln!("[smart] erreur exec smartctl {}: {}", dev, e); continue }
|
Err(e) => { eprintln!("[smart] erreur exec smartctl {}: {}", dev, e); continue }
|
||||||
};
|
};
|
||||||
eprintln!("[smart] smartctl {} → exit={}, stdout={} octets, stderr={} octets",
|
|
||||||
dev, output.status, output.stdout.len(), output.stderr.len());
|
|
||||||
let json = String::from_utf8_lossy(&output.stdout);
|
let json = String::from_utf8_lossy(&output.stdout);
|
||||||
match parse_json(&json) {
|
match parse_json(&json) {
|
||||||
Ok(metrics) => {
|
Ok(metrics) => {
|
||||||
eprintln!("[smart] {} parsé OK (passed={})", dev, metrics.passed);
|
|
||||||
results.push(crate::payload::SmartMetrics {
|
results.push(crate::payload::SmartMetrics {
|
||||||
device: dev.trim_start_matches("/dev/").to_string(),
|
device: dev.trim_start_matches("/dev/").to_string(),
|
||||||
..metrics
|
..metrics
|
||||||
@@ -127,7 +136,6 @@ pub fn collect() -> Option<Vec<crate::payload::SmartMetrics>> {
|
|||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("[smart] {} parse JSON échoué: {}", dev, e);
|
eprintln!("[smart] {} parse JSON échoué: {}", dev, e);
|
||||||
eprintln!("[smart] premiers 200 octets stdout: {:?}", &json.chars().take(200).collect::<String>());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
# Nanometrics: accès groupe disk aux contrôleurs NVMe pour SMART
|
||||||
|
# Sans cette règle, /dev/nvme0 est crw------- root root (root only),
|
||||||
|
# ce qui empêche smartctl d'exécuter les commandes admin et omet smart_status du JSON.
|
||||||
|
KERNEL=="nvme[0-9]*", SUBSYSTEM=="nvme", GROUP="disk", MODE="0660"
|
||||||
@@ -45,6 +45,17 @@ else
|
|||||||
fi
|
fi
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
# ── 2. Règle udev NVMe (accès SMART pour le groupe disk) ──────────────────────
|
||||||
|
UDEV_RULE="/etc/udev/rules.d/99-nanometrics-smart.rules"
|
||||||
|
cat > "$UDEV_RULE" << 'UDEVRULE'
|
||||||
|
# Nanometrics: accès groupe disk aux contrôleurs NVMe pour SMART
|
||||||
|
KERNEL=="nvme[0-9]*", SUBSYSTEM=="nvme", GROUP="disk", MODE="0660"
|
||||||
|
UDEVRULE
|
||||||
|
udevadm control --reload-rules
|
||||||
|
udevadm trigger --subsystem-match=nvme 2>/dev/null || true
|
||||||
|
ok "Règle udev NVMe installée ($UDEV_RULE)"
|
||||||
|
echo ""
|
||||||
|
|
||||||
# ── 3. Détection de l'architecture ────────────────────────────────────────────
|
# ── 3. Détection de l'architecture ────────────────────────────────────────────
|
||||||
ARCH="$(uname -m)"
|
ARCH="$(uname -m)"
|
||||||
case "$ARCH" in
|
case "$ARCH" in
|
||||||
|
|||||||
@@ -17,7 +17,12 @@ ConfigurationDirectoryMode=0755
|
|||||||
ProtectSystem=strict
|
ProtectSystem=strict
|
||||||
ProtectHome=read-only
|
ProtectHome=read-only
|
||||||
PrivateTmp=yes
|
PrivateTmp=yes
|
||||||
NoNewPrivileges=yes
|
# CAP_SYS_ADMIN est requis par le noyau pour NVME_IOCTL_ADMIN_CMD (lecture SMART NVMe).
|
||||||
|
# NoNewPrivileges est retiré car il efface les ambient capabilities sur exec (noyau ≥ 5.2),
|
||||||
|
# ce qui empêcherait smartctl enfant d'hériter la capability.
|
||||||
|
# CapabilityBoundingSet borne à la seule cap nécessaire.
|
||||||
|
CapabilityBoundingSet=CAP_SYS_ADMIN
|
||||||
|
AmbientCapabilities=CAP_SYS_ADMIN
|
||||||
|
|
||||||
RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
|
RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user