Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] Remove service map beta badge (#78039) #78196

Merged
merged 1 commit into from
Sep 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions docs/apm/service-maps.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
[[service-maps]]
=== Service maps

beta::[]

WARNING: Service map support for Internet Explorer 11 is extremely limited.
Please use Chrome or Firefox if available.

A service map is a real-time visual representation of the instrumented services in your application's architecture.
It shows you how these services are connected, along with high-level metrics like average transaction duration,
requests per minute, and errors per minute.
Expand Down
36 changes: 0 additions & 36 deletions x-pack/plugins/apm/public/components/app/ServiceMap/BetaBadge.tsx

This file was deleted.

10 changes: 4 additions & 6 deletions x-pack/plugins/apm/public/components/app/ServiceMap/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
* you may not use this file except in compliance with the Elastic License.
*/

import React from 'react';
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { useTheme } from '../../../hooks/useTheme';
import React from 'react';
import { useTrackPageview } from '../../../../../observability/public';
import {
invalidLicenseMessage,
isActivePlatinumLicense,
} from '../../../../common/service_map';
import { useFetcher } from '../../../hooks/useFetcher';
import { useLicense } from '../../../hooks/useLicense';
import { useTheme } from '../../../hooks/useTheme';
import { useUrlParams } from '../../../hooks/useUrlParams';
import { callApmApi } from '../../../services/rest/createCallApmApi';
import { LicensePrompt } from '../../shared/LicensePrompt';
Expand All @@ -22,8 +23,6 @@ import { getCytoscapeDivStyle } from './cytoscapeOptions';
import { EmptyBanner } from './EmptyBanner';
import { Popover } from './Popover';
import { useRefDimensions } from './useRefDimensions';
import { BetaBadge } from './BetaBadge';
import { useTrackPageview } from '../../../../../observability/public';

interface ServiceMapProps {
serviceName?: string;
Expand Down Expand Up @@ -80,7 +79,6 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
style={getCytoscapeDivStyle(theme)}
>
<Controls />
<BetaBadge />
{serviceName && <EmptyBanner />}
<Popover focusedServiceName={serviceName} />
</Cytoscape>
Expand All @@ -96,7 +94,7 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
grow={false}
style={{ width: 600, textAlign: 'center' as const }}
>
<LicensePrompt text={invalidLicenseMessage} showBetaBadge />
<LicensePrompt text={invalidLicenseMessage} />
</EuiFlexItem>
</EuiFlexGroup>
);
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -4811,8 +4811,6 @@
"xpack.apm.serviceMap.avgMemoryUsagePopoverStat": "メモリー使用状況(平均)",
"xpack.apm.serviceMap.avgReqPerMinutePopoverMetric": "1分あたりのリクエスト(平均)",
"xpack.apm.serviceMap.avgTransDurationPopoverStat": "トランザクションの長さ(平均)",
"xpack.apm.serviceMap.betaBadge": "ベータ",
"xpack.apm.serviceMap.betaTooltipMessage": "現在、この機能はベータです。不具合を見つけた場合やご意見がある場合、サポートに問い合わせるか、またはディスカッションフォーラムにご報告ください。",
"xpack.apm.serviceMap.center": "中央",
"xpack.apm.serviceMap.download": "ダウンロード",
"xpack.apm.serviceMap.emptyBanner.docsLink": "詳細はドキュメントをご覧ください",
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -4814,8 +4814,6 @@
"xpack.apm.serviceMap.avgMemoryUsagePopoverStat": "内存使用率(平均值)",
"xpack.apm.serviceMap.avgReqPerMinutePopoverMetric": "每分钟请求数(平均)",
"xpack.apm.serviceMap.avgTransDurationPopoverStat": "事务持续时间(平均值)",
"xpack.apm.serviceMap.betaBadge": "公测版",
"xpack.apm.serviceMap.betaTooltipMessage": "此功能当前为公测版。如果遇到任何错误或有任何反馈,请报告问题或访问我们的论坛。",
"xpack.apm.serviceMap.center": "中",
"xpack.apm.serviceMap.download": "下载",
"xpack.apm.serviceMap.emptyBanner.docsLink": "在文档中了解详情",
Expand Down