From 859785bf055f11c53a56f8a0b7604fb5c58bf175 Mon Sep 17 00:00:00 2001 From: asleepyskye Date: Wed, 30 Apr 2025 14:33:50 -0400 Subject: [PATCH] fix(scheduled_tasks): update for k8s --- crates/libpk/src/_config.rs | 1 + crates/scheduled_tasks/src/tasks.rs | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/crates/libpk/src/_config.rs b/crates/libpk/src/_config.rs index 5af40a94..33b6c08a 100644 --- a/crates/libpk/src/_config.rs +++ b/crates/libpk/src/_config.rs @@ -88,6 +88,7 @@ pub struct ScheduledTasksConfig { pub set_guild_count: bool, pub expected_gateway_count: usize, pub gateway_url: String, + pub vm_url: String, } fn _metrics_default() -> bool { diff --git a/crates/scheduled_tasks/src/tasks.rs b/crates/scheduled_tasks/src/tasks.rs index 98396a3f..6d922359 100644 --- a/crates/scheduled_tasks/src/tasks.rs +++ b/crates/scheduled_tasks/src/tasks.rs @@ -95,7 +95,7 @@ pub async fn update_discord_stats(ctx: AppCtx) -> anyhow::Result<()> { for idx in 0..cfg.expected_gateway_count { let res = client - .get(format!("http://cluster{idx}.{}/stats", cfg.gateway_url)) + .get(format!("http://pluralkit-gateway-{idx}.{}/stats", cfg.gateway_url)) .send() .await?; @@ -163,6 +163,11 @@ pub async fn update_stats_api(ctx: AppCtx) -> anyhow::Result<()> { .build() .expect("error making client"); + let cfg = config + .scheduled_tasks + .as_ref() + .expect("missing scheduled_tasks config"); + #[derive(serde::Deserialize, Debug)] struct PrometheusResult { data: PrometheusResultData, @@ -178,9 +183,11 @@ pub async fn update_stats_api(ctx: AppCtx) -> anyhow::Result<()> { macro_rules! prom_instant_query { ($t:ty, $q:expr) => {{ + tracing::info!("Query: {}", $q); let resp = client .get(format!( - "http://vm.svc.pluralkit.net/select/0/prometheus/api/v1/query?query={}", + "{}/api/v1/query?query={}", + cfg.vm_url, $q )) .send()