3 files changed, 0 insertions, 134 deletions
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 0ab745a73a00..619b34c6d847 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index 5dc4dfa4d6e5..c166ace90dfb 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,4 +1,3 @@
-AUX 01-default-settings-1.7.0.patch 7705 BLAKE2B 9de6d34f5b8bbf1edb193c794e844288c4560773691e9a7805c0068f1843b5b9fca675c52c0f2ff3bdbc21a0201a51f1f6bc88b420944f0c0d8ec995473abaf3 SHA512 ce5061a4e50662d37e7a09e0cbd80164f626e1384b10592e73f9d08cac87130174f860c38675b83067c9924def2f60371c7373cfc83757636be57956a9a43159
 AUX node_exporter-1.7.0.logrotate 147 BLAKE2B 4153888cc2bf626217dc998943208498dec58200ef110288bf910857592fead4fa1a3fc4996608adfd7f05d635381f9c183bc109c4f4f7f666c8b12910f1e141 SHA512 b1a893c4939b819e69a4afc8d8c6c2e965eb88a83e708878c757c533741ecd0b65d2dc052f54484f39ed8e52c96107c43050c5b1e37f22d8d0053b21b9b47701
 AUX node_exporter-1.7.0.service 518 BLAKE2B de602f92fe43955eca670e920b4a40b78e2bdfe08bccd78d7846c87eb10562fe9f53100f97e7d551fd00f021888feb92ce533f95f34dedd4f1d120594bf1d920 SHA512 6c6afe1cb7df07ff11b9b272dce5fe30f156ea71a03ccc24af07a7abd37688d642f0f435772d74c00ec14b23627a02ffac510e0338991b54754d664902d73516
 AUX node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4d9d82be36ea5e63d3b8fc2a861a61c62e2e899209f7293588e3e7532ffe52ecb9aab4773a3943168d5dd SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d
diff --git a/app-metrics/node_exporter/files/01-default-settings-1.7.0.patch b/app-metrics/node_exporter/files/01-default-settings-1.7.0.patch
deleted file mode 100644
index 114c6d23423e..000000000000
--- a/app-metrics/node_exporter/files/01-default-settings-1.7.0.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Grabbed from https://salsa.debian.org/go-team/packages/prometheus-node-exporter/-/tree/debian/sid/debian/patches
-Only thing changed is textFileDirectory default path adapted for Gentoo
-##############
-Description: Set defaults that make sense for Debian systems.
- We remove the deprecated options completely because they were introduced in
- 1.0.0 and were never part of a stable release, and are causing issues with
- the default value setting as it then makes the code consider it a usage and
- errors out when the legacy option is used.
-Forwarded: not-needed
----
- collector/filesystem_linux.go |  2 +-
- collector/netdev_common.go    | 22 +---------------------
- collector/systemd_linux.go    | 23 ++---------------------
- collector/textfile.go         |  2 +-
- 4 files changed, 5 insertions(+), 44 deletions(-)
-
---- a/collector/filesystem_linux.go
-+++ b/collector/filesystem_linux.go
-@@ -33,7 +33,7 @@ import (
- )
- 
- const (
--	defMountPointsExcluded = "^/(dev|proc|run/credentials/.+|sys|var/lib/docker/.+|var/lib/containers/storage/.+)($|/)"
-+	defMountPointsExcluded = "^/(dev|proc|run|sys|mnt|media|var/lib/docker/.+|var/lib/containers/storage/.+)($|/)"
- 	defFSTypesExcluded     = "^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$"
- )
- 
---- a/collector/netdev_common.go
-+++ b/collector/netdev_common.go
-@@ -32,9 +32,7 @@ import (
- 
- var (
- 	netdevDeviceInclude    = kingpin.Flag("collector.netdev.device-include", "Regexp of net devices to include (mutually exclusive to device-exclude).").String()
--	oldNetdevDeviceInclude = kingpin.Flag("collector.netdev.device-whitelist", "DEPRECATED: Use collector.netdev.device-include").Hidden().String()
--	netdevDeviceExclude    = kingpin.Flag("collector.netdev.device-exclude", "Regexp of net devices to exclude (mutually exclusive to device-include).").String()
--	oldNetdevDeviceExclude = kingpin.Flag("collector.netdev.device-blacklist", "DEPRECATED: Use collector.netdev.device-exclude").Hidden().String()
-+	netdevDeviceExclude    = kingpin.Flag("collector.netdev.device-exclude", "Regexp of net devices to exclude (mutually exclusive to device-include).").Default("^lo$").String()
- 	netdevAddressInfo      = kingpin.Flag("collector.netdev.address-info", "Collect address-info for every device").Bool()
- 	netdevDetailedMetrics  = kingpin.Flag("collector.netdev.enable-detailed-metrics", "Use (incompatible) metric names that provide more detailed stats on Linux").Bool()
- )
-@@ -55,24 +53,6 @@ func init() {
- 
- // NewNetDevCollector returns a new Collector exposing network device stats.
- func NewNetDevCollector(logger log.Logger) (Collector, error) {
--	if *oldNetdevDeviceInclude != "" {
--		if *netdevDeviceInclude == "" {
--			level.Warn(logger).Log("msg", "--collector.netdev.device-whitelist is DEPRECATED and will be removed in 2.0.0, use --collector.netdev.device-include")
--			*netdevDeviceInclude = *oldNetdevDeviceInclude
--		} else {
--			return nil, errors.New("--collector.netdev.device-whitelist and --collector.netdev.device-include are mutually exclusive")
--		}
--	}
--
--	if *oldNetdevDeviceExclude != "" {
--		if *netdevDeviceExclude == "" {
--			level.Warn(logger).Log("msg", "--collector.netdev.device-blacklist is DEPRECATED and will be removed in 2.0.0, use --collector.netdev.device-exclude")
--			*netdevDeviceExclude = *oldNetdevDeviceExclude
--		} else {
--			return nil, errors.New("--collector.netdev.device-blacklist and --collector.netdev.device-exclude are mutually exclusive")
--		}
--	}
--
- 	if *netdevDeviceExclude != "" && *netdevDeviceInclude != "" {
- 		return nil, errors.New("device-exclude & device-include are mutually exclusive")
- 	}
---- a/collector/systemd_linux.go
-+++ b/collector/systemd_linux.go
-@@ -18,7 +18,6 @@ package collector
- 
- import (
- 	"context"
--	"errors"
- 	"fmt"
- 	"math"
- 	"regexp"
-@@ -47,13 +46,11 @@ var (
- 		systemdUnitIncludeSet = true
- 		return nil
- 	}).String()
--	oldSystemdUnitInclude = kingpin.Flag("collector.systemd.unit-whitelist", "DEPRECATED: Use --collector.systemd.unit-include").Hidden().String()
- 	systemdUnitExcludeSet bool
--	systemdUnitExclude    = kingpin.Flag("collector.systemd.unit-exclude", "Regexp of systemd units to exclude. Units must both match include and not match exclude to be included.").Default(".+\\.(automount|device|mount|scope|slice)").PreAction(func(c *kingpin.ParseContext) error {
-+	systemdUnitExclude    = kingpin.Flag("collector.systemd.unit-exclude", "Regexp of systemd units to exclude. Units must both match include and not match exclude to be included.").Default(".+\\.(automount|device|mount|scope|slice|target)").PreAction(func(c *kingpin.ParseContext) error {
- 		systemdUnitExcludeSet = true
- 		return nil
- 	}).String()
--	oldSystemdUnitExclude  = kingpin.Flag("collector.systemd.unit-blacklist", "DEPRECATED: Use collector.systemd.unit-exclude").Hidden().String()
- 	systemdPrivate         = kingpin.Flag("collector.systemd.private", "Establish a private, direct connection to systemd without dbus (Strongly discouraged since it requires root. For testing purposes only).").Hidden().Bool()
- 	enableTaskMetrics      = kingpin.Flag("collector.systemd.enable-task-metrics", "Enables service unit tasks metrics unit_tasks_current and unit_tasks_max").Bool()
- 	enableRestartsMetrics  = kingpin.Flag("collector.systemd.enable-restarts-metrics", "Enables service unit metric service_restart_total").Bool()
-@@ -83,7 +80,7 @@ type systemdCollector struct {
- var unitStatesName = []string{"active", "activating", "deactivating", "inactive", "failed"}
- 
- func init() {
--	registerCollector("systemd", defaultDisabled, NewSystemdCollector)
-+	registerCollector("systemd", defaultEnabled, NewSystemdCollector)
- }
- 
- // NewSystemdCollector returns a new Collector exposing systemd statistics.
-@@ -133,22 +130,6 @@ func NewSystemdCollector(logger log.Logg
- 		prometheus.BuildFQName(namespace, subsystem, "version"),
- 		"Detected systemd version", []string{"version"}, nil)
- 
--	if *oldSystemdUnitExclude != "" {
--		if !systemdUnitExcludeSet {
--			level.Warn(logger).Log("msg", "--collector.systemd.unit-blacklist is DEPRECATED and will be removed in 2.0.0, use --collector.systemd.unit-exclude")
--			*systemdUnitExclude = *oldSystemdUnitExclude
--		} else {
--			return nil, errors.New("--collector.systemd.unit-blacklist and --collector.systemd.unit-exclude are mutually exclusive")
--		}
--	}
--	if *oldSystemdUnitInclude != "" {
--		if !systemdUnitIncludeSet {
--			level.Warn(logger).Log("msg", "--collector.systemd.unit-whitelist is DEPRECATED and will be removed in 2.0.0, use --collector.systemd.unit-include")
--			*systemdUnitInclude = *oldSystemdUnitInclude
--		} else {
--			return nil, errors.New("--collector.systemd.unit-whitelist and --collector.systemd.unit-include are mutually exclusive")
--		}
--	}
- 	level.Info(logger).Log("msg", "Parsed flag --collector.systemd.unit-include", "flag", *systemdUnitInclude)
- 	systemdUnitIncludePattern := regexp.MustCompile(fmt.Sprintf("^(?:%s)$", *systemdUnitInclude))
- 	level.Info(logger).Log("msg", "Parsed flag --collector.systemd.unit-exclude", "flag", *systemdUnitExclude)
---- a/collector/textfile.go
-+++ b/collector/textfile.go
-@@ -33,7 +33,7 @@ import (
- )
- 
- var (
--	textFileDirectory = kingpin.Flag("collector.textfile.directory", "Directory to read text files with metrics from.").Default("").String()
-+	textFileDirectory = kingpin.Flag("collector.textfile.directory", "Directory to read text files with metrics from.").Default("/var/lib/node_exporter").String()
- 	mtimeDesc         = prometheus.NewDesc(
- 		"node_textfile_mtime_seconds",
- 		"Unixtime mtime of textfiles successfully read.",