NMS-16948: Add additional tags for latency resource

features/collection/api/src/main/java/org/opennms/netmgt/collection/api/CollectionResource.java

@@ -24,6 +24,9 @@
 import org.opennms.netmgt.collection.support.DefaultTimeKeeper;
 import org.opennms.netmgt.model.ResourcePath;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>CollectionResource interface.</p>
  *
@@ -95,4 +98,9 @@ public interface CollectionResource extends ResourceIdentifier, CollectionVisita
      */
     TimeKeeper getTimeKeeper();
 
+    // Can be used to add additional tags required by TimeSeries like Prometheus
+    default Map<String, String> getTags() {
+        return new HashMap<>();
+    }
+
 }

features/collection/api/src/main/java/org/opennms/netmgt/collection/api/LatencyCollectionResource.java

@@ -41,6 +41,8 @@ public class LatencyCollectionResource implements CollectionResource {
     private final String m_location;
     private final Map<AttributeGroupType, AttributeGroup> m_attributeGroups = Maps.newLinkedHashMap();
 
+    private final Map<String, String> m_tags = Maps.newHashMap();
+
     /**
      * <p>Constructor for LatencyCollectionResource.</p>
      *
@@ -54,6 +56,13 @@ public LatencyCollectionResource(String serviceName, String ipAddress, String lo
         m_location = location;
     }
 
+    public LatencyCollectionResource(String serviceName, String ipAddress, String location, Map<String, String> tags) {
+        m_serviceName = serviceName;
+        m_ipAddress = ipAddress;
+        m_location = location;
+        m_tags.putAll(tags);
+    }
+
     /**
      * <p>getInstance</p>
      *
@@ -197,4 +206,9 @@ public ResourcePath getParent() {
     public TimeKeeper getTimeKeeper() {
         return null;
     }
+
+    @Override
+    public Map<String, String> getTags() {
+        return m_tags;
+    }
 }

features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java

@@ -112,6 +112,7 @@ public Set<Tag> load(final CollectionResource resource) {
 
             // create tags for categories
             nodeOptional.ifPresent(onmsNode -> mapCategories(tags, onmsNode));
+            mapResourceTags(configuredMetaTags, tags, resource);
             return tags;
         });
     }
@@ -125,6 +126,22 @@ private void mapCategories(final Set<Tag> tags, final OnmsNode node) {
         }
     }
 
+    private void mapResourceTags(final Map<String, String> configuredMetaTags, final Set<Tag> tags,
+                                 final CollectionResource resource) {
+
+        for (Map.Entry<String, String> entry : configuredMetaTags.entrySet()) {
+            if (entry.getValue().contains("resource:label") && resource.getInterfaceLabel() != null) {
+                tags.add(new ImmutableTag(entry.getKey(), resource.getInterfaceLabel()));
+            }
+            if (entry.getValue().contains("resource:node_label") && resource.getTags().get("node_label") != null) {
+                tags.add(new ImmutableTag(entry.getKey(), resource.getTags().get("node_label")));
+            }
+            if (entry.getValue().contains("resource:location") && resource.getTags().get("location") != null) {
+                tags.add(new ImmutableTag(entry.getKey(), resource.getTags().get("location")));
+            }
+        }
+    }
+
     private Optional<OnmsNode> getNode(String nodeCriteria) {
         if (nodeCriteria == null || nodeCriteria.trim().isEmpty()) {
             return Optional.empty();

opennms-services/src/main/java/org/opennms/netmgt/poller/pollables/LatencyStoringServiceMonitorAdaptor.java

@@ -24,6 +24,7 @@
 import java.io.File;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -152,7 +153,11 @@ private CollectionSet getCollectionSet(MonitoredService service, Map<String, Num
         //     This happens whether or not storeByGroup is enabled.
         // 2) If multiple entries are present, the DSs are created in the same order that they
         //    appear in the map
-        LatencyCollectionResource latencyResource = new LatencyCollectionResource(service.getSvcName(), service.getIpAddr(), service.getNodeLocation());
+        // Add labels to be used in time series that depends on labels
+        Map<String, String> tags = new HashMap<>();
+        tags.put("node_label", service.getNodeLabel());
+        tags.put("location", service.getNodeLocation());
+        LatencyCollectionResource latencyResource = new LatencyCollectionResource(service.getSvcName(), service.getIpAddr(), service.getNodeLocation(), tags);
         for (final Entry<String, Number> entry : entries.entrySet()) {
             final String ds = entry.getKey();
             final Number value = entry.getValue() != null ? entry.getValue() : Double.NaN;