update telemetry banner notice text

src/legacy/core_plugins/telemetry/common/constants.ts

@@ -51,7 +51,7 @@ export const LOCALSTORAGE_KEY = 'telemetry.data';
 /**
  * Link to the Elastic Telemetry privacy statement.
  */
-export const PRIVACY_STATEMENT_URL = `https://www.elastic.co/legal/telemetry-privacy-statement`;
+export const PRIVACY_STATEMENT_URL = `https://www.elastic.co/legal/privacy-statement`;
 
 /**
  * The type name used within the Monitoring index to publish localization stats.

src/legacy/core_plugins/telemetry/public/components/opt_in_banner_component.tsx

@@ -35,7 +35,7 @@ export class OptInBanner extends React.PureComponent<Props> {
     const title = (
       <FormattedMessage
         id="telemetry.welcomeBanner.title"
-        defaultMessage="Help us improve the Elastic Stack!"
+        defaultMessage="Help us improve the Elastic Stack"
       />
     );
     return (
@@ -45,12 +45,18 @@ export class OptInBanner extends React.PureComponent<Props> {
         <EuiFlexGroup gutterSize="s" alignItems="center">
           <EuiFlexItem grow={false}>
             <EuiButton size="s" onClick={() => this.props.optInClick(true)}>
-              <FormattedMessage id="telemetry.welcomeBanner.yesButtonLabel" defaultMessage="Yes" />
+              <FormattedMessage
+                id="telemetry.welcomeBanner.enableButtonLabel"
+                defaultMessage="Enable"
+              />
             </EuiButton>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButton size="s" onClick={() => this.props.optInClick(false)}>
-              <FormattedMessage id="telemetry.welcomeBanner.noButtonLabel" defaultMessage="No" />
+              <FormattedMessage
+                id="telemetry.welcomeBanner.disableButtonLabel"
+                defaultMessage="Disable"
+              />
             </EuiButton>
           </EuiFlexItem>
         </EuiFlexGroup>

src/legacy/core_plugins/telemetry/public/components/opt_in_message.test.tsx

@@ -0,0 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { OptInMessage } from './opt_in_message';
+
+describe('OptInMessage', () => {
+  it('renders as expected', () => {
+    expect(
+      shallowWithIntl(<OptInMessage fetchTelemetry={jest.fn(async () => [])} />)
+    ).toMatchSnapshot();
+  });
+});

src/legacy/core_plugins/telemetry/public/components/opt_in_message.tsx

@@ -21,8 +21,7 @@ import * as React from 'react';
 import { EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { getConfigTelemetryDesc, PRIVACY_STATEMENT_URL } from '../../common/constants';
-import { OptInExampleFlyout } from './opt_in_details_component';
+import { PRIVACY_STATEMENT_URL } from '../../common/constants';
 
 interface Props {
   fetchTelemetry: () => Promise<any[]>;
@@ -46,60 +45,22 @@ export class OptInMessage extends React.PureComponent<Props, State> {
   };
 
   render() {
-    const { showDetails, showExample } = this.state;
-
-    const getDetails = () => (
-      <FormattedMessage
-        id="telemetry.welcomeBanner.telemetryConfigDetailsDescription"
-        defaultMessage="No information about the data you process or store will be sent. This feature
-          will periodically send basic feature usage statistics. See an {exampleLink} or read our {telemetryPrivacyStatementLink}.
-          You can disable this feature at any time."
-        values={{
-          exampleLink: (
-            <EuiLink onClick={this.toggleShowExample}>
-              <FormattedMessage
-                id="telemetry.welcomeBanner.telemetryConfigDetailsDescription.exampleLinkText"
-                defaultMessage="example"
-              />
-            </EuiLink>
-          ),
-          telemetryPrivacyStatementLink: (
-            <EuiLink href={PRIVACY_STATEMENT_URL} target="_blank">
-              <FormattedMessage
-                id="telemetry.welcomeBanner.telemetryConfigDetailsDescription.telemetryPrivacyStatementLinkText"
-                defaultMessage="telemetry privacy statement"
-              />
-            </EuiLink>
-          ),
-        }}
-      />
-    );
-
-    const getFlyoutDetails = () => (
-      <OptInExampleFlyout
-        onClose={() => this.setState({ showExample: false })}
-        fetchTelemetry={this.props.fetchTelemetry}
-      />
-    );
-
-    const getReadMore = () => (
-      <EuiLink onClick={() => this.setState({ showDetails: true })}>
-        <FormattedMessage
-          id="telemetry.welcomeBanner.telemetryConfigDescription.readMoreLinkText"
-          defaultMessage="Read more"
-        />
-      </EuiLink>
-    );
-
     return (
       <React.Fragment>
-        {getConfigTelemetryDesc()} {!showDetails && getReadMore()}
-        {showDetails && (
-          <span style={{ display: 'block', paddingTop: '10px' }}>
-            {getDetails()}
-            {showExample && getFlyoutDetails()}
-          </span>
-        )}
+        <FormattedMessage
+          id="telemetry.telemetryBannerDescription"
+          defaultMessage="Want to help us improve the Elastic Stack? Data usage collection is currently disabled. Enabling data usage collection helps us manage and improve our products and services. See our {privacyStatementLink} for more details."
+          values={{
+            privacyStatementLink: (
+              <EuiLink href={PRIVACY_STATEMENT_URL} target="_blank">
+                <FormattedMessage
+                  id="telemetry.welcomeBanner.telemetryConfigDetailsDescription.telemetryPrivacyStatementLinkText"
+                  defaultMessage="Privacy Statement"
+                />
+              </EuiLink>
+            ),
+          }}
+        />
       </React.Fragment>
     );
   }

x-pack/plugins/translations/translations/ja-JP.json

@@ -9921,12 +9921,7 @@
     "telemetry.telemetryErrorNotificationMessageDescription.unableToSaveTelemetryPreferenceText": "遠隔測定設定を保存できません。",
     "telemetry.telemetryErrorNotificationMessageTitle": "遠隔測定エラー",
     "telemetry.usageDataTitle": "使用データ",
-    "telemetry.welcomeBanner.noButtonLabel": "いいえ",
-    "telemetry.welcomeBanner.telemetryConfigDescription.readMoreLinkText": "続きを読む",
-    "telemetry.welcomeBanner.telemetryConfigDetailsDescription": "ユーザーが処理したり保管したりするデータに関する情報は一切送信されません。この機能は定期的に基本的な機能利用に関する統計情報を送信します。{exampleLink} をご覧いただくか、{telemetryPrivacyStatementLink} をお読みください。この機能はいつでも無効にできます。",
-    "telemetry.welcomeBanner.telemetryConfigDetailsDescription.exampleLinkText": "例",
     "telemetry.welcomeBanner.telemetryConfigDetailsDescription.telemetryPrivacyStatementLinkText": "遠隔測定に関するプライバシーステートメント",
-    "telemetry.welcomeBanner.yesButtonLabel": "はい",
     "xpack.upgradeAssistant.appTitle": "{version} アップグレードアシスタント",
     "xpack.upgradeAssistant.checkupTab.backUpCallout.calloutBody.calloutDetail": "{snapshotRestoreDocsButton} でデータをバックアップします。",
     "xpack.upgradeAssistant.checkupTab.backUpCallout.calloutBody.snapshotRestoreDocsButtonLabel": "API のスナップショットと復元",

x-pack/plugins/translations/translations/zh-CN.json

@@ -10076,12 +10076,7 @@
     "telemetry.telemetryErrorNotificationMessageDescription.unableToSaveTelemetryPreferenceText": "无法保存遥测首选项。",
     "telemetry.telemetryErrorNotificationMessageTitle": "遥测错误",
     "telemetry.usageDataTitle": "使用情况数据",
-    "telemetry.welcomeBanner.noButtonLabel": "否",
-    "telemetry.welcomeBanner.telemetryConfigDescription.readMoreLinkText": "阅读更多内容",
-    "telemetry.welcomeBanner.telemetryConfigDetailsDescription": "不会发送有关您处理或存储的数据的信息。此功能将定期发送基本功能使用情况统计信息。请参阅{exampleLink}或阅读我们的{telemetryPrivacyStatementLink}。您可以随时禁用此功能。",
-    "telemetry.welcomeBanner.telemetryConfigDetailsDescription.exampleLinkText": "示例",
     "telemetry.welcomeBanner.telemetryConfigDetailsDescription.telemetryPrivacyStatementLinkText": "遥测隐私声明",
-    "telemetry.welcomeBanner.yesButtonLabel": "是",
     "xpack.upgradeAssistant.appTitle": "{version} 升级助手",
     "xpack.upgradeAssistant.checkupTab.backUpCallout.calloutBody.calloutDetail": "使用 {snapshotRestoreDocsButton} 备份您的数据。",
     "xpack.upgradeAssistant.checkupTab.backUpCallout.calloutBody.snapshotRestoreDocsButtonLabel": "快照和还原 API",