Skip to content

Do not add date to index if @meta.index is set#29775

Merged
kvch merged 2 commits intoelastic:masterfrom
kvch:fix-libbeat-remove-leftover-iml-index-selection
Jan 11, 2022
Merged

Do not add date to index if @meta.index is set#29775
kvch merged 2 commits intoelastic:masterfrom
kvch:fix-libbeat-remove-leftover-iml-index-selection

Conversation

@kvch
Copy link
Copy Markdown
Contributor

@kvch kvch commented Jan 10, 2022

What does this PR do?

When @meta.index is set, Beats no longer concatenates datetime to the end of the index name. Adding the extra suffix is not needed because data streams take care of index naming and maintenance for us.

Why is it important?

This change was missing from the original PR. This will probably fix the issue in Stack Monitoring.

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

Closes #29657

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 10, 2022
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jan 10, 2022

This pull request does not have a backport label. Could you fix it @kvch? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Jan 10, 2022
@kvch kvch requested a review from sayden January 10, 2022 12:37
@kvch kvch added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jan 10, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 10, 2022
@kvch kvch added backport-v8.0.0 Automated backport with mergify needs_team Indicates that the issue/PR needs a Team:* label labels Jan 10, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 10, 2022
@botelastic
Copy link
Copy Markdown

botelastic bot commented Jan 10, 2022

This pull request doesn't have a Team:<team> label.

@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Jan 10, 2022
@kvch kvch changed the title Do not add datetime to index if @meta.index is set Do not add date to index if @meta.index is set Jan 10, 2022
@stuartnelson3
Copy link
Copy Markdown
Contributor

confirmed:

image

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jan 10, 2022

💚 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: 2022-01-10T17:01:05.155+0000

  • Duration: 108 min 22 sec

  • Commit: db9fecd

Test stats 🧪

Test Results
Failed 0
Passed 47839
Skipped 4284
Total 52123

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@kvch
Copy link
Copy Markdown
Contributor Author

kvch commented Jan 10, 2022

Failing tests are unrelated.

@kvch kvch merged commit ed62d2e into elastic:master Jan 11, 2022
mergify bot pushed a commit that referenced this pull request Jan 11, 2022
kvch added a commit that referenced this pull request Jan 11, 2022
(cherry picked from commit ed62d2e)

Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com>
@jasonrhodes
Copy link
Copy Markdown
Member

Thank you for taking care of this @kvch !

v1v added a commit to v1v/beats that referenced this pull request Jan 12, 2022
…b-for-macos

* upstream/master: (172 commits)
  [Elastic Agent] Fix issue with ensureServiceToken. (elastic#29800)
  [Winlogbeat] Add provider name to Security routing pipeline check (elastic#29781)
  Add summary to journeys which don't emit journey:end (early node subprocess exits) (elastic#29606)
  Prepare 8.0.0-rc1 changelog (elastic#29795) (elastic#29806)
  Change docker image from CentOS 7 to Ubuntu 20.04 (elastic#29681)
  libbeat/processors/add_process_metadata: implement a process cache eviction policy (elastic#29717)
  [Automation] Update elastic stack version to 8.1.0-7004acda for testing (elastic#29783)
  Missing changelog entry for elastic#29773 (elastic#29791)
  Add a readme for k8s autodiscover provider (elastic#28213)
  Remove overriding of index pattern on the Kubernetes overview dashboard (elastic#29676)
  jjbb: remove obsoleted branches (<7.16) (elastic#29707)
  Add k8s metadata in state_cronjob metricset (elastic#29572)
  ibmmq: Fix timestamp parsing (elastic#29773)
  Do not add date to index if `@meta.index` is set (elastic#29775)
  ci: uses aliases for the branches (elastic#29706)
  Filebeat tests: Restore `@timestamp` field validation (elastic#29772)
  Forward port 7.16.3 changelog to master (elastic#29777)
  auditd: Store program arguments in process.args array (elastic#29601)
  System/socket: Support kernel_clone() replacement for _do_fork() (elastic#29744)
  Do not mention removal if version is not specified in `cfgwarn` messages (elastic#29727)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-v8.0.0 Automated backport with mergify Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[metricbeat] beats xpack module creates a single datastream per service monitored

5 participants