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

Jump to bottom

[7.x] Remove degraded state from ES status service (#75007) #75014

Merged
merged 1 commit into from
Aug 14, 2020
Merged

[7.x] Remove degraded state from ES status service (#75007) #75014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/core/server/elasticsearch/status.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('calculateStatus', () => {
});
});

it('changes to degraded when isCompatible and warningNodes present', async () => {
it('changes to available with a differemnt message when isCompatible and warningNodes present', async () => {
expect(
await calculateStatus$(
of({
Expand All @@ -81,7 +81,7 @@ describe('calculateStatus', () => {
.pipe(take(2))
.toPromise()
).toEqual({
level: ServiceStatusLevels.degraded,
level: ServiceStatusLevels.available,
summary: 'Some nodes are a different version',
meta: {
incompatibleNodes: [],
Expand Down Expand Up @@ -188,7 +188,7 @@ describe('calculateStatus', () => {
"summary": "Incompatible with Elasticsearch",
},
Object {
"level": degraded,
"level": available,
"meta": Object {
"incompatibleNodes": Array [],
"warningNodes": Array [
Expand Down
2 changes: 1 addition & 1 deletion src/core/server/elasticsearch/status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const calculateStatus$ = (
};
} else if (warningNodes.length > 0) {
return {
level: ServiceStatusLevels.degraded,
level: ServiceStatusLevels.available,
summary:
// Message should always be present, but this is a safe fallback
message ??
Expand Down