Merge pull request #2081 from influxdb/new_diags_file

Refactor diags and write into internal database

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Features
 - [#2076](https://github.com/influxdb/influxdb/pull/2076): Seperate stdout and stderr output in init.d script
 - [#2091](https://github.com/influxdb/influxdb/pull/2091): Support disabling snapshot endpoint.
+- [#2081](https://github.com/influxdb/influxdb/pull/2081): Support writing diagnostic data into the internal database.
 
 ### Bugfixes
 - [#2084](https://github.com/influxdb/influxdb/pull/2084): Allowing leading underscores in identifiers.

diagnostics.go

@@ -0,0 +1,143 @@
+package influxdb
+
+import (
+	"os"
+	"runtime"
+	"time"
+
+	"github.com/influxdb/influxdb/influxql"
+)
+
+// GoDiagnostics captures basic information about the runtime.
+type GoDiagnostics struct {
+	GoMaxProcs   int
+	NumGoroutine int
+	Version      string
+}
+
+// NewGoDiagnostics returns a GoDiagnostics object.
+func NewGoDiagnostics() *GoDiagnostics {
+	return &GoDiagnostics{
+		GoMaxProcs:   runtime.GOMAXPROCS(0),
+		NumGoroutine: runtime.NumGoroutine(),
+		Version:      runtime.Version(),
+	}
+}
+
+// AsRow returns the GoDiagnostic object as an InfluxQL row.
+func (g *GoDiagnostics) AsRow(measurement string, tags map[string]string) *influxql.Row {
+	return &influxql.Row{
+		Name:    measurement,
+		Columns: []string{"time", "goMaxProcs", "numGoRoutine", "version"},
+		Tags:    tags,
+		Values: [][]interface{}{[]interface{}{time.Now().UTC(),
+			g.GoMaxProcs, g.NumGoroutine, g.Version}},
+	}
+}
+
+// SystemDiagnostics captures basic machine data.
+type SystemDiagnostics struct {
+	Hostname string
+	PID      int
+	OS       string
+	Arch     string
+	NumCPU   int
+}
+
+// NewSystemDiagnostics returns a SystemDiagnostics object.
+func NewSystemDiagnostics() *SystemDiagnostics {
+	hostname, err := os.Hostname()
+	if err != nil {
+		hostname = "unknown"
+	}
+
+	return &SystemDiagnostics{
+		Hostname: hostname,
+		PID:      os.Getpid(),
+		OS:       runtime.GOOS,
+		Arch:     runtime.GOARCH,
+		NumCPU:   runtime.NumCPU(),
+	}
+}
+
+// AsRow returns the GoDiagnostic object as an InfluxQL row.
+func (s *SystemDiagnostics) AsRow(measurement string, tags map[string]string) *influxql.Row {
+	return &influxql.Row{
+		Name:    measurement,
+		Columns: []string{"time", "hostname", "pid", "os", "arch", "numCPU"},
+		Tags:    tags,
+		Values: [][]interface{}{[]interface{}{time.Now().UTC(),
+			s.Hostname, s.PID, s.OS, s.Arch, s.NumCPU}},
+	}
+}
+
+// MemoryDiagnostics captures Go memory stats.
+type MemoryDiagnostics struct {
+	Alloc        int
+	TotalAlloc   int
+	Sys          int
+	Lookups      int
+	Mallocs      int
+	Frees        int
+	HeapAlloc    int
+	HeapSys      int
+	HeapIdle     int
+	HeapInUse    int
+	HeapReleased int
+	HeapObjects  int
+	PauseTotalNs int
+	NumGC        int
+}
+
+// NewMemoryDiagnostics returns a MemoryDiagnostics object.
+func NewMemoryDiagnostics() *MemoryDiagnostics {
+	var m runtime.MemStats
+	runtime.ReadMemStats(&m)
+
+	return &MemoryDiagnostics{
+		Alloc:        int(m.Alloc),
+		TotalAlloc:   int(m.TotalAlloc),
+		Sys:          int(m.Sys),
+		Lookups:      int(m.Lookups),
+		Mallocs:      int(m.Mallocs),
+		Frees:        int(m.Frees),
+		HeapAlloc:    int(m.HeapAlloc),
+		HeapSys:      int(m.HeapSys),
+		HeapIdle:     int(m.HeapIdle),
+		HeapInUse:    int(m.HeapInuse),
+		HeapReleased: int(m.HeapReleased),
+		HeapObjects:  int(m.HeapObjects),
+		PauseTotalNs: int(m.PauseTotalNs),
+		NumGC:        int(m.NumGC),
+	}
+}
+
+// AsRow returns the MemoryDiagnostics object as an InfluxQL row.
+func (m *MemoryDiagnostics) AsRow(measurement string, tags map[string]string) *influxql.Row {
+	return &influxql.Row{
+		Name: measurement,
+		Columns: []string{"time", "alloc", "totalAlloc", "sys", "lookups", "mallocs", "frees", "heapAlloc",
+			"heapSys", "heapIdle", "heapInUse", "heapReleased", "heapObjects", "pauseTotalNs", "numGG"},
+		Tags: tags,
+		Values: [][]interface{}{[]interface{}{time.Now().UTC(),
+			m.Alloc, m.TotalAlloc, m.Sys, m.Lookups, m.Mallocs, m.Frees, m.HeapAlloc,
+			m.HeapSys, m.HeapIdle, m.HeapInUse, m.HeapReleased, m.HeapObjects, m.PauseTotalNs, m.NumGC}},
+	}
+}
+
+// BuildDiagnostics capture basic build version information.
+type BuildDiagnostics struct {
+	Version    string
+	CommitHash string
+}
+
+// AsRow returns the BuildDiagnostics object as an InfluxQL row.
+func (b *BuildDiagnostics) AsRow(measurement string, tags map[string]string) *influxql.Row {
+	return &influxql.Row{
+		Name:    measurement,
+		Columns: []string{"time", "version", "commitHash"},
+		Tags:    tags,
+		Values: [][]interface{}{[]interface{}{time.Now().UTC(),
+			b.Version, b.CommitHash}},
+	}
+}

influxdb.go

@@ -10,6 +10,12 @@ import (
 	"github.com/influxdb/influxdb/client"
 )
 
+var startTime time.Time
+
+func init() {
+	startTime = time.Now().UTC()
+}
+
 var (
 	// ErrServerOpen is returned when opening an already open server.
 	ErrServerOpen = errors.New("server already open")