From 529c8e014f3d9802afde43377e8238049abf9601 Mon Sep 17 00:00:00 2001 From: arstercz Date: Sun, 23 Apr 2023 13:07:16 +0000 Subject: [PATCH 1/2] Makefile change --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 07d3ad2ea0cec..9982e6f82f2ef 100644 --- a/Makefile +++ b/Makefile @@ -29,10 +29,10 @@ else ifneq ($(findstring -rc,$(tag)),) tar_version := $(version)~$(rc) else version := $(tag:v%=%) - rpm_version := $(version)-2 - rpm_iteration := 2 - deb_version := $(version)-2 - deb_iteration := 2 + rpm_version := $(version)-3 + rpm_iteration := 3 + deb_version := $(version)-3 + deb_iteration := 3 tar_version := $(version) endif From 190653fdfe483ca66532d5331e8ce2767640f696 Mon Sep 17 00:00:00 2001 From: arstercz Date: Wed, 20 Dec 2023 04:42:14 +0000 Subject: [PATCH 2/2] fix one_enable logic --- scripts/telegraf-discover | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/telegraf-discover b/scripts/telegraf-discover index 20fc2621a7824..60acff1480d12 100755 --- a/scripts/telegraf-discover +++ b/scripts/telegraf-discover @@ -2962,7 +2962,7 @@ sub gen_conf_for_one_enable { my $counter = 0; - $secs->{ignore} = _one_enable_white($type); + $secs->{ignore} = 0 if _one_enable_white($type); if (defined($secs->{ignore})) { if ($secs->{ignore} > 0) {