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

Update monitoring-internal-collection.asciidoc (#19422) #19697

Merged
merged 1 commit into from
Jul 13, 2020

Conversation

ycombinator
Copy link
Contributor

@ycombinator ycombinator commented Jul 7, 2020

Forward ports a PR that was accidentally merged into 7.8 instead of master: #19422

the monitoring configuration shows an extra `ssl`.
for example, `monitoring.elasticsearch.ssl.certificate_authorities` should be right but now it looks like `monitoring.elasticsearch.ssl.ssl.certificate_authorities`.
this documentation was added since the version 7.5.
@ycombinator ycombinator added backport [zube]: In Review Team:Services (Deprecated) Label for the former Integrations-Services team labels Jul 7, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-services (Team:Services)

@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 Jul 7, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 7, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Branch indexing]

  • Start Time: 2020-07-13T09:42:30.128+0000

  • Duration: 25 min 7 sec

Copy link
Contributor

@dedemorton dedemorton left a comment

Choose a reason for hiding this comment

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

LGTM.

@ycombinator ycombinator merged commit ac89845 into elastic:master Jul 13, 2020
@ycombinator ycombinator deleted the fwd-port-19422 branch July 14, 2020 11:28
ycombinator added a commit to ycombinator/beats that referenced this pull request Jul 14, 2020
…ic#19697)

the monitoring configuration shows an extra `ssl`.
for example, `monitoring.elasticsearch.ssl.certificate_authorities` should be right but now it looks like `monitoring.elasticsearch.ssl.ssl.certificate_authorities`.
this documentation was added since the version 7.5.

Co-authored-by: uihyun <uihyun.kim@elastic.co>
v1v added a commit to v1v/beats that referenced this pull request Jul 14, 2020
* upstream/master: (25 commits)
  [Elastic Agent] Send checkin payload to Fleet (elastic#19857)
  [Ingest Manager] Fixed tests across agent elastic#19877
  [Ingest Manager] Fix serialization test  elastic#19876
  Fix service start type mapping in windows/service metricset (elastic#19551)
  ci: Change comment trigger detection method (elastic#19827)
  Add 21 autogenerated filesets from rsa2elk devices (elastic#19713)
  [Ingest Manager] Agent config cleanup (elastic#19848)
  libbeat/publisher/pipeline: fix data races (elastic#19821)
  Update monitoring-internal-collection.asciidoc (elastic#19422) (elastic#19697)
  [Elastic Agent] Trust exchange endpoint must bind to 127.0.0.1 (elastic#19861)
  Specify an ECS version in Auditbeat/Packetbeat/Winlogbeat (elastic#19159)
  Add azure billing metricset (elastic#19207)
  Add support for appinsights in the metricbeat azure module (elastic#18940)
  Add MySQL query metricset with lightweight module and SQL helper (elastic#18955)
  [Ingest Manager] Refuse invalid stream values in configuration (elastic#19587)
  Do not use vendor during integration tests (elastic#19839)
  LIBBEAT: Enhancement Convert dissected values from String to other basic data types and IP (elastic#18683)
  [Elastic Agent] Remove support for "logs" and only support logfile (elastic#19761)
  [CI] support windows-2012 (elastic#19773)
  Do not update go.mod during packaging and testing (elastic#19823)
  ...
ycombinator added a commit that referenced this pull request Jul 14, 2020
)

the monitoring configuration shows an extra `ssl`.
for example, `monitoring.elasticsearch.ssl.certificate_authorities` should be right but now it looks like `monitoring.elasticsearch.ssl.ssl.certificate_authorities`.
this documentation was added since the version 7.5.

Co-authored-by: uihyun <uihyun.kim@elastic.co>

Co-authored-by: uihyun <uihyun.kim@elastic.co>
@ycombinator
Copy link
Contributor Author

@dedemorton this typo fix was merged into master and backported to 7.x which, at the time of backport, pointed to 7.8. However, this typo exists in older versions as well. What is our policy on backporting such typo fixes to older versions?

@dedemorton
Copy link
Contributor

@ycombinator We typically only backport doc changes to versions that we are actively maintaining. So in this case, I would backport to 7.8, 7.9, 7.x, and 6.8...basically all the versions that show by default when you look at the version switcher in the docs.

melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
…ic#19697)

the monitoring configuration shows an extra `ssl`.
for example, `monitoring.elasticsearch.ssl.certificate_authorities` should be right but now it looks like `monitoring.elasticsearch.ssl.ssl.certificate_authorities`.
this documentation was added since the version 7.5.

Co-authored-by: uihyun <uihyun.kim@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Services (Deprecated) Label for the former Integrations-Services team [zube]: Done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants