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

[Discover] Only show logs profiles for O11y solution view #199255

Merged
merged 19 commits into from
Nov 18, 2024
Merged

[Discover] Only show logs profiles for O11y solution view #199255

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
027b23a
Only show logs profiles for O11y solution view
davismcphee Nov 7, 2024
42d9800
Add jest tests
davismcphee Nov 8, 2024
1be22ed
Update functional tests
davismcphee Nov 8, 2024
fe66899
Cleanup
davismcphee Nov 8, 2024
2362b4a
Moving files to observability folder
davismcphee Nov 8, 2024
4a6daf9
Update subprofile IDs
davismcphee Nov 8, 2024
ec25ffe
Fix functional tests
davismcphee Nov 14, 2024
97ea182
Merge branch 'main' into logs-profiles-o11y-only
davismcphee Nov 14, 2024
726a1f9
Merge branch 'main' into logs-profiles-o11y-only
davismcphee Nov 14, 2024
25bca72
Updated CODEOWNERS
davismcphee Nov 14, 2024
81c084c
[CI] Auto-commit changed files from 'make api-docs'
kibanamachine Nov 14, 2024
bbe4bd0
Merge branch 'main' into logs-profiles-o11y-only
davismcphee Nov 14, 2024
5658e92
[CI] Auto-commit changed files from 'make api-docs'
kibanamachine Nov 14, 2024
1a6d95e
Allow accessing ContextWithProfileId within profile resolve methods
davismcphee Nov 14, 2024
a41d43e
Update o11y logs profiles to check profileId instead of solutionType
davismcphee Nov 14, 2024
28c4f97
Merge branch 'main' into logs-profiles-o11y-only
davismcphee Nov 14, 2024
6a68792
Revert "[CI] Auto-commit changed files from 'make api-docs'"
davismcphee Nov 14, 2024
0b0d350
[CI] Auto-commit changed files from 'make api-docs'
kibanamachine Nov 14, 2024
a9a5e70
Merge branch 'main' into logs-profiles-o11y-only
davismcphee Nov 17, 2024
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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -1320,6 +1320,7 @@ x-pack/test_serverless/**/test_suites/observability/ai_assistant @elastic/obs-ai
/x-pack/test/functional/apps/dataset_quality @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/dataset_quality @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/ @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/discover @elastic/obs-ux-logs-team @elastic/kibana-data-discovery
/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview @elastic/obs-ux-logs-team
/x-pack/test/api_integration/apis/logs_shared @elastic/obs-ux-logs-team

Expand Down
0 ...ment_profile/accessors/get_doc_viewer.tsx → ...ment_profile/accessors/get_doc_viewer.tsx
View file
Open in desktop
File renamed without changes.
0 ...n/log_document_profile/accessors/index.ts → ...y/log_document_profile/accessors/index.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ders/common/log_document_profile/index.ts → ...servability/log_document_profile/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/

export { createLogDocumentProfileProvider } from './profile';
export { createObservabilityLogDocumentProfileProvider } from './profile';
40 changes: 37 additions & 3 deletions ...mmon/log_document_profile/profile.test.ts → ...lity/log_document_profile/profile.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,19 @@ import { DocViewsRegistry } from '@kbn/unified-doc-viewer';
import {
DataSourceCategory,
DataSourceContext,
DocumentProfileProviderParams,
DocumentType,
RootContext,
SolutionType,
} from '../../../profiles';
import { createContextAwarenessMocks } from '../../../__mocks__';
import { createLogDocumentProfileProvider } from './profile';
import { createObservabilityLogDocumentProfileProvider } from './profile';

const mockServices = createContextAwarenessMocks().profileProviderServices;

describe('logDocumentProfileProvider', () => {
const logDocumentProfileProvider = createLogDocumentProfileProvider(mockServices);
const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Default };
const logDocumentProfileProvider = createObservabilityLogDocumentProfileProvider(mockServices);
const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Observability };
const DATA_SOURCE_CONTEXT: DataSourceContext = { category: DataSourceCategory.Logs };
const RESOLUTION_MATCH = {
isMatch: true,
Expand Down Expand Up @@ -99,6 +100,39 @@ describe('logDocumentProfileProvider', () => {
).toEqual(RESOLUTION_MISMATCH);
});

it('does not match records when solution type is not Observability', () => {
const params: Omit<DocumentProfileProviderParams, 'rootContext'> = {
dataSourceContext: DATA_SOURCE_CONTEXT,
record: buildMockRecord('another-index', {
'data_stream.type': ['logs'],
}),
};
expect(
logDocumentProfileProvider.resolve({
...params,
rootContext: ROOT_CONTEXT,
})
).toEqual(RESOLUTION_MATCH);
expect(
logDocumentProfileProvider.resolve({
...params,
rootContext: { solutionType: SolutionType.Default },
})
).toEqual(RESOLUTION_MISMATCH);
expect(
logDocumentProfileProvider.resolve({
...params,
rootContext: { solutionType: SolutionType.Search },
})
).toEqual(RESOLUTION_MISMATCH);
expect(
logDocumentProfileProvider.resolve({
...params,
rootContext: { solutionType: SolutionType.Security },
})
).toEqual(RESOLUTION_MISMATCH);
});

describe('getDocViewer', () => {
it('adds a log overview doc view to the registry', () => {
const getDocViewer = logDocumentProfileProvider.profile.getDocViewer!(
Expand Down
12 changes: 8 additions & 4 deletions ...s/common/log_document_profile/profile.tsx → ...vability/log_document_profile/profile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,22 @@
*/

import { DataTableRecord } from '@kbn/discover-utils';
import { DocumentProfileProvider, DocumentType } from '../../../profiles';
import { DocumentProfileProvider, DocumentType, SolutionType } from '../../../profiles';
import { ProfileProviderServices } from '../../profile_provider_services';
import { getDocViewer } from './accessors';

export const createLogDocumentProfileProvider = (
export const createObservabilityLogDocumentProfileProvider = (
services: ProfileProviderServices
): DocumentProfileProvider => ({
profileId: 'log-document-profile',
profileId: 'observability-log-document-profile',
profile: {
getDocViewer,
},
resolve: ({ record }) => {
resolve: ({ record, rootContext }) => {
if (rootContext.solutionType !== SolutionType.Observability) {
return { isMatch: false };
}

const isLogRecord = getIsLogRecord(record, services.logsContextService.isLogsIndexPattern);

if (!isLogRecord) {
Expand Down
0 ..._profile/accessors/get_cell_renderers.tsx → ..._profile/accessors/get_cell_renderers.tsx
View file
Open in desktop
File renamed without changes.
0 ...rofile/accessors/get_default_app_state.ts → ...rofile/accessors/get_default_app_state.ts
View file
Open in desktop
File renamed without changes.
0 ...rs/get_row_additional_leading_controls.ts → ...rs/get_row_additional_leading_controls.ts
View file
Open in desktop
File renamed without changes.
0 ...e/accessors/get_row_indicator_provider.ts → ...e/accessors/get_row_indicator_provider.ts
View file
Open in desktop
File renamed without changes.
0 ...gs_data_source_profile/accessors/index.ts → ...gs_data_source_profile/accessors/index.ts
View file
Open in desktop
File renamed without changes.
0 ...common/logs_data_source_profile/consts.ts → ...bility/logs_data_source_profile/consts.ts
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion ...ource_profile/create_profile_providers.ts → ...ource_profile/create_profile_providers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import {
createWindowsLogsDataSourceProfileProvider,
} from './sub_profiles';

export const createLogsDataSourceProfileProviders = (providerServices: ProfileProviderServices) => {
export const createObservabilityLogsDataSourceProfileProviders = (
providerServices: ProfileProviderServices
) => {
const logsDataSourceProfileProvider = createLogsDataSourceProfileProvider(providerServices);

return [
Expand Down
2 changes: 1 addition & 1 deletion .../common/logs_data_source_profile/index.ts → ...ability/logs_data_source_profile/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/

export { createLogsDataSourceProfileProviders } from './create_profile_providers';
export { createObservabilityLogsDataSourceProfileProviders } from './create_profile_providers';
37 changes: 35 additions & 2 deletions .../logs_data_source_profile/profile.test.ts → .../logs_data_source_profile/profile.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ import { buildDataTableRecord } from '@kbn/discover-utils';
import type { EuiThemeComputed } from '@elastic/eui';
import { createStubIndexPattern } from '@kbn/data-views-plugin/common/data_view.stub';
import { createDataViewDataSource, createEsqlDataSource } from '../../../../../common/data_sources';
import { DataSourceCategory, RootContext, SolutionType } from '../../../profiles';
import {
DataSourceCategory,
DataSourceProfileProviderParams,
RootContext,
SolutionType,
} from '../../../profiles';
import { createContextAwarenessMocks } from '../../../__mocks__';
import { createLogsDataSourceProfileProvider } from './profile';
import { DataGridDensity } from '@kbn/unified-data-table';
Expand All @@ -24,7 +29,7 @@ describe('logsDataSourceProfileProvider', () => {
const VALID_INDEX_PATTERN = 'logs-nginx.access-*';
const MIXED_INDEX_PATTERN = 'logs-nginx.access-*,metrics-*';
const INVALID_INDEX_PATTERN = 'my_source-access-*';
const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Default };
const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Observability };
const RESOLUTION_MATCH = {
isMatch: true,
context: { category: DataSourceCategory.Logs },
Expand Down Expand Up @@ -87,6 +92,34 @@ describe('logsDataSourceProfileProvider', () => {
).toEqual(RESOLUTION_MISMATCH);
});

it('does NOT match data view sources when solution type is not Observability', () => {
const params: Omit<DataSourceProfileProviderParams, 'rootContext'> = {
dataSource: createEsqlDataSource(),
query: { esql: `from ${VALID_INDEX_PATTERN}` },
};
expect(logsDataSourceProfileProvider.resolve({ ...params, rootContext: ROOT_CONTEXT })).toEqual(
RESOLUTION_MATCH
);
expect(
logsDataSourceProfileProvider.resolve({
...params,
rootContext: { solutionType: SolutionType.Default },
})
).toEqual(RESOLUTION_MISMATCH);
expect(
logsDataSourceProfileProvider.resolve({
...params,
rootContext: { solutionType: SolutionType.Search },
})
).toEqual(RESOLUTION_MISMATCH);
expect(
logsDataSourceProfileProvider.resolve({
...params,
rootContext: { solutionType: SolutionType.Security },
})
).toEqual(RESOLUTION_MISMATCH);
});

const dataViewWithLogLevel = createStubIndexPattern({
spec: {
title: VALID_INDEX_PATTERN,
Expand Down
8 changes: 6 additions & 2 deletions ...ommon/logs_data_source_profile/profile.ts → ...ility/logs_data_source_profile/profile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import { DataSourceCategory, DataSourceProfileProvider } from '../../../profiles';
import { DataSourceCategory, DataSourceProfileProvider, SolutionType } from '../../../profiles';
import { ProfileProviderServices } from '../../profile_provider_services';
import {
getCellRenderers,
Expand All @@ -19,13 +19,17 @@ import { extractIndexPatternFrom } from '../../extract_index_pattern_from';
export const createLogsDataSourceProfileProvider = (
services: ProfileProviderServices
): DataSourceProfileProvider => ({
profileId: 'logs-data-source-profile',
profileId: 'observability-logs-data-source-profile',
profile: {
getCellRenderers,
getRowIndicatorProvider,
getRowAdditionalLeadingControls,
},
resolve: (params) => {
if (params.rootContext.solutionType !== SolutionType.Observability) {
return { isMatch: false };
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tip

Non-blocking suggestion, as this would work perfectly 👌

This condition should probably reflect how we resolve the O11y root profile, which means this needs to change and be aligned every time we update the logic for the O11y root profile resolution.

I don't expect that to change often, but we might miss some corner cases if we forget to update the logic also here and anywhere else this is implemented in this PR.

Have you considered to use the root profile resolve declaration to keep the resolution logic centralized and inherit it here?

resolve: async (params) => {
  const observabilityRootProfile = await createObservabilityRootProfileProvider(services).resolve(
    { solutionNavId: params.rootContext.solutionType }
  );

  if (!observabilityRootProfile.isMatch) {
    return { isMatch: false };
  }
  
  // ...
},

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we discussed offline, while we can't re-execute the root profile resolution logic (since it's async while document profile resolution is sync), I've updated the rootContext checks to look at profileId instead of solutionType, which has the same effect of protecting against future changes: a41d43e.


const indexPattern = extractIndexPatternFrom(params);

if (!services.logsContextService.isLogsIndexPattern(indexPattern)) {
Expand Down
2 changes: 1 addition & 1 deletion ...le/sub_profiles/apache_error_logs.test.ts → ...le/sub_profiles/apache_error_logs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { createContextAwarenessMocks } from '../../../../__mocks__';
import { createLogsDataSourceProfileProvider } from '../profile';
import { createApacheErrorLogsDataSourceProfileProvider } from './apache_error_logs';

const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Default };
const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Observability };
const { profileProviderServices } = createContextAwarenessMocks();
const logsDataSourceProfileProvider = createLogsDataSourceProfileProvider(profileProviderServices);
const dataSourceProfileProvider = createApacheErrorLogsDataSourceProfileProvider(
Expand Down
2 changes: 1 addition & 1 deletion ...profile/sub_profiles/apache_error_logs.ts → ...profile/sub_profiles/apache_error_logs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const createApacheErrorLogsDataSourceProfileProvider = (
logsDataSourceProfileProvider: DataSourceProfileProvider
): DataSourceProfileProvider =>
extendProfileProvider(logsDataSourceProfileProvider, {
profileId: 'apache-error-logs-data-source',
profileId: 'observability-apache-error-logs-data-source-profile',
profile: {
getDefaultAppState: createGetDefaultAppState({
defaultColumns: [LOG_LEVEL_COLUMN, CLIENT_IP_COLUMN, MESSAGE_COLUMN],
Expand Down
2 changes: 1 addition & 1 deletion ...le/sub_profiles/aws_s3access_logs.test.ts → ...le/sub_profiles/aws_s3access_logs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { createContextAwarenessMocks } from '../../../../__mocks__';
import { createLogsDataSourceProfileProvider } from '../profile';
import { createAwsS3accessLogsDataSourceProfileProvider } from './aws_s3access_logs';

const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Default };
const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Observability };
const { profileProviderServices } = createContextAwarenessMocks();
const logsDataSourceProfileProvider = createLogsDataSourceProfileProvider(profileProviderServices);
const dataSourceProfileProvider = createAwsS3accessLogsDataSourceProfileProvider(
Expand Down
2 changes: 1 addition & 1 deletion ...profile/sub_profiles/aws_s3access_logs.ts → ...profile/sub_profiles/aws_s3access_logs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const createAwsS3accessLogsDataSourceProfileProvider = (
logsDataSourceProfileProvider: DataSourceProfileProvider
): DataSourceProfileProvider =>
extendProfileProvider(logsDataSourceProfileProvider, {
profileId: 'aws-s3access-logs-data-source',
profileId: 'observability-aws-s3access-logs-data-source-profile',
profile: {
getDefaultAppState: createGetDefaultAppState({
defaultColumns: [
Expand Down
80 changes: 80 additions & 0 deletions ...file_providers/observability/logs_data_source_profile/sub_profiles/create_resolve.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import { createEsqlDataSource } from '../../../../../../common/data_sources';
import {
DataSourceCategory,
DataSourceProfileProviderParams,
RootContext,
SolutionType,
} from '../../../../profiles';
import { createResolve } from './create_resolve';

describe('createResolve', () => {
const VALID_INDEX_PATTERN = 'valid';
const INVALID_INDEX_PATTERN = 'invalid';
const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Observability };
const RESOLUTION_MATCH = {
isMatch: true,
context: { category: DataSourceCategory.Logs },
};
const RESOLUTION_MISMATCH = {
isMatch: false,
};
const resolve = createResolve(VALID_INDEX_PATTERN);

it('should match a valid index pattern', () => {
const result = resolve({
rootContext: ROOT_CONTEXT,
dataSource: createEsqlDataSource(),
query: { esql: `FROM ${VALID_INDEX_PATTERN}` },
});
expect(result).toEqual(RESOLUTION_MATCH);
});

it('should not match an invalid index pattern', () => {
const result = resolve({
rootContext: ROOT_CONTEXT,
dataSource: createEsqlDataSource(),
query: { esql: `FROM ${INVALID_INDEX_PATTERN}` },
});
expect(result).toEqual(RESOLUTION_MISMATCH);
});

it('should not match when the solution type is not Observability', () => {
const params: Omit<DataSourceProfileProviderParams, 'rootContext'> = {
dataSource: createEsqlDataSource(),
query: { esql: `FROM ${VALID_INDEX_PATTERN}` },
};
expect(
resolve({
...params,
rootContext: ROOT_CONTEXT,
})
).toEqual(RESOLUTION_MATCH);
expect(
resolve({
...params,
rootContext: { solutionType: SolutionType.Default },
})
).toEqual(RESOLUTION_MISMATCH);
expect(
resolve({
...params,
rootContext: { solutionType: SolutionType.Search },
})
).toEqual(RESOLUTION_MISMATCH);
expect(
resolve({
...params,
rootContext: { solutionType: SolutionType.Security },
})
).toEqual(RESOLUTION_MISMATCH);
});
});
6 changes: 5 additions & 1 deletion ...ce_profile/sub_profiles/create_resolve.ts → ...ce_profile/sub_profiles/create_resolve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import { createRegExpPatternFrom, testPatternAgainstAllowedList } from '@kbn/data-view-utils';
import { DataSourceCategory, DataSourceProfileProvider } from '../../../../profiles';
import { DataSourceCategory, DataSourceProfileProvider, SolutionType } from '../../../../profiles';
import { extractIndexPatternFrom } from '../../../extract_index_pattern_from';

export const createResolve = (baseIndexPattern: string): DataSourceProfileProvider['resolve'] => {
Expand All @@ -17,6 +17,10 @@ export const createResolve = (baseIndexPattern: string): DataSourceProfileProvid
]);

return (params) => {
if (params.rootContext.solutionType !== SolutionType.Observability) {
return { isMatch: false };
}

const indexPattern = extractIndexPatternFrom(params);

if (!indexPattern || !testIndexPattern(indexPattern)) {
Expand Down
0 ...data_source_profile/sub_profiles/index.ts → ...data_source_profile/sub_profiles/index.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rofiles/kubernetes_container_logs.test.ts → ...rofiles/kubernetes_container_logs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { createContextAwarenessMocks } from '../../../../__mocks__';
import { createLogsDataSourceProfileProvider } from '../profile';
import { createKubernetesContainerLogsDataSourceProfileProvider } from './kubernetes_container_logs';

const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Default };
const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Observability };
const { profileProviderServices } = createContextAwarenessMocks();
const logsDataSourceProfileProvider = createLogsDataSourceProfileProvider(profileProviderServices);
const dataSourceProfileProvider = createKubernetesContainerLogsDataSourceProfileProvider(
Expand Down
2 changes: 1 addition & 1 deletion ...sub_profiles/kubernetes_container_logs.ts → ...sub_profiles/kubernetes_container_logs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const createKubernetesContainerLogsDataSourceProfileProvider = (
logsDataSourceProfileProvider: DataSourceProfileProvider
): DataSourceProfileProvider =>
extendProfileProvider(logsDataSourceProfileProvider, {
profileId: 'kubernetes-container-logs-data-source',
profileId: 'observability-kubernetes-container-logs-data-source-profile',
profile: {
getDefaultAppState: createGetDefaultAppState({
defaultColumns: [
Expand Down
2 changes: 1 addition & 1 deletion ...le/sub_profiles/nginx_access_logs.test.ts → ...le/sub_profiles/nginx_access_logs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { createContextAwarenessMocks } from '../../../../__mocks__';
import { createLogsDataSourceProfileProvider } from '../profile';
import { createNginxAccessLogsDataSourceProfileProvider } from './nginx_access_logs';

const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Default };
const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Observability };
const { profileProviderServices } = createContextAwarenessMocks();
const logsDataSourceProfileProvider = createLogsDataSourceProfileProvider(profileProviderServices);
const dataSourceProfileProvider = createNginxAccessLogsDataSourceProfileProvider(
Expand Down
2 changes: 1 addition & 1 deletion ...profile/sub_profiles/nginx_access_logs.ts → ...profile/sub_profiles/nginx_access_logs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const createNginxAccessLogsDataSourceProfileProvider = (
logsDataSourceProfileProvider: DataSourceProfileProvider
): DataSourceProfileProvider =>
extendProfileProvider(logsDataSourceProfileProvider, {
profileId: 'nginx-access-logs-data-source',
profileId: 'observability-nginx-access-logs-data-source-profile',
profile: {
getDefaultAppState: createGetDefaultAppState({
defaultColumns: [
Expand Down
2 changes: 1 addition & 1 deletion ...ile/sub_profiles/nginx_error_logs.test.ts → ...ile/sub_profiles/nginx_error_logs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { createContextAwarenessMocks } from '../../../../__mocks__';
import { createLogsDataSourceProfileProvider } from '../profile';
import { createNginxErrorLogsDataSourceProfileProvider } from './nginx_error_logs';

const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Default };
const ROOT_CONTEXT: RootContext = { solutionType: SolutionType.Observability };
const { profileProviderServices } = createContextAwarenessMocks();
const logsDataSourceProfileProvider = createLogsDataSourceProfileProvider(profileProviderServices);
const dataSourceProfileProvider = createNginxErrorLogsDataSourceProfileProvider(
Expand Down
2 changes: 1 addition & 1 deletion ..._profile/sub_profiles/nginx_error_logs.ts → ..._profile/sub_profiles/nginx_error_logs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const createNginxErrorLogsDataSourceProfileProvider = (
logsDataSourceProfileProvider: DataSourceProfileProvider
): DataSourceProfileProvider =>
extendProfileProvider(logsDataSourceProfileProvider, {
profileId: 'nginx-error-logs-data-source',
profileId: 'observability-nginx-error-logs-data-source-profile',
profile: {
getDefaultAppState: createGetDefaultAppState({
defaultColumns: [LOG_LEVEL_COLUMN, MESSAGE_COLUMN],
Expand Down
Loading