From 956c85d081ed99002154f8689d7cfe52c20e7d0d Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: May 08 2015 21:43:49 +0000 Subject: Update to 0.13.0 Add missing [B]Rs for devel subpackage Add Godeps.json to docs - resolves: #1219972 --- diff --git a/.gitignore b/.gitignore index b7b1d35..0e3d25c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -cadvisor-ef7dddf.tar.gz +/cadvisor-35e8762.tar.gz diff --git a/0001-int64-to-float64-conversion.patch b/0001-int64-to-float64-conversion.patch deleted file mode 100644 index 78c255e..0000000 --- a/0001-int64-to-float64-conversion.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 71be3494d7bb6ee0dcb68e9a0d241b500c296fe3 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Tue, 31 Mar 2015 13:13:27 +0200 -Subject: [PATCH] int64 to float64 conversion - ---- - manager/container.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/manager/container.go b/manager/container.go -index 6e08674..4e9ef03 100644 ---- a/manager/container.go -+++ b/manager/container.go -@@ -222,7 +222,7 @@ func (c *containerData) housekeeping() { - - instantUsageInCores := float64(stats[numSamples-1].Cpu.Usage.Total-stats[numSamples-2].Cpu.Usage.Total) / float64(stats[numSamples-1].Timestamp.Sub(stats[numSamples-2].Timestamp).Nanoseconds()) - usageInCores := float64(usageCpuNs) / float64(stats[numSamples-1].Timestamp.Sub(stats[0].Timestamp).Nanoseconds()) -- usageInHuman := units.HumanSize(int64(usageMemory)) -+ usageInHuman := units.HumanSize(float64(usageMemory)) - glog.Infof("[%s] %.3f cores (average: %.3f cores), %s of memory", c.info.Name, instantUsageInCores, usageInCores, usageInHuman) - } - } --- -1.9.3 - diff --git a/cadvisor.spec b/cadvisor.spec index eef7c36..3828571 100644 --- a/cadvisor.spec +++ b/cadvisor.spec @@ -4,21 +4,20 @@ %global provider_tld com %global project google %global repo cadvisor -%global commit ef7dddf4385dc5d0c42b872bdcdb5a4ee9170eb1 +%global commit 35e876232a0a99a0fb70fd5e59c621cd8c1f790f %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo} -Version: 0.10.1 -Release: 2%{?dist} +Version: 0.13.0 +Release: 1%{?dist} Summary: Analyzes resource usage and performance characteristics of running containers License: ASL 2.0 URL: https://%{import_path} Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: cadvisor Source2: cadvisor.service -Patch0: 0001-int64-to-float64-conversion.patch -Patch1: 0001-change-import-path.patch +Patch0: 0001-change-import-path.patch BuildRequires: docker-io-pkg-devel BuildRequires: git @@ -26,27 +25,29 @@ BuildRequires: systemd BuildRequires: glibc-static BuildRequires: golang >= 1.2.1-3 -BuildRequires: golang(code.google.com/p/go.exp/inotify) -BuildRequires: golang(code.google.com/p/goauth2/oauth) -BuildRequires: golang(code.google.com/p/goauth2/oauth/jwt) -BuildRequires: golang(code.google.com/p/gomock/gomock) -BuildRequires: golang(code.google.com/p/google-api-go-client/bigquery/v2) -BuildRequires: golang(github.com/SeanDolphin/bqschema) -BuildRequires: golang(github.com/abbot/go-http-auth) -BuildRequires: golang(github.com/docker/docker/pkg/units) -BuildRequires: golang(github.com/docker/libcontainer) -BuildRequires: golang(github.com/docker/libcontainer/cgroups) -BuildRequires: golang(github.com/docker/libcontainer/cgroups/fs) -BuildRequires: golang(github.com/docker/libcontainer/cgroups/systemd) -BuildRequires: golang(github.com/docker/libcontainer/network) -BuildRequires: golang(github.com/fsouza/go-dockerclient) -BuildRequires: golang(github.com/golang/glog) -BuildRequires: golang(github.com/influxdb/influxdb/client) -BuildRequires: golang(github.com/kr/pretty) -BuildRequires: golang(github.com/stretchr/testify/assert) -BuildRequires: golang(github.com/stretchr/testify/mock) -BuildRequires: golang(github.com/stretchr/testify/require) -BuildRequires: golang(google.golang.org/cloud/compute/metadata) +BuildRequires: golang(code.google.com/p/go.exp/inotify) +BuildRequires: golang(code.google.com/p/gomock/gomock) +BuildRequires: golang(code.google.com/p/google-api-go-client/bigquery/v2) +BuildRequires: golang(github.com/abbot/go-http-auth) +BuildRequires: golang(github.com/docker/docker/pkg/units) +BuildRequires: golang(github.com/docker/docker/pkg/mount) +BuildRequires: golang(github.com/docker/libcontainer/cgroups) +BuildRequires: golang(github.com/docker/libcontainer/cgroups/fs) +BuildRequires: golang(github.com/docker/libcontainer/configs) +BuildRequires: golang(github.com/docker/libcontainer/cgroups/systemd) +BuildRequires: golang(github.com/docker/libcontainer) +BuildRequires: golang(github.com/fsouza/go-dockerclient) +BuildRequires: golang(github.com/golang/glog) +BuildRequires: golang(github.com/influxdb/influxdb/client) +BuildRequires: golang(github.com/kr/pretty) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus) +BuildRequires: golang(github.com/stretchr/testify/assert) +BuildRequires: golang(github.com/stretchr/testify/mock) +BuildRequires: golang(github.com/stretchr/testify/require) +BuildRequires: golang(golang.org/x/oauth2) +BuildRequires: golang(golang.org/x/oauth2/jwt) +BuildRequires: golang(google.golang.org/cloud/compute/metadata) + # indirect deps of docker BuildRequires: golang(github.com/Sirupsen/logrus) @@ -69,10 +70,61 @@ can also be added. cAdvisor's container abstraction is based on lmctfy's so containers are inherently nested hierarchically. %package devel -Requires: golang >= 1.2.1-3 Summary: Analyzes resource usage and performance characteristics of running containers + +BuildRequires: golang >= 1.2.1-3 +BuildRequires: docker-io-pkg-devel +BuildRequires: golang(code.google.com/p/go.exp/inotify) +BuildRequires: golang(code.google.com/p/gomock/gomock) +BuildRequires: golang(code.google.com/p/google-api-go-client/bigquery/v2) +BuildRequires: golang(github.com/abbot/go-http-auth) +BuildRequires: golang(github.com/docker/docker/pkg/units) +BuildRequires: golang(github.com/docker/docker/pkg/mount) +BuildRequires: golang(github.com/docker/libcontainer/cgroups) +BuildRequires: golang(github.com/docker/libcontainer/cgroups/fs) +BuildRequires: golang(github.com/docker/libcontainer/configs) +BuildRequires: golang(github.com/docker/libcontainer/cgroups/systemd) +BuildRequires: golang(github.com/docker/libcontainer) +BuildRequires: golang(github.com/fsouza/go-dockerclient) +BuildRequires: golang(github.com/golang/glog) +BuildRequires: golang(github.com/influxdb/influxdb/client) +BuildRequires: golang(github.com/kr/pretty) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus) +BuildRequires: golang(github.com/stretchr/testify/assert) +BuildRequires: golang(github.com/stretchr/testify/mock) +BuildRequires: golang(github.com/stretchr/testify/require) +BuildRequires: golang(golang.org/x/oauth2) +BuildRequires: golang(golang.org/x/oauth2/jwt) +BuildRequires: golang(google.golang.org/cloud/compute/metadata) + +Requires: golang >= 1.2.1-3 +Requires: docker-io-pkg-devel +Requires: golang(code.google.com/p/go.exp/inotify) +Requires: golang(code.google.com/p/gomock/gomock) +Requires: golang(code.google.com/p/google-api-go-client/bigquery/v2) +Requires: golang(github.com/abbot/go-http-auth) +Requires: golang(github.com/docker/docker/pkg/units) +Requires: golang(github.com/docker/docker/pkg/mount) +Requires: golang(github.com/docker/libcontainer/cgroups) +Requires: golang(github.com/docker/libcontainer/cgroups/fs) +Requires: golang(github.com/docker/libcontainer/configs) +Requires: golang(github.com/docker/libcontainer/cgroups/systemd) +Requires: golang(github.com/docker/libcontainer) +Requires: golang(github.com/fsouza/go-dockerclient) +Requires: golang(github.com/golang/glog) +Requires: golang(github.com/influxdb/influxdb/client) +Requires: golang(github.com/kr/pretty) +Requires: golang(github.com/prometheus/client_golang/prometheus) +Requires: golang(github.com/stretchr/testify/assert) +Requires: golang(github.com/stretchr/testify/mock) +Requires: golang(github.com/stretchr/testify/require) +Requires: golang(golang.org/x/oauth2) +Requires: golang(golang.org/x/oauth2/jwt) +Requires: golang(google.golang.org/cloud/compute/metadata) + Provides: golang(%{import_path}/api) = %{version}-%{release} Provides: golang(%{import_path}/client) = %{version}-%{release} +Provides: golang(%{import_path}/client/v2) = %{version}-%{release} Provides: golang(%{import_path}/container) = %{version}-%{release} Provides: golang(%{import_path}/container/docker) = %{version}-%{release} Provides: golang(%{import_path}/container/libcontainer) = %{version}-%{release} @@ -80,12 +132,16 @@ Provides: golang(%{import_path}/container/raw) = %{version}-%{release} Provides: golang(%{import_path}/events) = %{version}-%{release} Provides: golang(%{import_path}/fs) = %{version}-%{release} Provides: golang(%{import_path}/healthz) = %{version}-%{release} -Provides: golang(%{import_path}/info) = %{version}-%{release} -Provides: golang(%{import_path}/info/test) = %{version}-%{release} +Provides: golang(%{import_path}/http) = %{version}-%{release} +Provides: golang(%{import_path}/http/mux) = %{version}-%{release} +Provides: golang(%{import_path}/info/v1) = %{version}-%{release} +Provides: golang(%{import_path}/info/v1/test) = %{version}-%{release} +Provides: golang(%{import_path}/info/v2) = %{version}-%{release} Provides: golang(%{import_path}/integration/common) = %{version}-%{release} Provides: golang(%{import_path}/integration/framework) = %{version}-%{release} Provides: golang(%{import_path}/integration/tests/api) = %{version}-%{release} Provides: golang(%{import_path}/manager) = %{version}-%{release} +Provides: golang(%{import_path}/metrics) = %{version}-%{release} Provides: golang(%{import_path}/pages) = %{version}-%{release} Provides: golang(%{import_path}/pages/static) = %{version}-%{release} Provides: golang(%{import_path}/storage) = %{version}-%{release} @@ -98,7 +154,6 @@ Provides: golang(%{import_path}/summary) = %{version}-%{release} Provides: golang(%{import_path}/utils) = %{version}-%{release} Provides: golang(%{import_path}/utils/cpuload) = %{version}-%{release} Provides: golang(%{import_path}/utils/cpuload/netlink) = %{version}-%{release} -Provides: golang(%{import_path}/utils/cpuload/scheddebug) = %{version}-%{release} Provides: golang(%{import_path}/utils/fs) = %{version}-%{release} Provides: golang(%{import_path}/utils/fs/mockfs) = %{version}-%{release} Provides: golang(%{import_path}/utils/oomparser) = %{version}-%{release} @@ -107,6 +162,7 @@ Provides: golang(%{import_path}/utils/sysfs) = %{version}-%{release} Provides: golang(%{import_path}/utils/sysfs/fakesysfs) = %{version}-%{release} Provides: golang(%{import_path}/utils/sysinfo) = %{version}-%{release} Provides: golang(%{import_path}/validate) = %{version}-%{release} +Provides: golang(%{import_path}/version) = %{version}-%{release} %description devel %{summary} @@ -171,12 +227,14 @@ done %files %doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE README.md +%doc Godeps/Godeps.json %{_bindir}/cadvisor %{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %files devel %doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE README.md +%doc Godeps/Godeps.json %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %dir %{gopath}/src/%{import_path} %dir %{gopath}/src/%{import_path}/api @@ -203,6 +261,12 @@ done %{gopath}/src/%{import_path}/utils/* %changelog +* Fri May 08 2015 jchaloup - 0.13.0-1 +- Update to 0.13.0 +- Add missing [B]Rs for devel subpackage +- Add Godeps.json to docs + resolves: #1219972 + * Thu Apr 09 2015 jchaloup - 0.10.1-2 - Remove wrong option in cadvisor.service resolves: #1210336 diff --git a/sources b/sources index a715357..b08a175 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -815b2f06336d01372619222f8b66ed8b cadvisor-ef7dddf.tar.gz +7fb1067f1e0e96562e40c62321238137 cadvisor-35e8762.tar.gz