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

Elasticsearch: Fix default max concurrent shard requests #17770

Merged
merged 2 commits into from
Jun 28, 2019
Merged

Conversation

marefr
Copy link
Contributor

@marefr marefr commented Jun 25, 2019

What this PR does / why we need it:
Elasticsearch v7.0 changed the behavior of max concurrent shard
requests and the default to 5. v5.6 and before 7.0 the default
is 256. This adds some additional behavior given certain
version is selected when configure the datasource to set
default max concurrent shard requests.
Changing from a version pre-v7.0+ to v7.0+ sets max
concurrent shard requests to 5.
Changing from a version v7.0+ to a pre-v7.0 sets max
concurrent shard requests to 256.
docs: upgrade notes for v6.2 and Elasticsearch v7

Which issue(s) this PR fixes:
Fixes #17454

Special notes for your reviewer:

marefr added 2 commits June 26, 2019 00:18
Elasticsearch v7.0 changed the behavior of max concurrent shard
requests and the default to 5. v5.6 and before 7.0 the default
is 256. This adds some additional behavior given certain
version is selected when configure the datasource to set
default max concurrent shard requests.
Changing from a version pre-v7.0+ to v7.0+ sets max
concurrent shard requests to 5.
Changing from a version v7.0+ to a pre-v7.0 sets max
concurrent shard requests to 256.
@marefr marefr added this to the 6.3.0-beta1 milestone Jun 25, 2019
@marefr marefr requested review from papagian and torkelo and removed request for papagian June 25, 2019 22:22
@marefr marefr merged commit 0833f26 into master Jun 28, 2019
@marefr marefr deleted the 17454_fix branch June 28, 2019 16:38
markelog added a commit to markelog/grafana that referenced this pull request Jun 29, 2019
* master: (47 commits)
  Elasticsearch: Fix default max concurrent shard requests (grafana#17770)
  Explore: Fix filter by series level in logs graph (grafana#17798)
  Docs: Add v6.3 version notes and encryption format information (grafana#17825)
  Graphite: use POST for /metrics/find requests (grafana#17814)
  Dashboard: Force update after dashboard resize (grafana#17808)
  Toolkit: moved front end cli scripts to separate package and introduced very early version of plugin tools
  Explore: Uses new TimePicker from Grafana/UI (grafana#17793)
  Explore: Uses RFC3339Nano string to retrieve LogRow contexts from Loki API (grafana#17813)
  noImplicitAny: Lower count to about 3450 (grafana#17799)
  Graphite: Fixes issue with seriesByTag & function with variable param (grafana#17795)
  noImplicitAny: Reduce errors to 3800-ish (grafana#17781)
  Graphite: remove feature that moves alias function last (grafana#17791)
  Explore: Adds URL support for select mode (grafana#17755)
  TestData: add option to increase the number of test streams (grafana#17789)
  Usage Stats: Update known datasource plugins (grafana#17787)
  Docs: Adds section on Querying Logs for Elasticsearch (grafana#17730)
  Docs: Adds section on Querying Logs for InfluxDB (grafana#17726)
  Devenv: makes the grafana users default for saml. (grafana#17782)
  Explore: Displays only one Time column as configured in TimeZone settings (grafana#17775)
  Markdown: Replace rendering library (grafana#17686)
  ...
xlson added a commit to xlson/grafana that referenced this pull request Jul 1, 2019
* master: (69 commits)
  Elasticsearch: Fix default max concurrent shard requests (grafana#17770)
  Explore: Fix filter by series level in logs graph (grafana#17798)
  Docs: Add v6.3 version notes and encryption format information (grafana#17825)
  Graphite: use POST for /metrics/find requests (grafana#17814)
  Dashboard: Force update after dashboard resize (grafana#17808)
  Toolkit: moved front end cli scripts to separate package and introduced very early version of plugin tools
  Explore: Uses new TimePicker from Grafana/UI (grafana#17793)
  Explore: Uses RFC3339Nano string to retrieve LogRow contexts from Loki API (grafana#17813)
  noImplicitAny: Lower count to about 3450 (grafana#17799)
  Graphite: Fixes issue with seriesByTag & function with variable param (grafana#17795)
  noImplicitAny: Reduce errors to 3800-ish (grafana#17781)
  Graphite: remove feature that moves alias function last (grafana#17791)
  Explore: Adds URL support for select mode (grafana#17755)
  TestData: add option to increase the number of test streams (grafana#17789)
  Usage Stats: Update known datasource plugins (grafana#17787)
  Docs: Adds section on Querying Logs for Elasticsearch (grafana#17730)
  Docs: Adds section on Querying Logs for InfluxDB (grafana#17726)
  Devenv: makes the grafana users default for saml. (grafana#17782)
  Explore: Displays only one Time column as configured in TimeZone settings (grafana#17775)
  Markdown: Replace rendering library (grafana#17686)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jul 1, 2019
* grafana/master:
  Refactor: rename SeriesData to DataFrame (grafana#17854)
  devenv: switch OpenTSDB docker block (grafana#17849)
  Devenv:LDAP: couple simplifications for LDAP (grafana#17807)
  Login: divide login errors by pkg and service (grafana#17835)
  Auth Proxy: Respect auto_sign_up setting (grafana#17843)
  OAuth: return github teams as a part of user info (enable team sync) (grafana#17797)
  noImplicitAny: Sub 3000 errors (grafana#17821)
  TimePicker: Style and responsive fixes, restored dashboard settings (grafana#17822)
  Templating: Correctly display __text in multi-values variable (grafana#17840)
  Elasticsearch: Fix default max concurrent shard requests (grafana#17770)
  Explore: Fix filter by series level in logs graph (grafana#17798)
  Docs: Add v6.3 version notes and encryption format information (grafana#17825)
  Graphite: use POST for /metrics/find requests (grafana#17814)
  Dashboard: Force update after dashboard resize (grafana#17808)
  Toolkit: moved front end cli scripts to separate package and introduced very early version of plugin tools
  Explore: Uses new TimePicker from Grafana/UI (grafana#17793)
  Explore: Uses RFC3339Nano string to retrieve LogRow contexts from Loki API (grafana#17813)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jul 1, 2019
…-mapping-to-field

* grafana/master:
  Refactor: rename SeriesData to DataFrame (grafana#17854)
  devenv: switch OpenTSDB docker block (grafana#17849)
  Devenv:LDAP: couple simplifications for LDAP (grafana#17807)
  Login: divide login errors by pkg and service (grafana#17835)
  Auth Proxy: Respect auto_sign_up setting (grafana#17843)
  OAuth: return github teams as a part of user info (enable team sync) (grafana#17797)
  noImplicitAny: Sub 3000 errors (grafana#17821)
  TimePicker: Style and responsive fixes, restored dashboard settings (grafana#17822)
  Templating: Correctly display __text in multi-values variable (grafana#17840)
  Elasticsearch: Fix default max concurrent shard requests (grafana#17770)
  Explore: Fix filter by series level in logs graph (grafana#17798)
  Docs: Add v6.3 version notes and encryption format information (grafana#17825)
  Graphite: use POST for /metrics/find requests (grafana#17814)
  Dashboard: Force update after dashboard resize (grafana#17808)
  Toolkit: moved front end cli scripts to separate package and introduced very early version of plugin tools
  Explore: Uses new TimePicker from Grafana/UI (grafana#17793)
  Explore: Uses RFC3339Nano string to retrieve LogRow contexts from Loki API (grafana#17813)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jul 1, 2019
* grafana/master: (35 commits)
  Refactor: rename SeriesData to DataFrame (grafana#17854)
  devenv: switch OpenTSDB docker block (grafana#17849)
  Devenv:LDAP: couple simplifications for LDAP (grafana#17807)
  Login: divide login errors by pkg and service (grafana#17835)
  Auth Proxy: Respect auto_sign_up setting (grafana#17843)
  OAuth: return github teams as a part of user info (enable team sync) (grafana#17797)
  noImplicitAny: Sub 3000 errors (grafana#17821)
  TimePicker: Style and responsive fixes, restored dashboard settings (grafana#17822)
  Templating: Correctly display __text in multi-values variable (grafana#17840)
  Elasticsearch: Fix default max concurrent shard requests (grafana#17770)
  Explore: Fix filter by series level in logs graph (grafana#17798)
  Docs: Add v6.3 version notes and encryption format information (grafana#17825)
  Graphite: use POST for /metrics/find requests (grafana#17814)
  Dashboard: Force update after dashboard resize (grafana#17808)
  Toolkit: moved front end cli scripts to separate package and introduced very early version of plugin tools
  Explore: Uses new TimePicker from Grafana/UI (grafana#17793)
  Explore: Uses RFC3339Nano string to retrieve LogRow contexts from Loki API (grafana#17813)
  noImplicitAny: Lower count to about 3450 (grafana#17799)
  Graphite: Fixes issue with seriesByTag & function with variable param (grafana#17795)
  noImplicitAny: Reduce errors to 3800-ish (grafana#17781)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Elasticsearch: Default max_concurrent_shard_requests of 5 not applied for version 7.0+
2 participants