simono41/prometheus_wireguard_exporter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added optional sudo

Browse source
This commit is contained in:
Francesco Cogno 2020-10-11 16:40:10 +02:00
parent e77a3e26ee
commit fa739c423c
No known key found for this signature in database
GPG key ID: 89082D7200C96BD1
4 changed files with 533 additions and 528 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1032
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "prometheus_wireguard_exporter" name = "prometheus_wireguard_exporter"
version = "3.4.0" version = "3.4.1"
authors = ["Francesco Cogno <francesco.cogno@outlook.com>"] authors = ["Francesco Cogno <francesco.cogno@outlook.com>"]
description = "Prometheus WireGuard Exporter" description = "Prometheus WireGuard Exporter"
edition = "2018" edition = "2018"

20
src/main.rs
View file

@ -47,11 +47,21 @@ async fn perform_request(
let mut wg_accumulator: Option<WireGuard> = None; let mut wg_accumulator: Option<WireGuard> = None;
for interface_to_handle in interfaces_to_handle { for interface_to_handle in interfaces_to_handle {
let output = Command::new("wg") let output = if options.prepend_sudo {
.arg("show") Command::new("sudo")
.arg(&interface_to_handle) .arg("wg")
.arg("dump") .arg("show")
.output()?; .arg(&interface_to_handle)
.arg("dump")
.output()?
} else {
Command::new("wg")
.arg("show")
.arg(&interface_to_handle)
.arg("dump")
.output()?
};
let output_stdout_str = String::from_utf8(output.stdout)?; let output_stdout_str = String::from_utf8(output.stdout)?;
trace!( trace!(
"wg show {} dump stdout == {}", "wg show {} dump stdout == {}",

7
src/options.rs
View file

@ -1,6 +1,7 @@
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct Options { pub(crate) struct Options {
pub verbose: bool, pub verbose: bool,
pub prepend_sudo: bool,
pub separate_allowed_ips: bool, pub separate_allowed_ips: bool,
pub extract_names_config_file: Option<String>, pub extract_names_config_file: Option<String>,
pub interfaces: Option<Vec<String>>, pub interfaces: Option<Vec<String>>,
@ -11,6 +12,7 @@ impl Options {
pub fn from_claps(matches: &clap::ArgMatches<'_>) -> Options { pub fn from_claps(matches: &clap::ArgMatches<'_>) -> Options {
let options = Options { let options = Options {
verbose: matches.is_present("verbose"), verbose: matches.is_present("verbose"),
prepend_sudo: matches.is_present("prepend_sudo"),
separate_allowed_ips: matches.is_present("separate_allowed_ips"), separate_allowed_ips: matches.is_present("separate_allowed_ips"),
extract_names_config_file: matches extract_names_config_file: matches
.value_of("extract_names_config_files") .value_of("extract_names_config_files")
@ -29,8 +31,3 @@ impl Options {
options options
} }
} }
#[cfg(test)]
mod tests {
use super::*;
}