# HG changeset patch # User drewp@bigasterisk.com # Date 1713985719 25200 # Node ID 21185db8a52e4f6ad4ba7ff5875a0075cafb26dd # Parent e7318cbee0bc8ba022a90654f74e6520242d3ff8 refactor diff -r e7318cbee0bc -r 21185db8a52e tasks.py --- a/tasks.py Wed Apr 24 11:38:13 2024 -0700 +++ b/tasks.py Wed Apr 24 12:08:39 2024 -0700 @@ -10,17 +10,19 @@ @task def push_config(ctx): - configObj = scrapeConfig(ctx) rulesObj = alert_rules.allRules(ctx) - replaceCmap("victoriametrics-config", {"scrape_main": configObj, "rules": rulesObj}) + replaceCmap("victoriametrics-config", { + "scrape_main": scrapeConfig("config/scrape_main.yaml"), + "rules": rulesObj, + }) # these don't give errors on rules format! they just quietly keep the old # rules! use `skaffold run` to get errs. # # or run # validateTemplates = flag.Bool("rule.validateTemplates", true, "Whether to validate annotation and label templates") - # validateExpressions = flag.Bool("rule.validateExpressions", true, "Whether to validate rules expressions via MetricsQL engine") + # validateExpressions = flag.Bool("rule.validateExpressions", true, "Whether to validate rules expressions via MetricsQL engine") refreshPodCmaps(firstPodName("app=victoriametrics")) refreshPodCmaps(firstPodName("app=vmalert")) @@ -29,5 +31,5 @@ # hup(ctx, 'deploy/victoriametrics', 'victoria-metrics-prod') -def scrapeConfig(ctx): - return yaml.load(open("config/scrape_main.yaml"), yaml.FullLoader) +def scrapeConfig(fn): + return yaml.load(open(fn), yaml.FullLoader)