IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-22 00:47:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add min time interval in opentsdb plugin (#31534)

Browse Source 
* #31533 Add min time interval in Opentsdb plugin

* add docs to explain min time interval in opentsdb plugin

* Update docs/sources/datasources/opentsdb.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/datasources/opentsdb.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* optimize docs

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
This commit is contained in:
Gary Wang 2021-03-22 22:35:48 +08:00 committed by GitHub
parent 067bd5e604
commit 4a2ba2a3ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/sources/datasources/opentsdb.md
View File

@ -23,6 +23,22 @@ To access OpenTSDB settings, hover your mouse over the **Configuration** (gear)
| `Version` | Version = opentsdb version, either <=2.1 or 2.2 |
| `Resolution` | Metrics from opentsdb may have datapoints with either second or millisecond resolution. |
| `Lookup Limit`| Default is 1000. |
| `Min time interval`| A lower limit for the auto group by time interval. Recommended to be set to write frequency, for example `1m` if your data is written every minute. This option can also be overridden/configured in a dashboard panel under data source options. It's important to note that this value _must_ be formatted as a number followed by a [valid time identifier](#Supported min time identifiers), e.g. `1m` (1 minute) or `30s` (30 seconds). |
### Supported min time identifiers
The following time identifiers are supported:
| Identifier | Description |
| ---------- | ----------- |
| `y` | Years (365 days)|
| `n` | Months (30 days)|
| `w` | Weeks (7 days)|
| `d` | Days (24 hours)|
| `h` | Hours |
| `m` | Minutes |
| `s` | Seconds |
| `ms` | Milliseconds |
## Query editor

28
public/app/plugins/datasource/opentsdb/components/OpenTsdbDetails.tsx
View File

@ -1,6 +1,6 @@
import React, { SyntheticEvent } from 'react';
import { InlineFormLabel, LegacyForms } from '@grafana/ui';
const { Select, Input } = LegacyForms;
import { EventsWithValidation, regexValidation, InlineFormLabel, LegacyForms } from '@grafana/ui';
const { Select, Input, FormField } = LegacyForms;
import { DataSourceSettings, SelectableValue } from '@grafana/data';
import { OpenTsdbOptions } from '../types';
@ -53,6 +53,30 @@ export const OpenTsdbDetails = (props: Props) => {
onChange={onInputChangeHandler('lookupLimit', value, onChange)}
/>
</div>
<div className="gf-form-inline">
<div className="gf-form">
<FormField
labelWidth={7}
label="Min time interval"
inputEl={
<Input
className={'width-6'}
value={value.jsonData.interval || ''}
onChange={onInputChangeHandler('interval', value, onChange)}
placeholder="1m"
validationEvents={{
[EventsWithValidation.onBlur]: [
regexValidation(
/^\d+(ms|[Mwdhmsy])$/,
'Value is not valid, you can use number with time unit specifier: y, M, w, d, h, m, s'
),
],
}}
/>
}
/>
</div>
</div>
</>
);
};

2
public/app/plugins/datasource/opentsdb/datasource.ts
View File

@ -24,6 +24,7 @@ export default class OpenTsDatasource extends DataSourceApi<OpenTsdbQuery, OpenT
tsdbVersion: any;
tsdbResolution: any;
lookupLimit: any;
interval: any;
tagKeys: any;
aggregatorsPromise: any;
@ -40,6 +41,7 @@ export default class OpenTsDatasource extends DataSourceApi<OpenTsdbQuery, OpenT
this.tsdbVersion = instanceSettings.jsonData.tsdbVersion || 1;
this.tsdbResolution = instanceSettings.jsonData.tsdbResolution || 1;
this.lookupLimit = instanceSettings.jsonData.lookupLimit || 1000;
this.interval = instanceSettings.jsonData.interval || '30s';
this.tagKeys = {};
this.aggregatorsPromise = null;

1
public/app/plugins/datasource/opentsdb/types.ts
View File

@ -8,4 +8,5 @@ export interface OpenTsdbOptions extends DataSourceJsonData {
tsdbVersion: number;
tsdbResolution: number;
lookupLimit: number;
interval: string;
}