Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a1e1aa40d8 | |||
| 7fb47ffde8 | |||
| 3c15943e2e | |||
| a9506a5505 | |||
| ee5e8710a3 | |||
| d715b452c1 | |||
| fdeb4c2088 | |||
| 66605e22e3 |
@@ -410,7 +410,7 @@ body { background:var(--bg-1); color:var(--ink-1); font-family:var(--font-ui); f
|
||||
<div class="chk-box" id="chk-udp"><i class="fa-solid fa-check"></i></div>
|
||||
<div class="chk-label">
|
||||
<div class="chk-name">UDP <span class="chk-badge udp">UDP</span></div>
|
||||
<div class="chk-desc">Fire-and-forget · serveur 10.0.0.50 · port 9999</div>
|
||||
<div class="chk-desc">Fire-and-forget · serveur 10.0.0.82 · port 9999</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -542,7 +542,7 @@ body{background:var(--bg-1);color:var(--ink-1);font-family:var(--font-ui);font-s
|
||||
<div class="cfg-body">
|
||||
<div class="cfg-section">
|
||||
<div class="cfg-sec-title">PROTOCOLES DE TRANSPORT</div>
|
||||
<div class="check-row active"><div class="chk-box"><i class="fa-solid fa-check"></i></div><div class="chk-label"><div class="chk-name">UDP <span class="chk-badge udp">UDP</span></div><div class="chk-desc">Fire-and-forget · serveur 10.0.0.50 · port 9999</div></div></div>
|
||||
<div class="check-row active"><div class="chk-box"><i class="fa-solid fa-check"></i></div><div class="chk-label"><div class="chk-name">UDP <span class="chk-badge udp">UDP</span></div><div class="chk-desc">Fire-and-forget · serveur 10.0.0.82 · port 9999</div></div></div>
|
||||
<div class="check-row mqtt-active"><div class="chk-box" style="background:var(--purple);border-color:var(--purple);color:var(--bg-0)"><i class="fa-solid fa-check"></i></div><div class="chk-label"><div class="chk-name">MQTT <span class="chk-badge mqtt">MQTT</span></div><div class="chk-desc">Bidirectionnel · broker 10.0.0.3 · port 1883</div></div></div>
|
||||
<div class="mqtt-opts">
|
||||
<div class="mqtt-field"><label>Broker</label><input class="mqtt-input" type="text" value="10.0.0.3"></div>
|
||||
|
||||
@@ -485,7 +485,7 @@ body{background:var(--bg-1);color:var(--ink-1);font-family:var(--font-ui);font-s
|
||||
<!-- PROTOCOLES -->
|
||||
<div class="cfg-section">
|
||||
<div class="cfg-sec-title">PROTOCOLES DE TRANSPORT</div>
|
||||
<div class="check-row active"><div class="chk-box"><i class="fa-solid fa-check"></i></div><div class="chk-label"><div class="chk-name">UDP <span class="chk-badge udp">UDP</span></div><div class="chk-desc">Fire-and-forget · 10.0.0.50:9999</div></div></div>
|
||||
<div class="check-row active"><div class="chk-box"><i class="fa-solid fa-check"></i></div><div class="chk-label"><div class="chk-name">UDP <span class="chk-badge udp">UDP</span></div><div class="chk-desc">Fire-and-forget · 10.0.0.82:9999</div></div></div>
|
||||
<div class="check-row mqtt-active"><div class="chk-box" style="background:var(--purple);border-color:var(--purple);color:var(--bg-0)"><i class="fa-solid fa-check"></i></div><div class="chk-label"><div class="chk-name">MQTT <span class="chk-badge mqtt">MQTT</span></div><div class="chk-desc">Bidirectionnel · 10.0.0.3:1883</div></div></div>
|
||||
<div class="mqtt-opts">
|
||||
<div class="mqtt-field"><label>Broker</label><input class="mqtt-input" type="text" value="10.0.0.3"></div>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{"type":"server-started","port":55731,"host":"0.0.0.0","url_host":"10.0.0.50","url":"http://10.0.0.50:55731","screen_dir":"/home/gilles/projects/nano_metrics/.superpowers/brainstorm/599687-1779425985/content","state_dir":"/home/gilles/projects/nano_metrics/.superpowers/brainstorm/599687-1779425985/state"}
|
||||
{"type":"server-started","port":55731,"host":"0.0.0.0","url_host":"10.0.0.82","url":"http://10.0.0.82:55731","screen_dir":"/home/gilles/projects/nano_metrics/.superpowers/brainstorm/599687-1779425985/content","state_dir":"/home/gilles/projects/nano_metrics/.superpowers/brainstorm/599687-1779425985/state"}
|
||||
{"type":"screen-added","file":"/home/gilles/projects/nano_metrics/.superpowers/brainstorm/599687-1779425985/content/approaches.html"}
|
||||
{"source":"user-event","type":"click","text":"C\n \n SQLite + WebSocket ⭐ Recommandé\n SQLite — simplicité opérationnelle, suffisant pour 20+ agents avec rétention configurable.\n WebSocket — bidirectionnel dès le départ, sans surcoût opérationnel.\n \n AvantagesPas de conteneur DB supplémentaireWebSocket prêt pour extensions futuresSimple à debugger et sauvegarder\n LimitesRequêtes temporelles moins expressives qu'InfluxDBScalabilité limitée au-delà de ~100 agents","choice":"c","id":null,"timestamp":1779426035162}
|
||||
{"source":"user-event","type":"click","text":"C\n \n SQLite + WebSocket ⭐ Recommandé\n SQLite — simplicité opérationnelle, suffisant pour 20+ agents avec rétention configurable.\n WebSocket — bidirectionnel dès le départ, sans surcoût opérationnel.\n \n AvantagesPas de conteneur DB supplémentaireWebSocket prêt pour extensions futuresSimple à debugger et sauvegarder\n LimitesRequêtes temporelles moins expressives qu'InfluxDBScalabilité limitée au-delà de ~100 agents","choice":"c","id":null,"timestamp":1779426056446}
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ Ligne de Conduite 1 : L'Agent de Télémétrie (Rust)
|
||||
|
||||
Orchestration Temporelle : N'inclus aucun moteur asynchrone (comme Tokio). Les fréquences d'actualisation différenciées (ex: CPU toutes les 2s, Disque toutes les 60s) doivent être gérées via une boucle mono-thread utilisant des pauses natives std::thread::sleep pour suspendre complètement le processus.
|
||||
|
||||
Configuration : Implémente la lecture d'un fichier config.toml externe via la bibliothèque serde pour paramétrer dynamiquement l'adresse IP du serveur cible (10.0.0.50) et les métriques à activer.
|
||||
Configuration : Implémente la lecture d'un fichier config.toml externe via la bibliothèque serde pour paramétrer dynamiquement l'adresse IP du serveur cible (10.0.0.82) et les métriques à activer.
|
||||
|
||||
Transport : Utilise le protocole UDP pour expédier les charges utiles (payloads) en JSON, privilégiant la vitesse sans état (modèle fire-and-forget) sur un réseau local.
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ Créer `/etc/nanometrics/config.toml` :
|
||||
|
||||
```toml
|
||||
[server]
|
||||
ip = "10.0.0.50" # IP du serveur Go
|
||||
ip = "10.0.0.82" # IP du serveur Go
|
||||
port = 9999 # Port UDP du serveur
|
||||
|
||||
[mqtt]
|
||||
|
||||
Generated
+1
-1
@@ -248,7 +248,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "nanometrics-agent"
|
||||
version = "0.1.10"
|
||||
version = "0.1.17"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rumqttc",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "nanometrics-agent"
|
||||
version = "0.1.11"
|
||||
version = "0.1.17"
|
||||
edition = "2021"
|
||||
|
||||
[lib]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[server]
|
||||
ip = "10.0.0.50"
|
||||
ip = "10.0.0.82"
|
||||
port = 9999
|
||||
|
||||
[protocols.udp]
|
||||
|
||||
+46
-26
@@ -2,17 +2,24 @@ use serde::Deserialize;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct SmartJson {
|
||||
smart_status: SmartStatus,
|
||||
#[serde(default)]
|
||||
smart_status: Option<SmartStatus>,
|
||||
temperature: Option<SmartTemp>,
|
||||
ata_smart_attributes: Option<SmartAttrs>,
|
||||
nvme_smart_health_information_log: Option<NvmeHealth>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct SmartStatus { passed: bool }
|
||||
struct SmartStatus {
|
||||
#[serde(default)]
|
||||
passed: bool,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct SmartTemp { current: i64 }
|
||||
struct SmartTemp {
|
||||
#[serde(default)]
|
||||
current: Option<i64>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
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> {
|
||||
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);
|
||||
|
||||
let mut reallocated = None;
|
||||
@@ -72,7 +79,7 @@ pub fn parse_json(json: &str) -> Result<crate::payload::SmartMetrics, serde_json
|
||||
|
||||
Ok(crate::payload::SmartMetrics {
|
||||
device: String::new(),
|
||||
passed: s.smart_status.passed,
|
||||
passed: s.smart_status.as_ref().map(|s| s.passed).unwrap_or(false),
|
||||
temperature,
|
||||
reallocated_sectors: reallocated,
|
||||
power_on_hours: power_hours,
|
||||
@@ -82,42 +89,55 @@ pub fn parse_json(json: &str) -> Result<crate::payload::SmartMetrics, serde_json
|
||||
|
||||
pub fn collect() -> Option<Vec<crate::payload::SmartMetrics>> {
|
||||
if !is_available() {
|
||||
eprintln!("[smart] smartctl introuvable dans PATH");
|
||||
return None;
|
||||
}
|
||||
let mut devs: Vec<String> = std::fs::read_dir("/sys/block")
|
||||
.into_iter()
|
||||
.flatten()
|
||||
.flatten()
|
||||
.map(|e| e.file_name().into_string().unwrap_or_default())
|
||||
.filter_map(|n| {
|
||||
let mut set = std::collections::HashSet::new();
|
||||
|
||||
// SATA/SAS : /sys/block/sd* → /dev/sda, /dev/sdb…
|
||||
for e in std::fs::read_dir("/sys/block").into_iter().flatten().flatten() {
|
||||
let n = e.file_name().into_string().unwrap_or_default();
|
||||
if n.starts_with("sd") {
|
||||
// /dev/sda, /dev/sdb — block device, groupe disk OK
|
||||
Some(format!("/dev/{}", 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))
|
||||
} else {
|
||||
None
|
||||
set.insert(format!("/dev/{}", n));
|
||||
}
|
||||
})
|
||||
.collect::<std::collections::HashSet<_>>()
|
||||
.into_iter()
|
||||
.collect();
|
||||
}
|
||||
|
||||
// NVMe : /sys/class/nvme/nvme* → /dev/nvme0, /dev/nvme1…
|
||||
// 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.
|
||||
for e in std::fs::read_dir("/sys/class/nvme").into_iter().flatten().flatten() {
|
||||
let n = e.file_name().into_string().unwrap_or_default();
|
||||
if n.starts_with("nvme") {
|
||||
set.insert(format!("/dev/{}", n));
|
||||
}
|
||||
}
|
||||
|
||||
let mut devs: Vec<String> = set.into_iter().collect();
|
||||
devs.sort();
|
||||
eprintln!("[smart] disques détectés: {:?}", devs);
|
||||
|
||||
let mut results = Vec::new();
|
||||
for dev in &devs {
|
||||
let Ok(output) = std::process::Command::new("smartctl")
|
||||
let output = match std::process::Command::new("smartctl")
|
||||
.args(["-a", "-j", dev])
|
||||
.output() else { continue };
|
||||
.output()
|
||||
{
|
||||
Ok(o) => o,
|
||||
Err(e) => { eprintln!("[smart] erreur exec smartctl {}: {}", dev, e); continue }
|
||||
};
|
||||
let json = String::from_utf8_lossy(&output.stdout);
|
||||
if let Ok(metrics) = parse_json(&json) {
|
||||
match parse_json(&json) {
|
||||
Ok(metrics) => {
|
||||
results.push(crate::payload::SmartMetrics {
|
||||
device: dev.trim_start_matches("/dev/").to_string(),
|
||||
..metrics
|
||||
});
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("[smart] {} parse JSON échoué: {}", dev, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
if results.is_empty() { None } else { Some(results) }
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ fn test_config_parse_complet() {
|
||||
let mut f = NamedTempFile::new().unwrap();
|
||||
write!(f, r#"
|
||||
[server]
|
||||
ip = "10.0.0.50"
|
||||
ip = "10.0.0.82"
|
||||
port = 9999
|
||||
|
||||
[protocols.udp]
|
||||
@@ -26,7 +26,7 @@ udp = true
|
||||
mqtt = false
|
||||
"#).unwrap();
|
||||
let cfg = nanometrics_agent::config::load(f.path()).unwrap();
|
||||
assert_eq!(cfg.server.ip, "10.0.0.50");
|
||||
assert_eq!(cfg.server.ip, "10.0.0.82");
|
||||
assert_eq!(cfg.server.port, 9999);
|
||||
assert!(cfg.protocols.udp.enabled);
|
||||
assert!(cfg.protocols.mqtt.enabled);
|
||||
@@ -40,7 +40,7 @@ fn test_config_mqtt_absent() {
|
||||
let mut f = NamedTempFile::new().unwrap();
|
||||
write!(f, r#"
|
||||
[server]
|
||||
ip = "10.0.0.50"
|
||||
ip = "10.0.0.82"
|
||||
port = 9999
|
||||
|
||||
[protocols.udp]
|
||||
|
||||
@@ -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"
|
||||
+13
-2
@@ -2,7 +2,7 @@
|
||||
# Installe l'agent Nanometrics depuis la dernière release Gitea.
|
||||
# Usage :
|
||||
# curl -fsSL https://git.maison43gil.com/gilles/nano_metrics/raw/branch/main/deploy/install.sh | bash
|
||||
# SERVER_IP=10.0.0.50 SERVER_PORT=9999 curl -fsSL ... | bash
|
||||
# SERVER_IP=10.0.0.82 SERVER_PORT=9999 curl -fsSL ... | bash
|
||||
set -euo pipefail
|
||||
|
||||
REPO_API="https://git.maison43gil.com/api/v1/repos/gilles/nano_metrics"
|
||||
@@ -45,6 +45,17 @@ else
|
||||
fi
|
||||
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 ────────────────────────────────────────────
|
||||
ARCH="$(uname -m)"
|
||||
case "$ARCH" in
|
||||
@@ -98,7 +109,7 @@ ok "Binaire téléchargé ($(du -sh "$TMP_BIN" | cut -f1))"
|
||||
echo ""
|
||||
echo "--- Configuration du serveur ---"
|
||||
|
||||
SERVER_IP="${SERVER_IP:-10.0.0.50}"
|
||||
SERVER_IP="${SERVER_IP:-10.0.0.82}"
|
||||
SERVER_PORT="${SERVER_PORT:-9999}"
|
||||
MQTT_HOST="${MQTT_HOST:-10.0.0.3}"
|
||||
MQTT_ENABLED="${MQTT_ENABLED:-false}"
|
||||
|
||||
@@ -17,7 +17,12 @@ ConfigurationDirectoryMode=0755
|
||||
ProtectSystem=strict
|
||||
ProtectHome=read-only
|
||||
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
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ tempfile = "3"
|
||||
|
||||
```toml
|
||||
[server]
|
||||
ip = "10.0.0.50"
|
||||
ip = "10.0.0.82"
|
||||
port = 9999
|
||||
|
||||
[protocols.udp]
|
||||
@@ -172,7 +172,7 @@ fn test_config_parse_complet() {
|
||||
let mut f = NamedTempFile::new().unwrap();
|
||||
write!(f, r#"
|
||||
[server]
|
||||
ip = "10.0.0.50"
|
||||
ip = "10.0.0.82"
|
||||
port = 9999
|
||||
|
||||
[protocols.udp]
|
||||
@@ -192,7 +192,7 @@ udp = true
|
||||
mqtt = false
|
||||
"#).unwrap();
|
||||
let cfg = nanometrics_agent::config::load(f.path()).unwrap();
|
||||
assert_eq!(cfg.server.ip, "10.0.0.50");
|
||||
assert_eq!(cfg.server.ip, "10.0.0.82");
|
||||
assert_eq!(cfg.server.port, 9999);
|
||||
assert!(cfg.protocols.udp.enabled);
|
||||
assert!(cfg.protocols.mqtt.enabled);
|
||||
@@ -206,7 +206,7 @@ fn test_config_mqtt_absent() {
|
||||
let mut f = NamedTempFile::new().unwrap();
|
||||
write!(f, r#"
|
||||
[server]
|
||||
ip = "10.0.0.50"
|
||||
ip = "10.0.0.82"
|
||||
port = 9999
|
||||
|
||||
[protocols.udp]
|
||||
|
||||
+10
-9
@@ -2,7 +2,6 @@ package transport
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"net"
|
||||
|
||||
@@ -34,19 +33,21 @@ func StartUDP(addr string, handler func(*models.AgentMetrics)) error {
|
||||
func processUDP(data []byte, src string, handler func(*models.AgentMetrics)) {
|
||||
var m models.AgentMetrics
|
||||
if err := json.Unmarshal(data, &m); err != nil {
|
||||
preview := ""
|
||||
if len(data) > 0 {
|
||||
end := len(data)
|
||||
if end > 32 {
|
||||
end = 32
|
||||
end := 32
|
||||
if len(data) < end {
|
||||
end = len(data)
|
||||
}
|
||||
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
|
||||
}
|
||||
if m.Hostname == "" {
|
||||
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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user