Merge pull request #12816 from slashpai/lightsail

LIGHTSAIL SD: Validate HTTP config
pull/12820/head
Julien Pivotto 3 years ago committed by GitHub
commit d659e672f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      config/config_test.go
  2. 6
      config/testdata/lightsail_token_file.bad.yml
  3. 2
      discovery/aws/lightsail.go

@ -1749,6 +1749,10 @@ var expectedErrors = []struct {
filename: "ec2_token_file.bad.yml",
errMsg: `at most one of bearer_token & bearer_token_file must be configured`,
},
{
filename: "lightsail_token_file.bad.yml",
errMsg: `at most one of bearer_token & bearer_token_file must be configured`,
},
{
filename: "section_key_dup.bad.yml",
errMsg: "field scrape_configs already set in type config.plain",

@ -0,0 +1,6 @@
scrape_configs:
- job_name: foo
lightsail_sd_configs:
- region: us-east-1
bearer_token: foo
bearer_token_file: foo

@ -109,7 +109,7 @@ func (c *LightsailSDConfig) UnmarshalYAML(unmarshal func(interface{}) error) err
}
c.Region = region
}
return nil
return c.HTTPClientConfig.Validate()
}
// LightsailDiscovery periodically performs Lightsail-SD requests. It implements

Loading…
Cancel
Save