From d7b11277301b50b16f3f5ec0043610bc8ddfa906 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Tue, 23 Jul 2019 18:21:38 +0200
Subject: [PATCH] InfluxdbWriter: skip non-resolvable tags

refs #7341
---
 lib/perfdata/influxdbwriter.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
index c5e3edb2f..39106c95f 100644
--- a/lib/perfdata/influxdbwriter.cpp
+++ b/lib/perfdata/influxdbwriter.cpp
@@ -258,8 +258,10 @@ void InfluxdbWriter::CheckResultHandlerWQ(const Checkable::Ptr& checkable, const
 			String missing_macro;
 			Value value = MacroProcessor::ResolveMacros(pair.second, resolvers, cr, &missing_macro);
 
-			if (!missing_macro.IsEmpty())
+			if (!missing_macro.IsEmpty()) {
+				tags->Remove(pair.first);
 				continue;
+			}
 
 			tags->Set(pair.first, value);
 		}