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

improve logger output

Browse Source
This commit is contained in:
Sven Grossmann 2024-02-02 10:19:33 +01:00
parent 00521cc803
commit 0f82e5226b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/tsdb/elasticsearch/healthcheck.go
View File

@ -7,6 +7,7 @@ import (
"net/http"
"net/url"
"path"
"time"
"github.com/grafana/grafana-plugin-sdk-go/backend"
)
@ -44,25 +45,26 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
}, err
}
logger.Debug("Sending health request to Elasticsearch")
start := time.Now()
logger.Debug("Sending healthcheck request to Elasticsearch", "url", esUrl.String())
response, err := ds.HTTPClient.Do(request)
if err != nil {
logger.Error("Failed to Do request", "error", err, "url", esUrl.String())
logger.Error("Failed to do healthcheck request", "error", err, "url", esUrl.String())
return &backend.CheckHealthResult{
Status: backend.HealthStatusUnknown,
Message: "Failed to Do request",
Message: "Failed to do healthcheck request",
}, err
}
if response.StatusCode == http.StatusRequestTimeout {
return &backend.CheckHealthResult{
Status: backend.HealthStatusError,
Message: "Elasticsearch cluster is not healthy",
Message: "Elasticsearch data source is not healthy",
}, nil
}
logger.Info("Response received from Elasticsearch", "statusCode", response.StatusCode, "status", "ok")
logger.Info("Response received from Elasticsearch", "statusCode", response.StatusCode, "status", "ok", "duration", time.Since(start))
defer func() {
if err := response.Body.Close(); err != nil {
@ -91,11 +93,11 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
}
status := backend.HealthStatusOk
message := "Elasticsearch cluster is healthy"
message := "Elasticsearch data source is healthy"
if jsonData["status"] == "red" {
status = backend.HealthStatusError
message = "Elasticsearch cluster is not healthy"
message = "Elasticsearch data source is not healthy"
}
return &backend.CheckHealthResult{