diff --git a/Cargo.lock b/Cargo.lock index cc69a675a..e9054f743 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,7 +39,7 @@ dependencies = [ "dotenv", "envy", "logger", - "monitor_client 1.4.0", + "monitor_client", "serde", "termination_signal", "tokio", @@ -1951,7 +1951,7 @@ name = "logger" version = "1.4.0" dependencies = [ "anyhow", - "monitor_client 1.4.0", + "monitor_client", "opentelemetry", "opentelemetry-otlp", "opentelemetry_sdk", @@ -2024,7 +2024,7 @@ dependencies = [ "dotenv", "envy", "logger", - "monitor_client 1.4.0", + "monitor_client", "mungos", "serde", "termination_signal", @@ -2068,19 +2068,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mongo_indexed" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0cd571ac04a8ac4751e6899f404e5d1370ec79f17609ea5a3caa823619b7513" -dependencies = [ - "anyhow", - "async-trait", - "mongo_indexed_derive 0.2.2", - "mongodb", - "serde", -] - [[package]] name = "mongo_indexed" version = "0.3.0" @@ -2088,22 +2075,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e837961dc668ca0d6e298066f22c1c9242bdfe7cc473b18f5e3d960f27e6adb" dependencies = [ "anyhow", - "mongo_indexed_derive 0.3.0", + "mongo_indexed_derive", "mongodb", "serde", ] -[[package]] -name = "mongo_indexed_derive" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da28743409e01e8a63877563786b227285423a0f36c3c16e83f6b8226de9990e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.64", -] - [[package]] name = "mongo_indexed_derive" version = "0.3.0" @@ -2170,7 +2146,7 @@ dependencies = [ "clap", "colored", "futures", - "monitor_client 1.3.0", + "monitor_client", "partial_derive2", "serde", "serde_json", @@ -2181,40 +2157,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "monitor_client" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6349d2caa7828bf9561bf61e2612bfa6541d6ede5c90049756095df74358c3a0" -dependencies = [ - "anyhow", - "async_timing_util", - "bollard", - "clap", - "derive_builder", - "derive_default_builder", - "derive_empty_traits", - "derive_variants", - "envy", - "futures", - "mongo_indexed 0.2.2", - "mungos", - "partial_derive2", - "reqwest 0.12.4", - "resolver_api 0.1.9", - "serde", - "serde_json", - "serror", - "strum 0.26.2", - "thiserror", - "tokio", - "tokio-tungstenite", - "tokio-util", - "tracing", - "typeshare", - "uuid", -] - [[package]] name = "monitor_client" version = "1.4.0" @@ -2230,10 +2172,10 @@ dependencies = [ "derive_variants", "envy", "futures", - "mongo_indexed 0.3.0", + "mongo_indexed", "partial_derive2", "reqwest 0.12.4", - "resolver_api 1.1.0", + "resolver_api", "serde", "serde_json", "serror", @@ -2266,15 +2208,15 @@ dependencies = [ "jwt", "logger", "merge_config_files", - "mongo_indexed 0.3.0", - "monitor_client 1.4.0", + "mongo_indexed", + "monitor_client", "mungos", "parse_csl", "partial_derive2", "periphery_client", "rand", "reqwest 0.12.4", - "resolver_api 1.1.0", + "resolver_api", "serde", "serde_json", "serror", @@ -2307,10 +2249,10 @@ dependencies = [ "envy", "logger", "merge_config_files", - "monitor_client 1.4.0", + "monitor_client", "parse_csl", "periphery_client", - "resolver_api 1.1.0", + "resolver_api", "run_command", "serde", "serde_json", @@ -2630,9 +2572,9 @@ name = "periphery_client" version = "1.4.0" dependencies = [ "anyhow", - "monitor_client 1.4.0", + "monitor_client", "reqwest 0.12.4", - "resolver_api 1.1.0", + "resolver_api", "serde", "serde_json", "serror", @@ -2899,20 +2841,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "resolver_api" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43981e6bc9a85f1072ffd38bcaca5823e3cd7f24bb675fa5e79736a318f1f998" -dependencies = [ - "anyhow", - "async-trait", - "resolver_api_derive 0.1.8", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "resolver_api" version = "1.1.0" @@ -2920,23 +2848,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4e8831e742662de68dbce8ca6243d1f0a1a5a295e1b3fa9ad996f215d1645b5" dependencies = [ "anyhow", - "resolver_api_derive 1.1.0", + "resolver_api_derive", "serde", "serde_json", "thiserror", ] -[[package]] -name = "resolver_api_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0af2b29987c0bff183294b58b5b084f16c8f1b77951c7c72b7c70d66cf91ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.64", -] - [[package]] name = "resolver_api_derive" version = "1.1.0" @@ -3636,7 +3553,7 @@ dependencies = [ "dotenv", "envy", "logger", - "monitor_client 1.4.0", + "monitor_client", "mungos", "partial_derive2", "rand", @@ -4177,7 +4094,7 @@ version = "1.4.0" dependencies = [ "anyhow", "logger", - "monitor_client 1.4.0", + "monitor_client", "termination_signal", "tokio", "tracing", diff --git a/Cargo.toml b/Cargo.toml index 880b12a64..15e1874f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,9 +10,12 @@ license = "GPL-3.0-or-later" repository = "https://github.com/mbecker20/monitor" homepage = "https://docs.monitor.mogh.tech" +[patch.crates-io] +monitor_client = { path = "client/core/rs" } + [workspace.dependencies] # LOCAL -monitor_client = { path = "client/core/rs" } +monitor_client = "1.3.0" periphery_client = { path = "client/periphery/rs" } logger = { path = "lib/logger" } diff --git a/bin/cli/Cargo.toml b/bin/cli/Cargo.toml index 97be22c8a..8684a9519 100644 --- a/bin/cli/Cargo.toml +++ b/bin/cli/Cargo.toml @@ -14,12 +14,9 @@ path = "src/main.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[patch.crates-io] -monitor_client.workspace = true - [dependencies] # local client -monitor_client = "1.3.0" +monitor_client.workspace = true # mogh partial_derive2.workspace = true # external diff --git a/bin/cli/resources/deployments.toml b/bin/cli/resources/deployments.toml index 2120d2291..82cfabd81 100644 --- a/bin/cli/resources/deployments.toml +++ b/bin/cli/resources/deployments.toml @@ -5,7 +5,7 @@ description = "An NGINX proxy for mogh.tech" tags = ["monitor"] config.server_id = "monitor-01" config.network = "host" -config.restart = "on-failure" +config.restart = "unless-stopped" config.image.type = "Image" config.image.params.image = "jc21/nginx-proxy-manager" @@ -137,7 +137,7 @@ type = "Image" params.image = "timberio/vector:latest-debian" [[deployment.config.volumes]] -local = "/home/ubuntu/.config/vector" +local = "/root/.config/vector" container = "/etc/vector" [[deployment.config.volumes]] @@ -169,7 +169,7 @@ type = "Build" params.build_id = "monitor_core" [[deployment.config.volumes]] -local = "/home/ubuntu/.config/monitor/dev.core.config.toml" +local = "/root/.config/monitor/dev.core.config.toml" container = "/config/config.toml" [[deployment.config.volumes]] diff --git a/bin/cli/resources/procedures.toml b/bin/cli/resources/procedures.toml index cafad041f..f84ebd683 100644 --- a/bin/cli/resources/procedures.toml +++ b/bin/cli/resources/procedures.toml @@ -1,8 +1,35 @@ [[procedure]] -name = "test-procedure" +name = "build-monitor" description = "" -tags = [] +tags = ["monitor"] [procedure.config] -procedure_type = "Sequence" -executions = [] \ No newline at end of file +procedure_type = "Parallel" +webhook_enabled = true + +[[procedure.config.executions]] +enabled = true + +[procedure.config.executions.execution] +type = "RunBuild" + +[procedure.config.executions.execution.params] +build = "monitor_core" + +[[procedure.config.executions]] +enabled = true + +[procedure.config.executions.execution] +type = "RunBuild" + +[procedure.config.executions.execution.params] +build = "monitor_frontend" + +[[procedure.config.executions]] +enabled = false + +[procedure.config.executions.execution] +type = "RunBuild" + +[procedure.config.executions.execution.params] +build = "monitor_frontend_dev"