DEV-43744-alert-eval-api #1
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // LOGZ.IO GRAFANA CHANGE :: DEV-17927 use LogzIoHeaders obj to pass on headers | ||
| package models | ||
|
|
||
| import ( | ||
| "net/http" | ||
| ) | ||
|
|
||
| const LogzioHeadersCtxKey string = "logzioHeaders" | ||
| const LogzioRequestIdHeaderName string = "x-request-id" | ||
|
|
||
| type LogzIoHeaders struct { | ||
| RequestHeaders http.Header | ||
| } | ||
|
|
||
| var logzioHeadersWhitelist = []string{ | ||
| "x-auth-token", | ||
| "x-api-token", | ||
| "user-context", | ||
| LogzioRequestIdHeaderName, | ||
| "cookie", | ||
| "x-logz-csrf-token", | ||
| "x-logz-csrf-token-v2", | ||
| } | ||
|
|
||
| func (logzioHeaders *LogzIoHeaders) GetDatasourceQueryHeaders(grafanaGeneratedHeaders http.Header) http.Header { | ||
| datasourceRequestHeaders := grafanaGeneratedHeaders.Clone() | ||
| logzioGrafanaRequestHeaders := logzioHeaders.RequestHeaders | ||
|
|
||
| for _, whitelistedHeader := range logzioHeadersWhitelist { | ||
| if requestHeader := logzioGrafanaRequestHeaders.Get(whitelistedHeader); requestHeader != "" { | ||
| datasourceRequestHeaders.Set(whitelistedHeader, requestHeader) | ||
| } | ||
| } | ||
|
|
||
| return datasourceRequestHeaders | ||
| } | ||
|
|
||
| // LOGZ.IO GRAFANA CHANGE :: end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package api | ||
|
|
||
| // LOGZ.IO GRAFANA CHANGE :: DEV-30169,DEV-30170: add endpoints to evaluate and process alerts | ||
| import ( | ||
| "github.com/grafana/grafana/pkg/api/response" | ||
| "github.com/grafana/grafana/pkg/api/routing" | ||
| contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model" | ||
| apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" | ||
| "github.com/grafana/grafana/pkg/services/ngalert/metrics" | ||
| "github.com/grafana/grafana/pkg/web" | ||
| "net/http" | ||
| ) | ||
|
|
||
| type LogzioAlertingApi struct { | ||
| service *LogzioAlertingService | ||
| } | ||
|
|
||
| type RunAlertMigrationForOrg struct { | ||
| OrgId int64 `json:"orgId"` | ||
| EmailNotifications []AlertMigrationEmailNotification `json:"emailNotifications"` | ||
| } | ||
|
|
||
| type ClearOrgAlertMigration struct { | ||
| OrgId int64 `json:"orgId"` | ||
| } | ||
|
|
||
| type AlertMigrationEmailNotification struct { | ||
| EmailAddress string `json:"address"` | ||
| ChannelUid string `json:"channelUid"` | ||
| } | ||
|
|
||
| // NewLogzioAlertingApi creates a new LogzioAlertingApi instance | ||
| func NewLogzioAlertingApi(service *LogzioAlertingService) *LogzioAlertingApi { | ||
|
There was a problem hiding this comment. Didn't we say its redundant? (leave only the service) There was a problem hiding this comment. this is the structure of all APIs in this project. there is a class of "XXXApi" that has the route to the endpoint, and the function to call the service class that contains the main logic. |
||
| return &LogzioAlertingApi{ | ||
| service: service, | ||
| } | ||
| } | ||
|
|
||
| func (api *LogzioAlertingApi) RouteEvaluateAlert(ctx *contextmodel.ReqContext) response.Response { | ||
| body := apimodels.AlertEvaluationRequest{} | ||
| if err := web.Bind(ctx.Req, &body); err != nil { | ||
| return response.Error(http.StatusBadRequest, "bad request data", err) | ||
| } | ||
|
|
||
| return api.service.RouteEvaluateAlert(ctx, body) | ||
| } | ||
|
|
||
| //func (api *LogzioAlertingApi) RouteProcessAlert(ctx *contextmodel.ReqContext) response.Response { | ||
| // body := apimodels.AlertProcessRequest{} | ||
| // if err := web.Bind(ctx.Req, &body); err != nil { | ||
| // return response.Error(http.StatusBadRequest, "bad request data", err) | ||
| // } | ||
| // | ||
| // return api.service.RouteProcessAlert(*ctx.Req, body) | ||
| //} | ||
|
|
||
| func (api *API) RegisterLogzioAlertingApiEndpoints(srv *LogzioAlertingApi, m *metrics.API) { | ||
| api.RouteRegister.Group("", func(group routing.RouteRegister) { | ||
| group.Post( | ||
| toMacaronPath("/internal/alert/api/v1/eval"), | ||
| metrics.Instrument( | ||
| http.MethodPost, | ||
| "/internal/alert/api/v1/eval", | ||
| srv.RouteEvaluateAlert, | ||
| m, | ||
| ), | ||
| ) | ||
| //group.Post( | ||
| // toMacaronPath("/internal/alert/api/v1/process"), | ||
| // metrics.Instrument( | ||
| // http.MethodPost, | ||
| // "/internal/alert/api/v1/process", | ||
| // srv.RouteProcessAlert, | ||
| // m, | ||
| // ), | ||
| //) | ||
| }) | ||
| } | ||
|
|
||
| // LOGZ.IO GRAFANA CHANGE :: end | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the comment, I think better to use the reference to the new tickets. Also note in my PR I used a slightly different comment, so better be consistent (you can change mine if you wish).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done