From 1195bd427b8483f6f01b024092d6e829496433ec Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 3 Apr 2018 09:56:30 +1200 Subject: [PATCH 1/2] add subiquity version to pollinate data --- subiquity/models/subiquity.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/subiquity/models/subiquity.py b/subiquity/models/subiquity.py index 1ea3a50c..ce9f85ee 100644 --- a/subiquity/models/subiquity.py +++ b/subiquity/models/subiquity.py @@ -114,6 +114,12 @@ class SubiquityModel: 'builtin': 'curtin block-meta custom', }, + 'pollinate': { + 'user_agent': { + 'subiquity': os.environ.get("SNAP_VERSION", 'dry-run'), + }, + }, + 'reporting': { 'subiquity': { 'type': 'journald', From 6a5ae21c8514afb3e98d231da1c1981c5d0a642c Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 5 Apr 2018 14:59:59 +1200 Subject: [PATCH 2/2] include SNAP_REVISION too --- subiquity/models/subiquity.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/subiquity/models/subiquity.py b/subiquity/models/subiquity.py index ce9f85ee..4a30aaa3 100644 --- a/subiquity/models/subiquity.py +++ b/subiquity/models/subiquity.py @@ -116,7 +116,8 @@ class SubiquityModel: 'pollinate': { 'user_agent': { - 'subiquity': os.environ.get("SNAP_VERSION", 'dry-run'), + 'subiquity-version': os.environ.get("SNAP_VERSION", 'dry-run'), + 'subiquity-revision': os.environ.get("SNAP_REVISION", 'dry-run'), }, },