Move vm_monitor under compute_tools/

For clarity. It's an integral part of compute_ctl, not a general
library that should be used anywhere else.

.github/workflows/trigger-e2e-tests.yml

@@ -112,7 +112,7 @@ jobs:
                 # This isn't exhaustive, just the paths that are most directly compute-related.
                 # For example, compute_ctl also depends on libs/utils, but we don't trigger
                 # an e2e run on that.
-                vendor/*|pgxn/*|compute_tools/*|libs/vm_monitor/*|compute/Dockerfile.compute-node)
+                vendor/*|pgxn/*|compute_tools/*|compute/Dockerfile.compute-node)
                   platforms=$(echo "${platforms}" | jq --compact-output '. += ["k8s-neonvm"] | unique')
                   ;;
                 *)

CODEOWNERS

@@ -1,10 +1,10 @@
 /compute_tools/ @neondatabase/control-plane @neondatabase/compute
+/compute_tools/vm_monitor/ @neondatabase/autoscaling
 /storage_controller @neondatabase/storage
 /libs/pageserver_api/ @neondatabase/storage
 /libs/postgres_ffi/ @neondatabase/compute @neondatabase/storage
 /libs/remote_storage/ @neondatabase/storage
 /libs/safekeeper_api/ @neondatabase/storage
-/libs/vm_monitor/ @neondatabase/autoscaling
 /pageserver/ @neondatabase/storage
 /pgxn/ @neondatabase/compute
 /pgxn/neon/ @neondatabase/compute @neondatabase/storage

Cargo.toml

@@ -2,6 +2,7 @@
 resolver = "2"
 members = [
     "compute_tools",
+    "compute_tools/vm_monitor",
     "control_plane",
     "control_plane/storcon_cli",
     "pageserver",
@@ -31,7 +32,6 @@ members = [
     "libs/remote_storage",
     "libs/tracing-utils",
     "libs/postgres_ffi/wal_craft",
-    "libs/vm_monitor",
     "libs/walproposer",
 ]
 
@@ -235,7 +235,7 @@ storage_controller_client = { path = "./storage_controller/client" }
 tenant_size_model = { version = "0.1", path = "./libs/tenant_size_model/" }
 tracing-utils = { version = "0.1", path = "./libs/tracing-utils/" }
 utils = { version = "0.1", path = "./libs/utils/" }
-vm_monitor = { version = "0.1", path = "./libs/vm_monitor/" }
+vm_monitor = { version = "0.1", path = "./compute_tools/vm_monitor/" }
 walproposer = { version = "0.1", path = "./libs/walproposer/" }
 
 ## Common library dependency

compute_tools/Cargo.toml

@@ -44,7 +44,7 @@ compute_api.workspace = true
 utils.workspace = true
 workspace_hack.workspace = true
 remote_storage = { version = "0.1", path = "../libs/remote_storage/" }
-vm_monitor = { version = "0.1", path = "../libs/vm_monitor/" }
+vm_monitor = { version = "0.1", path = "vm_monitor/" }
 zstd = "0.13"
 bytes = "1.0"
 rust-ini = "0.20.0"

compute_tools/README.md

@@ -20,7 +20,7 @@ Also `compute_ctl` spawns two separate service threads:
   last activity requests.
 
 If `AUTOSCALING` environment variable is set, `compute_ctl` will start the
-`vm-monitor` located in [`neon/libs/vm_monitor`]. For VM compute nodes,
+`vm-monitor` located in [`neon/compute_tools/vm_monitor`]. For VM compute nodes,
 `vm-monitor` communicates with the VM autoscaling system. It coordinates
 downscaling and requests immediate upscaling under resource pressure.
 

compute_tools/src/bin/compute_ctl.rs

@@ -21,7 +21,7 @@
 //!   last activity requests.
 //!
 //! If `AUTOSCALING` environment variable is set, `compute_ctl` will start the
-//! `vm-monitor` located in [`neon/libs/vm_monitor`]. For VM compute nodes,
+//! `vm-monitor` located in [`neon/compute_tools/vm_monitor`]. For VM compute nodes,
 //! `vm-monitor` communicates with the VM autoscaling system. It coordinates
 //! downscaling and requests immediate upscaling under resource pressure.
 //!