Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Allow self signed certificates to ScraperTarget #20047

Merged

Conversation

cmackenzie1
Copy link
Contributor

@cmackenzie1 cmackenzie1 commented Nov 16, 2020

Closes #20045

  • Adding a new optional field, allowInsecure with the default value of false to the API POST /api/v2/scrapers

  • Using the new allowInsecure field to the Gather() method

  • CHANGELOG.md updated with a link to the PR (not the Issue)
  • Well-formatted commit messages
  • Rebased/mergeable
  • Tests pass
  • http/swagger.yml updated (if modified Go structs or API)
  • Feature flagged (if modified API)
  • Documentation updated or issue created (provide link to issue/pr)
  • Signed CLA (if not already signed)

@cmackenzie1 cmackenzie1 force-pushed the scraper-self-signed-certificates branch from 202fbe4 to 80c04b2 Compare November 16, 2020 05:43
@cmackenzie1 cmackenzie1 requested a review from a team as a code owner November 16, 2020 05:43
@cmackenzie1 cmackenzie1 requested review from Palakp41 and removed request for a team November 16, 2020 05:43
@cmackenzie1 cmackenzie1 changed the title Allow self signed certificates to ScraperTarget fix: Allow self signed certificates to ScraperTarget Nov 16, 2020
CHANGELOG.md Outdated
@@ -5,6 +5,7 @@
1. [19987](https://github.com/influxdata/influxdb/pull/19987): Fix various typos. Thanks @kumakichi!
1. [19991](https://github.com/influxdata/influxdb/pull/19991): Use --skip-verify flag for backup/restore CLI command.
1. [19995](https://github.com/influxdata/influxdb/pull/19995): Don't auto-print help on influxd errors
1. [20047](https://github.com/influxdata/influxdb/pull/20047): Allow InsecureSkipVerify to be specified on ScraperTarget's
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: maybe Allow scraper to ignore insecure certificates on a target or

Suggested change
1. [20047](https://github.com/influxdata/influxdb/pull/20047): Allow InsecureSkipVerify to be specified on ScraperTarget's
1. [20047](https://github.com/influxdata/influxdb/pull/20047): Allow InsecureSkipVerify to be specified on a ScraperTarget

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

gather/prometheus.go Show resolved Hide resolved
@Palakp41 Palakp41 removed their request for review November 16, 2020 23:04
Copy link
Contributor

@glinton glinton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 very nice!

@danxmoran danxmoran self-assigned this Nov 17, 2020
@danxmoran
Copy link
Contributor

Thanks @cmackenzie1! I'll merge once the build goes green, it'll be included in our next release

@danxmoran danxmoran merged commit b337d42 into influxdata:2.0 Nov 17, 2020
danxmoran added a commit that referenced this pull request Nov 17, 2020
danxmoran added a commit that referenced this pull request Nov 17, 2020
danxmoran added a commit that referenced this pull request Nov 17, 2020
danxmoran added a commit that referenced this pull request Nov 17, 2020
danxmoran added a commit that referenced this pull request Nov 17, 2020
danxmoran added a commit that referenced this pull request Nov 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants