InfluxdbWriter: Log a warning about soon-to-be-removed socket_timeout attribute for...

refs #5460
refs #5469
refs #5504

diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
index 0a7f506fdabb816709b763f73ed68e1e6597fda3..191748c5602f3c2e14597f6fc18081ed0763a879 100644 (file)
--- 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
index e0a149c3a1503a737fba9396f7ddcfe88ef6eb1c..2d455c1f83a1e68a28b0b6dadcd399839237d757 100644 (file)
--- a/lib/perfdata/influxdbwriter.hpp
+++ b/lib/perfdata/influxdbwriter.hpp
@@ -49,6 +49,7 @@ public:
 
        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
index a2bf1924802258209bdeb63ba356b6100035a6bc..94188471f6426dc8e15d833a77b4d88daffc136f 100644 (file)
--- 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 {