X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-frontend%2Fsrc%2Fapp%2Fstats%2Fstats.component.ts;fp=webapp-frontend%2Fsrc%2Fapp%2Fstats%2Fstats.component.ts;h=109400f1350da554b8a2d4248caea5c9d473d327;hb=8848d27a648dbfe88346425a7c4c36cb1aff9e46;hp=b966230400910aae90532794f3f92eb1138c872b;hpb=4d016dc92a169835f1ab9b043b32b2775817ff6c;p=portal%2Fric-dashboard.git diff --git a/webapp-frontend/src/app/stats/stats.component.ts b/webapp-frontend/src/app/stats/stats.component.ts index b9662304..109400f1 100644 --- a/webapp-frontend/src/app/stats/stats.component.ts +++ b/webapp-frontend/src/app/stats/stats.component.ts @@ -23,7 +23,7 @@ import { StatsService } from '../services/stats/stats.service'; import { HttpClient } from '@angular/common/http'; import { map } from 'rxjs/operators'; import { DashboardSuccessTransport } from '../interfaces/dashboard.types'; -import { DomSanitizer, SafeUrl, SafeResourceUrl } from '@angular/platform-browser'; +import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; @Component({ selector: 'rd-stats', @@ -33,299 +33,13 @@ import { DomSanitizer, SafeUrl, SafeResourceUrl } from '@angular/platform-browse export class StatsComponent implements OnInit { @ViewChildren(BaseChartDirective) charts: QueryList; - timeLeft = 60; - interval; checked = false; - load; - delay; metricsUrlAc : SafeResourceUrl; metricsUrlMc : SafeResourceUrl; - public latencyChartColors: Array = [ - { // blue - backgroundColor: 'rgba(197, 239, 247, 0.2)', - borderColor: 'lightblue', - pointBackgroundColor: 'lightblue', - pointBorderColor: '#fff', - pointHoverBackgroundColor: '#fff', - pointHoverBorderColor: 'rgba(148,159,177,0.8)' - } - ]; - public latencyChartOptions = { - scaleShowVerticalLines: true, - responsive: true, - animation: { - duration: 800 * 1.5, - easing: 'linear' - }, - hover: { - animationDuration: 1 // duration of animations when hovering an item - }, - responsiveAnimationDuration: 500, - scales: { - yAxes: [{ - ticks: { - // the data minimum used for determining the ticks is Math.min(dataMin, suggestedMin) - suggestedMin: 0, - // the data maximum used for determining the ticks is Math.max(dataMax, suggestedMax) - // suggestedMax: 1000 - }, - scaleLabel: { - display: true, - labelString: 'msecs' - } - }], - xAxes: [{ - scaleLabel: { - display: true, - labelString: 'time (last 10 seconds)' - } - }] - }, - }; - public latencyChartLabels = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; - public latencyChartType = 'line'; - public latencyChartLegend = true; - public latencyChartData = [ - { data: [65, 59, 80, 81, 56, 55, 40, 20, 12, 34], label: 'Latency' }, - ]; - - public loadChartColors: Array = [ - - { // green - backgroundColor: 'rgba(200, 247, 197, 0.2)', - borderColor: 'lightgreen', - pointBackgroundColor: 'lightgreen', - pointBorderColor: '#fff', - pointHoverBackgroundColor: '#fff', - pointHoverBorderColor: 'rgba(0,200,0,0.5)' - } - ]; - public loadChartOptions = { - scaleShowVerticalLines: false, - responsive: true, - animation: { - duration: 800 * 1.5, - easing: 'linear' - }, - hover: { - animationDuration: 1 // duration of animations when hovering an item - }, - responsiveAnimationDuration: 500, - scales: { - yAxes: [{ - ticks: { - // the data minimum used for determining the ticks is Math.min(dataMin, suggestedMin) - suggestedMin: 0, - // the data maximum used for determining the ticks is Math.max(dataMax, suggestedMax) - // suggestedMax: 1000 - }, - scaleLabel: { - display: true, - labelString: '# of requests' - } - }], - xAxes: [{ - scaleLabel: { - display: true, - labelString: 'time (last 10 seconds)' - } - }] - }, - }; - public loadChartLabels = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; - public loadChartType = 'line'; - public loadChartLegend = true; - public loadChartData = [ - { data: [28, 48, 40, 19, 86, 77, 90, 20, 12, 34], label: 'Load' } - ]; - - public cpuChartColors: Array = [ - - { // red - backgroundColor: 'rgba(241, 169, 160, 0.2)', - borderColor: 'brown', - pointBackgroundColor: 'brown', - pointBorderColor: '#fff', - pointHoverBackgroundColor: '#fff', - pointHoverBorderColor: 'rgba(0,200,0,0.5)' - } - ]; - public cpuChartOptions = { - scaleShowVerticalLines: false, - responsive: true, - animation: { - duration: 800 * 1.5, - easing: 'linear' - }, - hover: { - animationDuration: 1 // duration of animations when hovering an item - }, - responsiveAnimationDuration: 500, - scales: { - yAxes: [{ - ticks: { - // the data minimum used for determining the ticks is Math.min(dataMin, suggestedMin) - suggestedMin: 0, - // the data maximum used for determining the ticks is Math.max(dataMax, suggestedMax) - // suggestedMax: 1000 - }, - scaleLabel: { - display: true, - labelString: '# of requests' - } - }], - xAxes: [{ - scaleLabel: { - display: true, - labelString: 'time (last 10 seconds)' - } - }] - }, - }; - public cpuChartLabels = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; - public cpuChartType = 'line'; - public cpuChartLegend = true; - public cpuChartData = [ - { data: [15, 29, 30, 31, 53, 52, 41, 70, 32, 14], label: 'RICLoad' } - ]; - - public x = 11; - public y = 11; - public z = 11; - public loop = true; - - public sliderLoadMax = Number(this.service.loadMax) || 0; - - public sliderDelayMax = Number(this.service.delayMax) || 0; - - latencyClickData() { - // this.latencyChartData = [{data: [Math.random() * 100, Math.random() * 100, Math.random() * 100, - // Math.random() * 100, Math.random() * 100, Math.random() * 100, Math.random() * 100, Math.random() * 100, - // Math.random() * 100, Math.random() * 100], label: 'Latency'}]; - this.charts.forEach((child) => { - if (child.datasets[0].label === 'Latency') { - this.latencyChartLabels.shift(); - child.datasets[0].data.shift(); - - const latencyData = this.service.getLatencyMetrics(); - child.datasets[0].data.push(latencyData); - this.latencyChartLabels.push('' + this.x++); - } - // once new data is computed and datasets are updated, tell our baseChart the datasets changed - child.ngOnChanges({ - datasets: { - currentValue: child.datasets, - previousValue: null, - firstChange: true, - isFirstChange: () => true - } - }); - }); - } - - loadClickData() { - if (this.loop) { - this.loop = false; - this.startLoadTimer(); - } else { - this.loop = true; - this.pauseLoadTimer(); - } - } - - loopLoadData(metricsv: any) { - this.charts.forEach((child) => { - if (child.datasets[0].label === 'Load') { - this.loadChartLabels.shift(); - child.datasets[0].data.shift(); - - // const loadData = this.service.getLoad(); - // child.datasets[0].data.push(this.service.load); - child.datasets[0].data.push(metricsv['load']); - this.loadChartLabels.push('' + this.x++); - } - if (child.datasets[0].label === 'Latency') { - this.latencyChartLabels.shift(); - child.datasets[0].data.shift(); - - // const loadData = this.service.getLoad(); - // child.datasets[0].data.push(this.service.load); - child.datasets[0].data.push(metricsv['latency']); - this.latencyChartLabels.push('' + this.x++); - } - if (child.datasets[0].label === 'RICLoad') { - this.latencyChartLabels.shift(); - child.datasets[0].data.shift(); - - // const loadData = this.service.getLoad(); - // child.datasets[0].data.push(this.service.load); - child.datasets[0].data.push(metricsv['ricload']); - this.latencyChartLabels.push('' + this.x++); - } - // once new data is computed and datasets are updated, tell our baseChart the datasets changed - child.ngOnChanges({ - datasets: { - currentValue: child.datasets, - previousValue: null, - firstChange: true, - isFirstChange: () => true - } - }); - }); - } - - cpuClickData() { - // this.cpuChartData = [{data: [Math.random() * 100, Math.random() * 100, Math.random() * 100, - // Math.random() * 100, Math.random() * 100, Math.random() * 100, Math.random() * 100, Math.random() * 100, - // Math.random() * 100, Math.random() * 100], label: 'CPU'}]; - const cpuData = this.service.getLatencyMetrics(); - this.newDataPoint([cpuData], this.z++); - } - - newDataPoint(dataArr = [100], label) { - - this.cpuChartData.forEach((dataset, index) => { - this.cpuChartData[index] = Object.assign({}, this.cpuChartData[index], { - data: [...this.cpuChartData[index].data, dataArr[index]] - }); - }); - - this.cpuChartLabels = [...this.cpuChartLabels, label]; - // console.log(this.cpuChartLabels); - // console.log(this.cpuChartData); - } - - formatLabel(value: number | null) { - if (!value) { - return 0; - } - - if (value >= 1000) { - return Math.round(value / 1000); - } - - return value; - } - constructor(private service: StatsService, private httpClient: HttpClient, private sanitize: DomSanitizer) { - this.sliderLoadMax = Number(this.service.loadMax) || 0; - this.sliderDelayMax = Number(this.service.delayMax) || 0; - // console.log('this.sliderLoadMax: ' + this.sliderLoadMax); - // console.log('this.sliderDelayMax: ' + this.sliderDelayMax); } ngOnInit() { - this.fetchLoad().subscribe(loadv => { - // console.log('loadv: ' + loadv); - this.checked = loadv; - }); - this.fetchDelay().subscribe(delayv => { - // console.log('delayv: ' + delayv); - this.delay = delayv; - }); - this.fetchMetrics().subscribe(metricsv => { - // console.log('metricsv.load: ' + metricsv['load']); - }); this.service.getAppMetricsUrl('AC').subscribe((res:DashboardSuccessTransport) => { this.metricsUrlAc = this.sanitize.bypassSecurityTrustResourceUrl(res.data); }); @@ -334,56 +48,4 @@ export class StatsComponent implements OnInit { }); } - startLoadTimer() { - this.interval = setInterval(() => { - if (this.timeLeft > 0) { - this.timeLeft--; - this.fetchMetrics().subscribe(metricsv => { - // console.log('metricsv.load: ' + metricsv['latency']); - // console.log('metricsv.load: ' + metricsv['load']); - // console.log('metricsv.load: ' + metricsv['ricload']); - this.loopLoadData(metricsv); - }); - - } else { - this.timeLeft = 60; - } - }, 1000); - } - - pauseLoadTimer() { - clearInterval(this.interval); - } - - fetchMetrics() { - return this.httpClient.get(this.service.hostURL + this.service.metricsPath, this.service.httpOptions).pipe(map(res => { - return res; - })); - } - - fetchDelay() { - return this.httpClient.get(this.service.hostURL + this.service.delayPath, this.service.httpOptions).pipe(map(res => { - const delayv = res['delay']; - this.delay = delayv; - return this.delay; - })); - } - - saveDelay() { - this.service.putDelay(this.delay); - } - - fetchLoad() { - return this.httpClient.get(this.service.hostURL + this.service.loadPath, this.service.httpOptions).pipe(map(res => { - const loadv = res['load']; - this.load = loadv; - return this.load; - })); - - } - - saveLoad() { - this.service.putLoad(this.load); - } - }