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

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

Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ export class LogsContent extends PureComponent {
defaultMessage="Visit {link} to dive deeper."
values={{
link: (
<EuiLink href={discoverLink}>
<EuiLink href={discoverLink} data-test-subj="monitoringLogsLink">
{i18n.translate('xpack.monitoring.logs.listing.calloutLinkText', {
defaultMessage: 'Discover',
})}
Expand Down Expand Up @@ -259,7 +259,7 @@ export class LogsContent extends PureComponent {
}

return (
<div>
<div data-test-subj="monitoringLogs">
<EuiTitle>
<h1>
{i18n.translate('xpack.monitoring.logs.listing.pageTitle', {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,9 @@
"enabled": false,
"logs": [],
"reason": {
"indexPatternExists": false,
"indexPatternExists": true,
"indexPatternInTimeRangeExists": false,
"typeExistsAtAnyTime": false,
"typeExistsAtAnyTime": true,
"typeExists": false,
"usingStructuredLogs": false,
"clusterExists": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1009,9 +1009,9 @@
"enabled": false,
"logs": [],
"reason": {
"indexPatternExists": false,
"indexPatternExists": true,
"indexPatternInTimeRangeExists": false,
"typeExistsAtAnyTime": false,
"typeExistsAtAnyTime": true,
"typeExists": false,
"usingStructuredLogs": false,
"clusterExists": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
]
},
"logs": {
"enabled": false,
"enabled": true,
"limit": 10,
"reason": {
"clusterExists": false,
"indexPatternExists": false,
"indexPatternInTimeRangeExists": false,
"typeExistsAtAnyTime": false,
"usingStructuredLogs": false,
"nodeExists": null,
"indexExists": null,
"typeExists": false
},
"logs": []
"logs": [
{
"component": "o.e.c.m.MetaDataMappingService",
"index": "phone-home",
"level": "INFO",
"message": "update_mapping [_doc]",
"node": "whatever-01",
"timestamp": 1507235724641,
"type": "server"
}
]
},
"metrics": {
"cluster_index_latency": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ export const getLifecycleMethods = (getService, getPageObjects) => {
async setup(archive, { from, to, useSuperUser = false, useCreate = false }) {
_archive = archive;
if (!useSuperUser) {
await security.testUser.setRoles(['monitoring_user', 'kibana_admin', 'test_monitoring']);
await security.testUser.setRoles([
'monitoring_user',
'kibana_admin',
'test_monitoring',
'test_filebeat_reader',
]);
}

const kibanaServer = getService('kibanaServer');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default function ({ getService, getPageObjects }) {
'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
{
from: 'Oct 5, 2017 @ 20:31:48.354',
to: 'Oct 5, 2017 @ 20:35:12.176',
to: 'Oct 5, 2017 @ 20:35:30.176',
}
);

Expand Down Expand Up @@ -81,6 +81,12 @@ export default function ({ getService, getPageObjects }) {
health: 'Health: yellow',
});
});

it('should show the link to view more index logs', async () => {
await indicesList.clickRowByName('phone-home');

expect(await indexDetail.viewLogsLinkIsShowing()).to.be(true);
});
});
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default function ({ getService, getPageObjects }) {
'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb',
{
from: 'Oct 5, 2017 @ 20:31:48.354',
to: 'Oct 5, 2017 @ 20:35:12.176',
to: 'Oct 5, 2017 @ 20:35:30.176',
useCreate: true,
}
);
Expand Down Expand Up @@ -82,6 +82,12 @@ export default function ({ getService, getPageObjects }) {
health: 'Health: yellow',
});
});

it('should show the link to view more index logs', async () => {
await indicesList.clickRowByName('phone-home');

expect(await indexDetail.viewLogsLinkIsShowing()).to.be(true);
});
});
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default function ({ getService, getPageObjects }) {
'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
{
from: 'Oct 5, 2017 @ 20:31:48.354',
to: 'Oct 5, 2017 @ 20:35:12.176',
to: 'Oct 5, 2017 @ 20:35:30.176',
}
);

Expand All @@ -47,7 +47,7 @@ export default function ({ getService, getPageObjects }) {

expect(await nodeDetail.getSummary()).to.eql({
transportAddress: 'Transport Address\n127.0.0.1:9300',
jvmHeap: 'JVM Heap\n29%',
jvmHeap: 'JVM Heap\n41%',
freeDiskSpace: 'Free Disk Space\n173.9 GB (37.42%)',
documentCount: 'Documents\n24.8k',
dataSize: 'Data\n50.4 MB',
Expand All @@ -58,21 +58,27 @@ export default function ({ getService, getPageObjects }) {
});
});

it('should show node summary of data node with 4 indices and 4 shards', async () => {
it('should show node summary of data node with 5 indices and 5 shards', async () => {
await nodesList.clickRowByResolver('bwQWH-7IQY-mFPpfoaoFXQ');

expect(await nodeDetail.getSummary()).to.eql({
transportAddress: 'Transport Address\n127.0.0.1:9302',
jvmHeap: 'JVM Heap\n17%',
jvmHeap: 'JVM Heap\n28%',
freeDiskSpace: 'Free Disk Space\n173.9 GB (37.42%)',
documentCount: 'Documents\n240',
documentCount: 'Documents\n247',
dataSize: 'Data\n1.4 MB',
indicesCount: 'Indices\n4',
shardsCount: 'Shards\n4',
indicesCount: 'Indices\n5',
shardsCount: 'Shards\n5',
nodeType: 'Type\nNode',
status: 'Status: Online',
});
});

it('should show the link to view more node logs', async () => {
await nodesList.clickRowByResolver('jUT5KdxfRbORSCWkb5zjmA');

expect(await nodeDetail.viewLogsLinkIsShowing()).to.be(true);
});
});

describe('Offline Node', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default function ({ getService, getPageObjects }) {
'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb',
{
from: 'Oct 5, 2017 @ 20:31:48.354',
to: 'Oct 5, 2017 @ 20:35:12.176',
to: 'Oct 5, 2017 @ 20:35:30.176',
useCreate: true,
}
);
Expand All @@ -48,7 +48,7 @@ export default function ({ getService, getPageObjects }) {

expect(await nodeDetail.getSummary()).to.eql({
transportAddress: 'Transport Address\n127.0.0.1:9300',
jvmHeap: 'JVM Heap\n29%',
jvmHeap: 'JVM Heap\n41%',
freeDiskSpace: 'Free Disk Space\n173.9 GB (37.42%)',
documentCount: 'Documents\n24.8k',
dataSize: 'Data\n50.4 MB',
Expand All @@ -59,21 +59,27 @@ export default function ({ getService, getPageObjects }) {
});
});

it('should show node summary of data node with 4 indices and 4 shards', async () => {
it('should show node summary of data node with 5 indices and 5 shards', async () => {
await nodesList.clickRowByResolver('bwQWH-7IQY-mFPpfoaoFXQ');

expect(await nodeDetail.getSummary()).to.eql({
transportAddress: 'Transport Address\n127.0.0.1:9302',
jvmHeap: 'JVM Heap\n17%',
jvmHeap: 'JVM Heap\n28%',
freeDiskSpace: 'Free Disk Space\n173.9 GB (37.42%)',
documentCount: 'Documents\n240',
documentCount: 'Documents\n247',
dataSize: 'Data\n1.4 MB',
indicesCount: 'Indices\n4',
shardsCount: 'Shards\n4',
indicesCount: 'Indices\n5',
shardsCount: 'Shards\n5',
nodeType: 'Type\nNode',
status: 'Status: Online',
});
});

it('should show the link to view more node logs', async () => {
await nodesList.clickRowByResolver('jUT5KdxfRbORSCWkb5zjmA');

expect(await nodeDetail.viewLogsLinkIsShowing()).to.be(true);
});
});

describe('Offline Node', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }) {
'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
{
from: 'Oct 5, 2017 @ 20:31:48.354',
to: 'Oct 5, 2017 @ 20:35:12.176',
to: 'Oct 5, 2017 @ 20:35:30.176',
}
);

Expand All @@ -39,14 +39,18 @@ export default function ({ getService, getPageObjects }) {
it('should have an Elasticsearch Cluster Summary Status with correct info', async () => {
expect(await esClusterSummaryStatus.getContent()).to.eql({
nodesCount: 'Nodes\n3',
indicesCount: 'Indices\n20',
memory: 'JVM Heap\n575.3 MB / 2.0 GB',
totalShards: 'Total shards\n80',
indicesCount: 'Indices\n21',
memory: 'JVM Heap\n629.3 MB / 2.0 GB',
totalShards: 'Total shards\n82',
unassignedShards: 'Unassigned shards\n5',
documentCount: 'Documents\n25,927',
dataSize: 'Data\n101.6 MB',
documentCount: 'Documents\n26,062',
dataSize: 'Data\n101.9 MB',
health: 'Health: yellow',
});
});

it('should show the link to view more cluster logs', async () => {
expect(await esClusterSummaryStatus.viewLogsLinkIsShowing()).to.be(true);
});
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }) {
'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb',
{
from: 'Oct 5, 2017 @ 20:31:48.354',
to: 'Oct 5, 2017 @ 20:35:12.176',
to: 'Oct 5, 2017 @ 20:35:30.176',
useCreate: true,
}
);
Expand All @@ -40,14 +40,18 @@ export default function ({ getService, getPageObjects }) {
it('should have an Elasticsearch Cluster Summary Status with correct info', async () => {
expect(await esClusterSummaryStatus.getContent()).to.eql({
nodesCount: 'Nodes\n3',
indicesCount: 'Indices\n20',
memory: 'JVM Heap\n575.3 MB / 2.0 GB',
totalShards: 'Total shards\n80',
indicesCount: 'Indices\n21',
memory: 'JVM Heap\n629.3 MB / 2.0 GB',
totalShards: 'Total shards\n82',
unassignedShards: 'Unassigned shards\n5',
documentCount: 'Documents\n25,927',
dataSize: 'Data\n101.6 MB',
documentCount: 'Documents\n26,062',
dataSize: 'Data\n101.9 MB',
health: 'Health: yellow',
});
});

it('should show the link to view more cluster logs', async () => {
expect(await esClusterSummaryStatus.viewLogsLinkIsShowing()).to.be(true);
});
});
}
14 changes: 14 additions & 0 deletions x-pack/test/functional/config.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,20 @@ export default async function ({ readConfigFile }) {
},
kibana: [],
},
test_filebeat_reader: {
elasticsearch: {
cluster: [],
indices: [
{
names: ['filebeat*'],
privileges: ['read', 'view_index_metadata'],
field_security: { grant: ['*'], except: [] },
},
],
run_as: [],
},
kibana: [],
},

global_canvas_all: {
kibana: [
Expand Down
Binary file not shown.
Loading