From 44e87cb60b167170c1ea43bf6138407bfd23eb88 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 2 Feb 2019 01:17:09 -0500 Subject: [PATCH] fix: telemetry --- CHANGELOG.md | 1 + client/components/admin/admin-utilities.vue | 6 +- client/components/setup.vue | 6 +- package.json | 44 +- server/app/data.yml | 2 +- server/core/db.js | 3 - server/core/kernel.js | 16 + server/core/system.js | 2 - server/core/telemetry.js | 92 ++-- server/index.js | 15 - server/setup.js | 56 +-- yarn.lock | 467 +++++++++++--------- 12 files changed, 400 insertions(+), 310 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7cf64da..45f7ffb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Fixed root admin refresh token fail - Fixed error page metadata title warning +- Fixed telemetry ### Changed - Moved Insert Media button in Markdown editor diff --git a/client/components/admin/admin-utilities.vue b/client/components/admin/admin-utilities.vue index d3b16d57..ae64b14a 100644 --- a/client/components/admin/admin-utilities.vue +++ b/client/components/admin/admin-utilities.vue @@ -95,7 +95,7 @@ v-card-text v-subheader What is telemetry? .body-1.pl-3 Telemetry allows the developers of Wiki.js to improve the software by collecting basic anonymized data about its usage and the host info. #[br] This is entirely optional and #[strong absolutely no] private data (such as content or personal data) is collected. - .body-1.pt-3.pl-3 For maximum privacy, a random client ID is generated every time Wiki.js is started. This ID is used to group requests together while keeping complete anonymity. + .body-1.pt-3.pl-3 For maximum privacy, a random client ID is generated during setup. This ID is used to group requests together while keeping complete anonymity. You can reset and generate a new one below at any time. v-divider.my-3 v-subheader What is collected? .body-1.pl-3 When telemetry is enabled, only the following data is transmitted: @@ -105,13 +105,13 @@ v-list-tile-content: v-list-tile-title.caption Version of Wiki.js installed v-list-tile v-list-tile-avatar: v-icon info_outline - v-list-tile-content: v-list-tile-title.caption Basic OS information (version, CPU cores, RAM available) + v-list-tile-content: v-list-tile-title.caption Basic OS information (platform, CPU cores count, DB type) v-list-tile v-list-tile-avatar: v-icon info_outline v-list-tile-content: v-list-tile-title.caption Crash debug data v-list-tile v-list-tile-avatar: v-icon info_outline - v-list-tile-content: v-list-tile-title.caption Setup analytics (step reached) + v-list-tile-content: v-list-tile-title.caption Setup analytics (installation checkpoint reached) .body-2.pl-3 v-divider.my-3 v-subheader Settings diff --git a/client/components/setup.vue b/client/components/setup.vue index 541bf290..8dc0027a 100644 --- a/client/components/setup.vue +++ b/client/components/setup.vue @@ -3,7 +3,7 @@ v-toolbar(color='blue darken-2', dark, app, clipped-left, fixed, flat) v-spacer v-toolbar-title - span.subheading Wiki.js Setup + span.subheading Wiki.js {{wikiVersion}} v-spacer v-content.white v-progress-linear.ma-0(indeterminate, height='4', :active='loading') @@ -193,9 +193,7 @@ v-btn(color='success', @click='finish', v-if='loading || final.ok', :disabled='loading') Continue v-footer.pa-3(app, absolute, color='grey darken-3', height='auto') - .caption.grey--text Wiki.js - v-spacer - .caption.grey--text(v-if='conf.telemetry') Telemetry Client ID: {{telemetryId}} + .caption.grey--text Wiki.js {{wikiVersion}} Installation Wizard