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

API: Use SettingsProvider on GET settings handler (#34632)

Browse Source
This commit is contained in:
Joan López de la Franca Beltran
2021-05-25 15:35:43 +02:00
committed by GitHub
parent 881abb3af8
commit b74a502dc4
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/admin.go
+2 -15
View File
@@ -4,23 +4,10 @@ import (
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
)
func AdminGetSettings(c *models.ReqContext) response.Response {
settings := make(map[string]interface{})
for _, section := range setting.Raw.Sections() {
jsonSec := make(map[string]interface{})
settings[section.Name()] = jsonSec
for _, key := range section.Keys() {
keyName := key.Name()
jsonSec[keyName] = setting.RedactedValue(keyName, key.Value())
}
}
return response.JSON(200, settings)
func (hs *HTTPServer) AdminGetSettings(_ *models.ReqContext) response.Response {
return response.JSON(200, hs.SettingsProvider.Current())
}
func AdminGetStats(c *models.ReqContext) response.Response {
pkg/api/api.go
+1 -1
View File
@@ -440,7 +440,7 @@ func (hs *HTTPServer) registerRoutes() {
// admin api
r.Group("/api/admin", func(adminRoute routing.RouteRegister) {
adminRoute.Get("/settings", reqGrafanaAdmin, routing.Wrap(AdminGetSettings))
adminRoute.Get("/settings", reqGrafanaAdmin, routing.Wrap(hs.AdminGetSettings))
adminRoute.Get("/stats", reqGrafanaAdmin, routing.Wrap(AdminGetStats))
adminRoute.Post("/pause-all-alerts", reqGrafanaAdmin, bind(dtos.PauseAllAlertsCommand{}), routing.Wrap(PauseAllAlerts))