github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update events for v1beta3 api

Browse Source
This commit is contained in:
BC Broussard 2015-05-21 00:28:12 -07:00
parent 0bea034edb
commit b4ab5eddf0
3 changed files with 102 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
pkg/ui/datafile.go
View File

@ -1592,7 +1592,7 @@ func www_app_assets_css_app_css() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/assets/css/app.css", size: 37661, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/assets/css/app.css", size: 37661, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -3235,7 +3235,7 @@ angular.module('kubernetesApp.components.dashboard', [])
app.controller('ListEventsCtrl', [ app.controller('ListEventsCtrl', [
'$scope', '$scope',
'$routeParams', '$routeParams',
'k8sApi', 'k8sv1Beta3Api',
'$location', '$location',
'$filter', '$filter',
function($scope, $routeParams, k8sApi, $location, $filter) { function($scope, $routeParams, k8sApi, $location, $filter) {
@ -3248,26 +3248,20 @@ app.controller('ListEventsCtrl', [
$scope.serverView = false; $scope.serverView = false;
$scope.headers = [ $scope.headers = [
{name: 'Time', field: 'time'}, {name: 'First Seen', field: 'firstSeen'},
{name: 'From', field: 'from'}, {name: 'Last Seen', field: 'lastSeen'},
{name: 'Sub Object Path', field: 'subobject'}, {name: 'Count', field: 'count'},
{name: 'Name', field: 'name'},
{name: 'Kind', field: 'kind'},
{name: 'SubObject', field: 'subObject'},
{name: 'Reason', field: 'reason'}, {name: 'Reason', field: 'reason'},
{name: 'Source', field: 'source'},
{name: 'Message', field: 'message'} {name: 'Message', field: 'message'}
]; ];
$scope.custom = {
time: '', $scope.sortable = ['firstSeen', 'lastSeen', 'count', 'name', 'kind', 'subObject', 'reason', 'source'];
from: 'grey',
subobject: 'grey',
reason: 'grey',
message: 'grey'
};
$scope.sortable = ['time', 'from', 'subobject'];
$scope.thumbs = 'thumb';
$scope.count = 10; $scope.count = 10;
$scope.go = function(d) { $location.path('/dashboard/pods/' + d.id); };
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;
@ -3289,15 +3283,26 @@ app.controller('ListEventsCtrl', [
}; };
data.items.forEach(function(event) { data.items.forEach(function(event) {
var _sources = '';
if (event.source) {
_sources = event.source.component + ' ' + event.source.host;
}
$scope.content.push({ $scope.content.push({
time: $filter('date')(event.timestamp, 'medium'), firstSeen: $filter('date')(event.firstTimestamp, 'medium'),
from: event.source, lastSeen: $filter('date')(event.lastTimestamp, 'medium'),
subobject: event.involvedObject.fieldPath, count: event.count,
name: event.involvedObject.name,
kind: event.involvedObject.kind,
subObject: event.involvedObject.fieldPath,
reason: event.reason, reason: event.reason,
source: _sources,
message: event.message message: event.message
}); });
}); });
}).error($scope.handleError); }).error($scope.handleError);
@ -4676,7 +4681,7 @@ func www_app_assets_js_app_js() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/assets/js/app.js", size: 93234, mode: os.FileMode(420), modTime: time.Unix(1432766336, 0)} info := bindata_file_info{name: "www/app/assets/js/app.js", size: 93570, mode: os.FileMode(420), modTime: time.Unix(1432767440, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -4718,7 +4723,7 @@ func www_app_assets_js_base_js() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/assets/js/base.js", size: 477048, mode: os.FileMode(420), modTime: time.Unix(1432766336, 0)} info := bindata_file_info{name: "www/app/assets/js/base.js", size: 477048, mode: os.FileMode(420), modTime: time.Unix(1432767440, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -4735,7 +4740,7 @@ func www_app_components_dashboard_img_icons_ic_arrow_drop_down_18px_svg() (*asse
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_arrow_drop_down_18px.svg", size: 114, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_arrow_drop_down_18px.svg", size: 114, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -4756,7 +4761,7 @@ func www_app_components_dashboard_img_icons_ic_arrow_drop_down_24px_svg() (*asse
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_arrow_drop_down_24px.svg", size: 166, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_arrow_drop_down_24px.svg", size: 166, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -4773,7 +4778,7 @@ func www_app_components_dashboard_img_icons_ic_close_18px_svg() (*asset, error)
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_close_18px.svg", size: 215, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_close_18px.svg", size: 215, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -4790,7 +4795,7 @@ func www_app_components_dashboard_img_icons_ic_close_24px_svg() (*asset, error)
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_close_24px.svg", size: 202, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_close_24px.svg", size: 202, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -4872,7 +4877,7 @@ func www_app_components_dashboard_manifest_json() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/manifest.json", size: 1854, mode: os.FileMode(420), modTime: time.Unix(1432766339, 0)} info := bindata_file_info{name: "www/app/components/dashboard/manifest.json", size: 1854, mode: os.FileMode(420), modTime: time.Unix(1432767443, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -4889,7 +4894,7 @@ func www_app_components_dashboard_pages_footer_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/pages/footer.html", size: 7, mode: os.FileMode(420), modTime: time.Unix(1432766339, 0)} info := bindata_file_info{name: "www/app/components/dashboard/pages/footer.html", size: 7, mode: os.FileMode(420), modTime: time.Unix(1432767443, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -4932,7 +4937,7 @@ func www_app_components_dashboard_pages_header_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/pages/header.html", size: 1313, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/pages/header.html", size: 1313, mode: os.FileMode(420), modTime: time.Unix(1432767443, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -4956,7 +4961,7 @@ func www_app_components_dashboard_pages_home_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/pages/home.html", size: 247, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/pages/home.html", size: 247, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -4973,7 +4978,7 @@ func www_app_components_dashboard_protractor_smoke_spec_js() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/protractor/smoke.spec.js", size: 2616, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/protractor/smoke.spec.js", size: 2616, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -4990,7 +4995,7 @@ func www_app_components_dashboard_test_controllers_header_spec_js() (*asset, err
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/test/controllers/header.spec.js", size: 1293, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/test/controllers/header.spec.js", size: 1293, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5041,7 +5046,7 @@ func www_app_components_dashboard_views_groups_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/groups.html", size: 1298, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/groups.html", size: 1298, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5065,7 +5070,7 @@ func www_app_components_dashboard_views_listevents_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/listEvents.html", size: 326, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/listEvents.html", size: 326, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5089,7 +5094,7 @@ func www_app_components_dashboard_views_listminions_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/listMinions.html", size: 348, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/listMinions.html", size: 348, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5113,7 +5118,7 @@ func www_app_components_dashboard_views_listpods_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/listPods.html", size: 345, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/listPods.html", size: 345, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5189,7 +5194,7 @@ func www_app_components_dashboard_views_listpodscards_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/listPodsCards.html", size: 1967, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/listPodsCards.html", size: 1967, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5223,7 +5228,7 @@ func www_app_components_dashboard_views_listpodsvisualizer_html() (*asset, error
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/listPodsVisualizer.html", size: 841, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/listPodsVisualizer.html", size: 841, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5247,7 +5252,7 @@ func www_app_components_dashboard_views_listreplicationcontrollers_html() (*asse
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/listReplicationControllers.html", size: 363, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/listReplicationControllers.html", size: 363, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5271,7 +5276,7 @@ func www_app_components_dashboard_views_listservices_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/listServices.html", size: 349, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/listServices.html", size: 349, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5377,7 +5382,7 @@ func www_app_components_dashboard_views_node_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/node.html", size: 2307, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/node.html", size: 2307, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5403,7 +5408,7 @@ func www_app_components_dashboard_views_partials_cadvisor_html() (*asset, error)
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/cadvisor.html", size: 443, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/partials/cadvisor.html", size: 443, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5440,7 +5445,7 @@ func www_app_components_dashboard_views_partials_groupbox_html() (*asset, error)
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/groupBox.html", size: 769, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/partials/groupBox.html", size: 769, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5499,7 +5504,7 @@ func www_app_components_dashboard_views_partials_groupitem_html() (*asset, error
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/groupItem.html", size: 2213, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/partials/groupItem.html", size: 2213, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5549,7 +5554,7 @@ func www_app_components_dashboard_views_partials_podtilesbyname_html() (*asset,
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/podTilesByName.html", size: 1287, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/partials/podTilesByName.html", size: 1287, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5599,7 +5604,7 @@ func www_app_components_dashboard_views_partials_podtilesbyserver_html() (*asset
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/podTilesByServer.html", size: 1281, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/partials/podTilesByServer.html", size: 1281, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5710,7 +5715,7 @@ func www_app_components_dashboard_views_pod_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/pod.html", size: 2646, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/pod.html", size: 2646, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5809,7 +5814,7 @@ func www_app_components_dashboard_views_replication_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/replication.html", size: 2165, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/replication.html", size: 2165, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -5923,7 +5928,7 @@ func www_app_components_dashboard_views_service_html() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "www/app/components/dashboard/views/service.html", size: 2477, mode: os.FileMode(420), modTime: time.Unix(1432766340, 0)} info := bindata_file_info{name: "www/app/components/dashboard/views/service.html", size: 2477, mode: os.FileMode(420), modTime: time.Unix(1432767444, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }

43
www/app/assets/js/app.js
View File

@ -1311,7 +1311,7 @@ angular.module('kubernetesApp.components.dashboard', [])
app.controller('ListEventsCtrl', [ app.controller('ListEventsCtrl', [
'$scope', '$scope',
'$routeParams', '$routeParams',
'k8sApi', 'k8sv1Beta3Api',
'$location', '$location',
'$filter', '$filter',
function($scope, $routeParams, k8sApi, $location, $filter) { function($scope, $routeParams, k8sApi, $location, $filter) {
@ -1324,26 +1324,20 @@ app.controller('ListEventsCtrl', [
$scope.serverView = false; $scope.serverView = false;
$scope.headers = [ $scope.headers = [
{name: 'Time', field: 'time'}, {name: 'First Seen', field: 'firstSeen'},
{name: 'From', field: 'from'}, {name: 'Last Seen', field: 'lastSeen'},
{name: 'Sub Object Path', field: 'subobject'}, {name: 'Count', field: 'count'},
{name: 'Name', field: 'name'},
{name: 'Kind', field: 'kind'},
{name: 'SubObject', field: 'subObject'},
{name: 'Reason', field: 'reason'}, {name: 'Reason', field: 'reason'},
{name: 'Source', field: 'source'},
{name: 'Message', field: 'message'} {name: 'Message', field: 'message'}
]; ];
$scope.custom = {
time: '', $scope.sortable = ['firstSeen', 'lastSeen', 'count', 'name', 'kind', 'subObject', 'reason', 'source'];
from: 'grey',
subobject: 'grey',
reason: 'grey',
message: 'grey'
};
$scope.sortable = ['time', 'from', 'subobject'];
$scope.thumbs = 'thumb';
$scope.count = 10; $scope.count = 10;
$scope.go = function(d) { $location.path('/dashboard/pods/' + d.id); };
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;
@ -1365,15 +1359,26 @@ app.controller('ListEventsCtrl', [
}; };
data.items.forEach(function(event) { data.items.forEach(function(event) {
var _sources = '';
if (event.source) {
_sources = event.source.component + ' ' + event.source.host;
}
$scope.content.push({ $scope.content.push({
time: $filter('date')(event.timestamp, 'medium'), firstSeen: $filter('date')(event.firstTimestamp, 'medium'),
from: event.source, lastSeen: $filter('date')(event.lastTimestamp, 'medium'),
subobject: event.involvedObject.fieldPath, count: event.count,
name: event.involvedObject.name,
kind: event.involvedObject.kind,
subObject: event.involvedObject.fieldPath,
reason: event.reason, reason: event.reason,
source: _sources,
message: event.message message: event.message
}); });
}); });
}).error($scope.handleError); }).error($scope.handleError);

43
www/master/components/dashboard/js/modules/controllers/listEventsController.js
View File

@ -6,7 +6,7 @@
app.controller('ListEventsCtrl', [ app.controller('ListEventsCtrl', [
'$scope', '$scope',
'$routeParams', '$routeParams',
'k8sApi', 'k8sv1Beta3Api',
'$location', '$location',
'$filter', '$filter',
function($scope, $routeParams, k8sApi, $location, $filter) { function($scope, $routeParams, k8sApi, $location, $filter) {
@ -19,26 +19,20 @@ app.controller('ListEventsCtrl', [
$scope.serverView = false; $scope.serverView = false;
$scope.headers = [ $scope.headers = [
{name: 'Time', field: 'time'}, {name: 'First Seen', field: 'firstSeen'},
{name: 'From', field: 'from'}, {name: 'Last Seen', field: 'lastSeen'},
{name: 'Sub Object Path', field: 'subobject'}, {name: 'Count', field: 'count'},
{name: 'Name', field: 'name'},
{name: 'Kind', field: 'kind'},
{name: 'SubObject', field: 'subObject'},
{name: 'Reason', field: 'reason'}, {name: 'Reason', field: 'reason'},
{name: 'Source', field: 'source'},
{name: 'Message', field: 'message'} {name: 'Message', field: 'message'}
]; ];
$scope.custom = {
time: '', $scope.sortable = ['firstSeen', 'lastSeen', 'count', 'name', 'kind', 'subObject', 'reason', 'source'];
from: 'grey',
subobject: 'grey',
reason: 'grey',
message: 'grey'
};
$scope.sortable = ['time', 'from', 'subobject'];
$scope.thumbs = 'thumb';
$scope.count = 10; $scope.count = 10;
$scope.go = function(d) { $location.path('/dashboard/pods/' + d.id); };
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;
@ -60,15 +54,26 @@ app.controller('ListEventsCtrl', [
}; };
data.items.forEach(function(event) { data.items.forEach(function(event) {
var _sources = '';
if (event.source) {
_sources = event.source.component + ' ' + event.source.host;
}
$scope.content.push({ $scope.content.push({
time: $filter('date')(event.timestamp, 'medium'), firstSeen: $filter('date')(event.firstTimestamp, 'medium'),
from: event.source, lastSeen: $filter('date')(event.lastTimestamp, 'medium'),
subobject: event.involvedObject.fieldPath, count: event.count,
name: event.involvedObject.name,
kind: event.involvedObject.kind,
subObject: event.involvedObject.fieldPath,
reason: event.reason, reason: event.reason,
source: _sources,
message: event.message message: event.message
}); });
}); });
}).error($scope.handleError); }).error($scope.handleError);