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.

Sign up for GitHub

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

[APM] Updated header icons #84760

Merged
merged 24 commits into from
Dec 16, 2020
Merged

[APM] Updated header icons #84760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4b709ae
creating service name header
cauemarcondes Dec 2, 2020
47dd1dd
fixing icons
cauemarcondes Dec 2, 2020
de12761
removing unused api import
cauemarcondes Dec 10, 2020
7614d90
fixing some stuff
cauemarcondes Dec 10, 2020
3be873e
adding API tests
cauemarcondes Dec 10, 2020
5bac619
refactoring some stuff
cauemarcondes Dec 14, 2020
b59eee6
fixing tests
cauemarcondes Dec 14, 2020
a0d4017
refactoring some stuff
cauemarcondes Dec 14, 2020
4254999
fixing i18n
cauemarcondes Dec 14, 2020
689cf6e
reverting
cauemarcondes Dec 14, 2020
9072287
renaming
cauemarcondes Dec 14, 2020
6295806
applying min width
cauemarcondes Dec 14, 2020
cfc9fdc
Merge branch 'master' of github.com:elastic/kibana into apm-serv-over…
cauemarcondes Dec 14, 2020
2858596
addressing PR comments and adding test
cauemarcondes Dec 15, 2020
77eb860
sorting service version
cauemarcondes Dec 15, 2020
190810d
Merge branch 'master' of github.com:elastic/kibana into apm-serv-over…
cauemarcondes Dec 15, 2020
53335ea
changing sort type to desc
cauemarcondes Dec 15, 2020
c2eb190
addressing pr comments
cauemarcondes Dec 15, 2020
7903865
changing to show total and not avg
cauemarcondes Dec 15, 2020
a5edbe5
Merge branch 'master' into apm-serv-overview-header-icons
kibanamachine Dec 15, 2020
400c277
addressing pr comments
cauemarcondes Dec 16, 2020
588c76d
Merge branch 'apm-serv-overview-header-icons' of github.com:cauemarco…
cauemarcondes Dec 16, 2020
1e7c498
addressing pr comments
cauemarcondes Dec 16, 2020
00a78b8
addressing pr comments
cauemarcondes Dec 16, 2020
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
109 changes: 109 additions & 0 deletions x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
* you may not use this file except in compliance with the Elastic License.
*/

export const CLOUD = 'cloud';
export const CLOUD_AVAILABILITY_ZONE = 'cloud.availability_zone';
export const CLOUD_PROVIDER = 'cloud.provider';
export const CLOUD_REGION = 'cloud.region';
export const CLOUD_MACHINE_TYPE = 'cloud.machine.type';

export const SERVICE = 'service';
export const SERVICE_NAME = 'service.name';
export const SERVICE_ENVIRONMENT = 'service.environment';
export const SERVICE_FRAMEWORK_NAME = 'service.framework.name';
Expand All @@ -19,6 +22,7 @@ export const SERVICE_RUNTIME_VERSION = 'service.runtime.version';
export const SERVICE_NODE_NAME = 'service.node.name';
export const SERVICE_VERSION = 'service.version';

export const AGENT = 'agent';
export const AGENT_NAME = 'agent.name';
export const AGENT_VERSION = 'agent.version';

Expand Down Expand Up @@ -102,8 +106,11 @@ export const METRIC_JAVA_GC_TIME = 'jvm.gc.time';

export const LABEL_NAME = 'labels.name';

export const HOST = 'host';
export const HOST_NAME = 'host.hostname';
export const CONTAINER = 'container.id';
export const CONTAINER_ID = 'container.id';
export const KUBERNETES = 'kubernetes';
export const POD_NAME = 'kubernetes.pod.name';

export const CLIENT_GEO_COUNTRY_ISO_CODE = 'client.geo.country_iso_code';
Expand Down
7 changes: 7 additions & 0 deletions x-pack/plugins/apm/common/service_metadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

export type ContainerType = 'Kubernetes' | 'Docker' | undefined;
16 changes: 12 additions & 4 deletions x-pack/plugins/apm/public/components/app/service_details/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { EuiTitle } from '@elastic/eui';
import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
import React from 'react';
import { RouteComponentProps } from 'react-router-dom';
import { ApmHeader } from '../../shared/ApmHeader';
import { ServiceIcons } from './service_icons';
import { ServiceDetailTabs } from './service_detail_tabs';

interface Props extends RouteComponentProps<{ serviceName: string }> {
Expand All @@ -20,9 +21,16 @@ export function ServiceDetails({ match, tab }: Props) {
return (
<div>
<ApmHeader>
<EuiTitle>
<h1>{serviceName}</h1>
</EuiTitle>
<EuiFlexGroup alignItems="center">
<EuiFlexItem grow={false}>
<EuiTitle>
<h1>{serviceName}</h1>
</EuiTitle>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<ServiceIcons serviceName={serviceName} />
</EuiFlexItem>
</EuiFlexGroup>
</ApmHeader>
<ServiceDetailTabs serviceName={serviceName} tab={tab} />
</div>
Expand Down
Loading