# HG changeset patch # User drewp@bigasterisk.com # Date 1714761144 25200 # Node ID c5e98d891638ecef34cf56632323db6892c293e5 # Parent adde35eb477306d17dca1280cfa9c12080745fb8 remove 'next' prefix diff -r adde35eb4773 -r c5e98d891638 .hgignore --- a/.hgignore Fri May 03 11:21:08 2024 -0700 +++ b/.hgignore Fri May 03 11:32:24 2024 -0700 @@ -4,6 +4,6 @@ .vscode .venv ^migration/export -^next/build -^next/private.py +^build +^private.py diff -r adde35eb4773 -r c5e98d891638 create_k8s.py --- a/create_k8s.py Fri May 03 11:21:08 2024 -0700 +++ b/create_k8s.py Fri May 03 11:32:24 2024 -0700 @@ -213,8 +213,8 @@ def main(): tzArg = "-loggerTimezone=America/Los_Angeles" - objPrefix = "next-victoriametrics" # prefix on all k8s object names - webRoot = "/m/next" + objPrefix = "victoriametrics" # prefix on all k8s object names + webRoot = "/m" vmVersion = "v1.100.1" webHost = 'bigasterisk.com' pipelines = [ diff -r adde35eb4773 -r c5e98d891638 create_scrape_configs.py --- a/create_scrape_configs.py Fri May 03 11:21:08 2024 -0700 +++ b/create_scrape_configs.py Fri May 03 11:32:24 2024 -0700 @@ -54,14 +54,14 @@ jobConfig(name="telegraf", targets=[f'{h}:9273' for h in all_hosts]), jobConfig(name="victorialogs",targets=['victorialogs'], metrics_path='/logs/metrics'), - jobConfig(name="next-victoriametrics-forever-vmagent", metrics_path='/m/next/forever/vmagent/metrics', targets=FromName), - jobConfig(name="next-victoriametrics-forever-vminsert", metrics_path='/m/next/forever/vminsert/metrics', targets=FromName), - jobConfig(name="next-victoriametrics-forever-vmstorage", metrics_path='/m/next/forever/vmstorage/metrics',targets=FromName), - jobConfig(name="next-victoriametrics-recent-vmagent", metrics_path='/m/next/recent/vmagent/metrics', targets=FromName), - jobConfig(name="next-victoriametrics-recent-vminsert", metrics_path='/m/next/recent/vminsert/metrics', targets=FromName), - jobConfig(name="next-victoriametrics-recent-vmstorage", metrics_path='/m/next/recent/vmstorage/metrics', targets=FromName), - jobConfig(name="next-victoriametrics-vmselect", metrics_path='/m/next/vmselect/metrics', targets=FromName), - jobConfig(name="next-victoriametrics-index", targets=FromName), + jobConfig(name="victoriametrics-forever-vmagent", metrics_path='/m/forever/vmagent/metrics', targets=FromName), + jobConfig(name="victoriametrics-forever-vminsert", metrics_path='/m/forever/vminsert/metrics', targets=FromName), + jobConfig(name="victoriametrics-forever-vmstorage", metrics_path='/m/forever/vmstorage/metrics',targets=FromName), + jobConfig(name="victoriametrics-recent-vmagent", metrics_path='/m/recent/vmagent/metrics', targets=FromName), + jobConfig(name="victoriametrics-recent-vminsert", metrics_path='/m/recent/vminsert/metrics', targets=FromName), + jobConfig(name="victoriametrics-recent-vmstorage", metrics_path='/m/recent/vmstorage/metrics', targets=FromName), + jobConfig(name="victoriametrics-vmselect", metrics_path='/m/vmselect/metrics', targets=FromName), + jobConfig(name="victoriametrics-index", targets=FromName), # todo: # - video-files diff -r adde35eb4773 -r c5e98d891638 migration/tasks.py --- a/migration/tasks.py Fri May 03 11:21:08 2024 -0700 +++ b/migration/tasks.py Fri May 03 11:32:24 2024 -0700 @@ -85,7 +85,7 @@ @task def ingestForeverMetrics(ctx): - svc = ctx.run('khost next-victoriametrics-forever-vminsert').stdout + svc = ctx.run('khost victoriametrics-forever-vminsert').stdout for p in Path('export').glob('*.native.gz'): print(f'importing {p}') - ctx.run(f'zcat {p} | curl -s http://{svc}/m/next/forever/vminsert/insert/0/prometheus/api/v1/import/native --data-binary @-') + ctx.run(f'zcat {p} | curl -s http://{svc}/m/forever/vminsert/insert/0/prometheus/api/v1/import/native --data-binary @-') diff -r adde35eb4773 -r c5e98d891638 tasks.py --- a/tasks.py Fri May 03 11:21:08 2024 -0700 +++ b/tasks.py Fri May 03 11:32:24 2024 -0700 @@ -28,6 +28,6 @@ top = Path('build/scrape_config') for p in top.glob('*.yaml'): map[str(p.relative_to(top))] = scrapeConfig(p) - replaceCmap("next-victoriametrics-config", map) - refreshPodCmaps(firstPodName("app=next-victoriametrics-forever-vmagent")) - refreshPodCmaps(firstPodName("app=next-victoriametrics-recent-vmagent")) + replaceCmap("victoriametrics-config", map) + refreshPodCmaps(firstPodName("app=victoriametrics-forever-vmagent")) + refreshPodCmaps(firstPodName("app=victoriametrics-recent-vmagent"))