github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(docker-event-display): EE-1968: support (event_name)[:extra info] for all event Actions, and append it to the output details (#6092) 

Signed-off-by: Sven Dowideit <sven.dowideit@portainer.io>
pull/6176/head
Sven Dowideit 2021-11-30 09:59:55 +10:00 committed by GitHub
parent c24dc3112b
commit 120584909c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/docker/models/event.js
View File

@ -1,9 +1,18 @@
function createEventDetails(event) {
var eventAttr = event.Actor.Attributes;
var details = '';
var action = event.Action;
var extra = '';
var hasColon = action.indexOf(':');
if (hasColon != -1) {
extra = action.substring(hasColon);
action = action.substring(0, hasColon);
}
switch (event.Type) {
case 'container':
switch (event.Action) {
switch (action) {
case 'stop':
details = 'Container ' + eventAttr.name + ' stopped';
break;
@ -64,20 +73,21 @@ function createEventDetails(event) {
case 'update':
details = 'Container ' + eventAttr.name + ' updated';
break;
default:
if (event.Action.indexOf('exec_create') === 0) {
case 'exec_create':
details = 'Exec instance created';
} else if (event.Action.indexOf('exec_start') === 0) {
break;
case 'exec_start':
details = 'Exec instance started';
} else if (event.Action.indexOf('exec_die') === 0) {
details = 'Exec instance exited ';
} else {
break;
case 'exec_die':
details = 'Exec instance exited';
break;
default:
details = 'Unsupported event';
}
}
break;
case 'image':
switch (event.Action) {
switch (action) {
case 'delete':
details = 'Image deleted';
break;
@ -107,7 +117,7 @@ function createEventDetails(event) {
}
break;
case 'network':
switch (event.Action) {
switch (action) {
case 'create':
details = 'Network ' + eventAttr.name + ' created';
break;
@ -128,7 +138,7 @@ function createEventDetails(event) {
}
break;
case 'volume':
switch (event.Action) {
switch (action) {
case 'create':
details = 'Volume ' + event.Actor.ID + ' created';
break;
@ -148,7 +158,7 @@ function createEventDetails(event) {
default:
details = 'Unsupported event';
}
return details;
return details + extra;
}
export function EventViewModel(data) {