From 9a4a96c9b11d1c73908ae427ca9b00ec00e11512 Mon Sep 17 00:00:00 2001 From: jiahuay Date: Sat, 6 Sep 2014 00:11:14 -0700 Subject: [PATCH] Fix network mapping. Update monitoring overview. Change-Id: I46960cb72afed5f362cf3de4811b43c66ecfa336 --- v2/assets/css/shelf.css | 12 +- v2/assets/css/style.css | 3 + v2/assets/img/moni/alert.png | Bin 0 -> 3889 bytes v2/assets/img/moni/cluster_summary.png | Bin 0 -> 1903 bytes v2/assets/img/{ => moni}/compute.png | Bin v2/assets/img/{ => moni}/controller.png | Bin v2/assets/img/{ => moni}/database.png | Bin v2/assets/img/{ => moni}/image.png | Bin .../{messagebus1.png => moni/messagebus.png} | Bin .../{messagebus.png => moni/messagebus1.png} | Bin .../img/{monitor.png => moni/monitoring.png} | Bin v2/assets/img/{ => moni}/processes.png | Bin .../img/{security1.png => moni/security.png} | Bin v2/assets/img/moni/store.png | Bin 0 -> 706 bytes v2/assets/img/moni/users.png | Bin 0 -> 1428 bytes v2/data/config.json | 20 +- v2/src/app/appDev.js | 20 +- .../monitoring/cluster-monitoring.tpl.html | 2 +- v2/src/app/monitoring/monitoring.js | 543 +++++++++++------- v2/src/app/monitoring/overview.tpl.html | 293 +++++----- v2/src/app/wizard/review.tpl.html | 6 +- v2/src/app/wizard/wizard.js | 2 +- 22 files changed, 521 insertions(+), 380 deletions(-) create mode 100644 v2/assets/img/moni/alert.png create mode 100644 v2/assets/img/moni/cluster_summary.png rename v2/assets/img/{ => moni}/compute.png (100%) rename v2/assets/img/{ => moni}/controller.png (100%) rename v2/assets/img/{ => moni}/database.png (100%) rename v2/assets/img/{ => moni}/image.png (100%) rename v2/assets/img/{messagebus1.png => moni/messagebus.png} (100%) rename v2/assets/img/{messagebus.png => moni/messagebus1.png} (100%) rename v2/assets/img/{monitor.png => moni/monitoring.png} (100%) rename v2/assets/img/{ => moni}/processes.png (100%) rename v2/assets/img/{security1.png => moni/security.png} (100%) create mode 100644 v2/assets/img/moni/store.png create mode 100644 v2/assets/img/moni/users.png diff --git a/v2/assets/css/shelf.css b/v2/assets/css/shelf.css index 0328adf..5c8dcd3 100644 --- a/v2/assets/css/shelf.css +++ b/v2/assets/css/shelf.css @@ -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 { diff --git a/v2/assets/css/style.css b/v2/assets/css/style.css index d40563c..610dda5 100644 --- a/v2/assets/css/style.css +++ b/v2/assets/css/style.css @@ -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; diff --git a/v2/assets/img/moni/alert.png b/v2/assets/img/moni/alert.png new file mode 100644 index 0000000000000000000000000000000000000000..217e93325baff367eac1568b9b31ea2ccd950694 GIT binary patch literal 3889 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 literal 0 HcmV?d00001 diff --git a/v2/assets/img/compute.png b/v2/assets/img/moni/compute.png similarity index 100% rename from v2/assets/img/compute.png rename to v2/assets/img/moni/compute.png diff --git a/v2/assets/img/controller.png b/v2/assets/img/moni/controller.png similarity index 100% rename from v2/assets/img/controller.png rename to v2/assets/img/moni/controller.png diff --git a/v2/assets/img/database.png b/v2/assets/img/moni/database.png similarity index 100% rename from v2/assets/img/database.png rename to v2/assets/img/moni/database.png diff --git a/v2/assets/img/image.png b/v2/assets/img/moni/image.png similarity index 100% rename from v2/assets/img/image.png rename to v2/assets/img/moni/image.png diff --git a/v2/assets/img/messagebus1.png b/v2/assets/img/moni/messagebus.png similarity index 100% rename from v2/assets/img/messagebus1.png rename to v2/assets/img/moni/messagebus.png diff --git a/v2/assets/img/messagebus.png b/v2/assets/img/moni/messagebus1.png similarity index 100% rename from v2/assets/img/messagebus.png rename to v2/assets/img/moni/messagebus1.png diff --git a/v2/assets/img/monitor.png b/v2/assets/img/moni/monitoring.png similarity index 100% rename from v2/assets/img/monitor.png rename to v2/assets/img/moni/monitoring.png diff --git a/v2/assets/img/processes.png b/v2/assets/img/moni/processes.png similarity index 100% rename from v2/assets/img/processes.png rename to v2/assets/img/moni/processes.png diff --git a/v2/assets/img/security1.png b/v2/assets/img/moni/security.png similarity index 100% rename from v2/assets/img/security1.png rename to v2/assets/img/moni/security.png diff --git a/v2/assets/img/moni/store.png b/v2/assets/img/moni/store.png new file mode 100644 index 0000000000000000000000000000000000000000..cd205d42bba94d50541462bfdbb0333795858645 GIT binary patch literal 706 zcmeAS@N?(olHy`uVBq!ia0vp^bAfmc2OE$~ty)+$B>F!Z|o;gWM81r41!L(ySK~Ukb?jNX~8N_-^Ih{#f*)Wz@!!4nBV2MTal# zJfHZI!%PgwQnZ?(X2mb~u5=pTaqUITI~Rit6U?>&8}_a^!s^-n>z#bw?JpEcfCk@r zts~nP4z%*I>i1nTA7>xB)c8U`wxs`DEuXjh8}*2bhIcQ4tT|$z}W+R2_c}WS@*z>aA9AR{I5DT@1yGhpeF=motH+%-rfN8piBD;2M8q~+rf9S z@x_d@pZ@bNowD})*V&9UllRpo#9n{<;>a=2ui-WBec=ZS)%IP!$k`Wt=ycQK@`}iU zFMQ|weO~BATUM=~yEOR+*oQIOD!84z+3okU)$)SF669^L;lQw9zWA}^-#gQ7zb0IV zxEd(oc>Beq?JaGW?kyFT+s?YZbPrd5bkpzB<-&4jn{R(sP_&uFw*C9d(2AOh(|he{^w$xv{t+ifW_Y7zjVN=>diRqP{Lfn4=E5u9ka{BF z@uNr27*1SJPN`^+Bo{`)0-rDh(K3JAr9Z3yNDtC;uye5cclgivPj+r_W@xRPoIXu| z@@`Qa=-@Iesk0KnbDYRMJPD#y zbuIW5%=LZ3BZ398$(y8`ue{kpq$P}g5FQ(MSA%6I`yUh?5^NcO`j9GCvz%f#2#q(1 z7{`wcvLy<@Y9b(vOV4r@~*yNcVs};`jsY!K?a#N{@M)1iWE&Vrud4LGbS0 zs2?D*9c!-Kcqx*IK?!zPk4bJ_c$#Ka1!__@F-?0DSTYYb-v`Pryjtwv_MYS)qgeh}o6}g{r8-PBI3maY@ zom^U-U0G+8Sl{!Kft`F6k>hQ9P!y%#?zQuV3EP?Aj9{5SLFhqF4c-uMm=C%o!v2|fsdzP6mO?kXqtb$y_@iz#%JuUuGpmr9khQBlB9NP@3YMF1n=G3#{Vc8MzM_+8egZqoP zh^&bRmyA03u=3nW^LXLpCVvn^`uC~ z4VbDY)Hl{tO^O&^duv026vfFVf6@|~g;6aAbV^=%i27IKz}j*1fT?ag&c+#d>D^WR zEXyZHAA|Z*fMA(m83tv|NvSr%pd6rr9CQxt3$U*QUuY{xf4yBv<1>2_9b*-~&o&ZI zeKe7Dzm_VW=V@o&b!j`R$7kNfX&-Af&0FoY_fMp2=T7H2-Tz7P`NM)V=R6;OS+oCR l3C>1uc+3CZ#&v189zaet9}S>9xvl%C03jd*+qyfU@NaSEq$>ab literal 0 HcmV?d00001 diff --git a/v2/data/config.json b/v2/data/config.json index d93206c..8ed950f 100644 --- a/v2/data/config.json +++ b/v2/data/config.json @@ -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": "" } } diff --git a/v2/src/app/appDev.js b/v2/src/app/appDev.js index 02ec24f..d7cd633 100644 --- a/v2/src/app/appDev.js +++ b/v2/src/app/appDev.js @@ -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", diff --git a/v2/src/app/monitoring/cluster-monitoring.tpl.html b/v2/src/app/monitoring/cluster-monitoring.tpl.html index 9d65de9..c8deb31 100644 --- a/v2/src/app/monitoring/cluster-monitoring.tpl.html +++ b/v2/src/app/monitoring/cluster-monitoring.tpl.html @@ -1,3 +1,3 @@ -
+
diff --git a/v2/src/app/monitoring/monitoring.js b/v2/src/app/monitoring/monitoring.js index 4e1c7ba..2eac84f 100644 --- a/v2/src/app/monitoring/monitoring.js +++ b/v2/src/app/monitoring/monitoring.js @@ -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": [{ diff --git a/v2/src/app/monitoring/overview.tpl.html b/v2/src/app/monitoring/overview.tpl.html index 7632026..33ad83f 100644 --- a/v2/src/app/monitoring/overview.tpl.html +++ b/v2/src/app/monitoring/overview.tpl.html @@ -4,153 +4,178 @@
-
-
+
+
+
-
+ diff --git a/v2/src/app/wizard/review.tpl.html b/v2/src/app/wizard/review.tpl.html index e0ea417..9b5c965 100644 --- a/v2/src/app/wizard/review.tpl.html +++ b/v2/src/app/wizard/review.tpl.html @@ -62,7 +62,7 @@ - {{server['network'][key].ip}} + {{server.networks[key].ip}} @@ -100,8 +100,8 @@ - {{value.display}} - {{value.mapping_interface}} + {{key}} + {{value}} diff --git a/v2/src/app/wizard/wizard.js b/v2/src/app/wizard/wizard.js index 8fa553b..a5e9354 100644 --- a/v2/src/app/wizard/wizard.js +++ b/v2/src/app/wizard/wizard.js @@ -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",