Merge branch 'FreeBSD' of github.com:redanthrax/go-sysinfo into FreeBSD

Author: redanthrax

providers/freebsd/arch.go

@@ -0,0 +1,35 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package freebsd
+
+import (
+	"syscall"
+
+	"github.com/pkg/errors"
+)
+
+const hardwareMIB = "hw.machine"
+
+func Architecture() (string, error) {
+	arch, err := syscall.Sysctl(hardwareMIB)
+	if err != nil {
+		return "", errors.Wrap(err, "failed to get architecture")
+	}
+
+	return arch, nil
+}

providers/freebsd/boottime_freebsd_test.go

@@ -0,0 +1,35 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package freebsd
+
+import (
+	"testing"
+
+	"github.com/elastic/go-sysinfo/internal/registry"
+)
+
+var _ registry.HostProvider = freebsdSystem{}
+
+func TestBootTime(t *testing.T) {
+	boottime, err := BootTime()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Log(boottime)
+}

providers/freebsd/host_freebsd.go

@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// +build,freebsd,cgo
-
 package freebsd
 
 // #cgo LDFLAGS: -lkvm
@@ -33,9 +31,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/procfs"
 
-	"github.com/redanthrax/go-sysinfo/internal/registry"
-	"github.com/redanthrax/go-sysinfo/providers/shared"
-	"github.com/redanthrax/go-sysinfo/types"
+	"github.com/elastic/go-sysinfo/internal/registry"
+	"github.com/elastic/go-sysinfo/providers/shared"
+	"github.com/elastic/go-sysinfo/types"
 )
 
 func init() {
@@ -59,6 +57,7 @@ func (s freebsdSystem) Host() (types.Host, error) {
 }
 
 type host struct {
+	procFS procFS
 	info types.HostInfo
 }
 
@@ -244,3 +243,8 @@ type procFS struct {
 	procfs.FS
 	mountPoint string
 }
+
+func (fs *procFS) path(p ...string) string {
+	elem := append([]string{fs.mountPoint}, p...)
+	return filepath.Join(elem...)
+}

providers/freebsd/host_freebsd_test.go

@@ -15,22 +15,19 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// +build,freebsd,cgo
-
 package freebsd
 
 import (
 	"encoding/json"
 	"testing"
 
-	"github.com/redanthrax/go-sysinfo/internal/registry"
-	"github.com/stretchr/testify/assert"
+	"github.com/elastic/go-sysinfo/internal/registry"
 )
 
 var _ registry.HostProvider = freebsdSystem{}
 
 func TestHost(t *testing.T) {
-	host, err := freebsdSystem{}.Host()
+	host, err := newFreeBSDSystem("").Host()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -45,11 +42,8 @@ func TestHostMemoryInfo(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	m, err := host.Memory()
+	_, err = host.Memory()
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	assert.EqualValues(t, 8554647552, int64(m.Total))
-	assert.NotContains(t, m.Metrics, "MemTotal")
 }

providers/freebsd/kernel.go

@@ -0,0 +1,35 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package freebsd
+
+import (
+	"syscall"
+
+	"github.com/pkg/errors"
+)
+
+const kernelReleaseMIB = "kern.osrelease"
+
+func KernelVersion() (string, error) {
+	version, err := syscall.Sysctl(kernelReleaseMIB)
+	if err != nil {
+		return "", errors.Wrap(err, "failed to get kernel version")
+	}
+
+	return version, nil
+}

providers/freebsd/machineid.go

@@ -0,0 +1,35 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package freebsd
+
+import (
+	"syscall"
+
+	"github.com/pkg/errors"
+)
+
+const kernelHostUUIDMIB = "kern.hostuuid"
+
+func MachineID() (string, error) {
+	uuid, err := syscall.Sysctl(kernelHostUUIDMIB)
+	if err != nil {
+		return "", errors.Wrap(err, "failed to get machine id")
+	}
+
+	return uuid, nil
+}

providers/freebsd/os_freebsd.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/redanthrax/go-sysinfo/types"
+	"github.com/elastic/go-sysinfo/types"
 )
 
 const ostypeMIB = "kern.ostype"

providers/freebsd/os_freebsd_test.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/redanthrax/go-sysinfo/types"
+	"github.com/elastic/go-sysinfo/types"
 )
 
 func TestOperatingSystem(t *testing.T) {

providers/freebsd/process_freebsd.go

@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//+build,freebsd,cgo
-
 package freebsd
 
 // #cgo LDFLAGS: -lkvm -lprocstat
@@ -67,14 +65,15 @@ import "C"
 
 import (
 	"os"
+	"io/ioutil"
 	"strconv"
 	"strings"
 	"syscall"
 	"time"
 
 	"github.com/pkg/errors"
 
-	"github.com/redanthrax/go-sysinfo/types"
+	"github.com/elastic/go-sysinfo/types"
 )
 
 func getProcInfo(op int, arg int) ([]process, error) {
@@ -103,6 +102,10 @@ func getProcInfo(op int, arg int) ([]process, error) {
 	return procs, nil
 }
 
+func (p *process) path(pa ...string) string {
+	return p.fs.path(append([]string{strconv.Itoa(p.PID())}, pa...)...)
+}
+
 func copyArray(from **C.char) []string {
 	if from == nil {
 		return nil
@@ -215,6 +218,7 @@ func getProcCWD(p *process) (string, error) {
 
 type process struct {
 	pid   int
+	fs   procFS
 	kinfo C.struct_kinfo_proc
 }
 
@@ -300,6 +304,30 @@ func (p *process) User() (types.UserInfo, error) {
 	}, nil
 }
 
+
+// NetworkStats reports network stats for an individual PID.
+func (p *process) NetworkCounters() (*types.NetworkCountersInfo, error) {
+	snmpRaw, err := ioutil.ReadFile(p.path("net/snmp"))
+	if err != nil {
+		return nil, err
+	}
+	snmp, err := getNetSnmpStats(snmpRaw)
+	if err != nil {
+		return nil, err
+	}
+
+	netstatRaw, err := ioutil.ReadFile(p.path("net/netstat"))
+	if err != nil {
+		return nil, err
+	}
+	netstat, err := getNetstatStats(netstatRaw)
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.NetworkCountersInfo{SNMP: snmp, Netstat: netstat}, nil
+}
+
 func (p *process) PID() int {
 	return p.pid
 }