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.

Sign up for GitHub

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

Jump to bottom

Explore: Prevents histogram loading from killing Prometheus instance #16768

Merged
merged 1 commit into from
Apr 29, 2019
Merged

Explore: Prevents histogram loading from killing Prometheus instance #16768

merged 1 commit into from
Apr 29, 2019

Conversation

hugohaggmark
Copy link
Contributor

What this PR does / why we need it:
This PR prevents killing Prometheus Instances when Histogram metrics are loaded.

Which issue(s) this PR fixes:
Closes: #15992

@hugohaggmark hugohaggmark requested review from davkal and torkelo April 25, 2019 11:38
@hugohaggmark hugohaggmark force-pushed the hugoh/explore-prometheus-hinting branch from 80f9071 to 8ef392e Compare April 25, 2019 13:01
davkal
davkal approved these changes Apr 26, 2019
View reviewed changes
Copy link
Contributor

@davkal davkal left a comment

Choose a reason for hiding this comment

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

Two small nits, otherwise LGTM.

(I've also checked on our clusters, all responses to the series API request simply contain metric names that end on _bucket, so I'm happy with that heuristic.)

public/app/plugins/datasource/prometheus/language_provider.ts Outdated Show resolved Hide resolved
public/app/plugins/datasource/prometheus/language_utils.ts Outdated Show resolved Hide resolved
public/app/plugins/datasource/prometheus/language_utils.ts Outdated Show resolved Hide resolved
@hugohaggmark hugohaggmark force-pushed the hugoh/explore-prometheus-hinting branch from 8ef392e to ec0c53e Compare April 29, 2019 11:07
@hugohaggmark hugohaggmark merged commit ddefcb2 into master Apr 29, 2019
@hugohaggmark hugohaggmark deleted the hugoh/explore-prometheus-hinting branch April 29, 2019 13:43
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 29, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into panel-plugin-location
a0e5040 
* grafana/master:
  updates changelog for 6.1.6
  Fix: Fetch histogram series from other api route (grafana#16768)
  phantomjs: set web-security to true
  Chore: Lowered implicit anys limit to 5668
@marefr marefr added this to the 6.2 milestone Apr 29, 2019
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 29, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into transforms
1b65b2a 
* grafana/master:
  Explore: Support user timezone (grafana#16469)
  Plugins: rename vizPlugin to panelPlugin (grafana#16802)
  Plugins: move app/feature/plugin properties into PluginMeta (grafana#16809)
  Plugins: move PanelPluginMeta to grafana/ui (grafana#16804)
  Plugins: move datasource specific meta out of the main meta type (grafana#16803)
  updates changelog for 6.1.6
  Fix: Fetch histogram series from other api route (grafana#16768)
  phantomjs: set web-security to true
  Chore: Lowered implicit anys limit to 5668
bergquist added a commit to vivtony00/grafana that referenced this pull request Apr 30, 2019
@bergquist
Merge branch 'master' into vivtony00-master
4dfd46a 
* master: (470 commits)
  removes gopkg.lock from root folder
  Explore: Support user timezone (grafana#16469)
  Plugins: rename vizPlugin to panelPlugin (grafana#16802)
  Plugins: move app/feature/plugin properties into PluginMeta (grafana#16809)
  Plugins: move PanelPluginMeta to grafana/ui (grafana#16804)
  Plugins: move datasource specific meta out of the main meta type (grafana#16803)
  updates changelog for 6.1.6
  Fix: Fetch histogram series from other api route (grafana#16768)
  phantomjs: set web-security to true
  Chore: Lowered implicit anys limit to 5668
  build: restore postgres integration tests (grafana#16801)
  docs: explain correct access control model of GCS buckets (grafana#16792)
  Chore: Fixed no implicit any Typescript errors (grafana#16799)
  Feature: introduce LdapActiveSyncEnabled setting (grafana#16787)
  Plugins: ReactPanelPlugin to VizPanelPlugin (grafana#16779)
  UX: Improve Grafana usage for smaller screens  (grafana#16783)
  ThresholdEditor: Minor style fix for smaller screens (grafana#16791)
  Build: Use isolated modules for ts-jest (grafana#16786)
  LDAP Refactoring to support syncronizing more than one user at a time. (grafana#16705)
  build: removes unused vendored files
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 30, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into stream-mixed-query
3bb5d94 
* grafana/master:
  Auth: Enable retries and transaction for some db calls for auth tokens  (grafana#16785)
  Provisioning: Show file path of provisioning file in save/delete dialogs (grafana#16706)
  Add tracing headers for prometheus datasource (grafana#16724)
  Config: Fixes bug where timeouts for alerting was not parsed correctly (grafana#16784)
  build: removes gopkg files from dev docker file (grafana#16817)
  Provisioning: Trying to fix failing test (grafana#16800)
  Table: React table fix rotate support in storybook (grafana#16816)
  TestData: add log level in dummy message (grafana#16815)
  removes gopkg.lock from root folder
  Explore: Support user timezone (grafana#16469)
  Plugins: rename vizPlugin to panelPlugin (grafana#16802)
  Plugins: move app/feature/plugin properties into PluginMeta (grafana#16809)
  Plugins: move PanelPluginMeta to grafana/ui (grafana#16804)
  Plugins: move datasource specific meta out of the main meta type (grafana#16803)
  updates changelog for 6.1.6
  Fix: Fetch histogram series from other api route (grafana#16768)
  phantomjs: set web-security to true
  Chore: Lowered implicit anys limit to 5668
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 30, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into react-app-pages
35e5efc 
* grafana/master:
  Plugins: rename vizPlugin to panelPlugin (grafana#16802)
  Plugins: move app/feature/plugin properties into PluginMeta (grafana#16809)
  Plugins: move PanelPluginMeta to grafana/ui (grafana#16804)
  Plugins: move datasource specific meta out of the main meta type (grafana#16803)
  updates changelog for 6.1.6
  Fix: Fetch histogram series from other api route (grafana#16768)
  phantomjs: set web-security to true
  Chore: Lowered implicit anys limit to 5668
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 30, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into useQueryRunner-in-…
f71de25 
…MetricPanelCtrl

* grafana/master:
  Explore: Use SeriesData format for loki/logs (grafana#16793)
  Refactor: move NavModel to @grafana/ui (grafana#16813)
  Auth: Enable retries and transaction for some db calls for auth tokens  (grafana#16785)
  Provisioning: Show file path of provisioning file in save/delete dialogs (grafana#16706)
  Add tracing headers for prometheus datasource (grafana#16724)
  Config: Fixes bug where timeouts for alerting was not parsed correctly (grafana#16784)
  build: removes gopkg files from dev docker file (grafana#16817)
  Provisioning: Trying to fix failing test (grafana#16800)
  Table: React table fix rotate support in storybook (grafana#16816)
  TestData: add log level in dummy message (grafana#16815)
  removes gopkg.lock from root folder
  Explore: Support user timezone (grafana#16469)
  Plugins: rename vizPlugin to panelPlugin (grafana#16802)
  Plugins: move app/feature/plugin properties into PluginMeta (grafana#16809)
  Plugins: move PanelPluginMeta to grafana/ui (grafana#16804)
  Plugins: move datasource specific meta out of the main meta type (grafana#16803)
  updates changelog for 6.1.6
  Fix: Fetch histogram series from other api route (grafana#16768)
  phantomjs: set web-security to true
  Chore: Lowered implicit anys limit to 5668
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 30, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into tables-display
689959b 
* grafana/master:
  Explore: Use SeriesData format for loki/logs (grafana#16793)
  Refactor: move NavModel to @grafana/ui (grafana#16813)
  Auth: Enable retries and transaction for some db calls for auth tokens  (grafana#16785)
  Provisioning: Show file path of provisioning file in save/delete dialogs (grafana#16706)
  Add tracing headers for prometheus datasource (grafana#16724)
  Config: Fixes bug where timeouts for alerting was not parsed correctly (grafana#16784)
  build: removes gopkg files from dev docker file (grafana#16817)
  Provisioning: Trying to fix failing test (grafana#16800)
  Table: React table fix rotate support in storybook (grafana#16816)
  TestData: add log level in dummy message (grafana#16815)
  removes gopkg.lock from root folder
  Explore: Support user timezone (grafana#16469)
  Plugins: rename vizPlugin to panelPlugin (grafana#16802)
  Plugins: move app/feature/plugin properties into PluginMeta (grafana#16809)
  Plugins: move PanelPluginMeta to grafana/ui (grafana#16804)
  Plugins: move datasource specific meta out of the main meta type (grafana#16803)
  updates changelog for 6.1.6
  Fix: Fetch histogram series from other api route (grafana#16768)
  phantomjs: set web-security to true
  Chore: Lowered implicit anys limit to 5668
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davkal davkal davkal approved these changes

@torkelo torkelo Awaiting requested review from torkelo

Assignees
No one assigned
Labels
add to changelog type/bug
Projects
None yet
Milestone
6.2-beta1
Development

Successfully merging this pull request may close these issues.

Explore: Prometheus series and labels hinting kills Prometheus instance
4 participants
@hugohaggmark @torkelo @davkal @marefr