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

Merge with master

Browse Source
This commit is contained in:
Hugo Häggmark 2019-02-04 08:17:18 +01:00
parent 1f5bb76718
commit d9578bc485
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
View File

@ -33,7 +33,7 @@ export class LokiQueryEditor extends PureComponent<Props> {
query: { query: {
...this.state.query, ...this.state.query,
expr: query.expr, expr: query.expr,
} },
}); });
}; };
@ -61,12 +61,18 @@ export class LokiQueryEditor extends PureComponent<Props> {
datasource={datasource} datasource={datasource}
initialQuery={query} initialQuery={query}
onQueryChange={this.onFieldChange} onQueryChange={this.onFieldChange}
onPressEnter={this.onRunQuery} onExecuteQuery={this.onRunQuery}
history={[]}
/> />
<div className="gf-form-inline"> <div className="gf-form-inline">
<div className="gf-form"> <div className="gf-form">
<div className="gf-form-label">Format as</div> <div className="gf-form-label">Format as</div>
<Select isSearchable={false} options={formatOptions} onChange={this.onFormatChanged} value={currentFormat} /> <Select
isSearchable={false}
options={formatOptions}
onChange={this.onFormatChanged}
value={currentFormat}
/>
</div> </div>
<div className="gf-form gf-form--grow"> <div className="gf-form gf-form--grow">
<div className="gf-form-label gf-form-label--grow" /> <div className="gf-form-label gf-form-label--grow" />