From 180879e1c4bb0b9430d46ff3936850007dc78774 Mon Sep 17 00:00:00 2001 From: Johannes Ziemke Date: Tue, 2 May 2023 12:56:23 +0200 Subject: [PATCH] Use go-runit fork, mark collector as deprecated Signed-off-by: Johannes Ziemke --- README.md | 2 +- collector/runit.go | 4 +++- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ba6e1942..035e49ee 100644 --- a/README.md +++ b/README.md @@ -195,7 +195,6 @@ network_route | Exposes the routing table as metrics | Linux perf | Exposes perf based metrics (Warning: Metrics are dependent on kernel configuration and settings). | Linux processes | Exposes aggregate process statistics from `/proc`. | Linux qdisc | Exposes [queuing discipline](https://en.wikipedia.org/wiki/Network_scheduler#Linux_kernel) statistics | Linux -runit | Exposes service status from [runit](http://smarden.org/runit/). | _any_ slabinfo | Exposes slab statistics from `/proc/slabinfo`. Note that permission of `/proc/slabinfo` is usually 0400, so set it appropriately. | Linux supervisord | Exposes service status from [supervisord](http://supervisord.org/). | _any_ sysctl | Expose sysctl values from `/proc/sys`. Use `--collector.sysctl.include(-info)` to configure. | Linux @@ -211,6 +210,7 @@ These collectors are deprecated and will be removed in the next major release. Name | Description | OS ---------|-------------|---- ntp | Exposes local NTP daemon health to check [time](./docs/TIME.md) | _any_ +runit | Exposes service status from [runit](http://smarden.org/runit/). | _any_ ### Perf Collector diff --git a/collector/runit.go b/collector/runit.go index 6b80b535..3cae657c 100644 --- a/collector/runit.go +++ b/collector/runit.go @@ -20,8 +20,8 @@ import ( "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" + "github.com/prometheus-community/go-runit/runit" "github.com/prometheus/client_golang/prometheus" - "github.com/soundcloud/go-runit/runit" ) var runitServiceDir = kingpin.Flag("collector.runit.servicedir", "Path to runit service directory.").Default("/etc/service").String() @@ -46,6 +46,8 @@ func NewRunitCollector(logger log.Logger) (Collector, error) { labelNames = []string{"service"} ) + level.Warn(logger).Log("msg", "This collector is deprecated and will be removed in the next major version release.") + return &runitCollector{ state: typedDesc{prometheus.NewDesc( prometheus.BuildFQName(namespace, subsystem, "state"), diff --git a/go.mod b/go.mod index f3131fbe..25c6ef9d 100644 --- a/go.mod +++ b/go.mod @@ -21,13 +21,13 @@ require ( github.com/mdlayher/netlink v1.7.2 github.com/mdlayher/wifi v0.0.0-20220330172155-a44c70b6d3c8 github.com/opencontainers/selinux v1.11.0 + github.com/prometheus-community/go-runit v0.0.0-20150630195641-06ad41a06c4a github.com/prometheus/client_golang v1.15.0 github.com/prometheus/client_model v0.3.0 github.com/prometheus/common v0.42.0 github.com/prometheus/exporter-toolkit v0.9.1 github.com/prometheus/procfs v0.9.0 github.com/safchain/ethtool v0.3.0 - github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/sys v0.7.0 howett.net/plist v1.0.0 diff --git a/go.sum b/go.sum index 9f159cea..8fb5d180 100644 --- a/go.sum +++ b/go.sum @@ -86,6 +86,8 @@ github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaL github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus-community/go-runit v0.0.0-20150630195641-06ad41a06c4a h1:RRMBdmAhAHoF+ZQYQSlH/yVSqOUZFHsfe92nRO1ycsA= +github.com/prometheus-community/go-runit v0.0.0-20150630195641-06ad41a06c4a/go.mod h1:g+x8kfgGy197p0W98FEulT7GgCwkvkQ5Z6BoXtbQqE8= github.com/prometheus/client_golang v1.15.0 h1:5fCgGYogn0hFdhyhLbw7hEsWxufKtY9klyvdNfFlFhM= github.com/prometheus/client_golang v1.15.0/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= @@ -102,8 +104,6 @@ github.com/safchain/ethtool v0.3.0 h1:gimQJpsI6sc1yIqP/y8GYgiXn/NjgvpM0RNoWLVVmP github.com/safchain/ethtool v0.3.0/go.mod h1:SA9BwrgyAqNo7M+uaL6IYbxpm5wk3L7Mm6ocLW+CJUs= github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973 h1:GfSdC6wKfTGcgCS7BtzF5694Amne1pGCSTY252WhlEY= github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973/go.mod h1:G81aIFAMS9ECrwBYR9YxhlPjWgrItd+Kje78O6+uqm8= -github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a h1:os5OBNhwOwybXZMNLqT96XqtjdTtwRFw2w08uluvNeI= -github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a/go.mod h1:LeFCbQYJ3KJlPs/FvPz2dy1tkpxyeNESVyCNNzRXFR0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=