From efc1ea14ba75473586a2a50bd56f1dfab9be8e9b Mon Sep 17 00:00:00 2001 From: Tobias Schmidt Date: Thu, 20 Jul 2017 14:36:48 -0400 Subject: [PATCH 1/3] Ignore extracted sysfs fixture files from git --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 36af9cba..6f860227 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ dependencies-stamp /.idea *.iml + +# Test files extracted from ttar +collector/fixtures/sys/ From 016d79535d0ec52faa9ed64b44f5956497e3dc37 Mon Sep 17 00:00:00 2001 From: Tobias Schmidt Date: Thu, 20 Jul 2017 14:37:10 -0400 Subject: [PATCH 2/3] Fix build tags of meminfo collector The meminfo collector only supports darwin, dragonfly, freebsd and linux and must not be included in other archtictures. --- collector/meminfo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collector/meminfo.go b/collector/meminfo.go index 6476c616..399e1629 100644 --- a/collector/meminfo.go +++ b/collector/meminfo.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +// +build darwin dragonfly freebsd linux // +build !nomeminfo -// +build !netbsd package collector From 515b5a933d5976d85582016ed661f7b8e7600730 Mon Sep 17 00:00:00 2001 From: Tobias Schmidt Date: Thu, 20 Jul 2017 14:52:31 -0400 Subject: [PATCH 3/3] Fix build tags of loadavg collector The collector is only implemented for a subset of all operating systems supported by go. Compilation will fail if attempted for another OS target. --- collector/loadavg.go | 1 + collector/loadavg_freebsd.go | 13 +++++++++++++ collector/loadavg_solaris.go | 1 - 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/collector/loadavg.go b/collector/loadavg.go index 66cf1bce..1fcb0788 100644 --- a/collector/loadavg.go +++ b/collector/loadavg.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// +build darwin dragonfly freebsd linux netbsd openbsd solaris // +build !noloadavg package collector diff --git a/collector/loadavg_freebsd.go b/collector/loadavg_freebsd.go index b490513f..e919c50e 100644 --- a/collector/loadavg_freebsd.go +++ b/collector/loadavg_freebsd.go @@ -1,3 +1,16 @@ +// Copyright 2016 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 !noloadavg package collector diff --git a/collector/loadavg_solaris.go b/collector/loadavg_solaris.go index bf428d8a..3fc3b163 100644 --- a/collector/loadavg_solaris.go +++ b/collector/loadavg_solaris.go @@ -11,7 +11,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build solaris // +build !noloadavg package collector