fix: scrapeconfig level global tags on aws and azure scraper

flanksource · Jul 9, 2024 · 701d87d · 701d87d
1 parent c3189b0
commit 701d87d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/scrapers/aws/aws.go b/scrapers/aws/aws.go
@@ -1769,6 +1769,13 @@ func (aws Scraper) Scrape(ctx api.ScrapeContext) v1.ScrapeResults {
 				Value: lo.FromPtr(awsCtx.Caller.Account),
 			})
 
+			for _, t := range awsConfig.Tags {
+				(*results)[i].Tags = append((*results)[i].Tags, v1.Tag{
+					Name:  t.Name,
+					Value: t.Value,
+				})
+			}
+
 			delete((*results)[i].Labels, "name")
 			delete((*results)[i].Labels, "Name")
 		}

diff --git a/scrapers/azure/azure.go b/scrapers/azure/azure.go
@@ -173,6 +173,13 @@ func (azure Scraper) Scrape(ctx api.ScrapeContext) v1.ScrapeResults {
 				Value: azure.subscriptionName,
 			})
 
+			for _, t := range config.Tags {
+				results[i].Tags = append(results[i].Tags, v1.Tag{
+					Name:  t.Name,
+					Value: t.Value,
+				})
+			}
+
 			// Set parents where missing
 			for j, parent := range results[i].Parents {
 				if parent.ExternalID == "" {

diff --git a/scrapers/cron.go b/scrapers/cron.go
@@ -170,6 +170,10 @@ func scheduleScraperJob(sc api.ScrapeContext) error {
 		return fmt.Errorf("[%s] failed to schedule %v", j.Name, err)
 	}
 
+	if sc.Properties().On("scraper.kubernetes.watch.disable") {
+		return nil
+	}
+
 	for _, config := range sc.ScrapeConfig().Spec.Kubernetes {
 		if len(config.Watch) == 0 {
 			config.Watch = v1.DefaultWatchKinds