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

Previews: track oss adoption

Browse Source
This commit is contained in:
Artur Wierzbicki 2022-04-13 11:54:49 +02:00 committed by GitHub
parent 1957863b67
commit 46dc1e98fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/services/thumbs/service.go
View File

@ -11,6 +11,7 @@ import (
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/serverlock" "github.com/grafana/grafana/pkg/infra/serverlock"
"github.com/grafana/grafana/pkg/infra/usagestats"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/guardian" "github.com/grafana/grafana/pkg/services/guardian"
@ -48,6 +49,7 @@ type thumbService struct {
store sqlstore.Store store sqlstore.Store
crawlLockServiceActionName string crawlLockServiceActionName string
log log.Logger log log.Logger
usageStatsService usagestats.Service
} }
type crawlerScheduleOptions struct { type crawlerScheduleOptions struct {
@ -60,7 +62,7 @@ type crawlerScheduleOptions struct {
auth CrawlerAuth auth CrawlerAuth
} }
func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles, lockService *serverlock.ServerLockService, renderService rendering.Service, gl *live.GrafanaLive, store *sqlstore.SQLStore, authSetupService CrawlerAuthSetupService) Service { func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles, lockService *serverlock.ServerLockService, renderService rendering.Service, gl *live.GrafanaLive, store *sqlstore.SQLStore, authSetupService CrawlerAuthSetupService, usageStatsService usagestats.Service) Service {
if !features.IsEnabled(featuremgmt.FlagDashboardPreviews) { if !features.IsEnabled(featuremgmt.FlagDashboardPreviews) {
return &dummyService{} return &dummyService{}
} }
@ -73,8 +75,8 @@ func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles, lockS
logger.Error("Failed to setup auth for the dashboard previews crawler", "err", err) logger.Error("Failed to setup auth for the dashboard previews crawler", "err", err)
return &dummyService{} return &dummyService{}
} }
t := &thumbService{
return &thumbService{ usageStatsService: usageStatsService,
renderingService: renderService, renderingService: renderService,
renderer: newSimpleCrawler(renderService, gl, thumbnailRepo), renderer: newSimpleCrawler(renderService, gl, thumbnailRepo),
thumbnailRepo: thumbnailRepo, thumbnailRepo: thumbnailRepo,
@ -94,6 +96,27 @@ func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles, lockS
auth: crawlerAuth, auth: crawlerAuth,
}, },
} }
t.registerUsageStats()
return t
}
func (hs *thumbService) registerUsageStats() {
hs.usageStatsService.RegisterMetricsFunc(func(ctx context.Context) (map[string]interface{}, error) {
s := hs.getDashboardPreviewsSetupSettings(ctx)
stats := make(map[string]interface{})
if s.SystemRequirements.Met {
stats["stats.dashboard_previews.system_req_met.count"] = 1
}
if s.ThumbnailsExist {
stats["stats.dashboard_previews.thumbnails_exist.count"] = 1
}
return stats, nil
})
} }
func (hs *thumbService) Enabled() bool { func (hs *thumbService) Enabled() bool {
@ -203,8 +226,12 @@ func (hs *thumbService) GetImage(c *models.ReqContext) {
} }
func (hs *thumbService) GetDashboardPreviewsSetupSettings(c *models.ReqContext) dashboardPreviewsSetupConfig { func (hs *thumbService) GetDashboardPreviewsSetupSettings(c *models.ReqContext) dashboardPreviewsSetupConfig {
return hs.getDashboardPreviewsSetupSettings(c.Req.Context())
}
func (hs *thumbService) getDashboardPreviewsSetupSettings(ctx context.Context) dashboardPreviewsSetupConfig {
systemRequirements := hs.getSystemRequirements() systemRequirements := hs.getSystemRequirements()
thumbnailsExist, err := hs.thumbnailRepo.doThumbnailsExist(c.Req.Context()) thumbnailsExist, err := hs.thumbnailRepo.doThumbnailsExist(ctx)
if err != nil { if err != nil {
return dashboardPreviewsSetupConfig{ return dashboardPreviewsSetupConfig{