feat(ursv): add os/arch/distribution metric
This commit is contained in:
@@ -77,6 +77,7 @@ var (
|
|||||||
{regexp.MustCompile(`\ssyncthing@archlinux`), "Arch (3rd party)"},
|
{regexp.MustCompile(`\ssyncthing@archlinux`), "Arch (3rd party)"},
|
||||||
{regexp.MustCompile(`@debian`), "Debian (3rd party)"},
|
{regexp.MustCompile(`@debian`), "Debian (3rd party)"},
|
||||||
{regexp.MustCompile(`@fedora`), "Fedora (3rd party)"},
|
{regexp.MustCompile(`@fedora`), "Fedora (3rd party)"},
|
||||||
|
{regexp.MustCompile(`@openSUSE`), "openSUSE (3rd party)"},
|
||||||
{regexp.MustCompile(`\sbrew@`), "Homebrew (3rd party)"},
|
{regexp.MustCompile(`\sbrew@`), "Homebrew (3rd party)"},
|
||||||
{regexp.MustCompile(`\sroot@buildkitsandbox`), "LinuxServer.io (3rd party)"},
|
{regexp.MustCompile(`\sroot@buildkitsandbox`), "LinuxServer.io (3rd party)"},
|
||||||
{regexp.MustCompile(`\sports@freebsd`), "FreeBSD (3rd party)"},
|
{regexp.MustCompile(`\sports@freebsd`), "FreeBSD (3rd party)"},
|
||||||
@@ -351,6 +352,9 @@ func (s *server) addReport(rep *contract.Report) bool {
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
rep.DistDist = rep.Distribution
|
||||||
|
rep.DistOS = rep.OS
|
||||||
|
rep.DistArch = rep.Arch
|
||||||
|
|
||||||
_, loaded := s.reports.LoadAndStore(rep.UniqueID, rep)
|
_, loaded := s.reports.LoadAndStore(rep.UniqueID, rep)
|
||||||
return loaded
|
return loaded
|
||||||
|
|||||||
@@ -190,6 +190,11 @@ type Report struct {
|
|||||||
Country string `json:"country" metric:"location,gaugeVec:country"`
|
Country string `json:"country" metric:"location,gaugeVec:country"`
|
||||||
CountryCode string `json:"countryCode" metric:"location,gaugeVec:countryCode"`
|
CountryCode string `json:"countryCode" metric:"location,gaugeVec:countryCode"`
|
||||||
MajorVersion string `json:"majorVersion" metric:"reports_by_major_total,gaugeVec:version"`
|
MajorVersion string `json:"majorVersion" metric:"reports_by_major_total,gaugeVec:version"`
|
||||||
|
|
||||||
|
// Once more to create a metric on OS, arch, distribution
|
||||||
|
DistDist string `json:"distDist" metric:"distribution,gaugeVec:distribution"`
|
||||||
|
DistOS string `json:"distOS" metric:"distribution,gaugeVec:os"`
|
||||||
|
DistArch string `json:"distArch" metric:"distribution,gaugeVec:arch"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func New() *Report {
|
func New() *Report {
|
||||||
|
|||||||
Reference in New Issue
Block a user