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

#2048 - Support Elasticsearch ILM for managing jaeger indices #2796

Merged
merged 4 commits into from
Feb 15, 2021

Conversation

bhiravabhatla
Copy link
Contributor

@bhiravabhatla bhiravabhatla commented Feb 6, 2021

Signed-off-by: santosh bsantosh@thoughtworks.com

Which problem is this PR solving?

Short description of the changes

@bhiravabhatla
Copy link
Contributor Author

bhiravabhatla commented Feb 6, 2021

@albertteoh @yurishkuro

Old PRs for reference -
#2454
#2739

@codecov
Copy link

codecov bot commented Feb 6, 2021

Codecov Report

Merging #2796 (7bf1143) into master (061c669) will increase coverage by 0.03%.
The diff coverage is 97.67%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2796      +/-   ##
==========================================
+ Coverage   95.91%   95.94%   +0.03%     
==========================================
  Files         218      221       +3     
  Lines        9620     9693      +73     
==========================================
+ Hits         9227     9300      +73     
  Misses        324      324              
  Partials       69       69              
Impacted Files Coverage Δ
plugin/storage/es/factory.go 98.14% <94.28%> (-1.86%) ⬇️
cmd/esmapping-generator/app/flags.go 100.00% <100.00%> (ø)
cmd/esmapping-generator/app/renderer/render.go 100.00% <100.00%> (ø)
pkg/es/textTemplate.go 100.00% <100.00%> (ø)
plugin/storage/es/options.go 100.00% <100.00%> (ø)
plugin/storage/es/spanstore/writer.go 100.00% <100.00%> (ø)
cmd/query/app/server.go 97.08% <0.00%> (+1.45%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 061c669...7bf1143. Read the comment docs.

@yurishkuro
Copy link
Member

codecov is acting out again, but the report looks ok to merge: https://codecov.io/github/jaegertracing/jaeger/commit/49e6f871181214f3a29142c074660089692d8f9d

Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

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

lgtm, but I have some suggestions on refactoring for clarity/consistency

go.mod Outdated Show resolved Hide resolved
pkg/es/config/config.go Outdated Show resolved Hide resolved
pkg/es/textTemplate.go Outdated Show resolved Hide resolved
plugin/storage/es/factory.go Show resolved Hide resolved
cmd/templatizer/app/flags.go Outdated Show resolved Hide resolved
plugin/storage/es/spanstore/writer.go Outdated Show resolved Hide resolved
plugin/storage/es/spanstore/writer.go Show resolved Hide resolved
plugin/storage/integration/elasticsearch_test.go Outdated Show resolved Hide resolved
cmd/templatizer/app/flags.go Outdated Show resolved Hide resolved
cmd/templatizer/app/flags.go Outdated Show resolved Hide resolved
yurishkuro
yurishkuro previously approved these changes Feb 13, 2021
…dices

Signed-off-by: santosh <bsantosh@thoughtworks.com>
Signed-off-by: santosh <bsantosh@thoughtworks.com>
Signed-off-by: santosh <bsantosh@thoughtworks.com>
@bhiravabhatla
Copy link
Contributor Author

Rebased with master @yurishkuro - Kindly approve

@@ -232,6 +232,12 @@ func addFlags(flagSet *flag.FlagSet, nsConfig *namespaceConfig) {
"Use read and write aliases for indices. Use this option with Elasticsearch rollover "+
"API. It requires an external component to create aliases before startup and then performing its management. "+
"Note that "+nsConfig.namespace+suffixMaxSpanAge+" will influence trace search window start times.")
flagSet.Bool(
Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, that's fine @bhiravabhatla.

Signed-off-by: santosh <bsantosh@thoughtworks.com>
@bhiravabhatla
Copy link
Contributor Author

@yurishkuro Can we merge this PR to master - so that I can take rebase and create a new branch to work on for followup PRs.

#2813
#2814

@yurishkuro yurishkuro merged commit bf1cb8a into jaegertracing:master Feb 15, 2021
@yurishkuro
Copy link
Member

done

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.

Support for Elasticsearch ILM policies
5 participants