diff --git a/server/src/main/java/com/cloud/event/dao/EventJoinDaoImpl.java b/server/src/main/java/com/cloud/event/dao/EventJoinDaoImpl.java index a177d8d556d..c73f57529b8 100644 --- a/server/src/main/java/com/cloud/event/dao/EventJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/event/dao/EventJoinDaoImpl.java @@ -54,7 +54,7 @@ public class EventJoinDaoImpl extends GenericDaoBase implemen EntityManager entityMgr; private String getResourceName(Object obj) { - String[] possibleMethods = {"getDisplayName", "getHostName","getName", "getAccountName", "getUsername"}; + String[] possibleMethods = {"getDisplayName", "getDisplayText", "getHostName", "getName", "getAccountName", "getUsername"}; for (String possibleMethodName : possibleMethods) { try { Method m = obj.getClass().getMethod(possibleMethodName); diff --git a/ui/src/views/dashboard/UsageDashboard.vue b/ui/src/views/dashboard/UsageDashboard.vue index 677414221b8..77eb16ef496 100644 --- a/ui/src/views/dashboard/UsageDashboard.vue +++ b/ui/src/views/dashboard/UsageDashboard.vue @@ -86,6 +86,7 @@ :color="getEventColour(event)"> {{ $toLocaleDate(event.created) }}
{{ event.type }}
+ ({{ event.username }}) {{ event.description }} @@ -102,12 +103,14 @@ import store from '@/store' import ChartCard from '@/components/widgets/ChartCard' import UsageDashboardChart from '@/views/dashboard/UsageDashboardChart' +import ResourceLabel from '@/components/widgets/ResourceLabel' export default { name: 'UsageDashboard', components: { ChartCard, - UsageDashboardChart + UsageDashboardChart, + ResourceLabel }, props: { resource: {