Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d715b452c1 | ||
|
|
fdeb4c2088 | ||
|
|
66605e22e3 |
Generated
+1
-1
@@ -248,7 +248,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nanometrics-agent"
|
name = "nanometrics-agent"
|
||||||
version = "0.1.10"
|
version = "0.1.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"rumqttc",
|
"rumqttc",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nanometrics-agent"
|
name = "nanometrics-agent"
|
||||||
version = "0.1.11"
|
version = "0.1.13"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
|
|||||||
+27
-12
@@ -12,7 +12,10 @@ struct SmartJson {
|
|||||||
struct SmartStatus { passed: bool }
|
struct SmartStatus { 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 +47,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;
|
||||||
@@ -82,6 +85,7 @@ pub fn parse_json(json: &str) -> Result<crate::payload::SmartMetrics, serde_json
|
|||||||
|
|
||||||
pub fn collect() -> Option<Vec<crate::payload::SmartMetrics>> {
|
pub fn collect() -> Option<Vec<crate::payload::SmartMetrics>> {
|
||||||
if !is_available() {
|
if !is_available() {
|
||||||
|
eprintln!("[smart] smartctl introuvable dans PATH");
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let mut devs: Vec<String> = std::fs::read_dir("/sys/block")
|
let mut devs: Vec<String> = std::fs::read_dir("/sys/block")
|
||||||
@@ -91,11 +95,8 @@ pub fn collect() -> Option<Vec<crate::payload::SmartMetrics>> {
|
|||||||
.map(|e| e.file_name().into_string().unwrap_or_default())
|
.map(|e| e.file_name().into_string().unwrap_or_default())
|
||||||
.filter_map(|n| {
|
.filter_map(|n| {
|
||||||
if n.starts_with("sd") {
|
if n.starts_with("sd") {
|
||||||
// /dev/sda, /dev/sdb — block device, groupe disk OK
|
|
||||||
Some(format!("/dev/{}", n))
|
Some(format!("/dev/{}", n))
|
||||||
} else if n.starts_with("nvme") && n.contains('n') {
|
} else if n.starts_with("nvme") && n.contains('n') {
|
||||||
// /dev/nvme0n1 — block device (brw-rw---- root disk), groupe disk OK
|
|
||||||
// NE PAS utiliser /dev/nvme0 (contrôleur crw------- root root, root only)
|
|
||||||
Some(format!("/dev/{}", n))
|
Some(format!("/dev/{}", n))
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
@@ -105,18 +106,32 @@ pub fn collect() -> Option<Vec<crate::payload::SmartMetrics>> {
|
|||||||
.into_iter()
|
.into_iter()
|
||||||
.collect();
|
.collect();
|
||||||
devs.sort();
|
devs.sort();
|
||||||
|
eprintln!("[smart] disques détectés: {:?}", devs);
|
||||||
|
|
||||||
let mut results = Vec::new();
|
let mut results = Vec::new();
|
||||||
for dev in &devs {
|
for dev in &devs {
|
||||||
let Ok(output) = std::process::Command::new("smartctl")
|
let output = match std::process::Command::new("smartctl")
|
||||||
.args(["-a", "-j", dev])
|
.args(["-a", "-j", dev])
|
||||||
.output() else { continue };
|
.output()
|
||||||
|
{
|
||||||
|
Ok(o) => o,
|
||||||
|
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);
|
||||||
if let Ok(metrics) = parse_json(&json) {
|
match parse_json(&json) {
|
||||||
results.push(crate::payload::SmartMetrics {
|
Ok(metrics) => {
|
||||||
device: dev.trim_start_matches("/dev/").to_string(),
|
eprintln!("[smart] {} parsé OK (passed={})", dev, metrics.passed);
|
||||||
..metrics
|
results.push(crate::payload::SmartMetrics {
|
||||||
});
|
device: dev.trim_start_matches("/dev/").to_string(),
|
||||||
|
..metrics
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
eprintln!("[smart] {} parse JSON échoué: {}", dev, e);
|
||||||
|
eprintln!("[smart] premiers 200 octets stdout: {:?}", &json.chars().take(200).collect::<String>());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if results.is_empty() { None } else { Some(results) }
|
if results.is_empty() { None } else { Some(results) }
|
||||||
|
|||||||
+10
-9
@@ -2,7 +2,6 @@ package transport
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
|
||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
|
|
||||||
@@ -34,19 +33,21 @@ func StartUDP(addr string, handler func(*models.AgentMetrics)) error {
|
|||||||
func processUDP(data []byte, src string, handler func(*models.AgentMetrics)) {
|
func processUDP(data []byte, src string, handler func(*models.AgentMetrics)) {
|
||||||
var m models.AgentMetrics
|
var m models.AgentMetrics
|
||||||
if err := json.Unmarshal(data, &m); err != nil {
|
if err := json.Unmarshal(data, &m); err != nil {
|
||||||
preview := ""
|
end := 32
|
||||||
if len(data) > 0 {
|
if len(data) < end {
|
||||||
end := len(data)
|
end = len(data)
|
||||||
if end > 32 {
|
|
||||||
end = 32
|
|
||||||
}
|
|
||||||
preview = fmt.Sprintf(" | src=%s | premiers octets: %x | texte: %q", src, data[:end], data[:end])
|
|
||||||
}
|
}
|
||||||
log.Printf("[udp] JSON invalide: %v%s", err, preview)
|
log.Printf("[udp] JSON invalide: %v | src=%s | octets: %x", err, src, data[:end])
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if m.Hostname == "" {
|
if m.Hostname == "" {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// DEBUG SMART — logguer le payload ASUS complet
|
||||||
|
if m.Smart != nil {
|
||||||
|
log.Printf("[udp] SMART reçu de %s: %d disque(s)", m.Hostname, len(m.Smart))
|
||||||
|
} else {
|
||||||
|
log.Printf("[udp] payload de %s (v%s): smart=nil hdd=%v", m.Hostname, m.Version, m.HDDTotal)
|
||||||
|
}
|
||||||
handler(&m)
|
handler(&m)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user