[mon] Update monitoring format, add tags

Author: kostorr

src/CommandLineUtilities/Program.h

@@ -64,7 +64,7 @@ class Program : public AliceO2::Common::Program
   InfoLogger::InfoLogger mLogger;
   InfoLogger::InfoLogger::Severity mLogLevel = InfoLogger::InfoLogger::Severity::Info;
 
-  const std::string MONITORING_URI = "stdout://";
+  const std::string MONITORING_URI = "influxdb-stdout://";
 };
 
 } // namespace CommandLineUtilities

src/CommandLineUtilities/ProgramMetrics.cxx

@@ -104,14 +104,15 @@ class ProgramMetrics : public Program
       uint32_t totalPacketsPerSecond = bar2->getTotalPacketsPerSecond(0);
 
       if (mOptions.monitoring) {
-        monitoring->send(Metric{ std::to_string(i), "card" }
-                           .addValue(CardType::toString(card.cardType), "type")
+        monitoring->send(Metric{ "card" }
                            .addValue(card.pciAddress.toString(), "pciAddress")
                            .addValue(temperature, "temperature")
                            .addValue(dropped, "droppedPackets")
                            .addValue(ctpClock, "ctpClock")
                            .addValue(localClock, "localClock")
-                           .addValue((int)totalPacketsPerSecond, "totalPacketsPerSecond"));
+                           .addValue((int)totalPacketsPerSecond, "totalPacketsPerSecond")
+                           .addTag(tags::Key::ID, i)
+                           .addTag(tags::Key::Type, tags::Value::CRU));
 
       } else if (mOptions.jsonOut) {
         pt::ptree cardNode;

src/CommandLineUtilities/ProgramStatus.cxx

@@ -110,18 +110,22 @@ class ProgramStatus : public Program
 
       /* GENERAL PARAMETERS */
       if (mOptions.monitoring) {
-        monitoring->send(Metric{ cardIdString, "CRORC" }
+        monitoring->send(Metric{ "CRORC" }
+                           .addValue(card.pciAddress.toString(), "pciAddress")
                            .addValue(qsfpEnabled, "qsfp")
                            .addValue(offset, "offset")
                            .addValue(timeFrameDetectionEnabled, "timeFrameDetection")
-                           .addValue(reportInfo.timeFrameLength, "timeFrameLength"));
+                           .addValue(reportInfo.timeFrameLength, "timeFrameLength")
+                           .addTag(tags::Key::ID, card.sequenceId)
+                           .addTag(tags::Key::Type, tags::Value::CRORC));
       } else if (mOptions.jsonOut) {
         root.put("qsfp", qsfpEnabled);
         root.put("offset", offset);
         root.put("timeFrameDetection", timeFrameDetectionEnabled);
         root.put("timeFrameLength", reportInfo.timeFrameLength);
       } else if (mOptions.csvOut) {
         auto csvLine = std::string(",,,") + qsfpEnabled + "," + offset + "," + timeFrameDetectionEnabled + "," + std::to_string(reportInfo.timeFrameLength) + "\n";
+
         std::cout << csvLine;
       } else {
         std::cout << "-----------------------------" << std::endl;
@@ -142,9 +146,12 @@ class ProgramStatus : public Program
         float opticalPower = link.opticalPower;
 
         if (mOptions.monitoring) {
-          monitoring->send(Metric{ id, "link" }
+          monitoring->send(Metric{ "link" }
+                             .addValue(card.pciAddress.toString(), "pciAddress")
                              .addValue(linkStatus, "status")
-                             .addValue(opticalPower, "opticalPower"));
+                             .addValue(opticalPower, "opticalPower")
+                             .addTag(tags::Key::CRORC, card.sequenceId)
+                             .addTag(tags::Key::ID, id));
         } else if (mOptions.jsonOut) {
           pt::ptree linkNode;
 
@@ -188,10 +195,13 @@ class ProgramStatus : public Program
 
       /* GENERAL PARAMETERS */
       if (mOptions.monitoring) {
-        monitoring->send(Metric{ cardIdString, "CRU" }
+        monitoring->send(Metric{ "CRU" }
+                           .addValue(card.pciAddress.toString(), "pciAddress")
                            .addValue(clock, "clock")
                            .addValue(offset, "offset")
-                           .addValue(userLogic, "userLogic"));
+                           .addValue(userLogic, "userLogic")
+                           .addTag(tags::Key::ID, card.sequenceId)
+                           .addTag(tags::Key::Type, tags::Value::CRU));
       } else if (mOptions.jsonOut) {
         root.put("clock", clock);
         root.put("offset", offset);
@@ -249,7 +259,8 @@ class ProgramStatus : public Program
         float opticalPower = link.opticalPower;
 
         if (mOptions.monitoring) {
-          monitoring->send(Metric{ globalId, "link" }
+          monitoring->send(Metric{ "link" }
+                             .addValue(card.pciAddress.toString(), "pciAddress")
                              .addValue(gbtTxRxMode, "gbtMode")
                              .addValue(loopback, "loopback")
                              .addValue(gbtMux, "gbtMux")
@@ -258,7 +269,9 @@ class ProgramStatus : public Program
                              .addValue(rxFreq, "rxFreq")
                              .addValue(txFreq, "txFreq")
                              .addValue(linkStatus, "status")
-                             .addValue(opticalPower, "opticalPower"));
+                             .addValue(opticalPower, "opticalPower")
+                             .addTag(tags::Key::CRU, card.sequenceId)
+                             .addTag(tags::Key::ID, globalId));
         } else if (mOptions.jsonOut) {
           pt::ptree linkNode;