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 output.elasticsearch.proxy_disable flag #27671

Merged
merged 2 commits into from
Sep 2, 2021

Conversation

michel-laterman
Copy link
Contributor

What does this PR do?

Rename the output.elasticsearch.proxy_disabled flag to proxy_disable as
that is what the flag appears as under all other settings including
fleet.

Why is it important?

fleet-server expects the setting to be named proxy_disable

Checklist

  • My code follows the style guidelines of this project
  • [] ~~I have commented my code, particularly in hard-to-understand areas
  • [] ~~I have made corresponding changes to the documentation
  • [] I have made corresponding change to the default configuration files
  • [] I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

Rename the output.elasticsearch.proxy_disabled flag to proxy_disable as
that is what the flag appears as under all other settings including
fleet.
@michel-laterman michel-laterman added bug Team:Elastic-Agent Label for the Agent team backport-v7.14.0 Automated backport with mergify v7.16.0 backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify labels Aug 31, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Aug 31, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 31, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-09-01T02:34:27.695+0000

  • Duration: 79 min 19 sec

  • Commit: 74b8ecc

Test stats 🧪

Test Results
Failed 0
Passed 7028
Skipped 16
Total 7044

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 7028
Skipped 16
Total 7044

@michel-laterman
Copy link
Contributor Author

/test

Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Looks good.

@michel-laterman
Copy link
Contributor Author

/test

@ruflin
Copy link
Member

ruflin commented Sep 1, 2021

Shouldn't we do it the other way around and rename what is used in fleet-server?

@michel-laterman
Copy link
Contributor Author

@ruflin libbeat/common/transport/httpcommon/proxy.go also has it as proxy_disable (it appears directly under the fleet.yml config) so I believe that it's better to fix the agent code as it effects less components

@EricDavisX
Copy link
Contributor

7.14.1 is shipped, so it will be included in 7.14.2 (if and when that ships)
7.15 should pick this up but don't know if it will be BC4 or 5 until it is merged

@ruflin
Copy link
Member

ruflin commented Sep 2, 2021

@michel-laterman SGTM

@michel-laterman michel-laterman merged commit 0c9e194 into elastic:master Sep 2, 2021
@michel-laterman michel-laterman deleted the fix-proxy-disable branch September 2, 2021 15:29
mergify bot pushed a commit that referenced this pull request Sep 2, 2021
* Fix output.elasticsearch.proxy_disable flag

Rename the output.elasticsearch.proxy_disabled flag to proxy_disable as
that is what the flag appears as under all other settings including
fleet.

* Add pr number to CHANGELOG

(cherry picked from commit 0c9e194)
mergify bot pushed a commit that referenced this pull request Sep 2, 2021
* Fix output.elasticsearch.proxy_disable flag

Rename the output.elasticsearch.proxy_disabled flag to proxy_disable as
that is what the flag appears as under all other settings including
fleet.

* Add pr number to CHANGELOG

(cherry picked from commit 0c9e194)
mergify bot pushed a commit that referenced this pull request Sep 2, 2021
* Fix output.elasticsearch.proxy_disable flag

Rename the output.elasticsearch.proxy_disabled flag to proxy_disable as
that is what the flag appears as under all other settings including
fleet.

* Add pr number to CHANGELOG

(cherry picked from commit 0c9e194)
michel-laterman added a commit that referenced this pull request Sep 3, 2021
…27710)

* Fix output.elasticsearch.proxy_disable flag (#27671)

* Fix output.elasticsearch.proxy_disable flag

Rename the output.elasticsearch.proxy_disabled flag to proxy_disable as
that is what the flag appears as under all other settings including
fleet.

* Add pr number to CHANGELOG

(cherry picked from commit 0c9e194)

* Fix CHANGELOG

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
Co-authored-by: michel-laterman <michel.laterman@elastic.co>
michel-laterman added a commit that referenced this pull request Sep 3, 2021
…27711)

* Fix output.elasticsearch.proxy_disable flag (#27671)

* Fix output.elasticsearch.proxy_disable flag

Rename the output.elasticsearch.proxy_disabled flag to proxy_disable as
that is what the flag appears as under all other settings including
fleet.

* Add pr number to CHANGELOG

(cherry picked from commit 0c9e194)

* Fix CHANGELOG

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
Co-authored-by: michel-laterman <michel.laterman@elastic.co>
michel-laterman added a commit that referenced this pull request Sep 3, 2021
…27709)

* Fix output.elasticsearch.proxy_disable flag (#27671)

* Fix output.elasticsearch.proxy_disable flag

Rename the output.elasticsearch.proxy_disabled flag to proxy_disable as
that is what the flag appears as under all other settings including
fleet.

* Add pr number to CHANGELOG

(cherry picked from commit 0c9e194)

* Fix CHANGELOG

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
Co-authored-by: michel-laterman <michel.laterman@elastic.co>
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
* Fix output.elasticsearch.proxy_disable flag

Rename the output.elasticsearch.proxy_disabled flag to proxy_disable as
that is what the flag appears as under all other settings including
fleet.

* Add pr number to CHANGELOG
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v7.14.0 Automated backport with mergify backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify bug Team:Elastic-Agent Label for the Agent team v7.16.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Elastic Agent proxy config typo
5 participants