ston1th/node_exporter
0
0
Fork 0
Code Issues Releases Activity

Extends uname collector to export on Darwin OS (#1433)

Browse source 
Adds uname collector support for Darwin and OpenBSD

Signed-off-by: Philip Gough <philip.p.gough@gmail.com>
This commit is contained in:
Philip Gough 2019-08-03 11:32:43 +01:00 • committed by Ben Kochie
commit 2d95ecaa96
3 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
collector/uname.go
View file

@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// +build freebsd linux
// +build darwin freebsd openbsd linux
// +build !nouname
package collector

40
collector/uname_freebsd.go → collector/uname_bsd.go
View file

@ -11,6 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// +build darwin freebsd openbsd
// +build !nouname
package collector
@ -28,30 +29,35 @@ func getUname() (uname, error) {
return uname{}, err
}
// We do a little bit of work here to emulate what happens in the Linux
// uname calls since FreeBSD uname doesn't have a Domainname.
nodename := string(utsname.Nodename[:bytes.IndexByte(utsname.Nodename[:], 0)])
split := strings.SplitN(nodename, ".", 2)
// We'll always have at least a single element in the array. We assume this
// is the hostname.
hostname := split[0]
// If we have more than one element, we assume this is the domainname.
// Otherwise leave it to "(none)" like Linux.
domainname := "(none)"
if len(split) > 1 {
domainname = split[1]
}
nodeName, domainName := parseHostNameAndDomainName(utsname)
output := uname{
SysName: string(utsname.Sysname[:bytes.IndexByte(utsname.Sysname[:], 0)]),
Release: string(utsname.Release[:bytes.IndexByte(utsname.Release[:], 0)]),
Version: string(utsname.Version[:bytes.IndexByte(utsname.Version[:], 0)]),
Machine: string(utsname.Machine[:bytes.IndexByte(utsname.Machine[:], 0)]),
NodeName: hostname,
DomainName: domainname,
NodeName: nodeName,
DomainName: domainName,
}
return output, nil
}
// parseHostNameAndDomainName for FreeBSD,OpenBSD,Darwin.
// Attempts to emulate what happens in the Linux uname calls since these OS doesn't have a Domainname.
func parseHostNameAndDomainName(utsname unix.Utsname) (hostname string, domainname string) {
nodename := string(utsname.Nodename[:bytes.IndexByte(utsname.Nodename[:], 0)])
split := strings.SplitN(nodename, ".", 2)
// We'll always have at least a single element in the array. We assume this
// is the hostname.
hostname = split[0]
// If we have more than one element, we assume this is the domainname.
// Otherwise leave it to "(none)" like Linux.
domainname = "(none)"
if len(split) > 1 {
domainname = split[1]
}
return hostname, domainname
}