Skip to content

Commit a4fb143

Browse files
kdelemmekdelemme
committed
chore(slo): Migrate to server-route-repository (#198726)
(cherry picked from commit efcc2ab) # Conflicts: # oas_docs/output/kibana.serverless.yaml # x-pack/plugins/observability_solution/slo/public/plugin.ts # x-pack/plugins/observability_solution/slo/public/types.ts # x-pack/plugins/observability_solution/slo/tsconfig.json
1 parent 55ef74d commit a4fb143

161 files changed

Lines changed: 1309 additions & 1353 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎oas_docs/output/kibana.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23086,7 +23086,7 @@ paths:
2308623086
- $ref: '#/components/parameters/SLOs_space_id'
2308723087
- $ref: '#/components/parameters/SLOs_slo_id'
2308823088
responses:
23089-
'204':
23089+
'200':
2309023090
content:
2309123091
application/json; Elastic-Api-Version=2023-10-31:
2309223092
schema:
@@ -23130,7 +23130,7 @@ paths:
2313023130
- $ref: '#/components/parameters/SLOs_space_id'
2313123131
- $ref: '#/components/parameters/SLOs_slo_id'
2313223132
responses:
23133-
'200':
23133+
'204':
2313423134
description: Successful request
2313523135
'400':
2313623136
content:

‎x-pack/plugins/observability_solution/observability/server/errors/errors.ts‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎x-pack/plugins/observability_solution/observability/server/errors/handler.ts‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎x-pack/plugins/observability_solution/observability/server/errors/index.ts‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎x-pack/plugins/observability_solution/observability/server/routes/register_routes.ts‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,19 @@ import { errors } from '@elastic/elasticsearch';
88
import Boom from '@hapi/boom';
99
import { RulesClientApi } from '@kbn/alerting-plugin/server/types';
1010
import { CoreSetup, KibanaRequest, Logger, RouteRegistrar } from '@kbn/core/server';
11+
import { DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
1112
import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
1213
import {
1314
IoTsParamsObject,
1415
decodeRequestParams,
15-
stripNullishRequestParameters,
1616
parseEndpoint,
1717
passThroughValidationObject,
18+
stripNullishRequestParameters,
1819
} from '@kbn/server-route-repository';
1920
import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
2021
import axios from 'axios';
2122
import * as t from 'io-ts';
22-
import { DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
2323
import { ObservabilityConfig } from '..';
24-
import { getHTTPResponseCode, ObservabilityError } from '../errors';
2524
import { AlertDetailsContextualInsightsService } from '../services';
2625
import { ObservabilityRequestHandlerContext } from '../types';
2726
import { AbstractObservabilityServerRouteRepository } from './types';
@@ -88,16 +87,6 @@ export function registerRoutes({ config, repository, core, logger, dependencies
8887

8988
return response.ok({ body: data });
9089
} catch (error) {
91-
if (error instanceof ObservabilityError) {
92-
logger.error(error.message);
93-
return response.customError({
94-
statusCode: getHTTPResponseCode(error),
95-
body: {
96-
message: error.message,
97-
},
98-
});
99-
}
100-
10190
if (axios.isAxiosError(error)) {
10291
logger.error(error);
10392
return response.customError({

‎x-pack/plugins/observability_solution/observability_logs_explorer/public/types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/publi
2525
import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
2626
import { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
2727
import { LensPublicStart } from '@kbn/lens-plugin/public';
28-
import { SloPublicStart } from '@kbn/slo-plugin/public';
28+
import { SLOPublicStart } from '@kbn/slo-plugin/public';
2929
import { LogsDataAccessPluginStart } from '@kbn/logs-data-access-plugin/public';
3030
import {
3131
ObservabilityLogsExplorerLocators,
@@ -53,7 +53,7 @@ export interface ObservabilityLogsExplorerStartDeps {
5353
logsDataAccess: LogsDataAccessPluginStart;
5454
observabilityAIAssistant?: ObservabilityAIAssistantPublicStart;
5555
observabilityShared: ObservabilitySharedPluginStart;
56-
slo: SloPublicStart;
56+
slo: SLOPublicStart;
5757
serverless?: ServerlessPluginStart;
5858
triggersActionsUi?: TriggersAndActionsUIPublicPluginStart;
5959
unifiedSearch?: UnifiedSearchPublicPluginStart;

‎x-pack/plugins/observability_solution/slo/common/config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ export const config = {
2525
experimental: true,
2626
},
2727
};
28-
export type SloConfig = TypeOf<typeof configSchema>;
29-
export type ExperimentalFeatures = SloConfig['experimental'];
28+
export type SLOConfig = TypeOf<typeof configSchema>;
29+
export type ExperimentalFeatures = SLOConfig['experimental'];

‎x-pack/plugins/observability_solution/slo/docs/openapi/slo/bundled.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@
559559
}
560560
],
561561
"responses": {
562-
"200": {
562+
"204": {
563563
"description": "Successful request"
564564
},
565565
"400": {
@@ -625,7 +625,7 @@
625625
}
626626
],
627627
"responses": {
628-
"204": {
628+
"200": {
629629
"description": "Successful request",
630630
"content": {
631631
"application/json": {

‎x-pack/plugins/observability_solution/slo/docs/openapi/slo/bundled.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ paths:
341341
- $ref: '#/components/parameters/space_id'
342342
- $ref: '#/components/parameters/slo_id'
343343
responses:
344-
'200':
344+
'204':
345345
description: Successful request
346346
'400':
347347
description: Bad request
@@ -380,7 +380,7 @@ paths:
380380
- $ref: '#/components/parameters/space_id'
381381
- $ref: '#/components/parameters/slo_id'
382382
responses:
383-
'204':
383+
'200':
384384
description: Successful request
385385
content:
386386
application/json:

‎x-pack/plugins/observability_solution/slo/docs/openapi/slo/paths/s@{spaceid}@api@slos@{sloid}@_reset.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ post:
1111
- $ref: ../components/parameters/space_id.yaml
1212
- $ref: ../components/parameters/slo_id.yaml
1313
responses:
14-
'204':
14+
'200':
1515
description: Successful request
1616
content:
1717
application/json:

0 commit comments

Comments
 (0)