[receiver/snmp] Add column and scalar OID metrics to resources that have scalar OID attributes

receiver/snmpreceiver/README.md

@@ -80,8 +80,9 @@ Resource attribute configurations are used to define what resource attributes wi
 
 | Field Name           | Description                              | Value        |
 | --                   | --                                       | --           |
-| `oid`                  | Required if no `indexed_value_prefix`. This is the column OID in a SNMP table which will use the returned indexed SNMP data to create resource attribute values for unique resources. Metric configurations will reference these resource attribute configurations in order to assign metrics data to resources | string       |
-| `indexed_value_prefix` | Required if no `oid`. This is a string prefix which will be added to the indices of returned metric indexed SNMP data to create resource attribute values for unique resources. Metric configurations will reference these resource attribute configurations in order to assign metrics data to resources | string       |
+| `oid`                  | Required if no `scalar_oid` or `indexed_value_prefix`. This is the column OID in a SNMP table which will use the returned indexed SNMP data to create resource attribute values for unique resources. Metric configurations will reference these resource attribute configurations in order to assign metrics data to resources | string       |
+| `scalar_oid` | Required if no `oid` or `indexed_value_prefix`. This is the scalar OID which will return non-indexed SNMP data to create resource attribute values for unique resources. Metric configurations will reference these resource attribute configurations in order to assign metrics data to resources | string |
+| `indexed_value_prefix` | Required if no `scalar_oid` or `oid`. This is a string prefix which will be added to the indices of returned metric indexed SNMP data to create resource attribute values for unique resources. Metric configurations will reference these resource attribute configurations in order to assign metrics data to resources | string       |
 | `description`          | Definition of what the resource attribute represents  | string       |
 
 #### Attribute Configuration
@@ -124,6 +125,7 @@ Attribute configurations are used to define what resource attributes will be use
 | Field Name  | Description                                                    | Value                       | Default |
 | --          | --                                                             | --                          | --      |
 | `oid`       | The SNMP scalar OID value to grab data from (must end in .0).  | string                      |         |
+| `resource_attributes` | The names of the related resource attribute configurations, allowing scalar oid metrics to be added to resources that have one or more scalar oid resource attributes. Cannot have indexed resource attributes as values. | string[] | | 
 | `attributes` | The names of the related attribute enum configurations as well as the values to attach to this returned SNMP scalar data. This can be used to have a metric config with multiple ScalarOIDs as different datapoints with different attributue values within the same metric | Attribute              |    |
 
 #### ColumnOID Configuration

receiver/snmpreceiver/config_helper.go

@@ -13,6 +13,7 @@ type configHelper struct {
 	metricScalarOIDs            []string
 	metricColumnOIDs            []string
 	attributeColumnOIDs         []string
+	resourceAttributeScalarOIDs []string
 	resourceAttributeColumnOIDs []string
 	metricNamesByOID            map[string]string
 	metricAttributesByOID       map[string][]Attribute
@@ -26,6 +27,7 @@ func newConfigHelper(cfg *Config) *configHelper {
 		metricScalarOIDs:            []string{},
 		metricColumnOIDs:            []string{},
 		attributeColumnOIDs:         []string{},
+		resourceAttributeScalarOIDs: []string{},
 		resourceAttributeColumnOIDs: []string{},
 		metricNamesByOID:            map[string]string{},
 		metricAttributesByOID:       map[string][]Attribute{},
@@ -46,6 +48,7 @@ func newConfigHelper(cfg *Config) *configHelper {
 			ch.metricScalarOIDs = append(ch.metricScalarOIDs, oid.OID)
 			ch.metricNamesByOID[oid.OID] = name
 			ch.metricAttributesByOID[oid.OID] = oid.Attributes
+			ch.resourceAttributesByOID[oid.OID] = oid.ResourceAttributes
 		}
 
 		for i, oid := range metricCfg.ColumnOIDs {
@@ -77,21 +80,28 @@ func newConfigHelper(cfg *Config) *configHelper {
 		ch.attributeColumnOIDs = append(ch.attributeColumnOIDs, attributeCfg.OID)
 	}
 
-	// Find all resource attribute column OIDs
+	// Find all resource attribute scalar and column OIDs
 	for name, resourceAttributeCfg := range cfg.ResourceAttributes {
-		if resourceAttributeCfg.OID == "" {
+		if resourceAttributeCfg.ScalarOID != "" {
+			// Data is returned by the client with '.' prefix on the OIDs.
+			// Making sure the prefix exists here in the configs so we can match it up with returned data later
+			if !strings.HasPrefix(resourceAttributeCfg.ScalarOID, ".") {
+				resourceAttributeCfg.ScalarOID = "." + resourceAttributeCfg.ScalarOID
+				cfg.ResourceAttributes[name] = resourceAttributeCfg
+			}
+			ch.resourceAttributeScalarOIDs = append(ch.resourceAttributeScalarOIDs, resourceAttributeCfg.ScalarOID)
 			continue
 		}
-
-		// Data is returned by the client with '.' prefix on the OIDs.
-		// Making sure the prefix exists here in the configs so we can match it up with returned data later
-		if !strings.HasPrefix(resourceAttributeCfg.OID, ".") {
-			resourceAttributeCfg.OID = "." + resourceAttributeCfg.OID
-			cfg.ResourceAttributes[name] = resourceAttributeCfg
+		if resourceAttributeCfg.OID != "" {
+			// Data is returned by the client with '.' prefix on the OIDs.
+			// Making sure the prefix exists here in the configs so we can match it up with returned data later
+			if !strings.HasPrefix(resourceAttributeCfg.OID, ".") {
+				resourceAttributeCfg.OID = "." + resourceAttributeCfg.OID
+				cfg.ResourceAttributes[name] = resourceAttributeCfg
+			}
+			ch.resourceAttributeColumnOIDs = append(ch.resourceAttributeColumnOIDs, resourceAttributeCfg.OID)
 		}
-		ch.resourceAttributeColumnOIDs = append(ch.resourceAttributeColumnOIDs, resourceAttributeCfg.OID)
 	}
-
 	return &ch
 }
 
@@ -110,6 +120,11 @@ func (h configHelper) getAttributeColumnOIDs() []string {
 	return h.attributeColumnOIDs
 }
 
+// getResourceAttributeScalarOIDs returns all of the resource attribute scalar OIDs in the resource attribute configs
+func (h configHelper) getResourceAttributeScalarOIDs() []string {
+	return h.resourceAttributeScalarOIDs
+}
+
 // getResourceAttributeColumnOIDs returns all of the resource attribute column OIDs in the resource attribute configs
 func (h configHelper) getResourceAttributeColumnOIDs() []string {
 	return h.resourceAttributeColumnOIDs
@@ -175,6 +190,16 @@ func (h configHelper) getResourceAttributeConfigOID(name string) string {
 	return attrConfig.OID
 }
 
+// getResourceAttributeConfigScalarOID returns the scalar OID of a resource attribute config
+func (h configHelper) getResourceAttributeConfigScalarOID(name string) string {
+	attrConfig := h.cfg.ResourceAttributes[name]
+	if attrConfig == nil {
+		return ""
+	}
+
+	return attrConfig.ScalarOID
+}
+
 // getMetricConfigAttributes returns the metric config attributes for a given OID
 func (h configHelper) getMetricConfigAttributes(oid string) []Attribute {
 	return h.metricAttributesByOID[oid]