Fix uname collector for arm/ppc64/ppc64le architectures

The syscall.Utsname struct under arm/ppc64/ppc64le uses uint8 type
instead of int8.
This commit is contained in:
Tobias Schmidt 2015-10-03 02:22:15 -04:00
parent ee6b8e73a1
commit 52f79e699d
3 changed files with 62 additions and 20 deletions

View File

@ -46,31 +46,19 @@ func newUnameCollector() (Collector, error) {
return &unameCollector{}, nil return &unameCollector{}, nil
} }
func intArrayToString(array [65]int8) string {
var str string
for _, a := range array {
if a == 0 {
break
}
str += string(a)
}
return str
}
func (c unameCollector) Update(ch chan<- prometheus.Metric) error { func (c unameCollector) Update(ch chan<- prometheus.Metric) error {
var uname syscall.Utsname var uname syscall.Utsname
if err := syscall.Uname(&uname); err != nil { if err := syscall.Uname(&uname); err != nil {
return err return err
} }
labelValues := []string{ ch <- prometheus.MustNewConstMetric(unameDesc, prometheus.GaugeValue, 1,
intArrayToString(uname.Sysname), unameToString(uname.Sysname),
intArrayToString(uname.Release), unameToString(uname.Release),
intArrayToString(uname.Version), unameToString(uname.Version),
intArrayToString(uname.Machine), unameToString(uname.Machine),
intArrayToString(uname.Nodename), unameToString(uname.Nodename),
intArrayToString(uname.Domainname), unameToString(uname.Domainname),
} )
ch <- prometheus.MustNewConstMetric(unameDesc, prometheus.GaugeValue, 1, labelValues...)
return nil return nil
} }

View File

@ -0,0 +1,27 @@
// 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,386 !nouname,linux,amd64
package collector
func unameToString(input [65]int8) string {
var str string
for _, a := range input {
if a == 0 {
break
}
str += string(a)
}
return str
}

View File

@ -0,0 +1,27 @@
// 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
package collector
func unameToString(input [65]uint8) string {
var str string
for _, a := range input {
if a == 0 {
break
}
str += string(a)
}
return str
}