Skip to content

Commit 67e9e24

Browse files
author
Cairry
committed
✨ Add grafana apikey auth
1 parent 8c96891 commit 67e9e24

3 files changed

Lines changed: 13 additions & 1 deletion

File tree

‎internal/models/dashboard.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ type DashboardFolders struct {
1414
ID string `json:"id" form:"id"`
1515
Name string `json:"name"`
1616
Theme string `json:"theme" form:"theme"`
17+
ApiKey string `json:"apiKey" form:"apiKey"`
1718
GrafanaVersion string `json:"grafanaVersion" form:"grafanaVersion"` // v10及以下, v11及以上
1819
GrafanaHost string `json:"grafanaHost" form:"grafanaHost"`
1920
GrafanaFolderId string `json:"grafanaFolderId" form:"grafanaFolderId"`

‎internal/services/dashboard.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ func (ds dashboardService) CreateFolder(req interface{}) (data interface{}, erro
5656
ID: "f-" + tools.RandId(),
5757
Name: r.Name,
5858
Theme: r.Theme,
59+
ApiKey: r.ApiKey,
5960
GrafanaVersion: r.GrafanaVersion,
6061
GrafanaHost: r.GrafanaHost,
6162
GrafanaFolderId: r.GrafanaFolderId,
@@ -75,6 +76,7 @@ func (ds dashboardService) UpdateFolder(req interface{}) (data interface{}, erro
7576
ID: r.ID,
7677
Name: r.Name,
7778
Theme: r.Theme,
79+
ApiKey: r.ApiKey,
7880
GrafanaVersion: r.GrafanaVersion,
7981
GrafanaHost: r.GrafanaHost,
8082
GrafanaFolderId: r.GrafanaFolderId,
@@ -115,8 +117,15 @@ func (ds dashboardService) ListGrafanaDashboards(req interface{}) (data interfac
115117
return nil, fmt.Errorf("invalid grafana version, please change v10 or v11")
116118
}
117119

120+
var headers = make(map[string]string)
121+
if folder.ApiKey != "" {
122+
headers["Authorization"] = "Bearer " + folder.ApiKey
123+
}
124+
125+
fmt.Println("--->", headers)
126+
118127
requestURL := fmt.Sprintf("%s/api/search?%s", folder.GrafanaHost, query)
119-
get, err := tools.Get(nil, requestURL, 10)
128+
get, err := tools.Get(headers, requestURL, 10)
120129
if err != nil {
121130
return nil, fmt.Errorf("请求错误, err: %s", err.Error())
122131
}

‎internal/types/dashboard.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ type RequestDashboardFoldersCreate struct {
3838
TenantId string `json:"tenantId" form:"tenantId"`
3939
Name string `json:"name"`
4040
Theme string `json:"theme" form:"theme"`
41+
ApiKey string `json:"apiKey" form:"apiKey"`
4142
GrafanaVersion string `json:"grafanaVersion" form:"grafanaVersion"` // v10及以下, v11及以上
4243
GrafanaHost string `json:"grafanaHost" form:"grafanaHost"`
4344
GrafanaFolderId string `json:"grafanaFolderId" form:"grafanaFolderId"`
@@ -49,6 +50,7 @@ type RequestDashboardFoldersUpdate struct {
4950
ID string `json:"id" form:"id"`
5051
Name string `json:"name"`
5152
Theme string `json:"theme" form:"theme"`
53+
ApiKey string `json:"apiKey" form:"apiKey"`
5254
GrafanaVersion string `json:"grafanaVersion" form:"grafanaVersion"` // v10及以下, v11及以上
5355
GrafanaHost string `json:"grafanaHost" form:"grafanaHost"`
5456
GrafanaFolderId string `json:"grafanaFolderId" form:"grafanaFolderId"`

0 commit comments

Comments
 (0)