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

Metrics: Adds setting for turning off total stats metrics #19142

Merged
merged 3 commits into from
Sep 17, 2019
Merged

Metrics: Adds setting for turning off total stats metrics #19142

merged 3 commits into from
Sep 17, 2019

Conversation

marefr
Copy link
Contributor

@marefr marefr commented Sep 16, 2019

What this PR does / why we need it:
Update of total stats (stat_totals_*) metrics shouldn't be made when metrics endpoint is disabled.
Generation of total stats metrics is made each minute and can add quite high load on a database so for those that still want metrics endpoint enabled, but without total stats metrics, we introduce a new setting disable_total_stats to configure that.

Which issue(s) this PR fixes:
Ref #19137

Special notes for your reviewer:

@marefr marefr added this to the 6.3.6 milestone Sep 16, 2019
kylebrandt
kylebrandt reviewed Sep 16, 2019
View reviewed changes
Copy link
Contributor

@kylebrandt kylebrandt left a comment

Choose a reason for hiding this comment

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

https://github.com/grafana/grafana/blob/master/docs/sources/installation/configuration.md#metrics needs updating.

conf/defaults.ini Show resolved Hide resolved
kylebrandt
kylebrandt approved these changes Sep 16, 2019
View reviewed changes
Copy link
Contributor

@kylebrandt kylebrandt left a comment

Choose a reason for hiding this comment

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

LGTM once .md doc is updated

@marefr marefr merged commit 80592e3 into master Sep 17, 2019
@marefr marefr deleted the 19137_fix branch September 17, 2019 07:32
papagian pushed a commit that referenced this pull request Sep 17, 2019
@marefr @papagian
Metrics: Adds setting for turning off total stats metrics (#19142)
4183bc6 
Don't update total stats metrics if reporting is disabled.
New setting disable_total_stats for turning off update 
of total stats (stat_totals_*) metrics.

Ref #19137

(cherry picked from commit 80592e3)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Sep 17, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into dynamic-units
00b1418 
* grafana/master: (23 commits)
  API: adds redirect helper to simplify http redirects (grafana#19180)
  docs: image rendering (grafana#19183)
  Chore: Update latest.json (grafana#19177)
  Chore: Update version to next (grafana#19169)
  Docs: What's new in 6.4 update (grafana#19175)
  Devenv: create slow_proxy_mac (grafana#19174)
  Chore: Changelog for v6.4.0-beta1 (grafana#19171)
  Revert "Chore: Update Slate to 0.47.8 (grafana#18412)" (grafana#19167)
  Chore: Update Slate to 0.47.8 (grafana#18412)
  Changelog: Breaking changes and deprecation notes for v6.4 (grafana#19164)
  Docs: What's new 6.4 draft (grafana#19144)
  Docs: Add docs around feature toggles config (grafana#19162)
  Azure Monitor: Add support for cross resource queries (grafana#19115)
  Api: Readonly datasources should not be created via the API (grafana#19006)
  Explore: Update live tail buttons (grafana#19143)
  LDAP: only show tab if LDAP is enabled (grafana#19156)
  TimePicker: Fixes onBlur issue with FireFox on MacOS (grafana#19154)
  Feature: Encapsulated dynamic imports with error boundary and suspense (grafana#19128)
  Metrics: Adds setting for turning off total stats metrics (grafana#19142)
  Add directions for more details provided when not anymore on issue triage (grafana#19116)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Sep 17, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into skip-nulls-gauge
39b2cbd 
* grafana/master: (87 commits)
  API: adds redirect helper to simplify http redirects (grafana#19180)
  docs: image rendering (grafana#19183)
  Chore: Update latest.json (grafana#19177)
  Chore: Update version to next (grafana#19169)
  Docs: What's new in 6.4 update (grafana#19175)
  Devenv: create slow_proxy_mac (grafana#19174)
  Chore: Changelog for v6.4.0-beta1 (grafana#19171)
  Revert "Chore: Update Slate to 0.47.8 (grafana#18412)" (grafana#19167)
  Chore: Update Slate to 0.47.8 (grafana#18412)
  Changelog: Breaking changes and deprecation notes for v6.4 (grafana#19164)
  Docs: What's new 6.4 draft (grafana#19144)
  Docs: Add docs around feature toggles config (grafana#19162)
  Azure Monitor: Add support for cross resource queries (grafana#19115)
  Api: Readonly datasources should not be created via the API (grafana#19006)
  Explore: Update live tail buttons (grafana#19143)
  LDAP: only show tab if LDAP is enabled (grafana#19156)
  TimePicker: Fixes onBlur issue with FireFox on MacOS (grafana#19154)
  Feature: Encapsulated dynamic imports with error boundary and suspense (grafana#19128)
  Metrics: Adds setting for turning off total stats metrics (grafana#19142)
  Add directions for more details provided when not anymore on issue triage (grafana#19116)
  ...
papagian pushed a commit that referenced this pull request Sep 23, 2019
@marefr @papagian
Metrics: Adds setting for turning off total stats metrics (#19142)
2148a9f 
Don't update total stats metrics if reporting is disabled.
New setting disable_total_stats for turning off update 
of total stats (stat_totals_*) metrics.

Ref #19137

(cherry picked from commit 80592e3)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kylebrandt kylebrandt kylebrandt approved these changes

@torkelo torkelo torkelo approved these changes

Assignees
No one assigned
Labels
add to changelog
Projects
None yet
Milestone
6.3.6
Development

Successfully merging this pull request may close these issues.
4 participants
@marefr @torkelo @kylebrandt @papagian