Skip to content
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
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
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
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
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
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