[APM] Update APM general settings (#159999)

- Removes AWS Lambda Metrics (observability:enableAwsLambdaMetrics) as it's available in labs - Removes Infrastructure hosts (view observability:enableInfrastructureHostsView) as it's not related to APM - Removes the callout that points to advanced settings <img width="565" alt="image" src="https://github.com/elastic/kibana/assets/5831975/faa63d8d-ba83-4d5f-bf21-ca0f89805746"> Closes to #159911 --------- Co-authored-by: Kibana Machine <[email protected]>
elastic · Jun 21, 2023 · 513403e · 513403e
1 parent 9382687
commit 513403e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 43 deletions.
diff --git a/x-pack/plugins/apm/public/components/app/settings/general_settings/index.tsx b/x-pack/plugins/apm/public/components/app/settings/general_settings/index.tsx
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import { EuiCallOut, EuiLink, EuiSpacer } from '@elastic/eui';
+import { EuiSpacer } from '@elastic/eui';
 import { LazyField } from '@kbn/advanced-settings-plugin/public';
 import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
 import {
   apmLabsButton,
   apmServiceGroupMaxNumberOfServices,
@@ -19,8 +18,6 @@ import {
   apmAWSLambdaRequestCostPerMillion,
   apmEnableServiceMetrics,
   apmEnableContinuousRollups,
-  enableInfrastructureHostsView,
-  enableAwsLambdaMetrics,
   enableAgentExplorerView,
 } from '@kbn/observability-plugin/common';
 import { isEmpty } from 'lodash';
@@ -39,13 +36,11 @@ const apmSettingsKeys = [
   apmAWSLambdaRequestCostPerMillion,
   apmEnableServiceMetrics,
   apmEnableContinuousRollups,
-  enableInfrastructureHostsView,
-  enableAwsLambdaMetrics,
   enableAgentExplorerView,
 ];
 
 export function GeneralSettings() {
-  const { docLinks, notifications, application } = useApmPluginContext().core;
+  const { docLinks, notifications } = useApmPluginContext().core;
   const {
     handleFieldChange,
     settingsEditableConfig,
@@ -77,33 +72,6 @@ export function GeneralSettings() {
 
   return (
     <>
-      <EuiCallOut
-        title={i18n.translate('xpack.apm.apmSettings.callOutTitle', {
-          defaultMessage: 'Looking for all settings?',
-        })}
-        iconType="search"
-      >
-        <p>
-          <FormattedMessage
-            id="xpack.apm.apmSettings.kibanaLink"
-            defaultMessage="The full list of APM options can be found in {link}"
-            values={{
-              link: (
-                <EuiLink
-                  data-test-subj="apmGeneralSettingsKibanaAdvancedSettingsLink"
-                  href={application.getUrlForApp('management', {
-                    path: `/kibana/settings?query=category:(observability)`,
-                  })}
-                >
-                  {i18n.translate('xpack.apm.apmSettings.kibanaLink.label', {
-                    defaultMessage: 'Kibana advanced settings.',
-                  })}
-                </EuiLink>
-              ),
-            }}
-          />
-        </p>
-      </EuiCallOut>
       <EuiSpacer />
       {apmSettingsKeys.map((settingKey) => {
         const editableConfig = settingsEditableConfig[settingKey];

diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
@@ -7409,7 +7409,6 @@
     "xpack.apm.anomalyDetection.createJobs.failed.text": "Une erreur est survenue lors de la création d'une ou de plusieurs tâches de détection des anomalies pour les environnements de service APM [{environments}]. Erreur : \"{errorMessage}\"",
     "xpack.apm.anomalyDetection.createJobs.succeeded.text": "Tâches de détection des anomalies créées avec succès pour les environnements de service APM [{environments}]. Le démarrage de l'analyse du trafic à la recherche d'anomalies par le Machine Learning va prendre un certain temps.",
     "xpack.apm.anomalyDetectionSetup.notEnabledForEnvironmentText": "La détection des anomalies n'est pas encore activée pour l'environnement \"{currentEnvironment}\". Cliquez pour continuer la configuration.",
-    "xpack.apm.apmSettings.kibanaLink": "La liste complète d'options APM est disponible dans {link}",
     "xpack.apm.bottomBarActions.unsavedChanges": "{unsavedChangesCount, plural, =0 {0 modification non enregistrée} one {1 modification non enregistrée} many {# modifications non enregistrées} other {# modifications non enregistrées}} ",
     "xpack.apm.compositeSpanCallsLabel": ", {count} appels, sur une moyenne de {duration}",
     "xpack.apm.correlations.ccsWarningCalloutBody": "Les données pour l'analyse de corrélation n'ont pas pu être totalement récupérées. Cette fonctionnalité est prise en charge uniquement pour {version} et versions ultérieures.",
@@ -7779,9 +7778,7 @@
     "xpack.apm.apmDescription": "Collecte automatiquement les indicateurs et les erreurs de performances détaillés depuis vos applications.",
     "xpack.apm.apmSchema.index": "Schéma du serveur APM - Index",
     "xpack.apm.apmServiceGroups.title": "Groupes de services APM",
-    "xpack.apm.apmSettings.callOutTitle": "Vous recherchez tous les paramètres ?",
     "xpack.apm.apmSettings.index": "Paramètres APM - Index",
-    "xpack.apm.apmSettings.kibanaLink.label": "Paramètres avancés de Kibana.",
     "xpack.apm.apmSettings.save.error": "Une erreur s'est produite lors de l'enregistrement des paramètres",
     "xpack.apm.apmSettings.saveButton": "Enregistrer les modifications",
     "xpack.apm.appName": "APM",

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -7410,7 +7410,6 @@
     "xpack.apm.anomalyDetection.createJobs.failed.text": "APMサービス環境[{environments}]用に1つ以上の異常検知ジョブを作成しているときに問題が発生しました。エラー「{errorMessage}」",
     "xpack.apm.anomalyDetection.createJobs.succeeded.text": "APMサービス環境[{environments}]の異常検知ジョブが正常に作成されました。機械学習がトラフィック異常値の分析を開始するには、少し時間がかかります。",
     "xpack.apm.anomalyDetectionSetup.notEnabledForEnvironmentText": "「{currentEnvironment}」環境では、まだ異常検知が有効ではありません。クリックすると、セットアップを続行します。",
-    "xpack.apm.apmSettings.kibanaLink": "APMオプションの一覧は{link}を参照してください",
     "xpack.apm.bottomBarActions.unsavedChanges": "{unsavedChangesCount, plural, =0 {0個の保存されていない変更} other {#個の保存されていない変更}} ",
     "xpack.apm.compositeSpanCallsLabel": "、{count}件の呼び出し、平均：{duration}",
     "xpack.apm.correlations.ccsWarningCalloutBody": "相関関係分析のデータを完全に取得できませんでした。この機能はバージョン{version}以降でのみサポートされています。",
@@ -7780,9 +7779,7 @@
     "xpack.apm.apmDescription": "アプリケーション内から自動的に詳細なパフォーマンスメトリックやエラーを集めます。",
     "xpack.apm.apmSchema.index": "APMサーバースキーマ - インデックス",
     "xpack.apm.apmServiceGroups.title": "APMサービスグループ",
-    "xpack.apm.apmSettings.callOutTitle": "すべての設定を探している場合",
     "xpack.apm.apmSettings.index": "APM 設定 - インデックス",
-    "xpack.apm.apmSettings.kibanaLink.label": "Kibana詳細設定。",
     "xpack.apm.apmSettings.save.error": "設定の保存中にエラーが発生しました",
     "xpack.apm.apmSettings.saveButton": "変更を保存",
     "xpack.apm.appName": "APM",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -7409,7 +7409,6 @@
     "xpack.apm.anomalyDetection.createJobs.failed.text": "为 APM 服务环境 [{environments}] 创建一个或多个异常检测作业时出现问题。错误：“{errorMessage}”",
     "xpack.apm.anomalyDetection.createJobs.succeeded.text": "APM 服务环境 [{environments}] 的异常检测作业已成功创建。Machine Learning 要过一些时间才会开始分析流量以发现异常。",
     "xpack.apm.anomalyDetectionSetup.notEnabledForEnvironmentText": "尚未针对环境“{currentEnvironment}”启用异常检测。单击可继续设置。",
-    "xpack.apm.apmSettings.kibanaLink": "可在 {link} 中找到 APM 选项的完整列表",
     "xpack.apm.bottomBarActions.unsavedChanges": "{unsavedChangesCount, plural, =0 {0 个未保存更改} other {# 个未保存更改}} ",
     "xpack.apm.compositeSpanCallsLabel": "，{count} 个调用，平均 {duration}",
     "xpack.apm.correlations.ccsWarningCalloutBody": "无法完全检索相关性分析的数据。仅 {version} 及更高版本支持此功能。",
@@ -7779,9 +7778,7 @@
     "xpack.apm.apmDescription": "自动从您的应用程序内收集深层的性能指标和错误。",
     "xpack.apm.apmSchema.index": "APM Server 架构 - 索引",
     "xpack.apm.apmServiceGroups.title": "APM 服务组",
-    "xpack.apm.apmSettings.callOutTitle": "正在查找所有设置？",
     "xpack.apm.apmSettings.index": "APM 设置 - 索引",
-    "xpack.apm.apmSettings.kibanaLink.label": "Kibana 高级设置。",
     "xpack.apm.apmSettings.save.error": "保存设置时出错",
     "xpack.apm.apmSettings.saveButton": "保存更改",
     "xpack.apm.appName": "APM",