I'd like to propose the following patch:

diff --git a/debian/patches/0001-Debian-defaults.patch
b/debian/patches/0001-Debian-defaults.patch
index f8d93053..9f3fd310 100644
--- a/debian/patches/0001-Debian-defaults.patch
+++ b/debian/patches/0001-Debian-defaults.patch
@@ -1,6 +1,6 @@
 From: Martina Ferrari <t...@debian.org>
 Date: Mon, 13 Nov 2023 13:49:27 +0100
-Subject: Set defaults that make sense for Debian systems
+Subject: Remove deprecated options and set sane defaults for Debian

 Forwarded: not-needed

@@ -9,7 +9,6 @@ We remove the deprecated options completely because they
were introduced in
 the default value setting as it then makes the code consider it a usage and
 errors out when the legacy option is used.

-This patch also enables the systemd collector by default.
 ---
  collector/filesystem_linux.go |  2 +-
  collector/netdev_common.go    | 20 --------------------
@@ -17,11 +16,9 @@ This patch also enables the systemd collector by default.
  collector/textfile.go         |  2 +-
  4 files changed, 4 insertions(+), 43 deletions(-)

-diff --git a/collector/filesystem_linux.go b/collector/filesystem_linux.go
-index 1d0c849..8e4971d 100644
 --- a/collector/filesystem_linux.go
 +++ b/collector/filesystem_linux.go
-@@ -33,7 +33,7 @@ import (
+@@ -33,7 +33,7 @@
  )

  const (
@@ -30,11 +27,9 @@ index 1d0c849..8e4971d 100644
        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)$"
...skipping...
+@@ -47,13 +46,11 @@
                systemdUnitIncludeSet = true
                return nil
        }).String()
@@ -96,16 +89,7 @@ index e0d35bc..6f47c18 100644
        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()
-@@ -84,7 +81,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.
-@@ -134,22 +131,6 @@ func NewSystemdCollector(logger log.Logger)
(Collector, error) {
+@@ -134,22 +131,6 @@
                prometheus.BuildFQName(namespace, subsystem, "version"),
                "Detected systemd version", []string{"version"}, nil)

@@ -128,11 +112,9 @@ index e0d35bc..6f47c18 100644
        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)
-diff --git a/collector/textfile.go b/collector/textfile.go
-index 4f1fd0b..dd6d91e 100644
 --- a/collector/textfile.go
 +++ b/collector/textfile.go
-@@ -33,7 +33,7 @@ import (
+@@ -33,7 +33,7 @@
  )

  var (

On Tue, Nov 26, 2024 at 11:09 AM Debian Bug Tracking System <
ow...@bugs.debian.org> wrote:

> Thank you for filing a new Bug report with Debian.
>
> You can follow progress on this Bug here: 1088306:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1088306.
>
> This is an automatically generated reply to let you know your message
> has been received.
>
> Your message is being forwarded to the package maintainers and other
> interested parties for their attention; they will reply in due course.
>
> As you requested using X-Debbugs-CC, your message was also forwarded to
>   chrisk...@gmail.com
> (after having been given a Bug report number, if it did not have one).
>
> Your message has been sent to the package maintainer(s):
>  Debian Go Packaging Team <team+pkg...@tracker.debian.org>
>
> If you wish to submit further information on this problem, please
> send it to 1088...@bugs.debian.org.
>
> Please do not send mail to ow...@bugs.debian.org unless you wish
> to report a problem with the Bug-tracking system.
>
> --
> 1088306: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1088306
> Debian Bug Tracking System
> Contact ow...@bugs.debian.org with problems
>

Reply via email to