public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ngalert openapi: Use same basePath as rest of Grafana (#79025)

Browse Source 
* ngalert openapi: Use same `basePath` as rest of Grafana
Currently, there are two issues that prevent easily merging `ngalert` and grafana openapi specs:
- The basePath is different. `grafana` has `/api` and `ngalert` has `/api/v1`. I changed `ngalert` to use `/api`
- The `ngalert` endpoints have their basePath in the each operation path. The basePath should actually be omitted
---------

Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
This commit is contained in:
Julien Duchesne
2024-01-17 11:53:16 -05:00
committed by GitHub
co-authored by Yuriy Tseretyan
parent dce9d1e87c
commit c9211fbd69
22 changed files with 2639 additions and 2586 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ngalert/api/tooling/definitions/admin.go
+5 -5
View File
@@ -4,7 +4,7 @@ import (
v1 "github.com/prometheus/client_golang/api/prometheus/v1"
)
// swagger:route GET /api/v1/ngalert configuration RouteGetStatus
// swagger:route GET /v1/ngalert configuration RouteGetStatus
//
// Get the status of the alerting engine
//
@@ -14,7 +14,7 @@ import (
// Responses:
// 200: AlertingStatus
// swagger:route GET /api/v1/ngalert/alertmanagers configuration RouteGetAlertmanagers
// swagger:route GET /v1/ngalert/alertmanagers configuration RouteGetAlertmanagers
//
// Get the discovered and dropped Alertmanagers of the user's organization based on the specified configuration.
//
@@ -24,7 +24,7 @@ import (
// Responses:
// 200: GettableAlertmanagers
// swagger:route GET /api/v1/ngalert/admin_config configuration RouteGetNGalertConfig
// swagger:route GET /v1/ngalert/admin_config configuration RouteGetNGalertConfig
//
// Get the NGalert configuration of the user's organization, returns 404 if no configuration is present.
//
@@ -36,7 +36,7 @@ import (
// 404: Failure
// 500: Failure
// swagger:route POST /api/v1/ngalert/admin_config configuration RoutePostNGalertConfig
// swagger:route POST /v1/ngalert/admin_config configuration RoutePostNGalertConfig
//
// Creates or updates the NGalert configuration of the user's organization. If no value is sent for alertmanagersChoice, it defaults to "all".
//
@@ -47,7 +47,7 @@ import (
// 201: Ack
// 400: ValidationError
// swagger:route DELETE /api/v1/ngalert/admin_config configuration RouteDeleteNGalertConfig
// swagger:route DELETE /v1/ngalert/admin_config configuration RouteDeleteNGalertConfig
//
// Deletes the NGalert configuration of the user's organization.
//