From 685c3d95e79ef3a8a2989f3274236e7f565db3c1 Mon Sep 17 00:00:00 2001 From: Haleygo <hui.wang@daocloud.io> Date: Tue, 29 Aug 2023 15:58:24 +0800 Subject: [PATCH] fix clusterMembersCount check (#4900) --- lib/promscrape/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/promscrape/config.go b/lib/promscrape/config.go index 9ac356b7ba..5d85e489c7 100644 --- a/lib/promscrape/config.go +++ b/lib/promscrape/config.go @@ -53,7 +53,7 @@ var ( dropOriginalLabels = flag.Bool("promscrape.dropOriginalLabels", false, "Whether to drop original labels for scrape targets at /targets and /api/v1/targets pages. "+ "This may be needed for reducing memory usage when original labels for big number of scrape targets occupy big amounts of memory. "+ "Note that this reduces debuggability for improper per-target relabeling configs") - clusterMembersCount = flag.Int("promscrape.cluster.membersCount", 0, "The number of members in a cluster of scrapers. "+ + clusterMembersCount = flag.Int("promscrape.cluster.membersCount", 1, "The number of members in a cluster of scrapers. "+ "Each member must have a unique -promscrape.cluster.memberNum in the range 0 ... promscrape.cluster.membersCount-1 . "+ "Each member then scrapes roughly 1/N of all the targets. By default, cluster scraping is disabled, i.e. a single scraper scrapes all the targets") clusterMemberNum = flag.String("promscrape.cluster.memberNum", "0", "The number of vmagent instance in the cluster of scrapers. "+ @@ -83,7 +83,7 @@ func mustInitClusterMemberID() { if err != nil { logger.Fatalf("cannot parse -promscrape.cluster.memberNum=%q: %s", *clusterMemberNum, err) } - if n < 0 || n >= *clusterMembersCount { + if n < 0 || (*clusterMembersCount != 0 && n >= *clusterMembersCount) { logger.Fatalf("-promscrape.cluster.memberNum must be in the range [0..%d] according to -promscrape.cluster.membersCount=%d", *clusterMembersCount, *clusterMembersCount) }