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 branch 'master' into tooling/npm-scripts

Browse Source
This commit is contained in:
Dominik Prokop 2019-02-21 21:28:16 +01:00
commit 167a18f1f2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sources/project/building_from_source.md
View File

@ -83,7 +83,7 @@ go get github.com/Unknwon/bra
bra run bra run
``` ```
You'll also need to run `yarn watch` to watch for changes to the front-end (typescript, html, sass) You'll also need to run `yarn start` to watch for changes to the front-end (typescript, html, sass)
### Running tests ### Running tests

4
public/app/plugins/datasource/prometheus/datasource.ts
View File

@ -396,6 +396,10 @@ export class PrometheusDatasource implements DataSourceApi<PromQuery> {
const expandedQueries = queries.map(query => ({ const expandedQueries = queries.map(query => ({
...query, ...query,
expr: this.templateSrv.replace(query.expr, {}, this.interpolateQueryExpr), expr: this.templateSrv.replace(query.expr, {}, this.interpolateQueryExpr),
// null out values we don't support in Explore yet
legendFormat: null,
step: null,
})); }));
state = { state = {
...state, ...state,