Fix network mapping. Update monitoring overview.
Change-Id: I46960cb72afed5f362cf3de4811b43c66ecfa336
This commit is contained in:
jiahuay
parent
d347e06a40
commit
9a4a96c9b1
@ -81,38 +81,38 @@ address, caption, cite, code, dfn, em, strong, th, var {
|
||||
width: 600px;
|
||||
}
|
||||
.toc .tiles li:nth-child(1) a {
|
||||
background-color: rgb(81, 107, 238);
|
||||
background-color: #6C9842;
|
||||
}
|
||||
.toc .tiles li:nth-child(2) {
|
||||
width: 200px;
|
||||
}
|
||||
.toc .tiles li:nth-child(2) a {
|
||||
background-color: rgb(36, 16, 51);
|
||||
background-color: #D6487E;
|
||||
}
|
||||
.toc .tiles li:nth-child(3) {
|
||||
height: 400px;
|
||||
width: 200px;
|
||||
}
|
||||
.toc .tiles li:nth-child(3) a {
|
||||
background-color: rgb(46, 147, 45);
|
||||
background-color: #FFB752;
|
||||
}
|
||||
.toc .tiles li:nth-child(4), .toc .tiles li:nth-child(5) {
|
||||
width: 300px;
|
||||
}
|
||||
.toc .tiles li:nth-child(4) a, .toc .tiles li:nth-child(5) a {
|
||||
background-color: rgb(106, 106, 106);
|
||||
background-color: #7B68AF;
|
||||
}
|
||||
.toc .tiles li:nth-child(6), .toc .tiles li:nth-child(7), .toc .tiles li:nth-child(8) {
|
||||
width: 200px;
|
||||
}
|
||||
.toc .tiles li:nth-child(6) a, .toc .tiles li:nth-child(7) a, .toc .tiles li:nth-child(8) a {
|
||||
background-color: rgb(104, 52, 160);
|
||||
background-color: #A0A0A0;
|
||||
}
|
||||
.toc .tiles li:nth-child(9), .toc .tiles li:nth-child(10), .toc .tiles li:nth-child(11), .toc .tiles li:nth-child(12) {
|
||||
width: 200px;
|
||||
}
|
||||
.toc .tiles li:nth-child(9) a, .toc .tiles li:nth-child(10) a, .toc .tiles li:nth-child(11) a, .toc .tiles li:nth-child(12) a {
|
||||
background-color: rgb(11, 151, 202);
|
||||
background-color: #6FB3E0;
|
||||
}
|
||||
@media (max-width: 915px) {
|
||||
div.container {
|
||||
|
||||
@ -394,6 +394,9 @@ a:active {
|
||||
.label:first-letter {
|
||||
text-transform: uppercase !important;
|
||||
}
|
||||
.capitalize {
|
||||
text-transform: capitalize;
|
||||
}
|
||||
.nav-search {
|
||||
position: relative !important;
|
||||
float: right !important;
|
||||
|
||||
BIN
v2/assets/img/moni/alert.png
Normal file
BIN
v2/assets/img/moni/alert.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
BIN
v2/assets/img/moni/cluster_summary.png
Normal file
BIN
v2/assets/img/moni/cluster_summary.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
BIN
v2/assets/img/moni/store.png
Normal file
BIN
v2/assets/img/moni/store.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 706 B |
BIN
v2/assets/img/moni/users.png
Normal file
BIN
v2/assets/img/moni/users.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
@ -122,21 +122,9 @@
|
||||
}
|
||||
},
|
||||
"network_mapping": {
|
||||
"management": {
|
||||
"display": "Management",
|
||||
"mapping_interface": ""
|
||||
},
|
||||
"tenant": {
|
||||
"display": "Tenant",
|
||||
"mapping_interface": ""
|
||||
},
|
||||
"storage": {
|
||||
"display": "Storage",
|
||||
"mapping_interface": ""
|
||||
},
|
||||
"public": {
|
||||
"display": "Public",
|
||||
"mapping_interface": ""
|
||||
}
|
||||
"management": "",
|
||||
"tenant": "",
|
||||
"storage": "",
|
||||
"public": ""
|
||||
}
|
||||
}
|
||||
|
||||
@ -133,7 +133,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
||||
"switch_ip": "172.29.8.400",
|
||||
"vlan": 1,
|
||||
"port": 1,
|
||||
"name": "sv-1",
|
||||
"hostname": "sv-1",
|
||||
"clusters": [{
|
||||
"id": 1,
|
||||
"name": "cluster1"
|
||||
@ -152,7 +152,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
||||
"switch_ip": "172.1.20.100",
|
||||
"vlan": 2,
|
||||
"port": 2,
|
||||
"name": "sv-2",
|
||||
"hostname": "sv-2",
|
||||
"clusters": [],
|
||||
"os": "CentOS",
|
||||
"adapter": "OpenStack",
|
||||
@ -165,7 +165,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
||||
"switch_ip": "172.9.20.8",
|
||||
"vlan": 2,
|
||||
"port": 3,
|
||||
"name": "sv-3",
|
||||
"hostname": "sv-3",
|
||||
"clusters": [{
|
||||
"id": 1,
|
||||
"name": "cluster1"
|
||||
@ -181,7 +181,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
||||
"switch_ip": "172.29.8.40",
|
||||
"vlan": 2,
|
||||
"port": 4,
|
||||
"name": "sv-4",
|
||||
"hostname": "sv-4",
|
||||
"clusters": [{
|
||||
"id": 1,
|
||||
"name": "cluster1"
|
||||
@ -197,7 +197,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
||||
"switch_ip": "172.29.8.40",
|
||||
"vlan": 2,
|
||||
"port": 5,
|
||||
"name": "sv-5",
|
||||
"hostname": "sv-5",
|
||||
"clusters": [{
|
||||
"id": 1,
|
||||
"name": "cluster1"
|
||||
@ -213,7 +213,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
||||
"switch_ip": "172.29.8.40",
|
||||
"vlan": 2,
|
||||
"port": 6,
|
||||
"name": "sv-6",
|
||||
"hostname": "sv-6",
|
||||
"clusters": [{
|
||||
"id": 1,
|
||||
"name": "cluster1"
|
||||
@ -229,7 +229,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
||||
"switch_ip": "172.29.7.41",
|
||||
"vlan": 2,
|
||||
"port": 7,
|
||||
"name": "sv-7",
|
||||
"hostname": "sv-7",
|
||||
"clusters": [{
|
||||
"id": 1,
|
||||
"name": "cluster1"
|
||||
@ -245,7 +245,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
||||
"switch_ip": "172.29.8.41",
|
||||
"vlan": 8,
|
||||
"port": 8,
|
||||
"name": "sv-8",
|
||||
"hostname": "sv-8",
|
||||
"clusters": [{
|
||||
"id": 1,
|
||||
"name": "cluster1"
|
||||
@ -261,7 +261,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
||||
"switch_ip": "172.29.8.41",
|
||||
"vlan": 9,
|
||||
"port": 9,
|
||||
"name": "sv-9",
|
||||
"hostname": "sv-9",
|
||||
"clusters": [],
|
||||
"os": "CentOS",
|
||||
"adapter": "OpenStack",
|
||||
@ -274,7 +274,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
||||
"switch_ip": "172.29.8.41",
|
||||
"vlan": 10,
|
||||
"port": 10,
|
||||
"name": "sv-10",
|
||||
"hostname": "sv-10",
|
||||
"clusters": [],
|
||||
"os": "CentOS",
|
||||
"adapter": "OpenStack",
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
<div ng-controller="monitoringCtrl">
|
||||
<div>
|
||||
<div ui-view></div>
|
||||
</div>
|
||||
|
||||
@ -22,51 +22,182 @@ angular.module('compass.monitoring', [
|
||||
renderer: 'area'
|
||||
};
|
||||
|
||||
$scope.alertsData = {"id":"server-1.huawei.com","name":"server-1.huawei.com","resource":"hosts","state":"running","type":"server", "metrics":[], "alarms":[
|
||||
{"id":"critical","name":"critical","data":[
|
||||
{"start":1406831282409,"end":1406870037149},
|
||||
{"start":1406745382748,"end":1406761927670}
|
||||
]},
|
||||
{"id":"minor","name":"minor","data":[
|
||||
{"start":1406873957790,"end":1406886655198},
|
||||
{"start":1406774590378,"end":1406850781190}
|
||||
]},
|
||||
{"id":"positive","name":"positive","data":[
|
||||
{"start":1406873957790,"end":1406886655198},
|
||||
{"start":1406774590378,"end":1406850781190}
|
||||
]},
|
||||
{"id":"info","name":"info","data":[
|
||||
{"start":1406873957790,"end":1406886655198},
|
||||
{"start":1406774590378,"end":1406850781190}
|
||||
]}
|
||||
]};
|
||||
$scope.alertsData = {
|
||||
"id": "server-1.huawei.com",
|
||||
"name": "server-1.huawei.com",
|
||||
"resource": "hosts",
|
||||
"state": "running",
|
||||
"type": "server",
|
||||
"metrics": [],
|
||||
"alarms": [{
|
||||
"id": "critical",
|
||||
"name": "critical",
|
||||
"data": [{
|
||||
"start": 1406831282409,
|
||||
"end": 1406870037149
|
||||
}, {
|
||||
"start": 1406745382748,
|
||||
"end": 1406761927670
|
||||
}]
|
||||
}, {
|
||||
"id": "minor",
|
||||
"name": "minor",
|
||||
"data": [{
|
||||
"start": 1406873957790,
|
||||
"end": 1406886655198
|
||||
}, {
|
||||
"start": 1406774590378,
|
||||
"end": 1406850781190
|
||||
}]
|
||||
}, {
|
||||
"id": "positive",
|
||||
"name": "positive",
|
||||
"data": [{
|
||||
"start": 1406873957790,
|
||||
"end": 1406886655198
|
||||
}, {
|
||||
"start": 1406774590378,
|
||||
"end": 1406850781190
|
||||
}]
|
||||
}, {
|
||||
"id": "info",
|
||||
"name": "info",
|
||||
"data": [{
|
||||
"start": 1406873957790,
|
||||
"end": 1406886655198
|
||||
}, {
|
||||
"start": 1406774590378,
|
||||
"end": 1406850781190
|
||||
}]
|
||||
}]
|
||||
};
|
||||
|
||||
$scope.alerts = [
|
||||
{"startDate":new Date("Sun Dec 09 01:36:45 EST 2012"),"endDate":new Date("Sun Dec 09 02:36:45 EST 2012"),"name":"host-01","status":"WARNING"},
|
||||
{"startDate":new Date("Sun Dec 09 04:56:32 EST 2012"),"endDate":new Date("Sun Dec 09 06:35:47 EST 2012"),"name":"host-05","status":"WARNING"},
|
||||
{"startDate":new Date("Sun Dec 09 06:29:53 EST 2012"),"endDate":new Date("Sun Dec 09 06:34:04 EST 2012"),"name":"host-02","status":"WARNING"},
|
||||
{"startDate":new Date("Sun Dec 09 05:35:21 EST 2012"),"endDate":new Date("Sun Dec 09 06:21:22 EST 2012"),"name":"host-01","status":"WARNING"},
|
||||
{"startDate":new Date("Sun Dec 09 05:00:06 EST 2012"),"endDate":new Date("Sun Dec 09 05:05:07 EST 2012"),"name":"host-03","status":"WARNING"},
|
||||
{"startDate":new Date("Sun Dec 09 03:46:59 EST 2012"),"endDate":new Date("Sun Dec 09 04:54:19 EST 2012"),"name":"host-01","status":"WARNING"},
|
||||
{"startDate":new Date("Sun Dec 09 04:02:45 EST 2012"),"endDate":new Date("Sun Dec 09 04:48:56 EST 2012"),"name":"host-02","status":"WARNING"},
|
||||
{"startDate":new Date("Sun Dec 09 03:27:35 EST 2012"),"endDate":new Date("Sun Dec 09 03:58:43 EST 2012"),"name":"host-03","status":"SUCCEEDED"},
|
||||
{"startDate":new Date("Sun Dec 09 01:40:11 EST 2012"),"endDate":new Date("Sun Dec 09 03:26:35 EST 2012"),"name":"host-04","status":"SUCCEEDED"},
|
||||
{"startDate":new Date("Sun Dec 09 03:00:03 EST 2012"),"endDate":new Date("Sun Dec 09 03:09:51 EST 2012"),"name":"host-05","status":"SUCCEEDED"},
|
||||
{"startDate":new Date("Sun Dec 09 01:21:00 EST 2012"),"endDate":new Date("Sun Dec 09 02:51:42 EST 2012"),"name":"host-01","status":"SUCCEEDED"},
|
||||
{"startDate":new Date("Sun Dec 09 01:08:42 EST 2012"),"endDate":new Date("Sun Dec 09 01:33:42 EST 2012"),"name":"host-04","status":"CRITICAL"},
|
||||
{"startDate":new Date("Sun Dec 09 00:27:15 EST 2012"),"endDate":new Date("Sun Dec 09 00:54:56 EST 2012"),"name":"host-04","status":"SUCCEEDED"},
|
||||
{"startDate":new Date("Sun Dec 09 00:29:48 EST 2012"),"endDate":new Date("Sun Dec 09 00:44:50 EST 2012"),"name":"host-01","status":"SUCCEEDED"},
|
||||
{"startDate":new Date("Sun Dec 09 07:39:21 EST 2012"),"endDate":new Date("Sun Dec 09 07:43:22 EST 2012"),"name":"host-03","status":"WARNING"},
|
||||
{"startDate":new Date("Sun Dec 09 07:00:06 EST 2012"),"endDate":new Date("Sun Dec 09 07:05:07 EST 2012"),"name":"host-02","status":"WARNING"},
|
||||
{"startDate":new Date("Sun Dec 09 08:46:59 EST 2012"),"endDate":new Date("Sun Dec 09 09:54:19 EST 2012"),"name":"host-02","status":"WARNING"},
|
||||
{"startDate":new Date("Sun Dec 09 09:02:45 EST 2012"),"endDate":new Date("Sun Dec 09 09:48:56 EST 2012"),"name":"host-01","status":"WARNING"},
|
||||
{"startDate":new Date("Sun Dec 09 08:27:35 EST 2012"),"endDate":new Date("Sun Dec 09 08:58:43 EST 2012"),"name":"host-05","status":"SUCCEEDED"},
|
||||
{"startDate":new Date("Sun Dec 09 08:40:11 EST 2012"),"endDate":new Date("Sun Dec 09 08:46:35 EST 2012"),"name":"host-03","status":"SUCCEEDED"},
|
||||
{"startDate":new Date("Sun Dec 09 08:00:03 EST 2012"),"endDate":new Date("Sun Dec 09 08:09:51 EST 2012"),"name":"host-02","status":"SUCCEEDED"},
|
||||
{"startDate":new Date("Sun Dec 09 10:21:00 EST 2012"),"endDate":new Date("Sun Dec 09 10:51:42 EST 2012"),"name":"host-04","status":"SUCCEEDED"},
|
||||
{"startDate":new Date("Sun Dec 09 11:08:42 EST 2012"),"endDate":new Date("Sun Dec 09 11:33:42 EST 2012"),"name":"host-04","status":"CRITICAL"},
|
||||
{"startDate":new Date("Sun Dec 09 12:27:15 EST 2012"),"endDate":new Date("Sun Dec 09 12:54:56 EST 2012"),"name":"host-02","status":"SUCCEEDED"},
|
||||
{"startDate":new Date("Sat Dec 08 23:12:24 EST 2012"),"endDate":new Date("Sun Dec 09 00:26:13 EST 2012"),"name":"host-01","status":"UNKNOWN"}];
|
||||
$scope.alerts = [{
|
||||
"startDate": new Date("Sun Dec 09 01:36:45 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 02:36:45 EST 2012"),
|
||||
"name": "host-01",
|
||||
"status": "WARNING"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 04:56:32 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 06:35:47 EST 2012"),
|
||||
"name": "host-05",
|
||||
"status": "WARNING"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 06:29:53 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 06:34:04 EST 2012"),
|
||||
"name": "host-02",
|
||||
"status": "WARNING"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 05:35:21 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 06:21:22 EST 2012"),
|
||||
"name": "host-01",
|
||||
"status": "WARNING"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 05:00:06 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 05:05:07 EST 2012"),
|
||||
"name": "host-03",
|
||||
"status": "WARNING"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 03:46:59 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 04:54:19 EST 2012"),
|
||||
"name": "host-01",
|
||||
"status": "WARNING"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 04:02:45 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 04:48:56 EST 2012"),
|
||||
"name": "host-02",
|
||||
"status": "WARNING"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 03:27:35 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 03:58:43 EST 2012"),
|
||||
"name": "host-03",
|
||||
"status": "SUCCEEDED"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 01:40:11 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 03:26:35 EST 2012"),
|
||||
"name": "host-04",
|
||||
"status": "SUCCEEDED"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 03:00:03 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 03:09:51 EST 2012"),
|
||||
"name": "host-05",
|
||||
"status": "SUCCEEDED"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 01:21:00 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 02:51:42 EST 2012"),
|
||||
"name": "host-01",
|
||||
"status": "SUCCEEDED"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 01:08:42 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 01:33:42 EST 2012"),
|
||||
"name": "host-04",
|
||||
"status": "CRITICAL"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 00:27:15 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 00:54:56 EST 2012"),
|
||||
"name": "host-04",
|
||||
"status": "SUCCEEDED"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 00:29:48 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 00:44:50 EST 2012"),
|
||||
"name": "host-01",
|
||||
"status": "SUCCEEDED"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 07:39:21 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 07:43:22 EST 2012"),
|
||||
"name": "host-03",
|
||||
"status": "WARNING"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 07:00:06 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 07:05:07 EST 2012"),
|
||||
"name": "host-02",
|
||||
"status": "WARNING"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 08:46:59 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 09:54:19 EST 2012"),
|
||||
"name": "host-02",
|
||||
"status": "WARNING"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 09:02:45 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 09:48:56 EST 2012"),
|
||||
"name": "host-01",
|
||||
"status": "WARNING"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 08:27:35 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 08:58:43 EST 2012"),
|
||||
"name": "host-05",
|
||||
"status": "SUCCEEDED"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 08:40:11 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 08:46:35 EST 2012"),
|
||||
"name": "host-03",
|
||||
"status": "SUCCEEDED"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 08:00:03 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 08:09:51 EST 2012"),
|
||||
"name": "host-02",
|
||||
"status": "SUCCEEDED"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 10:21:00 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 10:51:42 EST 2012"),
|
||||
"name": "host-04",
|
||||
"status": "SUCCEEDED"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 11:08:42 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 11:33:42 EST 2012"),
|
||||
"name": "host-04",
|
||||
"status": "CRITICAL"
|
||||
}, {
|
||||
"startDate": new Date("Sun Dec 09 12:27:15 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 12:54:56 EST 2012"),
|
||||
"name": "host-02",
|
||||
"status": "SUCCEEDED"
|
||||
}, {
|
||||
"startDate": new Date("Sat Dec 08 23:12:24 EST 2012"),
|
||||
"endDate": new Date("Sun Dec 09 00:26:13 EST 2012"),
|
||||
"name": "host-01",
|
||||
"status": "UNKNOWN"
|
||||
}];
|
||||
|
||||
$scope.hosts = ["host-01", "host-02", "host-03", "host-04", "host-05"];
|
||||
|
||||
@ -170,177 +301,171 @@ angular.module('compass.monitoring', [
|
||||
|
||||
.controller('alarmsCtrl', ['$scope', '$http', 'graphConfigurations', 'graphService',
|
||||
function($scope, $http, graphConfigurations, graphService) {
|
||||
$scope.uris = graphService.getUris(graphConfigurations,"alarms");
|
||||
$scope.renderers = graphService.getRenderers(graphConfigurations,"alarms");
|
||||
$scope.rendererChanged = graphService.getRendererListener($scope);
|
||||
$scope.uriChanged = graphService.getUriListener($scope);
|
||||
$scope.alertsData = {"id":"server-1.huawei.com","name":"server-1.huawei.com","resource":"hosts","state":"running","type":"server", "metrics":[], "alarms":[
|
||||
{"id":"critical","name":"critical","data":[
|
||||
{"start":1406831282409,"end":1406870037149},
|
||||
{"start":1406745382748,"end":1406761927670}
|
||||
]},
|
||||
{"id":"minor","name":"minor","data":[
|
||||
{"start":1406873957790,"end":1406886655198},
|
||||
{"start":1406774590378,"end":1406850781190}
|
||||
]},
|
||||
{"id":"positive","name":"positive","data":[
|
||||
{"start":1406873957790,"end":1406886655198},
|
||||
{"start":1406774590378,"end":1406850781190}
|
||||
]},
|
||||
{"id":"info","name":"info","data":[
|
||||
{"start":1406873957790,"end":1406886655198},
|
||||
{"start":1406774590378,"end":1406850781190}
|
||||
]}
|
||||
]};
|
||||
$scope.changeSeriesData = graphService.getDataListener($scope, function(data) {
|
||||
var uri = $scope.uri;
|
||||
console.log("URI is .....", uri);
|
||||
var renderer = $scope.renderer;
|
||||
var isValidApi = (uri == graphConfigurations.apis["192.168.255.85.hostgroup"].uri.v);
|
||||
if (isValidApi) for (var i = 0; i < data.length; i++) data[i].name = data[i].id;
|
||||
var gFormatter = com.huawei.compass.formatter.hourminute;
|
||||
var gName = "Alarms";
|
||||
var gData = isValidApi ? data : data.groups[0].hosts;
|
||||
// TODO(jiahua): graphConfigurations.renderers[renderer] is undefined
|
||||
var gProperty = graphConfigurations.renderers[renderer].value;
|
||||
var view = new graphConfigurations.renderers[renderer].view({
|
||||
name: gName,
|
||||
model: new graphConfigurations.renderers[renderer].model({data:gData, propertyKey:"alarms", propertyName:gProperty}).model,
|
||||
formatter: gFormatter,
|
||||
yFormatter: d3.format('.3e'),
|
||||
css: "chart-title",
|
||||
width: 500,
|
||||
height: 500,
|
||||
css: {
|
||||
"header":"chart-title",
|
||||
"critical" : "alarm-critical",
|
||||
"major" : "alarm-major",
|
||||
"minor" : "alarm-minor",
|
||||
"info" : "alarm-info",
|
||||
"positive" : "alarm-positive"
|
||||
},
|
||||
listener: function(d) {
|
||||
alert("Alarm Selected (" + d.startDate + ", " + d.endDate + ")");
|
||||
}
|
||||
});
|
||||
$.graphs.get("alarmsGraphContainer").innerHTML = "";
|
||||
$.graphs.get("alarmsGraphContainer").appendChild(view);
|
||||
});
|
||||
$scope.uris = graphService.getUris(graphConfigurations, "alarms");
|
||||
$scope.renderers = graphService.getRenderers(graphConfigurations, "alarms");
|
||||
$scope.rendererChanged = graphService.getRendererListener($scope);
|
||||
$scope.uriChanged = graphService.getUriListener($scope);
|
||||
$scope.alertsData = {
|
||||
"id": "server-1.huawei.com",
|
||||
"name": "server-1.huawei.com",
|
||||
"resource": "hosts",
|
||||
"state": "running",
|
||||
"type": "server",
|
||||
"metrics": [],
|
||||
"alarms": [{
|
||||
"id": "critical",
|
||||
"name": "critical",
|
||||
"data": [{
|
||||
"start": 1406831282409,
|
||||
"end": 1406870037149
|
||||
}, {
|
||||
"start": 1406745382748,
|
||||
"end": 1406761927670
|
||||
}]
|
||||
}, {
|
||||
"id": "minor",
|
||||
"name": "minor",
|
||||
"data": [{
|
||||
"start": 1406873957790,
|
||||
"end": 1406886655198
|
||||
}, {
|
||||
"start": 1406774590378,
|
||||
"end": 1406850781190
|
||||
}]
|
||||
}, {
|
||||
"id": "positive",
|
||||
"name": "positive",
|
||||
"data": [{
|
||||
"start": 1406873957790,
|
||||
"end": 1406886655198
|
||||
}, {
|
||||
"start": 1406774590378,
|
||||
"end": 1406850781190
|
||||
}]
|
||||
}, {
|
||||
"id": "info",
|
||||
"name": "info",
|
||||
"data": [{
|
||||
"start": 1406873957790,
|
||||
"end": 1406886655198
|
||||
}, {
|
||||
"start": 1406774590378,
|
||||
"end": 1406850781190
|
||||
}]
|
||||
}]
|
||||
};
|
||||
$scope.changeSeriesData = graphService.getDataListener($scope, function(data) {
|
||||
var uri = $scope.uri;
|
||||
console.log("URI is .....", uri);
|
||||
var renderer = $scope.renderer;
|
||||
var isValidApi = (uri == graphConfigurations.apis["192.168.255.85.hostgroup"].uri.v);
|
||||
if (isValidApi)
|
||||
for (var i = 0; i < data.length; i++) data[i].name = data[i].id;
|
||||
var gFormatter = com.huawei.compass.formatter.hourminute;
|
||||
var gName = "Alarms";
|
||||
var gData = isValidApi ? data : data.groups[0].hosts;
|
||||
// TODO(jiahua): graphConfigurations.renderers[renderer] is undefined
|
||||
var gProperty = graphConfigurations.renderers[renderer].value;
|
||||
var view = new graphConfigurations.renderers[renderer].view({
|
||||
name: gName,
|
||||
model: new graphConfigurations.renderers[renderer].model({
|
||||
data: gData,
|
||||
propertyKey: "alarms",
|
||||
propertyName: gProperty
|
||||
}).model,
|
||||
formatter: gFormatter,
|
||||
yFormatter: d3.format('.3e'),
|
||||
css: "chart-title",
|
||||
width: 500,
|
||||
height: 500,
|
||||
css: {
|
||||
"header": "chart-title",
|
||||
"critical": "alarm-critical",
|
||||
"major": "alarm-major",
|
||||
"minor": "alarm-minor",
|
||||
"info": "alarm-info",
|
||||
"positive": "alarm-positive"
|
||||
},
|
||||
listener: function(d) {
|
||||
alert("Alarm Selected (" + d.startDate + ", " + d.endDate + ")");
|
||||
}
|
||||
});
|
||||
$.graphs.get("alarmsGraphContainer").innerHTML = "";
|
||||
$.graphs.get("alarmsGraphContainer").appendChild(view);
|
||||
});
|
||||
}
|
||||
])
|
||||
|
||||
|
||||
.controller('monitoringCtrl', ['$scope',
|
||||
function($scope) {
|
||||
$scope.options = {
|
||||
renderer: 'area'
|
||||
};
|
||||
$scope.features = {
|
||||
hover: {
|
||||
xFormatter: function(x) {
|
||||
return 't=' + x;
|
||||
},
|
||||
yFormatter: function(y) {
|
||||
return '$' + y;
|
||||
}
|
||||
}
|
||||
};
|
||||
$scope.series = [{
|
||||
name: 'Series 1',
|
||||
color: 'steelblue',
|
||||
data: [{
|
||||
x: 0,
|
||||
y: 23
|
||||
}, {
|
||||
x: 1,
|
||||
y: 15
|
||||
}, {
|
||||
x: 2,
|
||||
y: 79
|
||||
}, {
|
||||
x: 3,
|
||||
y: 31
|
||||
}, {
|
||||
x: 4,
|
||||
y: 60
|
||||
}]
|
||||
}, {
|
||||
name: 'Series 2',
|
||||
color: 'lightblue',
|
||||
data: [{
|
||||
x: 0,
|
||||
y: 30
|
||||
}, {
|
||||
x: 1,
|
||||
y: 20
|
||||
}, {
|
||||
x: 2,
|
||||
y: 64
|
||||
}, {
|
||||
x: 3,
|
||||
y: 50
|
||||
}, {
|
||||
x: 4,
|
||||
y: 15
|
||||
}]
|
||||
}];
|
||||
|
||||
$scope.options2 = {
|
||||
renderer: 'line'
|
||||
};
|
||||
$scope.features2 = {
|
||||
hover: {
|
||||
xFormatter: function(x) {
|
||||
return 't=' + x;
|
||||
},
|
||||
yFormatter: function(y) {
|
||||
return '$' + y;
|
||||
}
|
||||
}
|
||||
};
|
||||
$scope.series2 = [{
|
||||
name: 'Series 1',
|
||||
color: 'steelblue',
|
||||
data: [{
|
||||
x: 0,
|
||||
y: 23
|
||||
}, {
|
||||
x: 1,
|
||||
y: 15
|
||||
}, {
|
||||
x: 2,
|
||||
y: 79
|
||||
}, {
|
||||
x: 3,
|
||||
y: 31
|
||||
}, {
|
||||
x: 4,
|
||||
y: 60
|
||||
}]
|
||||
}, {
|
||||
name: 'Series 2',
|
||||
color: 'lightblue',
|
||||
data: [{
|
||||
x: 0,
|
||||
y: 30
|
||||
}, {
|
||||
x: 1,
|
||||
y: 20
|
||||
}, {
|
||||
x: 2,
|
||||
y: 64
|
||||
}, {
|
||||
x: 3,
|
||||
y: 50
|
||||
}, {
|
||||
x: 4,
|
||||
y: 15
|
||||
}]
|
||||
}];
|
||||
}
|
||||
])
|
||||
|
||||
.controller('moniOverviewCtrl', function($scope) {
|
||||
$scope.moniOverviewData = [{
|
||||
"name": "cluster_summary",
|
||||
"display_name": "Cluster Summary",
|
||||
"state": "ok"
|
||||
}, {
|
||||
"name": "controller",
|
||||
"display_name": "Controller",
|
||||
"state": "error"
|
||||
}, {
|
||||
"name": "alert",
|
||||
"display_name": "Alert",
|
||||
"state": "",
|
||||
"alerts": [{
|
||||
"type": "critical",
|
||||
"name": "host-1"
|
||||
}, {
|
||||
"type": "warning",
|
||||
"name": "host-22",
|
||||
}, {
|
||||
"type": "warning",
|
||||
"name": "host-13"
|
||||
}, {
|
||||
"type": "critical",
|
||||
"name": "host-20"
|
||||
}, {
|
||||
"type": "warning",
|
||||
"name": "host-20"
|
||||
}]
|
||||
}, {
|
||||
"name": "compute",
|
||||
"display_name": "Compute",
|
||||
"state": "ok"
|
||||
}, {
|
||||
"name": "security",
|
||||
"display_name": "Security",
|
||||
"state": "warning"
|
||||
}, {
|
||||
"name": "database",
|
||||
"display_name": "Database",
|
||||
"state": "warning"
|
||||
}, {
|
||||
"name": "image",
|
||||
"display_name": "Image",
|
||||
"state": "warning"
|
||||
}, {
|
||||
"name": "store",
|
||||
"display_name": "Store",
|
||||
"state": "ok"
|
||||
}, {
|
||||
"name": "messagebus",
|
||||
"display_name": "Message Bus",
|
||||
"state": "ok"
|
||||
}, {
|
||||
"name": "processes",
|
||||
"display_name": "Processes",
|
||||
"state": "ok"
|
||||
}, {
|
||||
"name": "monitoring",
|
||||
"display_name": "Monitoring",
|
||||
"state": "ok"
|
||||
}, {
|
||||
"name": "users",
|
||||
"display_name": "Users",
|
||||
"state": "ok"
|
||||
}];
|
||||
|
||||
|
||||
$scope.logicalTopoData = {
|
||||
"name": "cluster1",
|
||||
"children": [{
|
||||
|
||||
@ -4,153 +4,178 @@
|
||||
</h1>
|
||||
</div>
|
||||
|
||||
<div class="container row side-padding-0 top-padding-0">
|
||||
<div class="toc info-icons" id="toc">
|
||||
<div class="container row side-padding-0 top-padding-0" ng-controller="moniOverviewCtrl">
|
||||
<div class="toc info-icons">
|
||||
<ul class="tiles">
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #6C9842">
|
||||
<em>
|
||||
<span class="glyphicon glyphicon-list-alt">
|
||||
</span>
|
||||
</em>
|
||||
<br>
|
||||
Cluster Summary
|
||||
<span class="pull-right">
|
||||
<img style="margin-top: -25px;" src="assets/img/happy_face.png" height="80" width="80">
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(02_quickstart);" style="background-color: #D6487E;">
|
||||
<em>
|
||||
<image src="assets/img/controller.png" width="110" height="110" style="margin-left: -8px; margin-bottom: 40px;"></image>
|
||||
</em>
|
||||
<div style="margin-top: -22px;">
|
||||
Controller
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #FFB752;">
|
||||
<em>
|
||||
<span class="glyphicon glyphicon-warning-sign" style="padding-left: 10px;">
|
||||
</span>
|
||||
</em>
|
||||
<br>
|
||||
Alerts
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #7B68AF;">
|
||||
<em>
|
||||
<image src="assets/img/compute.png" width="85" height="85" style="margin-bottom: 40px; margin-left: 5px;"></image>
|
||||
</em>
|
||||
<br>
|
||||
Compute
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #7B68AF;">
|
||||
<em>
|
||||
<image src="assets/img/security1.png" width="85" height="85" style="margin-bottom: 38px; margin-left: 3px;"></image>
|
||||
</em>
|
||||
<br>
|
||||
Security
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #A0A0A0;">
|
||||
<em>
|
||||
<image src="assets/img/database.png" width="90" height="90" style="margin-bottom: 38px;"></image>
|
||||
</em>
|
||||
<br>
|
||||
Database
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #A0A0A0;">
|
||||
<em>
|
||||
<image src="assets/img/image.png" width="95" height="95" style="margin-bottom: 35px;"></image>
|
||||
</em>
|
||||
<br>
|
||||
Image
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #A0A0A0;">
|
||||
<em>
|
||||
<span class="glyphicon glyphicon-hdd" style="margin-left: 5px;">
|
||||
</span>
|
||||
</em>
|
||||
<div style="margin-top: 14px;">
|
||||
Store
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #6FB3E0;">
|
||||
<em>
|
||||
<image src="assets/img/messagebus1.png" width="90" height="90" style="margin-bottom: 42px;"></image>
|
||||
</em>
|
||||
<br>
|
||||
Message Bus
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #6FB3E0;">
|
||||
<em>
|
||||
<image src="assets/img/processes.png" width="90" height="90" style="margin-bottom: 42px;"></image>
|
||||
</em>
|
||||
<br>
|
||||
Processes
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #6FB3E0;">
|
||||
<em>
|
||||
<image src="assets/img/monitor.png" width="90" height="90" style="margin-bottom: 42px; margin-left: 5px;"></image>
|
||||
</em>
|
||||
<br>
|
||||
Monitoring
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #6FB3E0;">
|
||||
<em>
|
||||
<span class="glyphicon glyphicon-user" style="margin-left: 4px;">
|
||||
</span>
|
||||
</em>
|
||||
<div style="margin-top: 14px;">
|
||||
Users
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li ng-repeat="tile in moniOverviewData">
|
||||
<a href="javascript:getSummary({{tile.name}})">
|
||||
<span>
|
||||
<img src="assets/img/moni/{{tile.name}}.png" width="100" height="100" style="margin-left: 4px; margin-bottom: 40px; margin-top: 5px">
|
||||
</span>
|
||||
<br>
|
||||
<span class="capitalize pull-left" style="margin-top: -22px; margin-left: 15px">
|
||||
{{tile.display_name}}
|
||||
</span>
|
||||
<span class="pull-right">
|
||||
<div ng-switch on="tile.state">
|
||||
<div ng-switch-when="ok">
|
||||
<img style="margin-top: -35px;" src="assets/img/happy_face.png" height="45" width="45">
|
||||
</div>
|
||||
<div ng-switch-when="error">
|
||||
<img style="margin-top: -35px;" src="assets/img/unhappy_face.png" height="45" width="45">
|
||||
</div>
|
||||
<div ng-switch-when="warning">
|
||||
<img style="margin-top: -35px;" src="assets/img/meh_face.png" height="45" width="45">
|
||||
</div>
|
||||
</div>
|
||||
</span>
|
||||
<span class="clearfix"></span>
|
||||
<div ng-if="tile.name == 'alert'" style="font-size: 13px; margin-top: 10px; margin-left: 15px;">
|
||||
<span ng-repeat="alert in tile.alerts">
|
||||
<div ng-switch on="alert.type" class="pull-left" style="margin-bottom: 5px; margin-right: 5px;">
|
||||
<div ng-switch-when="critical" class="center" style="border: 2px solid #d15b47; border-radius: 5px; color: #d15b47; margin-right: 3px; padding: 1px 3px; width: 25px">
|
||||
C
|
||||
</div>
|
||||
<div ng-switch-when="warning" class="center" style="border: 2px solid rgba(255, 251, 175, 1); border-radius: 5px; color: rgba(255, 251, 175, 1); margin-right: 3px; padding: 1px 3px; width: 25px;">
|
||||
W
|
||||
</div>
|
||||
</div>
|
||||
<div class="pull-left" style="margin-top: 2px;">{{alert.name}}</div>
|
||||
<div class="clearfix"></div>
|
||||
</span>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!--div class="toc info-icons" id="toc">
|
||||
<ul class="tiles">
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #6C9842">
|
||||
<em>
|
||||
<span class="glyphicon glyphicon-list-alt">
|
||||
</span>
|
||||
</em>
|
||||
<br>Cluster Summary
|
||||
<span class="pull-right">
|
||||
<img style="margin-top: -25px;" src="assets/img/happy_face.png" height="80" width="80">
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(02_quickstart);" style="background-color: #D6487E;">
|
||||
<em>
|
||||
<image src="assets/img/controller.png" width="110" height="110" style="margin-left: -8px; margin-bottom: 40px;"></image>
|
||||
</em>
|
||||
<div style="margin-top: -22px;">
|
||||
Controller
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #FFB752;">
|
||||
<em>
|
||||
<span class="glyphicon glyphicon-warning-sign" style="padding-left: 10px;">
|
||||
</span>
|
||||
</em>
|
||||
<br>Alerts
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #7B68AF;">
|
||||
<em>
|
||||
<image src="assets/img/compute.png" width="85" height="85" style="margin-bottom: 40px; margin-left: 5px;"></image>
|
||||
</em>
|
||||
<br>Compute
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #7B68AF;">
|
||||
<em>
|
||||
<image src="assets/img/security.png" width="85" height="85" style="margin-bottom: 38px; margin-left: 3px;"></image>
|
||||
</em>
|
||||
<br>Security
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #A0A0A0;">
|
||||
<em>
|
||||
<image src="assets/img/database.png" width="90" height="90" style="margin-bottom: 38px;"></image>
|
||||
</em>
|
||||
<br>Database
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #A0A0A0;">
|
||||
<em>
|
||||
<image src="assets/img/image.png" width="95" height="95" style="margin-bottom: 35px;"></image>
|
||||
</em>
|
||||
<br>Image
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #A0A0A0;">
|
||||
<em>
|
||||
<span class="glyphicon glyphicon-hdd" style="margin-left: 5px;">
|
||||
</span>
|
||||
</em>
|
||||
<div style="margin-top: 14px;">
|
||||
Store
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #6FB3E0;">
|
||||
<em>
|
||||
<image src="assets/img/messagebus.png" width="90" height="90" style="margin-bottom: 42px;"></image>
|
||||
</em>
|
||||
<br>Message Bus
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #6FB3E0;">
|
||||
<em>
|
||||
<image src="assets/img/processes.png" width="90" height="90" style="margin-bottom: 42px;"></image>
|
||||
</em>
|
||||
<br>Processes
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #6FB3E0;">
|
||||
<em>
|
||||
<image src="assets/img/monitor.png" width="90" height="90" style="margin-bottom: 42px; margin-left: 5px;"></image>
|
||||
</em>
|
||||
<br>Monitoring
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript::getSummary(01_intro);" style="background-color: #6FB3E0;">
|
||||
<em>
|
||||
<span class="glyphicon glyphicon-user" style="margin-left: 4px;">
|
||||
</span>
|
||||
</em>
|
||||
<div style="margin-top: 14px;">
|
||||
Users
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div-->
|
||||
</div>
|
||||
|
||||
<div class="row side-padding-10 top-padding-10" ng-controller="moniOverviewCtrl">
|
||||
<!--div class="row side-padding-10 top-padding-10" ng-controller="moniOverviewCtrl">
|
||||
<div class="col-xs-12">
|
||||
<div ng-repeat="role in logicalTopoData.children" class="well pull-left">
|
||||
<span>{{role.name}}</span>
|
||||
<span>{{role.children.length}}</span> <br/>
|
||||
{{role.state}}
|
||||
<span>{{role.children.length}}</span>
|
||||
<br/>{{role.state}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 top-padding-10" style="height: 300px">
|
||||
<nvd3-stacked-area-chart
|
||||
data="exampleData"
|
||||
id="exampleId"
|
||||
showXAxis="true"
|
||||
showYAxis="true"
|
||||
tooltips="true"
|
||||
interactive="true"
|
||||
useInteractiveGuideline="true"
|
||||
toolTipContent="toolTipContentFunction()"
|
||||
forceY="[0]">
|
||||
<nvd3-stacked-area-chart data="exampleData" id="exampleId" showXAxis="true" showYAxis="true" tooltips="true" interactive="true" useInteractiveGuideline="true" toolTipContent="toolTipContentFunction()" forceY="[0]">
|
||||
<svg></svg>
|
||||
</nvd3-stacked-area-chart>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div-->
|
||||
|
||||
@ -62,7 +62,7 @@
|
||||
</span>
|
||||
</td>
|
||||
<td ng-repeat="(key, value) in interfaces">
|
||||
{{server['network'][key].ip}}
|
||||
{{server.networks[key].ip}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
@ -100,8 +100,8 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="(key, value) in network_mapping">
|
||||
<td>{{value.display}}</td>
|
||||
<td>{{value.mapping_interface}}</td>
|
||||
<td class="capitalize">{{key}}</td>
|
||||
<td>{{value}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@ -1352,7 +1352,7 @@ angular.module('compass.wizard', [
|
||||
}
|
||||
};
|
||||
dataService.updateClusterConfig(cluster.id, network_mapping).success(function(data) {
|
||||
wizardFactory.setNetworkMapping($scope.networking);
|
||||
wizardFactory.setNetworkMapping(networks);
|
||||
var commitState = {
|
||||
"name": "network_mapping",
|
||||
"state": "success",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user