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

Jump to bottom

[7.8] [Monitoring] Love for APM (#69052) #69742

Merged
merged 2 commits into from
Jun 25, 2020
Merged

[7.8] [Monitoring] Love for APM (#69052) #69742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f6c326
[Monitoring] Love for APM (#69052)
chrisronline Jun 23, 2020
70018e8
Merge branch '7.8' into backport/7.8/pr-69052
elasticmachine Jun 25, 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
16 changes: 11 additions & 5 deletions x-pack/plugins/monitoring/public/components/apm/instance/instance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@ import { Status } from './status';

export function ApmServerInstance({ summary, metrics, ...props }) {
const seriesToShow = [
metrics.apm_requests,
metrics.apm_responses_valid,

metrics.apm_responses_errors,
metrics.apm_acm_request_count,

metrics.apm_acm_response,
metrics.apm_acm_response_errors,

metrics.apm_output_events_rate_success,
metrics.apm_output_events_rate_failure,

metrics.apm_requests,
metrics.apm_transformations,

metrics.apm_cpu,
metrics.apm_memory,

metrics.apm_memory,
metrics.apm_os_load,
];

Expand All @@ -46,8 +50,10 @@ export function ApmServerInstance({ summary, metrics, ...props }) {
<EuiPage>
<EuiPageBody>
<EuiPageContent>
<Status stats={summary} />
<EuiSpacer size="s" />
<EuiPanel>
<Status stats={summary} />
</EuiPanel>
<EuiSpacer size="m" />
<EuiFlexGroup wrap>{charts}</EuiFlexGroup>
</EuiPageContent>
</EuiPageBody>
Expand Down
6 changes: 4 additions & 2 deletions x-pack/plugins/monitoring/public/components/apm/instances/instances.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React, { Fragment } from 'react';
import moment from 'moment';
import { uniq, get } from 'lodash';
import { EuiMonitoringTable } from '../../table';
import { EuiLink, EuiPage, EuiPageBody, EuiPageContent, EuiSpacer } from '@elastic/eui';
import { EuiLink, EuiPage, EuiPageBody, EuiPageContent, EuiSpacer, EuiPanel } from '@elastic/eui';
import { Status } from './status';
import { formatMetric } from '../../../lib/format_number';
import { getSafeForExternalLink } from '../../../lib/get_safe_for_external_link';
Expand Down Expand Up @@ -138,7 +138,9 @@ export function ApmServerInstances({ apms, setupMode }) {
<EuiPage>
<EuiPageBody>
<EuiPageContent>
<Status stats={data.stats} />
<EuiPanel>
<Status stats={data.stats} />
</EuiPanel>
<EuiSpacer size="m" />
{setupModeCallout}
<EuiMonitoringTable
Expand Down
4 changes: 3 additions & 1 deletion x-pack/plugins/monitoring/public/components/apm/overview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ export function ApmOverview({ stats, metrics, ...props }) {
<EuiPage>
<EuiPageBody>
<EuiPageContent>
<Status stats={stats} />
<EuiPanel>
<Status stats={stats} />
</EuiPanel>
<EuiSpacer size="s" />
<EuiFlexGroup wrap>{charts}</EuiFlexGroup>
</EuiPageContent>
Expand Down
4 changes: 4 additions & 0 deletions x-pack/plugins/monitoring/public/components/chart/get_color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@
* @param {Integer} index: index of the chart series, 0-3
* @returns {String} Hex color to use for chart series at the given index
*/
import { euiPaletteColorBlind } from '@elastic/eui/lib/services';

export function getColor(app, index) {
let seriesColors;
if (app === 'elasticsearch') {
seriesColors = ['#3ebeb0', '#3b73ac', '#f08656', '#6c478f'];
} else if (app === 'apm') {
seriesColors = euiPaletteColorBlind();
} else {
// for kibana, and fallback (e.g., Logstash and Beats)
seriesColors = ['#e8488b', '#3b73ac', '#3cab63', '#6c478f'];
Expand Down
2 changes: 2 additions & 0 deletions x-pack/plugins/monitoring/public/services/breadcrumbs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ function getKibanaBreadcrumbs(mainInstance) {
})
)
);
breadcrumbs.push(createCrumb(null, mainInstance.instance));
} else {
// don't link to Overview when we're possibly on Overview or its sibling tabs
breadcrumbs.push(createCrumb(null, 'Kibana'));
Expand Down Expand Up @@ -160,6 +161,7 @@ function getApmBreadcrumbs(mainInstance) {
})
)
);
breadcrumbs.push(createCrumb(null, mainInstance.instance));
} else {
// don't link to Overview when we're possibly on Overview or its sibling tabs
breadcrumbs.push(createCrumb(null, apmLabel));
Expand Down
Loading