changeset 54:21185db8a52e

refactor
author drewp@bigasterisk.com
date Wed, 24 Apr 2024 12:08:39 -0700
parents e7318cbee0bc
children 24f4ec319f98
files tasks.py
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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)