Add configuration for profiles to collect metrics from

grafana · May 16, 2024 · 219daa6 · 219daa6
1 parent 6e66137
commit 219daa6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cmd/exporter/config/config.go b/cmd/exporter/config/config.go
@@ -9,6 +9,7 @@ type Config struct {
 	ProjectID string
 	Providers struct {
 		AWS struct {
+			Profile  string
 			Profiles StringSliceFlag
 			Region   string
 			Services StringSliceFlag

diff --git a/cmd/exporter/exporter.go b/cmd/exporter/exporter.go
@@ -28,7 +28,8 @@ import (
 
 func providerFlags(fs *flag.FlagSet, cfg *config.Config) {
 	flag.StringVar(&cfg.Provider, "provider", "aws", "aws or gcp")
-	fs.Var(&cfg.Providers.AWS.Profiles, "aws.profile", "AWS profile(s).")
+	fs.StringVar(&cfg.Providers.AWS.Profile, "aws.profile", "", "AWS Profile to authenticate with.")
+	fs.Var(&cfg.Providers.AWS.Profiles, "aws.profiles", "AWS Profiles to collect resources from.")
 	// TODO: RENAME THIS TO JUST PROJECTS
 	fs.Var(&cfg.Providers.GCP.Projects, "gcp.bucket-projects", "GCP project(s).")
 	fs.Var(&cfg.Providers.AWS.Services, "aws.services", "AWS service(s).")
@@ -51,7 +52,8 @@ func selectProvider(cfg *config.Config) (provider.Provider, error) {
 	case "aws":
 		return aws.New(&aws.Config{
 			Region:         cfg.Providers.AWS.Region,
-			Profile:        cfg.Providers.AWS.Profiles.String(),
+			Profile:        cfg.Providers.AWS.Profile,
+			Profiles:       strings.Split(cfg.Providers.AWS.Profiles.String(), ","),
 			ScrapeInterval: cfg.Collector.ScrapeInterval,
 			Services:       strings.Split(cfg.Providers.AWS.Services.String(), ","),
 		})

diff --git a/pkg/aws/aws.go b/pkg/aws/aws.go
@@ -20,6 +20,7 @@ type Config struct {
 	Services       []string
 	Region         string
 	Profile        string
+	Profiles       []string
 	ScrapeInterval time.Duration
 }