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

Retry connection when Kibana version is not compatible. #3031

Merged
merged 2 commits into from
Dec 12, 2019

Conversation

jalvz
Copy link
Contributor

@jalvz jalvz commented Dec 11, 2019

Fixes #3022

@codecov-io
Copy link

Codecov Report

Merging #3031 into master will decrease coverage by 0.1%.
The diff coverage is 71.05%.

@@            Coverage Diff             @@
##           master    #3031      +/-   ##
==========================================
- Coverage   78.54%   78.44%   -0.11%     
==========================================
  Files          96       96              
  Lines        4797     4820      +23     
==========================================
+ Hits         3768     3781      +13     
- Misses       1029     1039      +10
Impacted Files Coverage Δ
tests/kibana.go 0% <0%> (ø) ⬆️
beater/api/config/agent/handler.go 94.87% <100%> (ø) ⬆️
kibana/connecting_client.go 47.54% <70.37%> (+7.54%) ⬆️

@graphaelli graphaelli requested a review from simitt December 11, 2019 14:28
@jalvz
Copy link
Contributor Author

jalvz commented Dec 11, 2019

This is a temporary fix for 7.5.1
Will be moved to libbeat as per elastic/beats#14495

Comment on lines 112 to 113
c.m.Lock()
defer c.m.Unlock()
Copy link
Member

Choose a reason for hiding this comment

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

this should probably also be RLock/RUnlock, as c.client is only read

@jalvz jalvz force-pushed the retry-stale-kibana-conn branch from 57beb62 to b0a4418 Compare December 12, 2019 10:14
@jalvz jalvz merged commit 4b415a5 into elastic:master Dec 12, 2019
jalvz added a commit to jalvz/apm-server that referenced this pull request Dec 12, 2019
* Retry connection when Kibana version is not compatible.

Fixes elastic#3022

* Update changelog
jalvz added a commit to jalvz/apm-server that referenced this pull request Dec 12, 2019
* Retry connection when Kibana version is not compatible.

Fixes elastic#3022

* Update changelog
jalvz added a commit that referenced this pull request Dec 12, 2019
* Retry connection when Kibana version is not compatible.

Fixes #3022

* Update changelog
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.

[Cloud] Agent configuration does not work when upgrading to 7.5.0
3 participants