Code Review
/
src
/
xds
/
xds-agent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added Grafana url setting in config panel
[src/xds/xds-agent.git]
/
webapp
/
src
/
app
/
pages
/
supervision
/
supervision.component.ts
diff --git
a/webapp/src/app/pages/supervision/supervision.component.ts
b/webapp/src/app/pages/supervision/supervision.component.ts
index
219f28f
..
53fff22
100644
(file)
--- a/
webapp/src/app/pages/supervision/supervision.component.ts
+++ b/
webapp/src/app/pages/supervision/supervision.component.ts
@@
-22,6
+22,7
@@
import { Subject } from 'rxjs/Subject';
import { NbThemeService } from '@nebular/theme';
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
import { NbThemeService } from '@nebular/theme';
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+import { ConfigService, IConfig } from '../../@core-xds/services/config.service';
import { SupervisionService } from '../../@core-xds/services/supervision.service';
import { AlertService } from '../../@core-xds/services/alert.service';
import { SupervisionService } from '../../@core-xds/services/supervision.service';
import { AlertService } from '../../@core-xds/services/alert.service';
@@
-70,10
+71,15
@@
export class SupervisionComponent implements OnInit {
private alert: AlertService,
private themeService: NbThemeService,
private sanitizer: DomSanitizer,
private alert: AlertService,
private themeService: NbThemeService,
private sanitizer: DomSanitizer,
+ private configSvr: ConfigService,
) {
}
) {
}
+ Config: IConfig = <IConfig>{};
+
ngOnInit() {
ngOnInit() {
+ this.configSvr.Conf$.subscribe(cfg => this.Config = cfg);
+
this._initDashboard();
this._initPanels();
this._initDashboard();
this._initPanels();
@@
-131,16
+137,24
@@
export class SupervisionComponent implements OnInit {
}
private _buildDashboardUrl(sname: string, from: number, to: number, theme: string) {
}
private _buildDashboardUrl(sname: string, from: number, to: number, theme: string) {
+ // FIXME get sname from config to support several dashboards
let url = 'http://localhost:3000/d/Lbpwc6Iiz/' + sname;
let url = 'http://localhost:3000/d/Lbpwc6Iiz/' + sname;
+ if (this.Config.grafanaDashboardUrl !== '') {
+ url = this.Config.grafanaDashboardUrl;
+ }
url += '?orgId=1';
url += '&from=' + from;
url += '&to=' + to;
url += '&theme=' + theme;
url += '?orgId=1';
url += '&from=' + from;
url += '&to=' + to;
url += '&theme=' + theme;
+ url += '&sidemenu=close';
return url;
}
private _buildPanelUrl(idx: string, from: number, to: number, theme: string) {
let url = 'http://localhost:3000/d-solo/Lbpwc6Iiz/agl-xds-supervisor';
return url;
}
private _buildPanelUrl(idx: string, from: number, to: number, theme: string) {
let url = 'http://localhost:3000/d-solo/Lbpwc6Iiz/agl-xds-supervisor';
+ if (this.Config.grafanaDashboardUrl !== '') {
+ url = this.Config.grafanaDashboardUrl;
+ }
url += '?panelId=' + idx;
url += '&orgId=1';
url += '&from=' + from;
url += '?panelId=' + idx;
url += '&orgId=1';
url += '&from=' + from;