Skip to content

Commit

Permalink
[8.8] [APM] Mark Agent explorer as beta (#156470) (#156538)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `8.8`:
- [[APM] Mark Agent explorer as beta
(#156470)](#156470)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Yngrid
Coello","email":"yngrid.coello@elastic.co"},"sourceCommit":{"committedDate":"2023-05-03T13:19:27Z","message":"[APM]
Mark Agent explorer as beta (#156470)\n\nCloses #156466.\r\n\r\n<img
width=\"1633\"
alt=\"image\"\r\nsrc=\"https://user-images.githubusercontent.com/1313018/235851516-f06ba00f-764b-436e-9e5f-138788fc323c.png\">\r\n\r\n<img
width=\"1981\"
alt=\"image\"\r\nsrc=\"https://user-images.githubusercontent.com/1313018/235851622-96ddd60b-fede-440d-87ea-cc0dc859065d.png\">","sha":"d96c5a636f17baa36757f0204cf273f7f21f5f3d","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:APM","release_note:feature","v8.8.0","v8.9.0"],"number":156470,"url":"https://github.com/elastic/kibana/pull/156470","mergeCommit":{"message":"[APM]
Mark Agent explorer as beta (#156470)\n\nCloses #156466.\r\n\r\n<img
width=\"1633\"
alt=\"image\"\r\nsrc=\"https://user-images.githubusercontent.com/1313018/235851516-f06ba00f-764b-436e-9e5f-138788fc323c.png\">\r\n\r\n<img
width=\"1981\"
alt=\"image\"\r\nsrc=\"https://user-images.githubusercontent.com/1313018/235851622-96ddd60b-fede-440d-87ea-cc0dc859065d.png\">","sha":"d96c5a636f17baa36757f0204cf273f7f21f5f3d"}},"sourceBranch":"main","suggestedTargetBranches":["8.8"],"targetPullRequestStates":[{"branch":"8.8","label":"v8.8.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/156470","number":156470,"mergeCommit":{"message":"[APM]
Mark Agent explorer as beta (#156470)\n\nCloses #156466.\r\n\r\n<img
width=\"1633\"
alt=\"image\"\r\nsrc=\"https://user-images.githubusercontent.com/1313018/235851516-f06ba00f-764b-436e-9e5f-138788fc323c.png\">\r\n\r\n<img
width=\"1981\"
alt=\"image\"\r\nsrc=\"https://user-images.githubusercontent.com/1313018/235851622-96ddd60b-fede-440d-87ea-cc0dc859065d.png\">","sha":"d96c5a636f17baa36757f0204cf273f7f21f5f3d"}}]}]
BACKPORT-->

Co-authored-by: Yngrid Coello <yngrid.coello@elastic.co>
  • Loading branch information
kibanamachine and yngrdyn authored May 3, 2023
1 parent 3e9e167 commit cc3b077
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import {
EuiTitle,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { isEmpty } from 'lodash';
import React from 'react';
import { useHistory } from 'react-router-dom';
import { isEmpty } from 'lodash';
import {
ElasticApmAgentLatestVersion,
OtelAgentLatestVersion,
Expand All @@ -33,12 +33,12 @@ import { useApmParams } from '../../../../hooks/use_apm_params';
import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
import { useProgressiveFetcher } from '../../../../hooks/use_progressive_fetcher';
import { useTimeRange } from '../../../../hooks/use_time_range';
import { BetaBadge } from '../../../shared/beta_badge';
import { ApmEnvironmentFilter } from '../../../shared/environment_filter';
import { UnifiedSearchBar } from '../../../shared/unified_search_bar';

import * as urlHelpers from '../../../shared/links/url_helpers';
import { SuggestionsSelect } from '../../../shared/suggestions_select';
import { TechnicalPreviewBadge } from '../../../shared/technical_preview_badge';
import { AgentList } from './agent_list';

const getOtelLatestAgentVersion = (
Expand Down Expand Up @@ -146,7 +146,7 @@ export function AgentExplorer() {
<EuiText color="subdued">
{i18n.translate('xpack.apm.settings.agentExplorer.descriptionText', {
defaultMessage:
'Agent Explorer Technical Preview provides an inventory and details of deployed Agents.',
'Agent Explorer provides an inventory and details of deployed Agents.',
})}
</EuiText>
</EuiFlexItem>
Expand All @@ -162,7 +162,7 @@ export function AgentExplorer() {
</h2>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<TechnicalPreviewBadge icon="beaker" />
<BetaBadge icon="beta" />
</EuiFlexItem>
</EuiFlexGroup>
</EuiTitle>
Expand Down Expand Up @@ -243,7 +243,7 @@ export function AgentExplorer() {
<EuiCallOut
size="s"
title={i18n.translate('xpack.apm.agentExplorer.callout.24hoursData', {
defaultMessage: 'Information based on the lastest 24h',
defaultMessage: 'Information based on the last 24h',
})}
iconType="clock"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import { CoreStart } from '@kbn/core/public';
import { i18n } from '@kbn/i18n';
import { enableAgentExplorerView } from '@kbn/observability-plugin/public';
import React from 'react';
import { useDefaultEnvironment } from '../../../hooks/use_default_environment';
import { Environment } from '../../../../common/environment_rt';
import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
import { useApmRouter } from '../../../hooks/use_apm_router';
import { TechnicalPreviewBadge } from '../../shared/technical_preview_badge';
import { useDefaultEnvironment } from '../../../hooks/use_default_environment';
import { BetaBadge } from '../../shared/beta_badge';
import { ApmRouter } from '../apm_route_config';
import { ApmMainTemplate } from './apm_main_template';

Expand Down Expand Up @@ -73,7 +73,7 @@ function getTabs({

const agentExplorerEnabled = core.uiSettings.get<boolean>(
enableAgentExplorerView,
false
true
);

const tabs: Tab[] = [
Expand Down Expand Up @@ -104,7 +104,7 @@ function getTabs({
serviceName: '',
},
}),
append: <TechnicalPreviewBadge icon="beaker" />,
append: <BetaBadge icon="beta" />,
hidden: !agentExplorerEnabled,
},
{
Expand Down
7 changes: 3 additions & 4 deletions x-pack/plugins/observability/server/ui_settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,16 +259,15 @@ export const uiSettings: Record<string, UiSettings> = {
defaultMessage: 'Agent explorer',
}),
description: i18n.translate('xpack.observability.enableAgentExplorerDescription', {
defaultMessage: '{technicalPreviewLabel} Enables Agent explorer view.',
defaultMessage: '{betaLabel} Enables Agent explorer view.',
values: {
technicalPreviewLabel: `<em>[${technicalPreviewLabel}]</em>`,
betaLabel: `<em>[${betaLabel}]</em>`,
},
}),
schema: schema.boolean(),
value: false,
value: true,
requiresPageReload: true,
type: 'boolean',
showInLabs: true,
},
[apmAWSLambdaPriceFactor]: {
category: [observabilityFeatureId],
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -25150,7 +25150,6 @@
"xpack.observability.apmProgressiveLoadingDescription": "{technicalPreviewLabel} S'il faut charger les données de façon progressive pour les vues APM. Les données peuvent être demandées d'abord avec un taux d'échantillonnage inférieur, avec une précision plus faible mais des temps de réponse plus rapides, pendant que les données non échantillonnées se chargent en arrière-plan",
"xpack.observability.apmServiceInventoryOptimizedSortingDescription": "{technicalPreviewLabel} Tri par défaut des pages d'inventaire et de stockage des services APM (pour les services hors Machine Learning) en fonction du nom de service. {feedbackLink}.",
"xpack.observability.apmTraceExplorerTabDescription": "{technicalPreviewLabel} Activer la fonctionnalité Explorateur de traces APM qui vous permet de rechercher et d'inspecter les traces avec KQL ou EQL. {feedbackLink}.",
"xpack.observability.enableAgentExplorerDescription": "{technicalPreviewLabel} Active la vue d'explorateur d'agent.",
"xpack.observability.enableAwsLambdaMetricsDescription": "{technicalPreviewLabel} Affichez les indicateurs Amazon Lambda dans l'onglet d'indicateurs de service. {feedbackLink}",
"xpack.observability.enableCriticalPathDescription": "{technicalPreviewLabel} Affichez de façon optionnelle le chemin critique d'une trace.",
"xpack.observability.enableInfrastructureHostsViewDescription": "{technicalPreviewLabel} Activez la vue Hôtes dans l'application Infrastructure. {feedbackLink}.",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -25135,7 +25135,6 @@
"xpack.observability.apmProgressiveLoadingDescription": "{technicalPreviewLabel} APMビューでデータのプログレッシブ読み込みを行うかどうか。サンプリングされていないデータをバックグラウンドで読み込みながら、最初は低いサンプリングレート、低い精度、高速の応答時間でデータを要求できます",
"xpack.observability.apmServiceInventoryOptimizedSortingDescription": "{technicalPreviewLabel}サービス名によるデフォルトAPMサービスインベントリおよびストレージエクスプローラーページの並べ替え(機械学習が適用されていないサービス)。{feedbackLink}。",
"xpack.observability.apmTraceExplorerTabDescription": "{technicalPreviewLabel} APMトレースエクスプローラー機能を有効にし、KQLまたはEQLでトレースを検索、検査できます。{feedbackLink}",
"xpack.observability.enableAgentExplorerDescription": "{technicalPreviewLabel}エージェントエクスプローラー表示を有効にします。",
"xpack.observability.enableAwsLambdaMetricsDescription": "{technicalPreviewLabel} [サービスメトリック]タブにAmazon Lambdaメトリックを表示します。{feedbackLink}",
"xpack.observability.enableCriticalPathDescription": "{technicalPreviewLabel} 任意で、トレースのクリティカルパスを表示します。",
"xpack.observability.enableInfrastructureHostsViewDescription": "{technicalPreviewLabel}インフラアプリでホストビューを有効にします。{feedbackLink}。",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -25148,7 +25148,6 @@
"xpack.observability.apmProgressiveLoadingDescription": "{technicalPreviewLabel} 是否以渐进方式为 APM 视图加载数据。可以先以较低的采样速率请求数据,这样的准确性较低,但响应时间更快,同时在后台加载未采样数据",
"xpack.observability.apmServiceInventoryOptimizedSortingDescription": "{technicalPreviewLabel} 默认 APM 服务库存和 Storage Explorer 页面排序(对于未应用 Machine Learning 的服务)将按服务名称排序。{feedbackLink}。",
"xpack.observability.apmTraceExplorerTabDescription": "{technicalPreviewLabel} 启用 APM Trace Explorer 功能,它允许您通过 KQL 或 EQL 搜索和检查跟踪。{feedbackLink}。",
"xpack.observability.enableAgentExplorerDescription": "{technicalPreviewLabel} 启用代理浏览器视图。",
"xpack.observability.enableAwsLambdaMetricsDescription": "{technicalPreviewLabel} 在服务指标选项卡中显示 Amazon Lambda 指标。{feedbackLink}",
"xpack.observability.enableCriticalPathDescription": "{technicalPreviewLabel}(可选)显示跟踪的关键路径。",
"xpack.observability.enableInfrastructureHostsViewDescription": "{technicalPreviewLabel} 在 Infrastructure 应用中启用主机视图。{feedbackLink}。",
Expand Down

0 comments on commit cc3b077

Please sign in to comment.