Zabbix: multiple metrics support; connection issue resolved (#16)

Author: awegrzyn

README.md

@@ -156,6 +156,8 @@ Metric can be sent by one of the following ways:
    + `send(T value, std::string name)`
    + `sendTagged(T value, std::string name, std::vector<Tag>&& tags)`
    + `sendTimed(T value, std::string name, std::chrono::time_point<std::chrono::system_clock>& timestamp)`
+3. Sending multiple metrics (only InfluxDB and Zabbix are supported, other backends fallback into sending metrics one by one)
+   + `void send(std::string name, std::vector<Metric>&& metrics)`
 
 ## Derived metrics
 The module can calculate derived metrics. To do so, use `addDerivedMetric(std::string name, DerivedMetricMode mode)` with one of two available modes:
@@ -303,6 +305,17 @@ collector->send(10, "myMetric");
 collector->send({10, "myMetric"});
 ```
 
+### Sending multiple metrics at once - examples/8-Multiple.cxx
+```cpp
+// configure monitoring (only once per process), pass configuration path as parameter
+Monitoring::Configure("file:///home/awegrzyn/hackathon/Monitoring/examples/config-default.ini");
+
+// Send two metrics at once as a single measurement
+Monitoring::Get().send("measurementName", {
+  {10, "myMetricInt"},
+  {10.10, "myMetricFloat"}
+});
+```
 
 ## System monitoring, server-side backends installation and configuration
 This guide explains manual installation. For `ansible` deployment see [AliceO2Group/system-configuration](https://gitlab.cern.ch/AliceO2Group/system-configuration/tree/master/ansible) gitlab repo.

include/Monitoring/Backend.h

@@ -32,6 +32,9 @@ class Backend
     /// Sends metric via backend
     virtual void send(const Metric& metric) = 0;
 
+    /// Sends multiple metrics (if supported), otherwise falls back into sending single metrics
+    virtual void sendMultiple(std::string measurement, std::vector<Metric>&& metrics) = 0;
+
     /// Sets a tag
     virtual void addGlobalTag(std::string name, std::string value) = 0;
 };

include/Monitoring/Collector.h

@@ -56,7 +56,7 @@ class Collector
     /// Sends a metric to all avaliabes backends
     /// If metric has been added to DerivedMetric the derived metric is calculated (see addDerivedMetric method)
     /// \param metric            r-value to metric object
-    void send(Metric&& metric, std::size_t skipBackend = -1);
+    void send(Metric&& metric);
 
     /// Sends multiple metrics to as a single measurement
     /// If it's not supported by backend it fallbacks into sending multiple metrics

src/Backends/ApMonBackend.cxx

@@ -42,6 +42,16 @@ void ApMonBackend::addGlobalTag(std::string name, std::string value)
   entity += value;
 }
 
+void ApMonBackend::sendMultiple(std::string measurement, std::vector<Metric>&& metrics)
+{
+  for (auto& m : metrics) {
+    std::string tempName = m.getName();
+    m.setName(measurement + "-" + m.getName());
+    send(m);
+    m.setName(tempName);
+  }
+}
+
 void ApMonBackend::send(const Metric& metric)
 {
   std::string name = metric.getName();

src/Backends/ApMonBackend.h

@@ -42,6 +42,12 @@ class ApMonBackend final : public Backend
     /// \param metric           reference to metric object:
     void send(const Metric& metric) override;
 
+    /// Sends multiple metric in single packet
+    /// Not supported by the backend therefore it falls back to sending metric one by one
+    /// \param name     measurement name
+    /// \param metrics  list of metrics
+    void sendMultiple(std::string measurement, std::vector<Metric>&& metrics) override;
+
     /// Extends entity value
     /// \param name             tag name (unused)
     /// \param value            tag value that is concatenated to entity string

src/Backends/Flume.cxx

@@ -45,6 +45,16 @@ std::string Flume::metricToJson(const Metric& metric)
     return s;
 }
 
+void Flume::sendMultiple(std::string measurement, std::vector<Metric>&& metrics)
+{
+  for (auto& m : metrics) {
+    std::string tempName = m.getName();
+    m.setName(measurement + "-" + m.getName());
+    send(m);
+    m.setName(tempName);
+  }
+}
+
 void Flume::send(const Metric& metric)
 {
     mTransport->send(metricToJson(metric));

src/Backends/Flume.h

@@ -37,7 +37,7 @@ class Flume final : public Backend
     /// Default destructor
     ~Flume() = default;
 
-    // Convert timestamp to unsigned long as required by Flume
+    /// Convert timestamp to unsigned long as required by Flume
     /// \param 		 chrono time_point timestamp
     /// \return  	 timestamp in nanoseconds
     inline unsigned long convertTimestamp(const std::chrono::time_point<std::chrono::system_clock>& timestamp);
@@ -46,6 +46,13 @@ class Flume final : public Backend
     /// \param metric    reference to metric object
     void send(const Metric& metric) override;
 
+    /// Sends multiple metric in single packet
+    /// Not supported by the backend therefore it falls back to sending metric one by one
+    /// TODO: changed required in Flume Source
+    /// \param name     measurement name
+    /// \param metrics  list of metrics 
+    void sendMultiple(std::string measurement, std::vector<Metric>&& metrics) override;
+
     /// Adds tag
     /// \param name      tag name
     /// \param value     tag value

src/Backends/InfluxDB.cxx

@@ -49,11 +49,11 @@ void InfluxDB::escape(std::string& escaped)
   boost::replace_all(escaped, " ", "\\ ");
 }
 
-void InfluxDB::sendMultiple(std::string name, std::vector<Metric>&& metrics)
+void InfluxDB::sendMultiple(std::string measurement, std::vector<Metric>&& metrics)
 {
-  escape(name);
+  escape(measurement);
   std::stringstream convert;
-  convert << name << "," << tagSet << " ";
+  convert << measurement << "," << tagSet << " ";
 
   for (const auto& metric : metrics) {
     std::string value = boost::lexical_cast<std::string>(metric.getValue());

src/Backends/InfluxDB.h

@@ -53,7 +53,7 @@ class InfluxDB final : public Backend
     /// Sends multiple values in single measurement
     /// \param name 	measurement name
     /// \param metrics 	list of metrics
-    void sendMultiple(std::string name, std::vector<Metric>&& metrics);
+    void sendMultiple(std::string measurement, std::vector<Metric>&& metrics);
 
     /// Adds tag
     /// \param name      tag name

src/Backends/InfoLoggerBackend.cxx

@@ -37,6 +37,16 @@ void InfoLoggerBackend::addGlobalTag(std::string name, std::string value)
   tagString += name + "=" + value;
 }
 
+void InfoLoggerBackend::sendMultiple(std::string measurement, std::vector<Metric>&& metrics)
+{
+  for (auto& m : metrics) {
+    std::string tempName = m.getName();
+    m.setName(measurement + "-" + m.getName());
+    send(m);
+    m.setName(tempName);
+  }
+}
+
 void InfoLoggerBackend::send(const Metric& metric)
 {
   std::string metricTags{};