opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 06:12:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

CloudWatch/Logs: Fix log alerts in new unified alerting (#36558)

Browse Source 
* Pass FromAlert header from new alerting

* Add better error messages
This commit is contained in:
Andrej Ocenas
2021-07-09 13:43:22 +02:00
committed by GitHub
parent 56903582ce
commit ea2ba06b93
6 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/expr/nodes.go
View File

@ -142,6 +142,7 @@ type DSNode struct {
timeRange TimeRange
intervalMS int64
maxDP int64
request Request
}
// NodeType returns the data pipeline node type.
@ -149,7 +150,7 @@ func (dn *DSNode) NodeType() NodeType {
return TypeDatasourceNode
}
func (s *Service) buildDSNode(dp *simple.DirectedGraph, rn *rawNode, orgID int64) (*DSNode, error) {
func (s *Service) buildDSNode(dp *simple.DirectedGraph, rn *rawNode, req *Request) (*DSNode, error) {
encodedQuery, err := json.Marshal(rn.Query)
if err != nil {
return nil, err
@ -160,12 +161,13 @@ func (s *Service) buildDSNode(dp *simple.DirectedGraph, rn *rawNode, orgID int64
id: dp.NewNode().ID(),
refID: rn.RefID,
},
orgID: orgID,
orgID: req.OrgId,
query: json.RawMessage(encodedQuery),
queryType: rn.QueryType,
intervalMS: defaultIntervalMS,
maxDP: defaultMaxDP,
timeRange: rn.TimeRange,
request: *req,
}
rawDsID, ok := rn.Query["datasourceId"]
@ -231,6 +233,7 @@ func (dn *DSNode) Execute(ctx context.Context, vars mathexp.Vars, s *Service) (m
resp, err := s.queryData(ctx, &backend.QueryDataRequest{
PluginContext: pc,
Queries: q,
Headers: dn.request.Headers,
})
if err != nil {