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

[Monitoring] Love for APM #69052

Merged
merged 14 commits into from
Jun 23, 2020
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,22 @@ import { FormattedMessage } from '@kbn/i18n/react';

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 @@ -56,8 +60,10 @@ export function ApmServerInstance({ summary, metrics, ...props }) {
</h1>
</EuiScreenReaderOnly>
<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 @@ -15,6 +15,7 @@ import {
EuiPageContent,
EuiSpacer,
EuiScreenReaderOnly,
EuiPanel,
} from '@elastic/eui';
import { Status } from './status';
import { formatMetric } from '../../../lib/format_number';
Expand Down Expand Up @@ -154,7 +155,9 @@ export function ApmServerInstances({ apms, setupMode }) {
</h1>
</EuiScreenReaderOnly>
<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 @@ -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