IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rendering: periodically refresh remote plugin version (#45505)

Browse Source 
* #44449: refresh image renderer version on a schedule

* #44449: simplify
This commit is contained in:
Artur Wierzbicki 2022-02-18 20:25:01 +04:00 committed by GitHub
parent 78c35e6000
commit 7643ae6c5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/services/rendering/http_mode.go
View File

@ -29,8 +29,9 @@ var netClient = &http.Client{
}
var (
remoteVersionFetchInterval time.Duration = time.Second * 15
remoteVersionFetchRetries uint = 4
remoteVersionFetchInterval time.Duration = time.Second * 15
remoteVersionFetchRetries uint = 4
remoteVersionRefreshInterval = time.Minute * 15
)
func (rs *RenderingService) renderViaHTTP(ctx context.Context, renderKey string, opts Opts) (*RenderResult, error) {
@ -251,3 +252,26 @@ func (rs *RenderingService) getRemotePluginVersion() (string, error) {
}
return info.Version, nil
}
func (rs *RenderingService) refreshRemotePluginVersion() {
newVersion, err := rs.getRemotePluginVersion()
if err != nil {
rs.log.Info("Failed to refresh remote plugin version", "err", err)
return
}
if newVersion == "" {
// the image-renderer could have been temporary unavailable - skip updating the version
rs.log.Debug("Received empty version when trying to refresh remote plugin version")
return
}
currentVersion := rs.Version()
if currentVersion != newVersion {
rs.versionMutex.Lock()
defer rs.versionMutex.Unlock()
rs.log.Info("Updating remote plugin version", "currentVersion", currentVersion, "newVersion", newVersion)
rs.version = newVersion
}
}

15
pkg/services/rendering/rendering.go
View File

@ -120,8 +120,19 @@ func (rs *RenderingService) Run(ctx context.Context) error {
})
rs.renderAction = rs.renderViaHTTP
rs.renderCSVAction = rs.renderCSVViaHTTP
<-ctx.Done()
return nil
refreshTicker := time.NewTicker(remoteVersionRefreshInterval)
for {
select {
case <-refreshTicker.C:
go rs.refreshRemotePluginVersion()
case <-ctx.Done():
rs.log.Debug("Grafana is shutting down - stopping image-renderer version refresh")
refreshTicker.Stop()
return nil
}
}
}
if rs.pluginAvailable() {