diff -Nru prometheus-process-exporter-0.4.0/debian/changelog prometheus-process-exporter-0.4.0+ds/debian/changelog --- prometheus-process-exporter-0.4.0/debian/changelog 2018-10-26 15:12:06.000000000 +0000 +++ prometheus-process-exporter-0.4.0+ds/debian/changelog 2019-01-14 01:33:35.000000000 +0000 @@ -1,3 +1,25 @@ +prometheus-process-exporter (0.4.0+ds-1) unstable; urgency=medium + + [ Frédéric Bonnard ] + * Fix TestReadFixture on non 4K page size arches. TestReadFixture checks + fixtures/14804/stat RSS which is a number of page and compares it to + hardcoded expected value 0x7b1000 (= 1969 * 4096). Instead of using a + 4k expected value, use system's pagesize like it's done in + proc_stat.go. Closes: #915035. + + [ Martín Ferrari ] + * Automated fixes from cme. + * Prefix patch with series numner. + * Add debian/gbp.conf to describe repo configuration. + * Claim /var/lib/prometheus directory. Closes: #915782. + * Use DH_GOLANG_INSTALL_EXTRA instead of linking test fixtures. + * Add myself to uploaders. + * Add '+ds' suffix to version number to reflect repackaging done to remove + vendoring. + * Update watchfile for repackaging suffix. + + -- Martín Ferrari Mon, 14 Jan 2019 01:33:35 +0000 + prometheus-process-exporter (0.4.0-1) unstable; urgency=medium * Initial release. Closes: #911939. diff -Nru prometheus-process-exporter-0.4.0/debian/control prometheus-process-exporter-0.4.0+ds/debian/control --- prometheus-process-exporter-0.4.0/debian/control 2018-10-26 13:34:21.000000000 +0000 +++ prometheus-process-exporter-0.4.0+ds/debian/control 2019-01-14 01:33:35.000000000 +0000 @@ -1,25 +1,28 @@ Source: prometheus-process-exporter +Maintainer: Debian Go Packaging Team +Uploaders: Daniel Swarbrick , + Martín Ferrari , Section: net +Testsuite: autopkgtest-pkg-go Priority: optional -Maintainer: Debian Go Packaging Team -Uploaders: Daniel Swarbrick Build-Depends: debhelper (>= 11), dh-golang, golang-github-google-go-cmp-dev, golang-github-prometheus-client-golang-dev, golang-go, golang-gopkg-check.v1-dev, - golang-yaml.v2-dev -Standards-Version: 4.2.1 -Homepage: https://github.com/ncabatoff/process-exporter + golang-yaml.v2-dev, +Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/go-team/packages/prometheus-process-exporter Vcs-Git: https://salsa.debian.org/go-team/packages/prometheus-process-exporter.git +Homepage: https://github.com/ncabatoff/process-exporter XS-Go-Import-Path: github.com/ncabatoff/process-exporter Package: prometheus-process-exporter Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Built-Using: ${misc:Built-Using} +Depends: ${misc:Depends}, + ${shlibs:Depends}, +Built-Using: ${misc:Built-Using}, Description: Prometheus exporter that exposes process metrics from procfs Some apps are impractical to instrument directly, either because you don't control the code or they're written in a language that isn't easy to diff -Nru prometheus-process-exporter-0.4.0/debian/copyright prometheus-process-exporter-0.4.0+ds/debian/copyright --- prometheus-process-exporter-0.4.0/debian/copyright 2018-10-26 13:56:52.000000000 +0000 +++ prometheus-process-exporter-0.4.0+ds/debian/copyright 2019-01-14 01:33:35.000000000 +0000 @@ -12,16 +12,16 @@ Files: * Copyright: 2016 Nick Cabatoff -License: MIT +License: Expat Files: debian/* Copyright: 2018 ProfitBricks GmbH -License: MIT +License: Expat Files: vendor/github.com/ncabatoff/fakescraper/* vendor/github.com/ncabatoff/go-seq/* Copyright: 2016 Nick Cabatoff -License: MIT +License: Expat Comment: Included in the repackaged source, as it does not seem to deserve a separate package. @@ -47,7 +47,7 @@ On Debian systems, the full text of the Apache License version 2 can be found in the file `/usr/share/common-licenses/Apache-2.0'. -License: MIT +License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff -Nru prometheus-process-exporter-0.4.0/debian/dirs prometheus-process-exporter-0.4.0+ds/debian/dirs --- prometheus-process-exporter-0.4.0/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ prometheus-process-exporter-0.4.0+ds/debian/dirs 2019-01-14 01:33:35.000000000 +0000 @@ -0,0 +1 @@ +var/lib/prometheus diff -Nru prometheus-process-exporter-0.4.0/debian/gbp.conf prometheus-process-exporter-0.4.0+ds/debian/gbp.conf --- prometheus-process-exporter-0.4.0/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ prometheus-process-exporter-0.4.0+ds/debian/gbp.conf 2019-01-14 01:33:35.000000000 +0000 @@ -0,0 +1,6 @@ +[DEFAULT] +debian-branch = debian/master + +[buildpackage] +dist = DEP14 +upstream-tag = upstream/%(version)s diff -Nru prometheus-process-exporter-0.4.0/debian/patches/01-fix-RSS-test-on-non4K-pagesize-systems.patch prometheus-process-exporter-0.4.0+ds/debian/patches/01-fix-RSS-test-on-non4K-pagesize-systems.patch --- prometheus-process-exporter-0.4.0/debian/patches/01-fix-RSS-test-on-non4K-pagesize-systems.patch 1970-01-01 00:00:00.000000000 +0000 +++ prometheus-process-exporter-0.4.0+ds/debian/patches/01-fix-RSS-test-on-non4K-pagesize-systems.patch 2019-01-14 01:33:35.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fix TestReadFixture on non 4K page size arches + TestReadFixture checks fixtures/14804/stat RSS which is a number of page + and compares it to hardcoded expected value 0x7b1000 (= 1969 * 4096). + Instead of using a 4k expected value, use system's pagesize like it's + done in proc_stat.go . +Author: Frédéric Bonnard +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/proc/read_test.go ++++ b/proc/read_test.go +@@ -83,7 +83,7 @@ + CtxSwitchNonvoluntary: 6, + }, + Memory: Memory{ +- ResidentBytes: 0x7b1000, ++ ResidentBytes: uint64(0x7b1 * os.Getpagesize()), + VirtualBytes: 0x1061000, + VmSwapBytes: 0x2800, + }, diff -Nru prometheus-process-exporter-0.4.0/debian/patches/series prometheus-process-exporter-0.4.0+ds/debian/patches/series --- prometheus-process-exporter-0.4.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ prometheus-process-exporter-0.4.0+ds/debian/patches/series 2019-01-14 01:33:35.000000000 +0000 @@ -0,0 +1 @@ +01-fix-RSS-test-on-non4K-pagesize-systems.patch diff -Nru prometheus-process-exporter-0.4.0/debian/rules prometheus-process-exporter-0.4.0+ds/debian/rules --- prometheus-process-exporter-0.4.0/debian/rules 2018-10-26 13:22:46.000000000 +0000 +++ prometheus-process-exporter-0.4.0+ds/debian/rules 2019-01-14 01:33:35.000000000 +0000 @@ -2,6 +2,7 @@ include /usr/share/dpkg/pkg-info.mk export DH_GOLANG_EXCLUDES := cmd/integration-tester cmd/load-generator +export DH_GOLANG_INSTALL_EXTRA := fixtures BINNAME := $(DEB_SOURCE) BUILDDIR := $(CURDIR)/build @@ -9,10 +10,6 @@ %: dh $@ --buildsystem=golang --with=golang --builddirectory=$(BUILDDIR) -override_dh_auto_test: - ln -s -t $(BUILDDIR)/src/github.com/ncabatoff/process-exporter $(CURDIR)/fixtures - dh_auto_test - override_dh_auto_build: dh_auto_build # Rename the binary to match the debian package. diff -Nru prometheus-process-exporter-0.4.0/debian/watch prometheus-process-exporter-0.4.0+ds/debian/watch --- prometheus-process-exporter-0.4.0/debian/watch 2018-10-25 16:49:51.000000000 +0000 +++ prometheus-process-exporter-0.4.0+ds/debian/watch 2019-01-14 01:33:35.000000000 +0000 @@ -1,3 +1,4 @@ version=4 -opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/process-exporter-$1\.tar\.gz/ \ +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/process-exporter-$1\.tar\.gz/,\ +dversionmangle=s/\+ds\d*$// \ https://github.com/ncabatoff/process-exporter/tags .*/v?(\d\S+)\.tar\.gz diff -Nru prometheus-process-exporter-0.4.0/Gopkg.lock prometheus-process-exporter-0.4.0+ds/Gopkg.lock --- prometheus-process-exporter-0.4.0/Gopkg.lock 2018-09-03 22:00:30.000000000 +0000 +++ prometheus-process-exporter-0.4.0+ds/Gopkg.lock 1970-01-01 00:00:00.000000000 +0000 @@ -1,158 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - branch = "master" - digest = "1:d6afaeed1502aa28e80a4ed0981d570ad91b2579193404256ce672ed0a609e0d" - name = "github.com/beorn7/perks" - packages = ["quantile"] - pruneopts = "UT" - revision = "3a771d992973f24aa725d07868b467d1ddfceafb" - -[[projects]] - digest = "1:15042ad3498153684d09f393bbaec6b216c8eec6d61f63dff711de7d64ed8861" - name = "github.com/golang/protobuf" - packages = ["proto"] - pruneopts = "UT" - revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" - version = "v1.1.0" - -[[projects]] - digest = "1:d2754cafcab0d22c13541618a8029a70a8959eb3525ff201fe971637e2274cd0" - name = "github.com/google/go-cmp" - packages = [ - "cmp", - "cmp/cmpopts", - "cmp/internal/diff", - "cmp/internal/function", - "cmp/internal/value", - ] - pruneopts = "UT" - revision = "3af367b6b30c263d47e8895973edcca9a49cf029" - version = "v0.2.0" - -[[projects]] - digest = "1:ca955a9cd5b50b0f43d2cc3aeb35c951473eeca41b34eb67507f1dbcc0542394" - name = "github.com/kr/pretty" - packages = ["."] - pruneopts = "UT" - revision = "73f6ac0b30a98e433b289500d779f50c1a6f0712" - version = "v0.1.0" - -[[projects]] - digest = "1:15b5cc79aad436d47019f814fde81a10221c740dc8ddf769221a65097fb6c2e9" - name = "github.com/kr/text" - packages = ["."] - pruneopts = "UT" - revision = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f" - version = "v0.1.0" - -[[projects]] - digest = "1:ff5ebae34cfbf047d505ee150de27e60570e8c394b3b8fdbb720ff6ac71985fc" - name = "github.com/matttproud/golang_protobuf_extensions" - packages = ["pbutil"] - pruneopts = "UT" - revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c" - version = "v1.0.1" - -[[projects]] - branch = "master" - digest = "1:71520363c3acc43c35a2a53f79f6c61f110a026326c8b16dbdd351164765feac" - name = "github.com/ncabatoff/fakescraper" - packages = ["."] - pruneopts = "UT" - revision = "15938421d91a82d197de7fc59aebcac65c43407d" - -[[projects]] - branch = "master" - digest = "1:9e33629d4ec9e9344715a54fa0a107f23ce800deb13999b0190df04c3540ccb5" - name = "github.com/ncabatoff/go-seq" - packages = ["seq"] - pruneopts = "UT" - revision = "b08ef85ed83364cba413c98a94bbd4169a0ce70b" - -[[projects]] - branch = "add-proc-status" - digest = "1:df5079557e0fa0fe9fb973f84fffd52e32ef26ada655900fdeea9b0848766c74" - name = "github.com/ncabatoff/procfs" - packages = [ - ".", - "internal/util", - "nfs", - "xfs", - ] - pruneopts = "UT" - revision = "e1a38cb53622f65e073c5e750e6498a44ebfbd2a" - -[[projects]] - digest = "1:b6221ec0f8903b556e127c449e7106b63e6867170c2d10a7c058623d086f2081" - name = "github.com/prometheus/client_golang" - packages = ["prometheus"] - pruneopts = "UT" - revision = "c5b7fccd204277076155f10851dad72b76a49317" - version = "v0.8.0" - -[[projects]] - branch = "master" - digest = "1:2d5cd61daa5565187e1d96bae64dbbc6080dacf741448e9629c64fd93203b0d4" - name = "github.com/prometheus/client_model" - packages = ["go"] - pruneopts = "UT" - revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f" - -[[projects]] - branch = "master" - digest = "1:63b68062b8968092eb86bedc4e68894bd096ea6b24920faca8b9dcf451f54bb5" - name = "github.com/prometheus/common" - packages = [ - "expfmt", - "internal/bitbucket.org/ww/goautoneg", - "model", - ] - pruneopts = "UT" - revision = "c7de2306084e37d54b8be01f3541a8464345e9a5" - -[[projects]] - branch = "master" - digest = "1:8c49953a1414305f2ff5465147ee576dd705487c35b15918fcd4efdc0cb7a290" - name = "github.com/prometheus/procfs" - packages = [ - ".", - "internal/util", - "nfs", - "xfs", - ] - pruneopts = "UT" - revision = "05ee40e3a273f7245e8777337fc7b46e533a9a92" - -[[projects]] - branch = "v1" - digest = "1:af715ae33cc1f5695c4b2a4e4b21d008add8802a99e15bb467ac7c32edb5000d" - name = "gopkg.in/check.v1" - packages = ["."] - pruneopts = "UT" - revision = "788fd78401277ebd861206a03c884797c6ec5541" - -[[projects]] - digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "UT" - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - version = "v2.2.1" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/google/go-cmp/cmp", - "github.com/google/go-cmp/cmp/cmpopts", - "github.com/ncabatoff/fakescraper", - "github.com/ncabatoff/go-seq/seq", - "github.com/ncabatoff/procfs", - "github.com/prometheus/client_golang/prometheus", - "gopkg.in/check.v1", - "gopkg.in/yaml.v2", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff -Nru prometheus-process-exporter-0.4.0/Gopkg.toml prometheus-process-exporter-0.4.0+ds/Gopkg.toml --- prometheus-process-exporter-0.4.0/Gopkg.toml 2018-09-03 22:00:30.000000000 +0000 +++ prometheus-process-exporter-0.4.0+ds/Gopkg.toml 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" -# -# [prune] -# non-go = false -# go-tests = true -# unused-packages = true - - -[[constraint]] - name = "github.com/google/go-cmp" - version = "0.2.0" - -[[constraint]] - branch = "master" - name = "github.com/ncabatoff/fakescraper" - -[[constraint]] - branch = "add-proc-status" - name = "github.com/ncabatoff/procfs" - -[[constraint]] - name = "github.com/prometheus/client_golang" - version = "0.8.0" - -[[constraint]] - branch = "v1" - name = "gopkg.in/check.v1" - -[[constraint]] - name = "gopkg.in/yaml.v2" - version = "2.2.1" - -[prune] - go-tests = true - unused-packages = true