From 7bdf07883b80e4a5ae1f46670b15d3fb7a0134ec Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Tue, 8 Dec 2020 14:53:41 +0200 Subject: [PATCH] app/{vmalert,vmagent}: skip empty values in `-remoteWrite.label` and `-label` lists --- app/vmagent/remotewrite/relabel.go | 3 +++ app/vmalert/main.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/vmagent/remotewrite/relabel.go b/app/vmagent/remotewrite/relabel.go index 0fe16e6b48..8756941734 100644 --- a/app/vmagent/remotewrite/relabel.go +++ b/app/vmagent/remotewrite/relabel.go @@ -65,6 +65,9 @@ type relabelConfigs struct { func initLabelsGlobal() { labelsGlobal = nil for _, s := range *unparsedLabelsGlobal { + if len(s) == 0 { + continue + } n := strings.IndexByte(s, '=') if n < 0 { logger.Fatalf("missing '=' in `-remoteWrite.label`. It must contain label in the form `name=value`; got %q", s) diff --git a/app/vmalert/main.go b/app/vmalert/main.go index a46715206e..587c0d0dd4 100644 --- a/app/vmalert/main.go +++ b/app/vmalert/main.go @@ -160,6 +160,9 @@ func newManager(ctx context.Context) (*manager, error) { manager.rr = rr for _, s := range *externalLabels { + if len(s) == 0 { + continue + } n := strings.IndexByte(s, '=') if n < 0 { return nil, fmt.Errorf("missing '=' in `-label`. It must contain label in the form `name=value`; got %q", s)