diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java index 491b0fe85ba..a0314586d92 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java @@ -47,13 +47,13 @@ public class GenerateUsageRecordsCmd extends BaseCmd { @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, - required = true, + required = false, description = "End date range for usage record query. Use yyyy-MM-dd as the date format, e.g. startDate=2009-06-03.") private Date endDate; @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, - required = true, + required = false, description = "Start date range for usage record query. Use yyyy-MM-dd as the date format, e.g. startDate=2009-06-01.") private Date startDate; diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 253f20294f5..8f2c9fa6d15 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -618,6 +618,7 @@ "label.datetime.filter.starting": "Starting {startDate}.", "label.datetime.filter.up.to": "Up to {endDate}.", "label.day": "Day", +"label.days": "Days", "label.day.of.month": "Day of month", "label.day.of.week": "Day of week", "label.db.usage.metrics": "DB/Usage server", @@ -806,6 +807,7 @@ "label.done": "Done", "label.down": "Down", "label.download": "Download", +"label.download.csv": "Download CSV", "label.download.kubeconfig.cluster": "Download kubeconfig for the cluster

The kubectl command-line tool uses kubeconfig files to find the information it needs to choose a cluster and communicate with the API server of a cluster.", "label.download.kubectl": "Download kubectl tool for cluster's Kubernetes version", "label.download.kubernetes.cluster.config": "Download Kubernetes cluster config", @@ -924,6 +926,7 @@ "label.fetch.instances": "Fetch Instances", "label.fetch.latest": "Fetch latest", "label.filename": "File Name", +"label.fetched": "Fetched", "label.files": "Alternate files to retrieve", "label.filter": "Filter", "label.filter.annotations.all": "All comments", @@ -1229,6 +1232,8 @@ "label.label": "Label", "label.last.updated": "Last update", "label.lastannotated": "Last annotation date", +"label.lastheartbeat": "Last heartbeat", +"label.lastsuccessfuljob": "Last successful job", "label.lastboottime": "Boot time of the management server machine", "label.lastname": "Last name", "label.lastname.lower": "lastname", @@ -1483,6 +1488,7 @@ "label.no.items": "No available Items", "label.no.matching.offering": "No matching offering found", "label.no.matching.network": "No matching Networks found", +"label.no.usage.records": "No usage records found", "label.noderootdisksize": "Node root disk size (in GB)", "label.nodiskcache": "No disk cache", "label.none": "None", @@ -1523,6 +1529,7 @@ "label.of": "of", "label.of.month": "of month", "label.offerha": "Offer HA", +"label.offeringid": "Offering ID", "label.offeringtype": "Compute offering type", "label.ok": "OK", "label.only.end.date.and.time": "Only end date and time", @@ -1700,6 +1707,8 @@ "label.publicnetwork": "Public Network", "label.publicport": "Public port", "label.purgeresources": "Purge Resources", +"label.purge.usage.records.success": "Successfuly purged usage records", +"label.purge.usage.records.error": "Failed while purging usage records", "label.purpose": "Purpose", "label.qostype": "QoS type", "label.quickview": "Quick view", @@ -1731,7 +1740,14 @@ "label.rados.secret": "RADOS secret", "label.rados.user": "RADOS user", "label.ram": "RAM", +"label.range.today": "Today", +"label.range.yesterday": "Yesterday", +"label.range.last.1week": "Last 1 week", +"label.range.last.2week": "Last 2 weeks", +"label.range.last.1month": "Last 1 month", +"label.range.last.3month": "Last 3 months", "label.raw.data": "Raw data", +"label.rawusage": "Raw usage (in hours)", "label.rbd": "RBD", "label.rbdid": "Cephx user", "label.rbdmonitor": "Ceph monitor", @@ -1975,6 +1991,7 @@ "label.sharedrouteripv6": "IPv6 address for the VR in this shared Network.", "label.sharewith": "Share with", "label.showing": "Showing", +"label.show.usage.records": "Show usage records", "label.shrinkok": "Shrink OK", "label.shutdown": "Shutdown", "label.shutdown.provider": "Shutdown provider", @@ -2283,8 +2300,22 @@ "label.upload.volume.from.url": "Upload volume from URL", "label.url": "URL", "label.usage.explanation": "Note: Only the usage server that owns the active usage job is shown here.", +"label.usage": "Usage", +"label.usage.records.downloading": "Downloading usage records", +"label.usage.records.fetch.child.domains": "Fetch usage records for child domains", +"label.usage.records.usagetype.required": "Usage type is required with resource ID", +"label.usage.records.generate": "Generate usage records", +"label.usage.records.generate.after": "Usage records will be created for the period after ", +"label.usage.records.generated": "A job has been created to generate usage records.", +"label.usage.records.generate.description": "If the scheduled usage job was not run or failed, this will generate records(only if there any records to be generated)", +"label.usage.records.purge": "Purge usage records", +"label.usage.records.purge.days": "Purge records older than", +"label.usage.records.purge.days.description": "Purge records older than the specified number of days.", +"label.usage.records.purge.alert": "Purging usage records will permanently delete the records from the database. Depending on the data being deleted, this can increase load on the database and may take a while. Are you sure you want to continue?", +"label.usageid": "Resource ID", "label.usageinterface": "Usage interface", "label.usagename": "Usage type", +"label.usagetype": "Usage type", "label.usageunit": "Unit", "label.usageislocal": "A Usage Server is installed locally", "label.usagetypedescription": "Usage description", diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue index c24f23371cf..2a379b5bf52 100644 --- a/ui/src/components/view/ListView.vue +++ b/ui/src/components/view/ListView.vue @@ -25,6 +25,7 @@ :pagination="false" :rowSelection="explicitlyAllowRowSelection || enableGroupAction() || $route.name === 'event' ? {selectedRowKeys: selectedRowKeys, onChange: onSelectChange, columnWidth: 30} : null" :rowClassName="getRowClassName" + @resizeColumn="handleResizeColumn" style="overflow-y: auto" >