Reconcile duplicated attributes #10956
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dedemorton
added
docs
review
needs_backport
bmorelli25
reviewed
Feb 27, 2019
cachedout
approved these changes
Feb 28, 2019
dedemorton
added a commit
to dedemorton/beats
that referenced
this pull request
Mar 22, 2019
* Replace libbeat with beats-ref * Replace metricbeat with metricbeat-ref * Replace filebeat with filebeat-ref * Replace auditbeat with auditbeat-ref * Replace logstashdoc with logstash-ref * Replace elasticsearch with ref * Replace elasticsearch-plugins with plugins * Replace securitydoc with stack-ov * Replace monitoringdoc with stack-ov * Remove unused attributes * Replace doc-branch with branch
dedemorton
added a commit
that referenced
this pull request
Mar 22, 2019
* Reconcile duplicated attributes (#10956) * Replace libbeat with beats-ref * Replace metricbeat with metricbeat-ref * Replace filebeat with filebeat-ref * Replace auditbeat with auditbeat-ref * Replace logstashdoc with logstash-ref * Replace elasticsearch with ref * Replace elasticsearch-plugins with plugins * Replace securitydoc with stack-ov * Replace monitoringdoc with stack-ov * Remove unused attributes * Replace doc-branch with branch * Replace remaining attributes * Run make update
dedemorton
added a commit
to dedemorton/beats
that referenced
this pull request
Mar 22, 2019
* Replace libbeat with beats-ref * Replace metricbeat with metricbeat-ref * Replace filebeat with filebeat-ref * Replace auditbeat with auditbeat-ref * Replace logstashdoc with logstash-ref * Replace elasticsearch with ref * Replace elasticsearch-plugins with plugins * Replace securitydoc with stack-ov * Replace monitoringdoc with stack-ov * Remove unused attributes * Replace doc-branch with branch
dedemorton
added a commit
that referenced
this pull request
Mar 22, 2019
* Reconcile duplicated attributes (#10956) * Replace libbeat with beats-ref * Replace metricbeat with metricbeat-ref * Replace filebeat with filebeat-ref * Replace auditbeat with auditbeat-ref * Replace logstashdoc with logstash-ref * Replace elasticsearch with ref * Replace elasticsearch-plugins with plugins * Replace securitydoc with stack-ov * Replace monitoringdoc with stack-ov * Remove unused attributes * Replace doc-branch with branch * Replace remaining attributes
dedemorton
added a commit
to dedemorton/beats
that referenced
this pull request
Mar 22, 2019
* Replace libbeat with beats-ref * Replace metricbeat with metricbeat-ref * Replace filebeat with filebeat-ref * Replace auditbeat with auditbeat-ref * Replace logstashdoc with logstash-ref * Replace elasticsearch with ref * Replace elasticsearch-plugins with plugins * Replace securitydoc with stack-ov * Replace monitoringdoc with stack-ov * Remove unused attributes * Replace doc-branch with branch
dedemorton
removed
the
needs_backport
dedemorton
added a commit
that referenced
this pull request
Mar 22, 2019
* Replace libbeat with beats-ref * Replace metricbeat with metricbeat-ref * Replace filebeat with filebeat-ref * Replace auditbeat with auditbeat-ref * Replace logstashdoc with logstash-ref * Replace elasticsearch with ref * Replace elasticsearch-plugins with plugins * Replace securitydoc with stack-ov * Replace monitoringdoc with stack-ov * Remove unused attributes * Replace doc-branch with branch
DStape
pushed a commit
to DStape/beats
that referenced
this pull request
Aug 20, 2019
* Replace libbeat with beats-ref * Replace metricbeat with metricbeat-ref * Replace filebeat with filebeat-ref * Replace auditbeat with auditbeat-ref * Replace logstashdoc with logstash-ref * Replace elasticsearch with ref * Replace elasticsearch-plugins with plugins * Replace securitydoc with stack-ov * Replace monitoringdoc with stack-ov * Remove unused attributes * Replace doc-branch with branch
DStape
pushed a commit
to DStape/beats
that referenced
this pull request
Aug 20, 2019
* Reconcile duplicated attributes (elastic#10956) * Replace libbeat with beats-ref * Replace metricbeat with metricbeat-ref * Replace filebeat with filebeat-ref * Replace auditbeat with auditbeat-ref * Replace logstashdoc with logstash-ref * Replace elasticsearch with ref * Replace elasticsearch-plugins with plugins * Replace securitydoc with stack-ov * Replace monitoringdoc with stack-ov * Remove unused attributes * Replace doc-branch with branch * Replace remaining attributes
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
* Reconcile duplicated attributes (elastic#10956) * Replace libbeat with beats-ref * Replace metricbeat with metricbeat-ref * Replace filebeat with filebeat-ref * Replace auditbeat with auditbeat-ref * Replace logstashdoc with logstash-ref * Replace elasticsearch with ref * Replace elasticsearch-plugins with plugins * Replace securitydoc with stack-ov * Replace monitoringdoc with stack-ov * Remove unused attributes * Replace doc-branch with branch * Replace remaining attributes * Run make update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes issue #6144 by removing attributes that duplicate attributes defined here.
Note that I've changed all paths to use
branchinstead ofdoc-branchto be consistent with the shared attributes file. However, I have not removeddoc-branchfrom version.asciidoc because the attribute is used bymake docs.I've also removed attributes that are not used anywhere.
@bmorelli25 Please confirm that APM does not use any of the attributes that I've removed.