InfluxdbWriter: Log a warning about soon-to-be-removed socket_timeout…

… attribute for 2.7.x refs #5460 refs #5469 refs #5504
Icinga · Aug 17, 2017 · 6c577d6 · 6c577d6
1 parent d052e94
commit 6c577d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
@@ -541,3 +541,7 @@ void InfluxdbWriter::ValidateServiceTemplate(const Dictionary::Ptr& value, const
 	}
 }
 
+void InfluxdbWriter::ValidateSocketTimeout(int, const ValidationUtils&)
+{
+	Log(LogWarning, "InfluxdbWriter", "'socket_timeout' option has no effect and will be removed in Icinga 2 v2.8");
+}
diff --git a/lib/perfdata/influxdbwriter.hpp b/lib/perfdata/influxdbwriter.hpp
@@ -49,6 +49,7 @@ class InfluxdbWriter : public ObjectImpl<InfluxdbWriter>
 
 	virtual void ValidateHostTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override;
 	virtual void ValidateServiceTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override;
+	virtual void ValidateSocketTimeout(int value, const ValidationUtils& utils) override;
 
 protected:
 	virtual void OnConfigLoaded(void) override;

diff --git a/lib/perfdata/influxdbwriter.ti b/lib/perfdata/influxdbwriter.ti
@@ -90,6 +90,9 @@ class InfluxdbWriter : ConfigObject
 	[config] int flush_threshold {
 		default {{{ return 1024; }}}
 	};
+	[config] int socket_timeout {
+		default {{{ return 5; }}}
+	};
 };
 
 validator InfluxdbWriter {
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     }
+    void InfluxdbWriter::ValidateSocketTimeout(int, const ValidationUtils&)
+    {
+    	Log(LogWarning, "InfluxdbWriter", "'socket_timeout' option has no effect and will be removed in Icinga 2 v2.8");
+    }