Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Address PR comments

pull/700/head
Jack Zampolin 2016-12-19 13:29:33 -08:00
parent 3ab2c13364
commit 9994097ebc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chronograf.go
View File

@ -260,7 +260,7 @@ type Cell struct {
I string `json:"i"` I string `json:"i"`
Name string `json:"name"` Name string `json:"name"`
Queries []Query `json:"queries"` Queries []Query `json:"queries"`
Type string `json:"type"` Type string `json:"type"`
} }
// Layout is a collection of Cells for visualization // Layout is a collection of Cells for visualization

6
server/server.go
View File

@ -43,7 +43,7 @@ type Server struct {
TokenSecret string `short:"t" long:"token-secret" description:"Secret to sign tokens" env:"TOKEN_SECRET"` TokenSecret string `short:"t" long:"token-secret" description:"Secret to sign tokens" env:"TOKEN_SECRET"`
GithubClientID string `short:"i" long:"github-client-id" description:"Github Client ID for OAuth 2 support" env:"GH_CLIENT_ID"` GithubClientID string `short:"i" long:"github-client-id" description:"Github Client ID for OAuth 2 support" env:"GH_CLIENT_ID"`
GithubClientSecret string `short:"s" long:"github-client-secret" description:"Github Client Secret for OAuth 2 support" env:"GH_CLIENT_SECRET"` GithubClientSecret string `short:"s" long:"github-client-secret" description:"Github Client Secret for OAuth 2 support" env:"GH_CLIENT_SECRET"`
ReportingDisabled bool `short:"r" long:"reporting-disabled" description:"Disable reporting of usage stats (os,arch,version,cluster_id) once every 24hr" env:"REPORTING_DISABLED"` ReportingDisabled bool `short:"r" long:"reporting-disabled" description:"Disable reporting of usage stats (os,arch,version,cluster_id,uptime) once every 24hr" env:"REPORTING_DISABLED"`
LogLevel string `short:"l" long:"log-level" value-name:"choice" choice:"debug" choice:"info" choice:"warn" choice:"error" choice:"fatal" choice:"panic" default:"info" description:"Set the logging level" env:"LOG_LEVEL"` LogLevel string `short:"l" long:"log-level" value-name:"choice" choice:"debug" choice:"info" choice:"warn" choice:"error" choice:"fatal" choice:"panic" default:"info" description:"Set the logging level" env:"LOG_LEVEL"`
ShowVersion bool `short:"v" long:"version" description:"Show Chronograf version info"` ShowVersion bool `short:"v" long:"version" description:"Show Chronograf version info"`
@ -168,7 +168,7 @@ func reportUsageStats(bi BuildInfo, logger chronograf.Logger) {
"arch": runtime.GOARCH, "arch": runtime.GOARCH,
"version": bi.Version, "version": bi.Version,
"cluster_id": serverID, "cluster_id": serverID,
"uptime": time.Since(startTime).Seconds(), "uptime": time.Since(startTime).Seconds(),
}, },
}, },
}, },
@ -176,7 +176,7 @@ func reportUsageStats(bi BuildInfo, logger chronograf.Logger) {
l := logger.WithField("component", "usage"). l := logger.WithField("component", "usage").
WithField("reporting_addr", reporter.URL). WithField("reporting_addr", reporter.URL).
WithField("freq", "24h"). WithField("freq", "24h").
WithField("stats", "os,arch,version,cluster_id") WithField("stats", "os,arch,version,cluster_id,uptime")
l.Info("Reporting usage stats") l.Info("Reporting usage stats")
reporter.Save(u) reporter.Save(u)