fix: Region filter

AndreZiviani · Apr 5, 2023 · 21b136f · 21b136f
1 parent 2ec5613
commit 21b136f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/exporter/metrics.go b/exporter/metrics.go
@@ -63,6 +63,9 @@ func (m *Metrics) init(ctx context.Context, c *cli.Context) {
 		panic(err.Error())
 	}
 
+	if c.String("regions") != "all-regions" {
+		m.regions = strings.Split(c.String("regions"), ",")
+	}
 }
 
 func (m *Metrics) Describe(ch chan<- *prometheus.Desc) {

diff --git a/exporter/org.go b/exporter/org.go
@@ -19,6 +19,7 @@ func (m *Metrics) GetOrgEvents() []HealthEvent {
 					From: &m.lastScrape,
 					To:   &now,
 				},
+				Regions: m.regions,
 			},
 		})
 

diff --git a/exporter/single.go b/exporter/single.go
@@ -21,6 +21,7 @@ func (m *Metrics) GetEvents() []HealthEvent {
 						To:   &now,
 					},
 				},
+				Regions: m.regions,
 			},
 		})
 

diff --git a/exporter/types.go b/exporter/types.go
@@ -10,16 +10,18 @@ import (
 )
 
 type Metrics struct {
-	health              *health.Client
-	organizationEnabled bool
-	awsconfig           aws.Config
-	lastScrape          time.Time
+	health *health.Client
 
 	slackApi     *slack.Client
 	slackToken   string
 	slackChannel string
 
-	tz *time.Location
+	tz         *time.Location
+	lastScrape time.Time
+
+	awsconfig           aws.Config
+	organizationEnabled bool
+	regions             []string
 }
 
 type HealthEvent struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ func (m *Metrics) GetOrgEvents() []HealthEvent { @@
     					From: &m.lastScrape,
     					To:   &now,
     				},
+    				Regions: m.regions,
     			},
     		})
@@ Expand Down @@