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

[Rename] remove remaining references #341

Merged
merged 2 commits into from
May 13, 2021
Merged

[Rename] remove remaining references #341

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c72ed43
[Rename] remove remaining references
kavilla May 11, 2021
75a0da2
[Rename] update url for configs
kavilla May 12, 2021
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
2 changes: 1 addition & 1 deletion src/core/server/saved_objects/status.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('calculateStatus$', () => {
const expectUnavailableDueToOpenSearch = (status$: Observable<ServiceStatus>) =>
expect(status$.pipe(take(1)).toPromise()).resolves.toEqual({
level: ServiceStatusLevels.unavailable,
summary: `SavedObjects service is not available without a healthy Elasticearch connection`,
summary: `SavedObjects service is not available without a healthy OpenSearch connection`,
});

const expectUnavailableDueToMigrations = (status$: Observable<ServiceStatus>) =>
Expand Down
2 changes: 1 addition & 1 deletion src/core/server/saved_objects/status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const calculateStatus$ = (
if (openSearchStatus.level >= ServiceStatusLevels.unavailable) {
return {
level: ServiceStatusLevels.unavailable,
summary: `SavedObjects service is not available without a healthy Elasticearch connection`,
summary: `SavedObjects service is not available without a healthy OpenSearch connection`,
};
} else if (migratorStatus.level === ServiceStatusLevels.unavailable) {
return migratorStatus;
Expand Down
8 changes: 4 additions & 4 deletions src/legacy/server/config/schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,11 @@ export default () =>
opensearchManifestServiceUrl: Joi.string().default(
'https://maps.search-services.aws.a2z.com/v4/ap-southeast-1/manifest'
),
emsFileApiUrl: Joi.string().default('https://vector.maps.elastic.co'),
emsTileApiUrl: Joi.string().default('https://tiles.maps.elastic.co'),
emsLandingPageUrl: Joi.string().default('https://maps.elastic.co/v7.9'),
emsFileApiUrl: Joi.string().default('https://vector.maps.opensearch.org'),
emsTileApiUrl: Joi.string().default('https://tiles.maps.opensearch.org'),
emsLandingPageUrl: Joi.string().default('https://maps.opensearch.org/v7.10'),
Copy link
Contributor

Choose a reason for hiding this comment

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

Are these dead links? Does it affect the rendering in any way?

Copy link
Member Author

@kavilla kavilla May 11, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Are these dead links?

Yes but it removes the elastic.co stuff

Does it affect the rendering in any way?

It uses opensearchManifestServiceUrl to actual get the map values. To be honest, there can be additional work that cleans up unneeded stuff.

Copy link
Member Author

Choose a reason for hiding this comment

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

I just updated those values to real links. Better to be unused and real rather than used and fake.

emsFontLibraryUrl: Joi.string().default(
'https://tiles.maps.elastic.co/fonts/{fontstack}/{range}.pbf'
'https://tiles.maps.opensearch.org/fonts/{fontstack}/{range}.pbf'
),
emsTileLayerId: Joi.object({
bright: Joi.string().default('road_map'),
Expand Down
Loading