Merge pull request #1871 from superbrothers/dmiIDAttributeNames_product_name

k8s-ci-robot · web-flow · commit a8fd5051bced · 2024-09-10T08:55:14.000+01:00
source/system: Add reading product name information
diff --git a/docs/usage/customization-guide.md b/docs/usage/customization-guide.md
@@ -1027,6 +1027,7 @@ The following features are available for matching:
 |                  |              | **`<parameter>`** | string | One parameter from `/etc/os-release` |
 | **`system.dmiid`** | attribute |       |            | DMI identification data from `/sys/devices/virtual/dmi/id/` |
 |                  |              | **`sys_vendor`** | string | Vendor name from `/sys/devices/virtual/dmi/id/sys_vendor` |
+|                  |              | **`product_name`** | string | Product name from `/sys/devices/virtual/dmi/id/product_name` |
 | **`system.name`** | attribute   |          |            | System name information |
 |                  |              | **`nodename`** | string | Name of the kubernetes node object |
 | **`usb.device`** | instance     |          |            | USB devices present in the system |
diff --git a/source/system/system.go b/source/system/system.go
@@ -103,7 +103,7 @@ func (s *systemSource) Discover() error {
 	}
 
 	// Get DMI ID attributes
-	dmiIDAttributeNames := []string{"sys_vendor"}
+	dmiIDAttributeNames := []string{"sys_vendor", "product_name"}
 	dmiAttrs := make(map[string]string)
 	for _, name := range dmiIDAttributeNames {
 		val, err := getDmiIDAttribute(name)

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func (s *systemSource) Discover() error {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`// Get DMI ID attributes`
`106`		`- dmiIDAttributeNames := []string{"sys_vendor"}`
	`106`	`+ dmiIDAttributeNames := []string{"sys_vendor", "product_name"}`
`107`	`107`	`dmiAttrs := make(map[string]string)`
`108`	`108`	`for _, name := range dmiIDAttributeNames {`
`109`	`109`	`val, err := getDmiIDAttribute(name)`