Fix missing IPsec fields caused scrape to fail (#97)

* Fix missing encr_alg field in child SA caused scrape to fail

* Fix missing integ_alg field caused scrape to fail

* Fix missing {bytes,packets}_{in,out} fields caused scrape to fail

* Fix missing life_time and install_time fields caused scrape to fail

Author: chitoku-k

src/application/metrics/ipsec.rs

@@ -80,10 +80,10 @@ impl Collector for IPsecResult {
                 in_packets,
                 out_packets,
             ) = (
-                child_sa.map(|c| c.bytes_in).unwrap_or_default(),
-                child_sa.map(|c| c.bytes_out).unwrap_or_default(),
-                child_sa.map(|c| c.packets_in).unwrap_or_default(),
-                child_sa.map(|c| c.packets_out).unwrap_or_default(),
+                child_sa.and_then(|c| c.bytes_in).unwrap_or_default(),
+                child_sa.and_then(|c| c.bytes_out).unwrap_or_default(),
+                child_sa.and_then(|c| c.packets_in).unwrap_or_default(),
+                child_sa.and_then(|c| c.packets_out).unwrap_or_default(),
             );
             let status = match (&sa.state, child_sa.map(|c| &c.state)) {
                 (SAState::Unknown, _) | (_, Some(ChildSAState::Unknown) | None) => 3,

src/domain/ipsec.rs

@@ -17,7 +17,7 @@ pub struct SA {
     pub remote_eap_id: Option<String>,
     pub encr_alg: Option<String>,
     pub encr_keysize: Option<u32>,
-    pub integ_alg: String,
+    pub integ_alg: Option<String>,
     pub integ_keysize: Option<u32>,
     pub prf_alg: String,
     pub dh_group: Option<String>,
@@ -52,22 +52,22 @@ pub struct ChildSA {
     pub state: ChildSAState,
     pub mode: String,
     pub protocol: Option<String>,
-    pub encr_alg: String,
+    pub encr_alg: Option<String>,
     pub encr_keysize: Option<u32>,
-    pub integ_alg: String,
+    pub integ_alg: Option<String>,
     pub integ_keysize: Option<u32>,
     pub prf_alg: Option<String>,
     pub dh_group: Option<String>,
     pub esn: Option<u32>,
-    pub bytes_in: u64,
-    pub packets_in: u64,
+    pub bytes_in: Option<u64>,
+    pub packets_in: Option<u64>,
     pub use_in: Option<u64>,
-    pub bytes_out: u64,
-    pub packets_out: u64,
+    pub bytes_out: Option<u64>,
+    pub packets_out: Option<u64>,
     pub use_out: Option<u64>,
     pub rekey_time: Option<u64>,
-    pub life_time: u64,
-    pub install_time: u64,
+    pub life_time: Option<u64>,
+    pub install_time: Option<u64>,
     pub local_ts: Vec<String>,
     pub remote_ts: Vec<String>,
 }