Merge cockroachdb#124598

124598: roachprod: condition to support cockroach-ephemeral r=herkolategan a=nameisbhaskar only the clusters in cockroach-ephemeral should be selected for scrapping. So, adding a condition for the same. Fixes: cockroachdb#124319 Epic: none Co-authored-by: Bhaskarjyoti Bora <[email protected]>
pav-kv · May 28, 2024 · 46b6fab · 46b6fab
2 parents 0ea8b62 + d6728f3
commit 46b6fab
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/roachprod/roachprod.go b/pkg/roachprod/roachprod.go
@@ -67,6 +67,9 @@ const (
 	prometheusHostUrlEnv = "COCKROACH_PROM_HOST_URL"
 )
 
+// supportedPromProjects are the projects supported for prometheus target
+var supportedPromProjects = map[string]struct{}{gce.DefaultProject(): {}}
+
 // MalformedClusterNameError is returned when the cluster name passed to Create is invalid.
 type MalformedClusterNameError struct {
 	name        string
@@ -798,7 +801,7 @@ func updatePrometheusTargets(ctx context.Context, l *logger.Logger, c *install.S
 	nodeIPPortsMutex := syncutil.RWMutex{}
 	var wg sync.WaitGroup
 	for _, node := range c.Nodes {
-		if c.VMs[node-1].Provider == gce.ProviderName {
+		if _, ok := supportedPromProjects[c.VMs[node-1].Project]; ok && c.VMs[node-1].Provider == gce.ProviderName {
 			wg.Add(1)
 			go func(index int, v vm.VM) {
 				defer wg.Done()