-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Add support for Elasticsearch ILM Polices #2454
Conversation
Signed-off-by: santosh <bsantosh@thoughtworks.com>
My bad, dint run integration tests locally. Looks like tests are failing because of ES version. is_write_index is supported in ES 6.4+. Would need some help in fixing tests, as I am new to golang |
"index.mapping.nested_fields.limit": 50, | ||
"index.requests.cache.enable": true, | ||
"lifecycle": { | ||
"name": "jaeger", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't want to add a new set of index templates.
Could we instead add the lifecycle
configuration to our existing index templates?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pavolloffay - I tried that initially, When jaeger comes up, it is also trying to create the index templates ( even with --es.use-alias enabled) and if the template name is same - it is overriding it. Hence had to use new set of templates with higher priority (order = 1).
Ideally, if --es-use-alias is enabled - I believe template creation should also be left to external component (esRollover) along with alias creation. There might be a valid reason why it is not - I am not sure.
Right now, both jaeger and esRollover try to create the templates. As Jaeger starts after esRollover is run, its overriding the templates created by esRollover.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Even if the templates are overridden it should not be an issue since the definition does not change it just references the name of ILM.
--es.create-index-templates
can be used to disable template creation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lifecycle or ILM is inside settings of index template -
"settings": {
"index.number_of_shards": ${__NUMBER_OF_SHARDS__},
"index.number_of_replicas": ${__NUMBER_OF_REPLICAS__},
"index.mapping.nested_fields.limit": 50,
"index.requests.cache.enable": true,
"lifecycle": {
"name": "jaeger",
"rollover_alias": "${__INDEX_WRITE_ALIAS__}"
}
Default template has settings without lifecycle. Hence when we start jaeger - it overrides the settings of the template ( unless --es.create-index-templates is used to disable it). That means we are saying user has to use --es.use-alias with --es.create-index-templates always - if ILM is needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I get it now, I want to avoid having multiple variations of the index templates.
Can be the lifecycle be configured but a PUT (change) request?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I get it now, I want to avoid having multiple variations of the index templates.
Yes - completely agree. Ideal thing would be to disable creation of templates from jaeger end whenever we have --es.use-aliases.
Can be the lifecycle be configured but a PUT (change) request?
Unfortunately we have to run init before starting jaeger. And index-templates must be created before 1st index is created. So, right now, I see no way but to have another set of templates for ILM with different name and higher order - so that when index templates are applied - ILM template takes precedence.
Either this or we somehow mandate to always use --es.use-alias with --es.create-index-templates set to false.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideal thing would be to disable creation of templates from jaeger end whenever we have --es.use-aliases
@pavolloffay, I think I know why this was not done. As of now, If we enable use-aliases and start jaeger with out running esRollover init first --> Jaeger is creating the default index templates and two initial indices with names jaeger-span-write & jaeger-span-read, so that it would continue to work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pavolloffay - As suggested - changes made to code to avoid using multiple variations of index templates. Please go through the latest commit
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pavolloffay Any feedback on this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pavolloffay / @jaegertracing/elasticsearch - Let me know, if you have any thoughts on the approach
…efixes Signed-off-by: santosh <bsantosh@thoughtworks.com>
…id creating new templates in repo. Signed-off-by: santosh <bsantosh@thoughtworks.com>
…g argument Signed-off-by: santosh <bsantosh@thoughtworks.com>
Any update on this? |
Yes. I updated the code to use single variation of index template. I am waiting for feedback on the same. |
Any update? Can this be merged? Does jaeger-operator support ILM? |
@albertteoh I think you folks run Jaeger with ES, would you like to take a look? |
Sure thing @yurishkuro, I can take a look at it tomorrow. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bhiravabhatla, sorry I took some time to get back to you; all of this is quite new to me, so I had to invest some time learning and trying stuff out.
Thanks for providing your repo, it helped me understand what you're trying to achieve and allowed me to see it working locally; and it works well by the way. 👍
I also tested the original non-ILM behaviour with rollover
and that seems to be working as expected too.
One thing I noticed though is that, before this PR, there would be a single write alias per index alias like:
jaeger-service-read jaeger-service-000001 - - - -
jaeger-service-read jaeger-service-000002 - - - -
jaeger-service-write jaeger-service-000002 - - - -
jaeger-span-read jaeger-span-000002 - - - -
jaeger-span-write jaeger-span-000002 - - - -
jaeger-span-read jaeger-span-000001 - - - -
When I query on jaeger-span-write
, it only returns data from jaeger-span-000002
.
With this change, I noticed every index has a write alias, but only one has the is_write_index
set to true, which makes sense:
jaeger-span-write jaeger-span-000002 - - - false
jaeger-span-write jaeger-span-000001 - - - false
jaeger-span-write jaeger-span-000004 - - - true
jaeger-span-write jaeger-span-000003 - - - false
When I query on jaeger-span-write
, it returns data from all indices, which also makes sense; however, this means behaviour has changed because previously, it would only return data from a single index, the one which is being written to. Is this expected behaviour when using the is_write_index
setting? I don't expect users to be querying from the write index anyway, as they should be using the read index, but was just curious.
Either this or we somehow mandate to always use --es.use-alias with --es.create-index-templates set to false.
As you noted, without --es.create-index-templates
, the collector will create an additional template:
jaeger-span-with-ilm [jaeger-span-*] 1
jaeger-service-with-ilm [jaeger-service-*] 1
jaeger-span [*jaeger-span-*] 0
jaeger-service [*jaeger-service-*] 0
However, those with higher order (larger number) will be merged and overwrites overlapping attributes from lower order templates.
Given that, why is there a need to mandate the use of --es.create-index-templates
along with --es.use-alias
?
@albertteoh Thanks you for taking time out to go through the PR. Let me try and answer your questions
Yes you are correct, it not mandatory. As I mentioned in one of the comments above - #2454 (comment) , I made changes to create templates with different name to not clash with default templates created by default by jaeger on startup. But to be clean, I would suggest to add it in documentation to preferably disable creating templates when using aliases.
As we use ILM rollover, ILM assigns this alias(rollover alias) to subsequent indexes - so all the indexes would end up having this alias. I dont foresee any issue with this from Jaeger point of view, as at a single point of time, we would have only one index having "is_write_index" set to true. |
…line param Signed-off-by: santosh <bsantosh@thoughtworks.com>
Signed-off-by: santosh <bsantosh@thoughtworks.com>
Signed-off-by: santosh <bsantosh@thoughtworks.com>
Codecov Report
@@ Coverage Diff @@
## master #2454 +/- ##
==========================================
- Coverage 95.83% 95.81% -0.03%
==========================================
Files 217 220 +3
Lines 9656 9744 +88
==========================================
+ Hits 9254 9336 +82
- Misses 331 334 +3
- Partials 71 74 +3
Continue to review full report at Codecov.
|
… parameter from jaeger config. Signed-off-by: santosh <bsantosh@thoughtworks.com>
Signed-off-by: santosh <bsantosh@thoughtworks.com>
plugin/storage/es/factory.go
Outdated
if esPrefix != "" { | ||
esPrefix += "-" | ||
} | ||
fixedMapping, _ := t.Execute(pongo2.Context{"NumberOfShards": shards, "NumberOfReplicas": replicas, "ESPrefix": esPrefix, "UseILM": false, "Order": 1}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we'll need to add a .use-ilm
config in plugin/storage/es/options.go
and pass it into "UseILM"
instead of the hard-coded false
.
Please also add ILM-enabled usage instructions to https://github.com/jaegertracing/jaeger/blob/master/plugin/storage/es/README.md.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@albertteoh - I did add the flag (useILM) to collector in initial commits and then reverted it. My thought process behind it below:
- If we do have a flag to enable UseILM in jaeger collector - we have to add a check if its being used along with --use-aliases or not. Because without aliases - there is no use of enabling ILM and it might need lead to confusion.
- If you think about it, the actual support for ILM (creation of initial indices, aliases ) is done by rollover.py. It makes no difference if have the flag at collector or not.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we have to add a check if its being used along with --use-aliases or not
I thought this should be a fairly easy and cheap check, though maybe I'm wrong?
If you think about it, the actual support for ILM (creation of initial indices, aliases ) is done by rollover.py. It makes no difference if have the flag at collector or not.
Consider these two scenarios where I think supporting use-ilm
in jaeger-collector would be useful:
- On-boarding to ILM from manual rollovers (
init
with ILM disabled, but start jaeger-collector with ILM enabled), which simply involves a single manual rollover to pickup the ILM-enabled template. - Off-boarding from ILM to manual rollovers (see Add support for Elasticsearch ILM Polices #2454 (comment)).
Further, I think it would reduce confusion for developers, who see that UseILM = false
in jaeger-collector, yet wonder why ILM is working; as what happened to me when reviewing this PR :).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep - I see your point 👍 . Let me revert my commits which actually added support for this flag along with tests and push. Would work on this during weekend.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added UseILM flag to es storage config and updated corresponding tests. Kindly check @albertteoh
plugin/storage/es/esRollover.py
Outdated
create_index_template(fix_mapping(mapping, shards, replicas), template_name) | ||
use_ilm = False | ||
create_index_template(fix_mapping(mapping, shards, replicas, prefix, use_ilm), | ||
prefix+template_name+"-override-template") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is the -override-template
necessary here? It seems to add another template matching the same index pattern; but the only difference is the order
; which seems unnecessary to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@albertteoh - Kept this because, as of now if some one wants to override replicas/shards - the only way they could do is with esRollover script (passing different Shard and Replica counts). By default, I guess counts are hard coded.
jaeger/plugin/storage/es/factory.go
Line 216 in 0b43839
mapping = strings.Replace(mapping, "${__NUMBER_OF_SHARDS__}", strconv.FormatInt(shards, 10), 1) |
jaeger/plugin/storage/es/factory.go
Line 217 in 0b43839
mapping = strings.Replace(mapping, "${__NUMBER_OF_REPLICAS__}", strconv.FormatInt(replicas, 10), 1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we dont have -override-template suffixed to the index template name. When jaeger comes up, if --es.create-index-templates is not set to false, it would overwrite the template created by rollover script (which is always run before jaeger is brought up) - as the name of index template would be same.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Kept this because, as of now if some one wants to override replicas/shards - the only way they could do is with esRollover script (passing different Shard and Replica counts).
Yup, this is a use case which I hadn't considered. However, if we do want to give users ability to override the shard and replica counts (presumably via the jaeger-collector), shouldn't Order
be set to 0
? From my own tests, because order for -override-template
is 2
, my jaeger-collector shard and replica settings (which have order = 1
) don't take effect because they are overridden by the esRollover script's -override-template
. Recall the templates are merged/applied in the order: 0 -> 1 -> 2 -> .... They are additively applied and the larger order
is preferred on conflict/overlapping configuration.
If we dont have -override-template suffixed to the index template name. When jaeger comes up, if --es.create-index-templates is not set to false, it would overwrite the template created by rollover script
Yes, you're right. Is this necessarily a bad thing though? From what I understand, the trade-offs of overwriting the template created by esRollover script are:
Pros:
- Reduces the number of overlapping templates:
- Simplifies the development & debugging process; there isn't a need to mentally merge two similar templates nor a need to understand how ordering works with ES templates.
- Avoids potential bugs from overlapping json elements that were not considered.
- Removes the need to manage ordering, which in turn, can avoid potential bugs if users decide to create their own templates matching the same jaeger indices, but with the wrong order. This also simplifies the code, removing the need to manage template
order
ing. - Provides the ability to easily "off-board" from ILM, if users wish to customise management of index rollovers because templates are additively applied when overlapping with another template.
- Consider the scenario where a user creates indices against an ILM-enabled template. They then decide to revert to manual rollovers (perhaps to have finer-grain control on index management). However, they cannot disable ILM, even when setting
ES_USE_ILM=false
in jaeger-collector, because the base template contains thelifecycle
setting and can't be removed through overriding templates.
- Consider the scenario where a user creates indices against an ILM-enabled template. They then decide to revert to manual rollovers (perhaps to have finer-grain control on index management). However, they cannot disable ILM, even when setting
Cons:
- Overwriting means we will lose history of the original template and when it was replaced.
- The base template may have index configurations that users may want and overwriting will remove these.
- Addressable by installing the custom template and running jaeger-collector with
--es.create-index-templates
, as suggested in: Revert "Fix failing kafka integration test" #1077.
- Addressable by installing the custom template and running jaeger-collector with
To me, the benefits of simplicity, maintainability and the ability to transition from ILM to manual rollovers outweigh the costs, though perhaps my understanding is incorrect. Let me know what you think.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
However, if we do want to give users ability to override the shard and replica counts (presumably via the jaeger-collector)
As of now there is no way to override the shard and replica counts from collector. Its always hardcoded to 10. Only way to achieve it is via override template in esRollover. And the ordering works as you explained. So, only way to customize shards/replicas as of now is to give higher order to templates getting created from esRollover or have additional flags in collector to customize the counts. Not sure if I am missing something
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And I agree with your points on ease of maintenance/on-boarding and off-boarding. Also I see esRollover script is trying to solve multiple problems. If you agree, we can have a separate issue created to add support for customizing replicas and shards from collector flags and then we can jus use esRollover for manual rollover and creation of initial aliases/indices
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As of now there is no way to override the shard and replica counts from collector.
I can see it's possible and was able to override shard counts in my template via the collector:
$ SPAN_STORAGE_TYPE=elasticsearch ES_NUM_SHARDS=3 go run ./cmd/collector/main.go
Help docs:
$ SPAN_STORAGE_TYPE=elasticsearch go run ./cmd/collector/main.go --help
...
--es.num-replicas int The number of replicas per index in Elasticsearch (default 1)
--es.num-shards int The number of shards per index in Elasticsearch (default 5)
...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I missed this then. My bad.
I see it now -
spanMapping, serviceMapping := GetSpanServiceMappings(cfg.GetNumShards(), cfg.GetNumReplicas(), client.GetVersion(), cfg.GetIndexPrefix())
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will push the changes removing the suffix in template name and order in the template.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Implemented above feedback @albertteoh
@@ -1,10 +1,22 @@ | |||
{ | |||
"index_patterns": "*jaeger-service-*", | |||
"index_patterns": "{{ ESPrefix }}jaeger-service-*", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The "elasticsearch 7.x" tests are failing because of this line. "*{{ ESPrefix }}jaeger-service-*"
should fix it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed the tests
@@ -1,10 +1,22 @@ | |||
{ | |||
"index_patterns": "*jaeger-span-*", | |||
"index_patterns": "{{ ESPrefix }}jaeger-span-*", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as above: "*{{ ESPrefix }}jaeger-span-*"
should fix it.
@albertteoh Forgot to mention one more usecase - Two Jaeger Installations ( mostly belonging to two environments - e.g. uat dev ) using same elasticsearch backend. create_index_template(fix_mapping(mapping, shards, replicas, prefix, use_ilm),
prefix + template_name) Now that we decided not to have multiple templates and not to use order - we should do the same thing while creating index templates in Here -
and here -
I propose we change it to - func (s *SpanWriter) CreateTemplates(spanTemplate, serviceTemplate, indexPrefix string) error {
if indexPrefix != "" {
indexPrefix += "-"
}
_, err := s.client.CreateTemplate(indexPrefix+"jaeger-span").Body(spanTemplate).Do(context.Background())
if err != nil {
return err
}
_, err = s.client.CreateTemplate(indexPrefix+"jaeger-service").Body(serviceTemplate).Do(context.Background())
if err != nil {
return err
}
return nil
} |
Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: Chen Zhengwei <chenzhengwei@inspur.com>
* Fix flaky TestHotReloadUIConfigTempFile Signed-off-by: albertteoh <albert.teoh@logz.io> * Address codecov warnings Signed-off-by: albertteoh <albert.teoh@logz.io> * make fmt Signed-off-by: albertteoh <albert.teoh@logz.io> * Address lint err: missing test file Signed-off-by: albertteoh <albert.teoh@logz.io> * Move to pkg/fswatcher, address other comments Signed-off-by: albertteoh <albert.teoh@logz.io> * Avoid failing hard when init watch() Signed-off-by: albertteoh <albert.teoh@logz.io> * Test Errors chan and validate error logs Signed-off-by: albertteoh <albert.teoh@logz.io>
) * [pkg/queue] Add `StartConsumersWithFactory` function This provides a way to keep state for each consumer of a bounded queue, which is useful in certain performance-critical setups. Fixes jaegertracing#2685. Signed-off-by: Pablo Baeyens <pablo.baeyens@datadoghq.com> * Refactor bounded queue tests to extract common parts The common part with the assertions was moved to a new `checkQueue` function that is used by `TestBoundedQueue` and `TestBoundedQueueWithFactory`. Signed-off-by: Pablo Baeyens <pablo.baeyens@datadoghq.com> * Use http.HandlerFunc pattern for getting a Consumer from a callback Signed-off-by: Pablo Baeyens <pablo.baeyens@datadoghq.com> * Address review comment about unit tests Refactor unit tests using a `helper` function that takes a function to start consumers. Signed-off-by: Pablo Baeyens <pablo.baeyens@datadoghq.com>
…usters (jaegertracing#2720) * Copy spans from memory store, fixes jaegertracing#2719 Copying allows spans to be freely modified by adjusters and any other code without accidentally altering what is stored in the in-memory store itself. Signed-off-by: Ivan Babrou <github@ivan.computer> * Add tests to exercise the broken serialization path Signed-off-by: Ivan Babrou <github@ivan.computer>
…ing#2721) Signed-off-by: Pierre De Paepe <pierre.de-paepe@ovhcloud.com> Co-authored-by: Pierre De Paepe <pierre.de-paepe@ovhcloud.com>
…ectors (jaegertracing#2657) * add metrics that show agent connection collector status Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * update comment Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * exec make fmt Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * simplify function and add testing relevant code in the builder_test.go Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * add comment in connect_metrics.go Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * simplify code and changed use expvar to show target Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * simplify code and changed use expvar to show target Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * exec make fmt Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Fix collector panic due to sarama sdk returning nil error (jaegertracing#2654) Signed-off-by: luhualin <luhualin@bilibili.com> Co-authored-by: luhualin <luhualin@bilibili.com> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Fix flaky tbuffered server test (jaegertracing#2635) * Fix flaky tbuffered server test Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu> * Apply suggestions from code review - more readable comments Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu> Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Add github actions for integration tests (jaegertracing#2649) * Add github action for jaeger integration tests Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> * Create separate workflow for each integration test Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> * Feedbacks changes Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Clean-up GH action names (jaegertracing#2661) Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Fix for failures in badger integration tests (jaegertracing#2660) Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Add protogen validation test (jaegertracing#2662) Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Add github action for jaeger all-in-one image (jaegertracing#2663) * Add github action for jaeger all-in-one image Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> * Feedbacks changes Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> * Feedbacks changes Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> * Feedbacks changes Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> * Feedbacks changes Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> * Feedbacks changes Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> * Make steps self-explantory Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> * Fix git tags issue Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> * Fix ES integration test Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Update comment that looks confusing during builds Signed-off-by: Yuri Shkuro <github@ysh.us> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Use GitHub actions based build badges Signed-off-by: Yuri Shkuro <github@ysh.us> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Fix and minor improvements to all-in-one github action (jaegertracing#2667) Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Fix docker login issue with all-in-one build (jaegertracing#2668) * Fix docker login issue with all-in-one build Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> * Fix docker login issue with all-in-one build Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Fix issue with all-in-one build (jaegertracing#2669) Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Update cmd/agent/app/reporter/connect_metrics.go accept suggestions Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * Update cmd/agent/app/reporter/connect_metrics.go accept suggestions Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * simplify the code that remove ConnectMetricsParams{} and integrate ConnectMetrics{} Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * simplify the code that remove ConnectMetricsParams{} and integrate ConnectMetrics{} Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * merage from the lastest master branch and exec make fmt Signed-off-by: walker.wangxy <walker.wangxy@walkerwangxydeMacBook-Pro.local> * add comment on ConnectMetrics Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * clear up redundant codes Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> Co-authored-by: WalkerWang731 <walkerwang731@gmail.com> Co-authored-by: Betula-L <N.Betula.Lu@gmail.com> Co-authored-by: luhualin <luhualin@bilibili.com> Co-authored-by: Pavel Kositsyn <kositsyn.pa@phystech.edu> Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Co-authored-by: Ashmita <ashmita.bohara152@gmail.com> Co-authored-by: Yuri Shkuro <github@ysh.us> Co-authored-by: walker.wangxy <walker.wangxy@walkerwangxydeMacBook-Pro.local>
* [refactor] Minor clean-up of jaegertracing#2657 Signed-off-by: Yuri Shkuro <github@ysh.us> * add test Signed-off-by: Yuri Shkuro <github@ysh.us>
…g#2729) * [tests] Add logging for TestGRPCResolverRoundRobin Signed-off-by: Yuri Shkuro <github@ysh.us> * rename var for clarity Signed-off-by: Yuri Shkuro <github@ysh.us> * cleanup Signed-off-by: Yuri Shkuro <github@ysh.us> * increase timeout Signed-off-by: Yuri Shkuro <github@ysh.us>
…gertracing#2707) * Add ability to use JS file for UI configuration (#123 from jaeger-ui) Signed-off-by: Mykhailo Semenchenko <mykhailo.semenchenko@logz.io> * Update UI config file injection Signed-off-by: Mykhailo Semenchenko <mykhailo.semenchenko@logz.io> * Update update test, refactor loadUIConfig function Signed-off-by: Mykhailo Semenchenko <mykhailo.semenchenko@logz.io> * Update errors text, minor refactor Signed-off-by: Mykhailo Semenchenko <mykhailo.semenchenko@logz.io> * Remove debug code Signed-off-by: Mykhailo Semenchenko <mykhailo.semenchenko@logz.io> * Update jaeger-ui to latest master with index.html changes Signed-off-by: Mykhailo Semenchenko <mykhailo.semenchenko@logz.io>
…SCRAM-SHA-512 mechanism (jaegertracing#2724) * add that suppot Kafka SASL/PLAIN authentication of SCRAM-SHA-256 or SCRAM-SHA-512 mechanism Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * rename XDGSCRAMClient to scramClient and remove paramater that no point on factory_test.go Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * add type assertion Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com> * replacement UserName to Username Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>
Signed-off-by: santosh <bsantosh@thoughtworks.com>
…t tests Signed-off-by: santosh <bsantosh@thoughtworks.com>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Mykhailo Semenchenko <mykhailo.semenchenko@logz.io>
* Added TLS for HTTP (consumer-query) server Signed-off-by: rjs211 <srivatsa211@gmail.com> * Add testcase of error in TLS HTTP server creation Signed-off-by: rjs211 <srivatsa211@gmail.com> * Minor refactoring of properties and vars Signed-off-by: rjs211 <srivatsa211@gmail.com> * Exposing flags for HTTP and GRPC with TLS config Signed-off-by: rjs211 <srivatsa211@gmail.com> * minor refactoring of comments Signed-off-by: rjs211 <srivatsa211@gmail.com> * Changed TLS server to use tlsCfg instead of injection Signed-off-by: rjs211 <srivatsa211@gmail.com> * Create test for HTTP server with TLS and MTLS Signed-off-by: rjs211 <srivatsa211@gmail.com> * Removing checks to avoid race condition Signed-off-by: rjs211 <srivatsa211@gmail.com> * Adding testdata of certificates and keys of CA, server & client Signed-off-by: rjs211 <srivatsa211@gmail.com> * Changing the names of keys and certificates Signed-off-by: rjs211 <srivatsa211@gmail.com> * Coverage increase and cleanup Signed-off-by: rjs211 <srivatsa211@gmail.com> * removing redundant certif/keys set and using previously available set Signed-off-by: rjs211 <srivatsa211@gmail.com> * Added helper function to serve HTTP server Signed-off-by: rjs211 <srivatsa211@gmail.com> * Modify cmux and tests for secure HTTP and GRPC Signed-off-by: rjs211 <srivatsa211@gmail.com> * Fixing testscases for safe re-use Signed-off-by: rjs211 <srivatsa211@gmail.com> * Use common certificate flags for GRPC and HTTP Signed-off-by: rjs211 <srivatsa211@gmail.com> * Use common certificate flags for GRPC and HTTP Signed-off-by: rjs211 <srivatsa211@gmail.com> * tempCommit Signed-off-by: rjs211 <srivatsa211@gmail.com> * Using same tlsCfg structure for server Signed-off-by: rjs211 <srivatsa211@gmail.com> * Removing reduntant code, added comments, using correct port for testing Signed-off-by: rjs211 <srivatsa211@gmail.com> * modified test-cases for dedicated ports with TLS Signed-off-by: rjs211 <srivatsa211@gmail.com> * remove redundant test, created error var Signed-off-by: rjs211 <srivatsa211@gmail.com> * remove redundant test, created error var Signed-off-by: rjs211 <srivatsa211@gmail.com> * removed code repitition, added comment Signed-off-by: rjs211 <srivatsa211@gmail.com> * added table-based tests for QueryOptions port allocation Signed-off-by: rjs211 <srivatsa211@gmail.com>
…jaegertracing#2733) Signed-off-by: Yuri Shkuro <github@ysh.us>
…ing#2735) Signed-off-by: Yuri Shkuro <github@ysh.us>
* Enable stale bot for PRs and questions Signed-off-by: Yuri Shkuro <github@ysh.us> * make it "warmer" Signed-off-by: Yuri Shkuro <github@ysh.us> * change stale label Signed-off-by: Yuri Shkuro <github@ysh.us> Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>
Signed-off-by: santosh <bsantosh@thoughtworks.com>
Signed-off-by: santosh <bsantosh@thoughtworks.com>
Signed-off-by: santosh <bsantosh@thoughtworks.com>
Signed-off-by: santosh <bsantosh@thoughtworks.com>
The last force push messed up my git history. Created a new branch and raising another PR. Sorry for the confusion caused. Closing this PR. New PR link |
Signed-off-by: santosh bsantosh@thoughtworks.com
Which problem is this PR solving?
Short description of the changes