IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus: Use default POST method if no httpMethod provided (#38446)

Browse Source 
* Prometheus: If no httpMethod, use default POST method

* Use http.MethodPost
This commit is contained in:
Ivana Huckova
2021-08-23 09:25:40 -04:00
committed by GitHub
parent 49fdab7e43
commit 74fef637af
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/prometheus/prometheus.go
View File

@@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"net/http"
"regexp" "regexp"
"strings" "strings"
"time" "time"
@@ -70,6 +71,7 @@ func (s *Service) Init() error {
func newInstanceSettings() datasource.InstanceFactoryFunc { func newInstanceSettings() datasource.InstanceFactoryFunc {
return func(settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) { return func(settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
defaultHttpMethod := http.MethodPost
jsonData := map[string]interface{}{} jsonData := map[string]interface{}{}
err := json.Unmarshal(settings.JSONData, &jsonData) err := json.Unmarshal(settings.JSONData, &jsonData)
if err != nil { if err != nil {
@@ -82,7 +84,7 @@ func newInstanceSettings() datasource.InstanceFactoryFunc {
httpMethod, ok := jsonData["httpMethod"].(string) httpMethod, ok := jsonData["httpMethod"].(string)
if !ok { if !ok {
return nil, errors.New("no http method provided") httpMethod = defaultHttpMethod
} }
// timeInterval can be a string or can be missing. // timeInterval can be a string or can be missing.