ktims/chimemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Keenan Tims 2022-11-22 12:14:26 -08:00
commit cb711475d4
Signed by: ktims
GPG Key ID: 11230674D69038D4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hwmon.rs
View File

@ -64,7 +64,7 @@ impl ChimemonSource for HwmonSource {
); );
let now = SystemTime::now().duration_since(UNIX_EPOCH).unwrap(); let now = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
let mut builder = let mut builder =
DataPoint::builder(&s.device).timestamp(now.as_nanos().try_into().unwrap()); DataPoint::builder(&self.config.sources.hwmon.measurement).timestamp(now.as_nanos().try_into().unwrap());
for (key, value) in &self.config.influxdb.tags { for (key, value) in &self.config.influxdb.tags {
builder = builder.tag(key, value) builder = builder.tag(key, value)
} }

4
src/lib.rs
View File

@ -86,7 +86,7 @@ pub struct HwmonSensorConfig {
pub struct HwmonConfig { pub struct HwmonConfig {
pub enabled: bool, pub enabled: bool,
pub interval: u64, pub interval: u64,
pub measurement_prefix: String, pub measurement: String,
pub sensors: Map<String, HwmonSensorConfig>, pub sensors: Map<String, HwmonSensorConfig>,
} }
@ -95,7 +95,7 @@ impl Default for HwmonConfig {
HwmonConfig { HwmonConfig {
enabled: false, enabled: false,
interval: 60, interval: 60,
measurement_prefix: "hwmon.".into(), measurement: "hwmon".into(),
sensors: map! {}, sensors: map! {},
} }
} }