From 00d1985cf9f62fb63cae0678fdeaed7e350049c3 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Thu, 23 Aug 2018 11:29:42 +0200
Subject: [PATCH] feat(xo-server/jobs): add job name to logs (#3351)

Fixes #3272
---
 CHANGELOG.md                                        | 1 +
 packages/xo-server/src/schemas/log/jobStart.js      | 4 ++++
 packages/xo-server/src/xo-mixins/backups-ng-logs.js | 1 +
 packages/xo-server/src/xo-mixins/jobs/index.js      | 1 +
 4 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 115cdcd9c..6560fd8de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - [Backup NG form] Show the compression checkbox when the full mode is active [#3236](https://github.com/vatesfr/xen-orchestra/issues/3236) (PR [#3345](https://github.com/vatesfr/xen-orchestra/pull/3345))
 - [New VM] Display an error when the getting of the coreOS default template fails [#3227](https://github.com/vatesfr/xen-orchestra/issues/3227) (PR [#3343](https://github.com/vatesfr/xen-orchestra/pull/3343))
 - [Backup NG form] Set default retention to 1 [#3134](https://github.com/vatesfr/xen-orchestra/issues/3134) (PR [#3290](https://github.com/vatesfr/xen-orchestra/pull/3290))
+- [Backup NG] New logs are searchable by job name [#3272](https://github.com/vatesfr/xen-orchestra/issues/3272) (PR [#3351](https://github.com/vatesfr/xen-orchestra/pull/3351))
 
 ### Bug fixes
 
diff --git a/packages/xo-server/src/schemas/log/jobStart.js b/packages/xo-server/src/schemas/log/jobStart.js
index e01163a9e..d9196fa76 100644
--- a/packages/xo-server/src/schemas/log/jobStart.js
+++ b/packages/xo-server/src/schemas/log/jobStart.js
@@ -13,6 +13,10 @@ export default {
       type: 'string',
       description: 'identifier of this job',
     },
+    jobName: {
+      type: 'string',
+      description: 'name of this job when it was started',
+    },
     scheduleId: {
       type: 'string',
       description: 'identifier of the schedule which ran the job',
diff --git a/packages/xo-server/src/xo-mixins/backups-ng-logs.js b/packages/xo-server/src/xo-mixins/backups-ng-logs.js
index 30a22fc73..a3044aa4a 100644
--- a/packages/xo-server/src/xo-mixins/backups-ng-logs.js
+++ b/packages/xo-server/src/xo-mixins/backups-ng-logs.js
@@ -64,6 +64,7 @@ export default {
             data: data.data,
             id,
             jobId,
+            jobName: data.jobName,
             scheduleId,
             start: time,
             status: runningJobs[jobId] === id ? 'pending' : 'interrupted',
diff --git a/packages/xo-server/src/xo-mixins/jobs/index.js b/packages/xo-server/src/xo-mixins/jobs/index.js
index 2fb56448f..dd9bcd2ad 100644
--- a/packages/xo-server/src/xo-mixins/jobs/index.js
+++ b/packages/xo-server/src/xo-mixins/jobs/index.js
@@ -272,6 +272,7 @@ export default class Jobs {
       event: 'job.start',
       userId: job.userId,
       jobId: id,
+      jobName: job.name,
       scheduleId: schedule?.id,
       // $FlowFixMe only defined for CallJob
       key: job.key,