Merge branch 'master' into ft-zmq-input

Author: kristrev

metadata_writer_zeromq.c

@@ -202,16 +202,11 @@ static void md_zeromq_writer_handle_munin(struct md_writer_zeromq *mwz,
                                    struct md_munin_event *mge)
 {
     char topic[8192];
-    char dataid[256];
 
     int retval;
 
     json_object_object_foreach(mge->json_blob, key, val) {
-        retval = snprintf(dataid, sizeof(dataid), "%s.%s",
-                mwz->topics[MD_ZMQ_TOPIC_SENSOR], key);
-        if (retval >= sizeof(dataid)) continue;
-
-        md_zeromq_writer_add_default_fields(mwz, val, mge->sequence, mge->tstamp, dataid);
+        md_zeromq_add_default_fields(mwz, val, mge->sequence, mge->tstamp, mwz->topics[MD_ZMQ_TOPIC_SENSOR]);
 
         retval = snprintf(topic, sizeof(topic), "%s.%s %s",
                 mwz->topics[MD_ZMQ_TOPIC_SENSOR],

metadata_writer_zeromq_monroe.c

@@ -42,24 +42,24 @@ const char *monroe_keys[MD_ZMQ_KEYS_MAX + 1] = {
     "InternalIPAddress",
     "Operator",
     "LAC",
-    "LTERSRP",
-    "LTEFrequency",
-    "LTERSSI",
-    "LTERSRQ",
-    "LTEBand",
-    "LTEPCI",
+    "RSRP",
+    "Frequency",
+    "RSSI",
+    "RSRQ",
+    "Band",
+    "PCI",
     "Mode",
     "NWMCCMNC",
     "RSCP",
     "RSSI",
     "SignalStrength",
-    "InterfaceId",
+    "ICCID",
     "InterfaceName",
     "Operator",
     "Altitude",
     "Longitude",
     "Latitude",
-    "NumberOfSatellites",
+    "SatelliteCount",
     "NMEA",
     "Speed",