diff --git a/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java b/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java index 8c71c89..0f02219 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java +++ b/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java @@ -36,7 +36,7 @@ public class MetricsDataController { @Autowired private RedisDataStorage redisDataStorage; - @GetMapping("/monitors/{monitorId}/metrics/{metrics}") + @GetMapping("/monitor/{monitorId}/metrics/{metrics}") @ApiOperation(value = "查询监控指标组的指标数据", notes = "查询监控指标组的指标数据") public ResponseEntity> getMetricsData( @ApiParam(value = "监控ID", example = "343254354") @@ -66,7 +66,7 @@ public class MetricsDataController { } } - @GetMapping("/monitors/{monitorId}/metrics/{metricFull}") + @GetMapping("/monitor/{monitorId}/metric/{metricFull}") @ApiOperation(value = "查询监控指标组的指定指标的历史数据", notes = "查询监控指标组下的指定指标的历史数据") public ResponseEntity> getMetricHistoryData( @ApiParam(value = "监控ID", example = "343254354") diff --git a/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.html b/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.html index 366bf7f..a1570a9 100644 --- a/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.html +++ b/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.html @@ -33,7 +33,7 @@ -

{{metric}}

+

{{metrics}}

采集时间:{{time | _date: "HH:mm:ss"}} diff --git a/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.ts b/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.ts index 0bb76b5..632a097 100644 --- a/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.ts +++ b/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.ts @@ -16,7 +16,7 @@ export class MonitorDataChartComponent implements OnInit { } private _monitorId!: number; @Input() - metric!: string; + metrics!: string; time!: any; fields!: any[]; @@ -29,7 +29,7 @@ export class MonitorDataChartComponent implements OnInit { loadData() { // 读取实时指标数据 - let metricData$ = this.monitorSvc.getMonitorMetricData(this.monitorId, this.metric) + let metricData$ = this.monitorSvc.getMonitorMetricsData(this.monitorId, this.metrics) .subscribe(message => { metricData$.unsubscribe(); if (message.code === 0) { diff --git a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html index fc2aab2..0539135 100644 --- a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html +++ b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html @@ -91,7 +91,7 @@
- +
diff --git a/web-app/src/app/service/monitor.service.ts b/web-app/src/app/service/monitor.service.ts index 5b5f422..2759926 100644 --- a/web-app/src/app/service/monitor.service.ts +++ b/web-app/src/app/service/monitor.service.ts @@ -104,8 +104,8 @@ export class MonitorService { return this.http.get>>(monitors_uri, options); } - public getMonitorMetricData(monitorId: number, metric: string) : Observable> { - return this.http.get>(`/monitors/${monitorId}/metrics/${metric}`); + public getMonitorMetricsData(monitorId: number, metrics: string) : Observable> { + return this.http.get>(`/monitor/${monitorId}/metrics/${metrics}`); } public getAppsMonitorSummary() : Observable> {