Merge branch 'master' into tooling/npm-scripts

docs/sources/project/building_from_source.md

@@ -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
 
 

public/app/plugins/datasource/prometheus/datasource.ts

@@ -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,