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

Instrumentation: Edition and license info to usage stats (#20589)

Browse Source 
* Added edition and licensing info to usage stats
This commit is contained in:
Jon Gyllenswärd
2019-11-22 12:19:00 +01:00
committed by GitHub
parent be6a4e806a
commit bccc5397f6
1 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/infra/usagestats/usage_stats.go
+37 -10
View File
@@ -28,12 +28,13 @@ func (uss *UsageStatsService) sendUsageStats(oauthProviders map[string]bool) {
metrics := map[string]interface{}{} metrics := map[string]interface{}{}
report := map[string]interface{}{ report := map[string]interface{}{
"version": version, "version": version,
"metrics": metrics, "metrics": metrics,
"os": runtime.GOOS, "os": runtime.GOOS,
"arch": runtime.GOARCH, "arch": runtime.GOARCH,
"edition": getEdition(uss.License.HasValidLicense()), "edition": getEdition(),
"packaging": setting.Packaging, "hasValidLicense": uss.License.HasValidLicense(),
"packaging": setting.Packaging,
} }
statsQuery := models.GetSystemStatsQuery{} statsQuery := models.GetSystemStatsQuery{}
@@ -60,6 +61,9 @@ func (uss *UsageStatsService) sendUsageStats(oauthProviders map[string]bool) {
metrics["stats.snapshots.count"] = statsQuery.Result.Snapshots metrics["stats.snapshots.count"] = statsQuery.Result.Snapshots
metrics["stats.teams.count"] = statsQuery.Result.Teams metrics["stats.teams.count"] = statsQuery.Result.Teams
metrics["stats.total_auth_token.count"] = statsQuery.Result.AuthTokens metrics["stats.total_auth_token.count"] = statsQuery.Result.AuthTokens
metrics["stats.valid_license.count"] = getValidLicenseCount(uss.License.HasValidLicense())
metrics["stats.edition.oss.count"] = getOssEditionCount()
metrics["stats.edition.enterprise.count"] = getEnterpriseEditionCount()
userCount := statsQuery.Result.Users userCount := statsQuery.Result.Users
avgAuthTokensPerUser := statsQuery.Result.AuthTokens avgAuthTokensPerUser := statsQuery.Result.AuthTokens
@@ -182,9 +186,32 @@ func (uss *UsageStatsService) updateTotalStats() {
metrics.StatsTotalActiveAdmins.Set(float64(statsQuery.Result.ActiveAdmins)) metrics.StatsTotalActiveAdmins.Set(float64(statsQuery.Result.ActiveAdmins))
} }
func getEdition(validLicense bool) string { func getEdition() string {
if validLicense { edition := "oss"
return "enterprise" if setting.IsEnterprise {
edition = "enterprise"
} }
return "oss"
return edition
}
func getEnterpriseEditionCount() int {
if setting.IsEnterprise {
return 1
}
return 0
}
func getOssEditionCount() int {
if setting.IsEnterprise {
return 0
}
return 1
}
func getValidLicenseCount(validLicense bool) int {
if validLicense {
return 1
}
return 0
} }