File tree 2 files changed +13
-0
lines changed
2 files changed +13
-0
lines changed Original file line number Diff line number Diff line change @@ -4313,6 +4313,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
4313
4313
. required ( true )
4314
4314
. help ( "Access Token" ) ,
4315
4315
)
4316
+ . arg (
4317
+ Arg :: with_name ( "org" )
4318
+ . value_name ( "ORG" )
4319
+ . takes_value ( true )
4320
+ . required ( true )
4321
+ . help ( "Organization" ) ,
4322
+ )
4316
4323
. arg (
4317
4324
Arg :: with_name ( "bucket" )
4318
4325
. value_name ( "BUCKET" )
@@ -5786,17 +5793,20 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
5786
5793
Some ( MetricsConfig {
5787
5794
url,
5788
5795
token : _,
5796
+ org,
5789
5797
bucket,
5790
5798
} ) => {
5791
5799
println ! ( "Url: {url}" ) ;
5792
5800
println ! ( "Token: ********" ) ;
5801
+ println ! ( "Organization: {org}" ) ;
5793
5802
println ! ( "Bucket: {bucket}" ) ;
5794
5803
}
5795
5804
} ,
5796
5805
( "set" , Some ( arg_matches) ) => {
5797
5806
db. set_metrics_config ( MetricsConfig {
5798
5807
url : value_t_or_exit ! ( arg_matches, "url" , String ) ,
5799
5808
token : value_t_or_exit ! ( arg_matches, "token" , String ) ,
5809
+ org : value_t_or_exit ! ( arg_matches, "org" , String ) ,
5800
5810
bucket : value_t_or_exit ! ( arg_matches, "bucket" , String ) ,
5801
5811
} ) ?;
5802
5812
println ! ( "InfluxDb configuration set" ) ;
Original file line number Diff line number Diff line change @@ -15,13 +15,15 @@ lazy_static::lazy_static! {
15
15
pub struct MetricsConfig {
16
16
pub url : String ,
17
17
pub token : String ,
18
+ pub org : String ,
18
19
pub bucket : String ,
19
20
}
20
21
21
22
pub fn env_config ( ) -> Option < MetricsConfig > {
22
23
Some ( MetricsConfig {
23
24
url : env:: var ( "INFLUX_URL" ) . ok ( ) ?,
24
25
token : env:: var ( "INFLUX_API_TOKEN" ) . ok ( ) ?,
26
+ org : env:: var ( "INFLUX_ORG" ) . ok ( ) ?,
25
27
bucket : env:: var ( "INFLUX_BUCKET" )
26
28
. ok ( )
27
29
. unwrap_or_else ( || "sys" . into ( ) ) ,
@@ -35,6 +37,7 @@ pub async fn push(point: Point) {
35
37
pub async fn send ( config : Option < MetricsConfig > ) {
36
38
if let Some ( config) = config {
37
39
let client = Client :: new ( config. url , config. token )
40
+ . with_org ( config. org )
38
41
. with_bucket ( config. bucket )
39
42
. with_precision ( Precision :: MS ) ;
40
43
//let client = client.insert_to_stdout();
You can’t perform that action at this time.
0 commit comments