From 59eb63bcdaea7052cc2c4ccda57d5ea3b432ded2 Mon Sep 17 00:00:00 2001 From: mbecker20 Date: Wed, 18 Jan 2023 09:15:36 +0000 Subject: [PATCH] 0.1.9 add 15-sec to Timelength options --- Cargo.lock | 114 ++++++++++++++++---------------- Dockerfile.core | 4 +- cli/Cargo.toml | 2 +- core/Cargo.toml | 4 +- lib/db_client/Cargo.toml | 4 +- lib/helpers/Cargo.toml | 4 +- lib/monitor_client/Cargo.toml | 4 +- lib/periphery_client/Cargo.toml | 6 +- lib/types/Cargo.toml | 2 +- periphery/Cargo.toml | 6 +- 10 files changed, 75 insertions(+), 75 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1bf72fb8d..6199d0135 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -257,9 +257,9 @@ checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" [[package]] name = "bson" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d76085681585d39016f4d3841eb019201fc54d2dd0d92ad1e4fab3bfb32754" +checksum = "8746d07211bb12a7c34d995539b4a2acd4e0b0e757de98ce2ab99bcf17443fad" dependencies = [ "ahash", "base64 0.13.1", @@ -276,9 +276,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -334,9 +334,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.32" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" dependencies = [ "bitflags", "clap_derive", @@ -349,9 +349,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -362,9 +362,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] @@ -408,8 +408,8 @@ dependencies = [ "hex", "hmac", "jwt", - "monitor_helpers 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "monitor_types 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_helpers 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "mungos", "periphery_client", "serde", @@ -644,10 +644,10 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "db_client" -version = "0.1.8" +version = "0.1.9" dependencies = [ "anyhow", - "monitor_types 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "mungos", ] @@ -1204,9 +1204,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" dependencies = [ "libc", "windows-sys", @@ -1472,7 +1472,7 @@ dependencies = [ [[package]] name = "monitor_cli" -version = "0.1.16" +version = "0.1.17" dependencies = [ "async_timing_util", "clap", @@ -1488,11 +1488,11 @@ dependencies = [ [[package]] name = "monitor_client" -version = "0.1.8" +version = "0.1.9" dependencies = [ "anyhow", "futures-util", - "monitor_types 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest", "serde", "serde_derive", @@ -1504,7 +1504,7 @@ dependencies = [ [[package]] name = "monitor_helpers" -version = "0.1.8" +version = "0.1.9" dependencies = [ "anyhow", "async_timing_util", @@ -1512,7 +1512,7 @@ dependencies = [ "bollard", "futures", "futures-util", - "monitor_types 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "rand", "run_command", "serde", @@ -1523,9 +1523,9 @@ dependencies = [ [[package]] name = "monitor_helpers" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571e3598c45b0c6190a43a6e7049f49529ff33c67dd79f3b12ba748c7c846e7d" +checksum = "6bdf204175ca05633efbfa86b880bd22ee314ac76819a6d2c9019588da8e9170" dependencies = [ "anyhow", "async_timing_util", @@ -1533,7 +1533,7 @@ dependencies = [ "bollard", "futures", "futures-util", - "monitor_types 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "rand", "run_command", "serde", @@ -1544,7 +1544,7 @@ dependencies = [ [[package]] name = "monitor_periphery" -version = "0.1.8" +version = "0.1.9" dependencies = [ "anyhow", "async_timing_util", @@ -1555,8 +1555,8 @@ dependencies = [ "dotenv", "envy", "futures-util", - "monitor_helpers 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "monitor_types 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_helpers 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "run_command", "serde", "serde_derive", @@ -1570,7 +1570,7 @@ dependencies = [ [[package]] name = "monitor_types" -version = "0.1.8" +version = "0.1.9" dependencies = [ "anyhow", "bollard", @@ -1587,9 +1587,9 @@ dependencies = [ [[package]] name = "monitor_types" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c99ca4b55b152f913e5597496f30dff0eec3b86ae31db7ea3c5e199ae1a056a9" +checksum = "3aca535e1ee2dc290df0a39eb86af0bf1ac8b425db6755949ed45b0efb53a32a" dependencies = [ "anyhow", "bollard", @@ -1839,12 +1839,12 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "periphery_client" -version = "0.1.8" +version = "0.1.9" dependencies = [ "anyhow", "futures-util", - "monitor_helpers 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "monitor_types 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_helpers 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest", "serde", "serde_json", @@ -1922,9 +1922,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" dependencies = [ "unicode-ident", ] @@ -2120,9 +2120,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -2458,9 +2458,9 @@ checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" [[package]] name = "sysinfo" -version = "0.27.5" +version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcd303550875ba33b137a7c93318cfdeb54c95e63ff7a0982d28425d3f87552c" +checksum = "975fe381e0ecba475d4acff52466906d95b153a40324956552e027b2a9eaa89e" dependencies = [ "cfg-if", "core-foundation-sys", @@ -2493,9 +2493,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -2590,9 +2590,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.24.1" +version = "1.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" dependencies = [ "autocfg", "bytes", @@ -3133,45 +3133,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" diff --git a/Dockerfile.core b/Dockerfile.core index 5d121c49c..ca51b473a 100644 --- a/Dockerfile.core +++ b/Dockerfile.core @@ -3,8 +3,8 @@ WORKDIR /builder COPY ./core ./core -COPY ./lib/types ./lib/types -COPY ./lib/helpers ./lib/helpers +# COPY ./lib/types ./lib/types +# COPY ./lib/helpers ./lib/helpers COPY ./lib/db_client ./lib/db_client COPY ./lib/periphery_client ./lib/periphery_client diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 38a4667ae..f7ea14da8 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_cli" -version = "0.1.16" +version = "0.1.17" edition = "2021" authors = ["MoghTech"] description = "monitor cli | tools to setup monitor system" diff --git a/core/Cargo.toml b/core/Cargo.toml index 2007ef542..19075855a 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -8,8 +8,8 @@ edition = "2021" [dependencies] # helpers = { package = "monitor_helpers", path = "../lib/helpers" } # types = { package = "monitor_types", path = "../lib/types" } -helpers = { package = "monitor_helpers", version = "0.1.8" } -types = { package = "monitor_types", version = "0.1.8" } +helpers = { package = "monitor_helpers", version = "0.1.9" } +types = { package = "monitor_types", version = "0.1.9" } db = { package = "db_client", path = "../lib/db_client" } periphery = { package = "periphery_client", path = "../lib/periphery_client" } axum_oauth2 = { path = "../lib/axum_oauth2" } diff --git a/lib/db_client/Cargo.toml b/lib/db_client/Cargo.toml index bca07f936..78b05be37 100644 --- a/lib/db_client/Cargo.toml +++ b/lib/db_client/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "db_client" -version = "0.1.8" +version = "0.1.9" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -types = { package = "monitor_types", version = "0.1.8" } +types = { package = "monitor_types", version = "0.1.9" } # types = { package = "monitor_types", path = "../types" } mungos = "0.3.0" anyhow = "1.0" \ No newline at end of file diff --git a/lib/helpers/Cargo.toml b/lib/helpers/Cargo.toml index 70cfe5cb6..9fec1b80f 100644 --- a/lib/helpers/Cargo.toml +++ b/lib/helpers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_helpers" -version = "0.1.8" +version = "0.1.9" edition = "2021" authors = ["MoghTech"] description = "helpers used as dependency for mogh tech monitor" @@ -10,7 +10,7 @@ license = "GPL-3.0-or-later" [dependencies] # types = { package = "monitor_types", path = "../types" } -types = { package = "monitor_types", version = "0.1.8" } +types = { package = "monitor_types", version = "0.1.9" } async_timing_util = "0.1.14" bollard = "0.13" anyhow = "1.0" diff --git a/lib/monitor_client/Cargo.toml b/lib/monitor_client/Cargo.toml index 43a0b63ec..083e147b6 100644 --- a/lib/monitor_client/Cargo.toml +++ b/lib/monitor_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_client" -version = "0.1.8" +version = "0.1.9" edition = "2021" authors = ["MoghTech"] description = "a client to interact with the monitor system" @@ -9,7 +9,7 @@ license = "GPL-3.0-or-later" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -monitor_types = "0.1.8" +monitor_types = "0.1.9" # monitor_types = { path = "../types" } reqwest = { version = "0.11", features = ["json"] } tokio-tungstenite = { version = "0.18", features=["native-tls"] } diff --git a/lib/periphery_client/Cargo.toml b/lib/periphery_client/Cargo.toml index 3f1ada942..4308d2d6a 100644 --- a/lib/periphery_client/Cargo.toml +++ b/lib/periphery_client/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "periphery_client" -version = "0.1.8" +version = "0.1.9" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -helpers = { package = "monitor_helpers", version = "0.1.8" } -types = { package = "monitor_types", version = "0.1.8" } +helpers = { package = "monitor_helpers", version = "0.1.9" } +types = { package = "monitor_types", version = "0.1.9" } # types = { package = "monitor_types", path = "../types" } # helpers = { package = "monitor_helpers", path = "../helpers" } tokio-tungstenite = { version = "0.18", features=["native-tls"] } diff --git a/lib/types/Cargo.toml b/lib/types/Cargo.toml index 2d356e9e0..fb4a4b4b0 100644 --- a/lib/types/Cargo.toml +++ b/lib/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_types" -version = "0.1.8" +version = "0.1.9" edition = "2021" authors = ["MoghTech"] description = "types for the mogh tech monitor" diff --git a/periphery/Cargo.toml b/periphery/Cargo.toml index 7dc2cd788..30229b5bf 100644 --- a/periphery/Cargo.toml +++ b/periphery/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_periphery" -version = "0.1.8" +version = "0.1.9" edition = "2021" authors = ["MoghTech"] description = "monitor periphery binary | run monitor periphery as system daemon" @@ -15,8 +15,8 @@ path = "src/main.rs" [dependencies] # helpers = { package = "monitor_helpers", path = "../lib/helpers" } # types = { package = "monitor_types", path = "../lib/types" } -helpers = { package = "monitor_helpers", version = "0.1.8" } -types = { package = "monitor_types", version = "0.1.8" } +helpers = { package = "monitor_helpers", version = "0.1.9" } +types = { package = "monitor_types", version = "0.1.9" } run_command = { version = "0.0.5", features = ["async_tokio"] } async_timing_util = "0.1.14" tokio = { version = "1.24", features = ["full"] }