IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus: Do not show rate hint when increase function is applied (#21955)

Browse Source
This commit is contained in:
Huan Wang 2020-02-06 04:56:53 -07:00 committed by GitHub
parent 89d1ab37de
commit 8b632ac029
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/plugins/datasource/prometheus/query_hints.test.ts
View File

@ -75,6 +75,19 @@ describe('getQueryHints()', () => {
expect(hints).toEqual(null); expect(hints).toEqual(null);
}); });
it('returns no rate hint for a counter metric that already has an increase', () => {
const series = [
{
datapoints: [
[23, 1000],
[24, 1001],
],
},
];
const hints = getQueryHints('increase(metric_total[1m])', series);
expect(hints).toEqual(null);
});
it('returns a rate hint w/o action for a complex counter metric', () => { it('returns a rate hint w/o action for a complex counter metric', () => {
const series = [ const series = [
{ {

2
public/app/plugins/datasource/prometheus/query_hints.ts
View File

@ -28,7 +28,7 @@ export function getQueryHints(query: string, series?: any[], datasource?: Promet
} }
// Check for need of rate() // Check for need of rate()
if (query.indexOf('rate(') === -1) { if (query.indexOf('rate(') === -1 && query.indexOf('increase(') === -1) {
// Use metric metadata for exact types // Use metric metadata for exact types
const nameMatch = query.match(/\b(\w+_(total|sum|count))\b/); const nameMatch = query.match(/\b(\w+_(total|sum|count))\b/);
let counterNameMetric = nameMatch ? nameMatch[1] : ''; let counterNameMetric = nameMatch ? nameMatch[1] : '';