Skip to content

K
k3s
Commit d97199c0 authored by Quinton Hoole's avatar Quinton Hoole
Browse files
Options

Merge pull request #9245 from bcbroussard/cadvisor-update

cAdvisor updates for v1beta3
parents 7633f2b5 15904039
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 22 deletions
www/app/assets/js/app.js
View file @ d97199c0
...@@ -860,7 +860,7 @@ app.provider('k8sv1Beta3Api', ...@@ -860,7 +860,7 @@ app.provider('k8sv1Beta3Api',
app.controller('cAdvisorController', [ app.controller('cAdvisorController', [
'$scope', '$scope',
'$routeParams', '$routeParams',
'k8sApi', 'k8sv1Beta3Api',
'lodash', 'lodash',
'cAdvisorService', 'cAdvisorService',
'$q', '$q',
...@@ -877,19 +877,22 @@ app.controller('cAdvisorController', [ ...@@ -877,19 +877,22 @@ app.controller('cAdvisorController', [
k8sApi.getMinions().success(angular.bind(this, function(res) { k8sApi.getMinions().success(angular.bind(this, function(res) {
$scope.minions = res; $scope.minions = res;
// console.log(res); // console.log(res);
var promises = lodash.map(res.items, function(m) { return cAdvisorService.getDataForMinion(m.id); }); var promises = lodash.map(res.items, function(m) { return cAdvisorService.getDataForMinion(m.metadata.name); });
$q.all(promises).then( $q.all(promises).then(
function(dataArray) { function(dataArray) {
lodash.each(dataArray, function(data, i) { lodash.each(dataArray, function(data, i) {
var m = res.items[i]; var m = res.items[i];
var maxData = maxMemCpuInfo(m.id, data.memoryData, data.cpuData, data.filesystemData); var maxData = maxMemCpuInfo(m.metadata.name, data.memoryData, data.cpuData, data.filesystemData);
// console.log("maxData", maxData); // console.log("maxData", maxData);
var hostname = "";
if(m.status.addresses)
hostname = m.status.addresses[0].address;
$scope.activeMinionDataById[m.id] = $scope.activeMinionDataById[m.metadata.name] =
transformMemCpuInfo(data.memoryData, data.cpuData, data.filesystemData, maxData, m.hostIP) transformMemCpuInfo(data.memoryData, data.cpuData, data.filesystemData, maxData, hostname);
}); });
}, },
...@@ -902,11 +905,6 @@ app.controller('cAdvisorController', [ ...@@ -902,11 +905,6 @@ app.controller('cAdvisorController', [
})).error(angular.bind(this, this.handleError)); })).error(angular.bind(this, this.handleError));
}; };
function getcAdvisorDataForMinion(m) {
var p = cAdvisorService.getDataForMinion(m.hostIP);
return p;
}
function handleError(data, status, headers, config) { function handleError(data, status, headers, config) {
// console.log("Error (" + status + "): " + data); // console.log("Error (" + status + "): " + data);
$scope.loading = false; $scope.loading = false;
......
www/app/components/dashboard/views/partials/cadvisor.html
View file @ d97199c0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="server-overview"> <div class="server-overview">
<md-content layout="row" layout-wrap> <md-content layout="row" layout-wrap>
<div flex-sm="100" flex-md="50" flex-lg="33" flex-gt-lg="25" class="chart_area" ng-repeat="minion in minions.items"> <div flex-sm="100" flex-md="50" flex-lg="33" flex-gt-lg="25" class="chart_area" ng-repeat="minion in minions.items">
<d3-minion-bar-gauge data="activeMinionDataById[minion.id]" class="concentric" graph-width="325" graph-height="325" thickness=18 /> <d3-minion-bar-gauge data="activeMinionDataById[minion.metadata.name]" class="concentric" graph-width="325" graph-height="325" thickness=18 />
</div> </div>
</md-content> </md-content>
</div> </div>
......
www/master/components/dashboard/js/modules/controllers/cAdvisorController.js
View file @ d97199c0
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
app.controller('cAdvisorController', [ app.controller('cAdvisorController', [
'$scope', '$scope',
'$routeParams', '$routeParams',
'k8sApi', 'k8sv1Beta3Api',
'lodash', 'lodash',
'cAdvisorService', 'cAdvisorService',
'$q', '$q',
...@@ -20,19 +20,22 @@ app.controller('cAdvisorController', [ ...@@ -20,19 +20,22 @@ app.controller('cAdvisorController', [
k8sApi.getMinions().success(angular.bind(this, function(res) { k8sApi.getMinions().success(angular.bind(this, function(res) {
$scope.minions = res; $scope.minions = res;
// console.log(res); // console.log(res);
var promises = lodash.map(res.items, function(m) { return cAdvisorService.getDataForMinion(m.id); }); var promises = lodash.map(res.items, function(m) { return cAdvisorService.getDataForMinion(m.metadata.name); });
$q.all(promises).then( $q.all(promises).then(
function(dataArray) { function(dataArray) {
lodash.each(dataArray, function(data, i) { lodash.each(dataArray, function(data, i) {
var m = res.items[i]; var m = res.items[i];
var maxData = maxMemCpuInfo(m.id, data.memoryData, data.cpuData, data.filesystemData); var maxData = maxMemCpuInfo(m.metadata.name, data.memoryData, data.cpuData, data.filesystemData);
// console.log("maxData", maxData); // console.log("maxData", maxData);
var hostname = "";
if(m.status.addresses)
hostname = m.status.addresses[0].address;
$scope.activeMinionDataById[m.id] = $scope.activeMinionDataById[m.metadata.name] =
transformMemCpuInfo(data.memoryData, data.cpuData, data.filesystemData, maxData, m.hostIP) transformMemCpuInfo(data.memoryData, data.cpuData, data.filesystemData, maxData, hostname);
}); });
}, },
...@@ -45,11 +48,6 @@ app.controller('cAdvisorController', [ ...@@ -45,11 +48,6 @@ app.controller('cAdvisorController', [
})).error(angular.bind(this, this.handleError)); })).error(angular.bind(this, this.handleError));
}; };
function getcAdvisorDataForMinion(m) {
var p = cAdvisorService.getDataForMinion(m.hostIP);
return p;
}
function handleError(data, status, headers, config) { function handleError(data, status, headers, config) {
// console.log("Error (" + status + "): " + data); // console.log("Error (" + status + "): " + data);
$scope.loading = false; $scope.loading = false;
......
www/master/components/dashboard/views/partials/cadvisor.html
View file @ d97199c0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="server-overview"> <div class="server-overview">
<md-content layout="row" layout-wrap> <md-content layout="row" layout-wrap>
<div flex-sm="100" flex-md="50" flex-lg="33" flex-gt-lg="25" class="chart_area" ng-repeat="minion in minions.items"> <div flex-sm="100" flex-md="50" flex-lg="33" flex-gt-lg="25" class="chart_area" ng-repeat="minion in minions.items">
<d3-minion-bar-gauge data="activeMinionDataById[minion.id]" class="concentric" graph-width="325" graph-height="325" thickness=18 /> <d3-minion-bar-gauge data="activeMinionDataById[minion.metadata.name]" class="concentric" graph-width="325" graph-height="325" thickness=18 />
</div> </div>
</md-content> </md-content>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment