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

QueryOptions: update maxDataPoints text and show any value that is configured (#18761)

Browse Source 
* update maxDataPoints UI

* use maxDataPoints to calculate interval

* don't change interval calculation
This commit is contained in:
Ryan McKinley
2019-09-10 22:45:08 -07:00
committed by Torkel Ödegaard
parent 4c0e5b14f5
commit 7b856ae040
4 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
public/app/features/dashboard/panel_editor/QueryOptions.tsx
View File

@@ -71,7 +71,8 @@ export class QueryOptions extends PureComponent<Props, State> {
tooltipInfo: (
<>
The maximum data points the query should return. For graphs this is automatically set to one data point per
pixel. For some data sources this can also be capped in the datasource settings page.
pixel. For some data sources this can also be capped in the datasource settings page. With streaming data,
this value is used for the rolling buffer.
</>
),
},
@@ -156,27 +157,31 @@ export class QueryOptions extends PureComponent<Props, State> {
this.setState({ ...this.state, [panelKey]: event.target.value });
};
/**
* Show options for any value that is set, or values that the
* current datasource says it will use
*/
renderOptions = () => {
const { datasource } = this.props;
const { queryOptions } = datasource.meta;
const queryOptions: any = datasource.meta.queryOptions || {};
if (!queryOptions) {
return null;
}
return Object.keys(queryOptions).map(key => {
return Object.keys(this.allOptions).map(key => {
const options = this.allOptions[key];
const panelKey = options.panelKey || key;
return (
<DataSourceOption
key={key}
{...options}
onChange={this.onDataSourceOptionChange(panelKey)}
onBlur={this.onDataSourceOptionBlur(panelKey)}
// @ts-ignore
value={this.state[panelKey]}
/>
);
// @ts-ignore
const value = this.state[panelKey];
if (value || queryOptions[key]) {
return (
<DataSourceOption
key={key}
{...options}
onChange={this.onDataSourceOptionChange(panelKey)}
onBlur={this.onDataSourceOptionBlur(panelKey)}
value={value}
/>
);
}
return null; // nothing to render
});
};