Repository: incubator-griffin Updated Branches: refs/heads/master 714a7231b -> 998848f1e
Error handling if the request fails on the server ,return an error Author: dodobel <1254288...@qq.com> Closes #174 from dodobel/merge. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/998848f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/998848f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/998848f1 Branch: refs/heads/master Commit: 998848f1e2379da4b5013d920ffd20b7f2739510 Parents: 714a723 Author: dodobel <1254288...@qq.com> Authored: Tue Nov 7 17:35:29 2017 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Tue Nov 7 17:35:29 2017 +0800 ---------------------------------------------------------------------- ui/angular/src/app/health/health.component.ts | 5 ++- .../detail-metric/detail-metric.component.ts | 33 +++++++++++--------- ui/angular/src/app/metric/metric.component.ts | 5 ++- ui/angular/src/app/sidebar/sidebar.component.ts | 5 ++- 4 files changed, 31 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/998848f1/ui/angular/src/app/health/health.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/health/health.component.ts b/ui/angular/src/app/health/health.component.ts index 2f3db42..5f3f0a2 100644 --- a/ui/angular/src/app/health/health.component.ts +++ b/ui/angular/src/app/health/health.component.ts @@ -221,7 +221,10 @@ export class HealthComponent implements OnInit { node.metrics.push(Object.assign({}, metricNode)); } - }); + }, + err => { + console.log('Error occurs when connect to elasticsearh!'); + }); } } this.finalData.push(node); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/998848f1/ui/angular/src/app/metric/detail-metric/detail-metric.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/metric/detail-metric/detail-metric.component.ts b/ui/angular/src/app/metric/detail-metric/detail-metric.component.ts index 6554b5b..1cb2038 100644 --- a/ui/angular/src/app/metric/detail-metric/detail-metric.component.ts +++ b/ui/angular/src/app/metric/detail-metric/detail-metric.component.ts @@ -56,24 +56,29 @@ export class DetailMetricComponent implements OnInit { var self = this; var metricDetailUrl = this.serviceService.config.uri.dashboard; this.http.post(metricDetailUrl, {"query": { "bool":{"filter":[ {"term" : {"name.keyword": this.currentMeasure }}]}}, "sort": [{"tmst": {"order": "desc"}}],"size":10000}).subscribe( data=> { - var metric = { + var metric = { 'name':'', 'timestamp':0, 'dq':0, 'details':[] - }; - this.data = data; - metric.name = this.data.hits.hits[0]._source.name; - metric.timestamp =this.data.hits.hits[this.data.hits.hits.length-1]._source.tmst; - metric.dq = this.data.hits.hits[this.data.hits.hits.length-1]._source.value.matched/this.data.hits.hits[this.data.hits.hits.length-1]._source.value.matched*100; - metric.details = new Array(); - for(let point of this.data.hits.hits){ - metric.details.push(point); - }; - this.chartOption = this.chartService.getOptionBig(metric); - $('#bigChartDiv').height(window.innerHeight-120+'px'); - $('#bigChartDiv').width(window.innerWidth-400+'px'); - $('#bigChartContainer').show(); + }; + this.data = data; + if(this.data){ + metric.name = this.data.hits.hits[0]._source.name; + metric.timestamp =this.data.hits.hits[this.data.hits.hits.length-1]._source.tmst; + metric.dq = this.data.hits.hits[this.data.hits.hits.length-1]._source.value.matched/this.data.hits.hits[this.data.hits.hits.length-1]._source.value.matched*100; + metric.details = new Array(); + for(let point of this.data.hits.hits){ + metric.details.push(point); + }; + } + this.chartOption = this.chartService.getOptionBig(metric); + $('#bigChartDiv').height(window.innerHeight-120+'px'); + $('#bigChartDiv').width(window.innerWidth-400+'px'); + $('#bigChartContainer').show(); + }, + err => { + console.log('Error occurs when connect to elasticsearh!'); }); } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/998848f1/ui/angular/src/app/metric/metric.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/metric/metric.component.ts b/ui/angular/src/app/metric/metric.component.ts index 8f47afa..112b0e5 100644 --- a/ui/angular/src/app/metric/metric.component.ts +++ b/ui/angular/src/app/metric/metric.component.ts @@ -120,7 +120,10 @@ export class MetricComponent implements OnInit { metricNode.dq = this.metricData[0]._source.value.matched/this.metricData[0]._source.value.total*100; node.metrics.push(Object.assign({}, metricNode)); } - }); + }, + err => { + console.log('Error occurs when connect to elasticsearh!'); + }); } } this.finalData.push(node); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/998848f1/ui/angular/src/app/sidebar/sidebar.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/sidebar/sidebar.component.ts b/ui/angular/src/app/sidebar/sidebar.component.ts index 26712d9..5981ab4 100644 --- a/ui/angular/src/app/sidebar/sidebar.component.ts +++ b/ui/angular/src/app/sidebar/sidebar.component.ts @@ -153,7 +153,10 @@ export class SidebarComponent implements OnInit { node.metrics.push(Object.assign({}, metricNode)); } - }); + }, + err => { + console.log('Error occurs when connect to elasticsearh!'); + }); } } this.finalData.push(node);
