opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-26 07:23:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

graphite: remove check so that query is sent even for possible non leaf nodes

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-12-12 17:00:00 +01:00
parent a00af85f36
commit a02086814e
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/blocks/graphite/docker-compose.yaml
View File

@ -1,4 +1,4 @@
graphite: graphite09:
build: blocks/graphite build: blocks/graphite
ports: ports:
- "8080:80" - "8080:80"

8
public/app/plugins/datasource/graphite/graphite_query.ts
View File

@ -120,14 +120,6 @@ export default class GraphiteQuery {
this.segments.push({value: "select metric"}); this.segments.push({value: "select metric"});
} }
hasSelectMetric() {
if (this.segments.length > 0) {
return this.segments[this.segments.length - 1].value === 'select metric';
} else {
return false;
}
}
addFunction(newFunc) { addFunction(newFunc) {
this.functions.push(newFunc); this.functions.push(newFunc);
this.moveAliasFuncLast(); this.moveAliasFuncLast();

2
public/app/plugins/datasource/graphite/query_ctrl.ts
View File

@ -218,7 +218,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
var oldTarget = this.queryModel.target.target; var oldTarget = this.queryModel.target.target;
this.updateModelTarget(); this.updateModelTarget();
if (this.queryModel.target !== oldTarget && !this.queryModel.hasSelectMetric()) { if (this.queryModel.target !== oldTarget) {
this.panelCtrl.refresh(); this.panelCtrl.refresh();
} }
} }