ston1th/node_exporter
0
0
Fork 0
Code Issues Releases Activity

Simplify Utsname string conversion (#716)

Browse source 
* Update golang.org/x/sys/unix

This allows to use simplified string conversion of Utsname members.

* Simplify Utsname string conversion

Use Utsname from golang.org/x/sys/unix which contains byte array
instead of int8/uint8 array members. This allows to simplify the string
conversions of these members.
This commit is contained in:
Tobias Klauser 2017-11-02 11:57:14 +01:00 • committed by Johannes 'fish' Ziemke
commit d73f1e60c4
123 changed files with 1958 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

20
collector/uname_linux.go
View file

@ -16,9 +16,11 @@
package collector
import (
"syscall"
"bytes"
"github.com/prometheus/client_golang/prometheus"
"golang.org/x/sys/unix"
)
var unameDesc = prometheus.NewDesc(
@ -47,18 +49,18 @@ func newUnameCollector() (Collector, error) {
}
func (c unameCollector) Update(ch chan<- prometheus.Metric) error {
var uname syscall.Utsname
if err := syscall.Uname(&uname); err != nil {
var uname unix.Utsname
if err := unix.Uname(&uname); err != nil {
return err
}
ch <- prometheus.MustNewConstMetric(unameDesc, prometheus.GaugeValue, 1,
unameToString(uname.Sysname),
unameToString(uname.Release),
unameToString(uname.Version),
unameToString(uname.Machine),
unameToString(uname.Nodename),
unameToString(uname.Domainname),
string(uname.Sysname[:bytes.IndexByte(uname.Sysname[:], 0)]),
string(uname.Release[:bytes.IndexByte(uname.Release[:], 0)]),
string(uname.Version[:bytes.IndexByte(uname.Version[:], 0)]),
string(uname.Machine[:bytes.IndexByte(uname.Machine[:], 0)]),
string(uname.Nodename[:bytes.IndexByte(uname.Nodename[:], 0)]),
string(uname.Domainname[:bytes.IndexByte(uname.Domainname[:], 0)]),
)
return nil
}

29
collector/uname_linux_int8.go
View file

@ -1,29 +0,0 @@
// Copyright 2015 The Prometheus Authors
// Licensed 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.
// +build 386 amd64 arm64 mips64 mips64le mips mipsle
// +build linux
// +build !nouname
package collector
func unameToString(input [65]int8) string {
var str string
for _, a := range input {
if a == 0 {
break
}
str += string(a)
}
return str
}

27
collector/uname_linux_uint8.go
View file

@ -1,27 +0,0 @@
// Copyright 2015 The Prometheus Authors
// Licensed 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.
// +build !nouname,linux,arm !nouname,linux,ppc64 !nouname,linux,ppc64le !nouname,linux,s390x
package collector
func unameToString(input [65]uint8) string {
var str string
for _, a := range input {
if a == 0 {
break
}
str += string(a)
}
return str
}