✨ Add FreeBSD, AIX support and normalize AMD manufacturer

- Add getCpuInfoFreeBSD using sysctl hw.model and kern.smp.cores
- Add getCpuInfoAIX using prtconf output parsing
- Extract normalizeManufacturer helper: GenuineIntel→Intel, AuthenticAMD→AMD
- Apply normalizeManufacturer to Linux and Windows paths
- Add tests for AMD Linux, FreeBSD, and AIX

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: tas50

providers/os/resources/cpu.go

@@ -42,6 +42,10 @@ func initMachineCpu(runtime *plugin.Runtime, args map[string]*llx.RawData) (map[
 		info, err = getCpuInfoMacos(conn)
 	case pf.IsFamily("windows"):
 		info, err = getCpuInfoWindows(conn)
+	case pf.Name == "freebsd":
+		info, err = getCpuInfoFreeBSD(conn)
+	case pf.Name == "aix":
+		info, err = getCpuInfoAIX(conn)
 	case pf.IsFamily(inventory.FAMILY_UNIX):
 		info, err = getCpuInfoLinux(conn)
 	default:
@@ -94,13 +98,8 @@ func getCpuInfoLinux(conn shared.Connection) (*cpuInfo, error) {
 		seenSockets[p.PhysicalID] = struct{}{}
 	}
 
-	manufacturer := parsed.Processors[0].VendorID
-	if manufacturer == "GenuineIntel" {
-		manufacturer = "Intel"
-	}
-
 	info := &cpuInfo{
-		Manufacturer: manufacturer,
+		Manufacturer: normalizeManufacturer(parsed.Processors[0].VendorID),
 		Model:        parsed.Processors[0].ModelName,
 	}
 
@@ -142,11 +141,8 @@ func getCpuInfoMacos(conn shared.Connection) (*cpuInfo, error) {
 		return nil, fmt.Errorf("failed to parse hw.physicalcpu: %w", err)
 	}
 
-	// Strip "Apple " prefix from brand string (e.g. "Apple M4 Pro" -> "M4 Pro")
-	model := strings.TrimPrefix(brandString, "Apple ")
-
 	info := &cpuInfo{
-		Model:          model,
+		Model:          brandString,
 		Cores:          physicalCPU,
 		ProcessorCount: 1, // Macs always have a single CPU package
 	}
@@ -202,8 +198,103 @@ func getCpuInfoWindows(conn shared.Connection) (*cpuInfo, error) {
 
 	return &cpuInfo{
 		Model:          strings.TrimSpace(result.Name),
-		Manufacturer:   strings.TrimSpace(result.Manufacturer),
+		Manufacturer:   normalizeManufacturer(strings.TrimSpace(result.Manufacturer)),
 		Cores:          result.NumberOfCores,
 		ProcessorCount: result.ProcessorCount,
 	}, nil
 }
+
+func getCpuInfoFreeBSD(conn shared.Connection) (*cpuInfo, error) {
+	cmd, err := conn.RunCommand("sysctl -n hw.model kern.smp.cores")
+	if err != nil {
+		return nil, err
+	}
+	if cmd.ExitStatus != 0 {
+		stderr, _ := io.ReadAll(cmd.Stderr)
+		return nil, fmt.Errorf("sysctl failed: %s", string(stderr))
+	}
+
+	data, err := io.ReadAll(cmd.Stdout)
+	if err != nil {
+		return nil, err
+	}
+
+	lines := strings.Split(strings.TrimSpace(string(data)), "\n")
+	if len(lines) < 2 {
+		return nil, fmt.Errorf("unexpected sysctl output: %s", string(data))
+	}
+
+	model := strings.TrimSpace(lines[0])
+	cores, err := strconv.ParseInt(strings.TrimSpace(lines[1]), 10, 64)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse kern.smp.cores: %w", err)
+	}
+
+	// FreeBSD doesn't expose socket/package count directly; default to 1
+	info := &cpuInfo{
+		Model:          model,
+		Cores:          cores,
+		ProcessorCount: 1,
+	}
+
+	// Extract manufacturer from model string
+	if strings.Contains(model, "Intel") {
+		info.Manufacturer = "Intel"
+	} else if strings.Contains(model, "AMD") {
+		info.Manufacturer = "AMD"
+	}
+
+	return info, nil
+}
+
+func getCpuInfoAIX(conn shared.Connection) (*cpuInfo, error) {
+	// Use prtconf for processor type and count
+	cmd, err := conn.RunCommand("prtconf")
+	if err != nil {
+		return nil, err
+	}
+	if cmd.ExitStatus != 0 {
+		stderr, _ := io.ReadAll(cmd.Stderr)
+		return nil, fmt.Errorf("prtconf failed: %s", string(stderr))
+	}
+
+	data, err := io.ReadAll(cmd.Stdout)
+	if err != nil {
+		return nil, err
+	}
+
+	info := &cpuInfo{
+		Manufacturer:   "IBM",
+		ProcessorCount: 1,
+	}
+
+	for _, line := range strings.Split(string(data), "\n") {
+		line = strings.TrimSpace(line)
+		if k, v, ok := strings.Cut(line, ":"); ok {
+			k = strings.TrimSpace(k)
+			v = strings.TrimSpace(v)
+			switch k {
+			case "Processor Type":
+				info.Model = v
+			case "Number Of Processors":
+				if n, err := strconv.ParseInt(v, 10, 64); err == nil {
+					info.Cores = n
+				}
+			}
+		}
+	}
+
+	return info, nil
+}
+
+// normalizeManufacturer maps CPUID vendor strings to human-readable names.
+func normalizeManufacturer(vendor string) string {
+	switch vendor {
+	case "GenuineIntel":
+		return "Intel"
+	case "AuthenticAMD":
+		return "AMD"
+	default:
+		return vendor
+	}
+}

providers/os/resources/cpu_test.go

@@ -39,7 +39,7 @@ func TestGetCpuInfoMacosAppleSilicon(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.Equal(t, "Apple", info.Manufacturer)
-	assert.Equal(t, "M4 Pro", info.Model)
+	assert.Equal(t, "Apple M4 Pro", info.Model)
 	assert.Equal(t, int64(1), info.ProcessorCount)
 	assert.Equal(t, int64(14), info.Cores)
 }
@@ -63,6 +63,61 @@ func TestGetCpuInfoMacosIntel(t *testing.T) {
 	assert.Equal(t, int64(8), info.Cores)
 }
 
+func TestGetCpuInfoLinuxAMD(t *testing.T) {
+	conn, err := mock.New(0, &inventory.Asset{}, mock.WithPath("./procfs/testdata/cpu-info-amd.toml"))
+	require.NoError(t, err)
+
+	info, err := getCpuInfoLinux(conn)
+	require.NoError(t, err)
+
+	assert.Equal(t, "AMD", info.Manufacturer)
+	assert.Equal(t, "AMD EPYC 7763 64-Core Processor", info.Model)
+	assert.Equal(t, int64(1), info.ProcessorCount)
+	assert.Equal(t, int64(2), info.Cores)
+}
+
+func TestGetCpuInfoFreeBSD(t *testing.T) {
+	conn, err := mock.New(0, &inventory.Asset{}, mock.WithData(&mock.TomlData{
+		Commands: map[string]*mock.Command{
+			"sysctl -n hw.model kern.smp.cores": {
+				Stdout: "Intel(R) Xeon(R) CPU E3-1220 v5 @ 3.00GHz\n4\n",
+			},
+		},
+	}))
+	require.NoError(t, err)
+
+	info, err := getCpuInfoFreeBSD(conn)
+	require.NoError(t, err)
+
+	assert.Equal(t, "Intel", info.Manufacturer)
+	assert.Equal(t, "Intel(R) Xeon(R) CPU E3-1220 v5 @ 3.00GHz", info.Model)
+	assert.Equal(t, int64(1), info.ProcessorCount)
+	assert.Equal(t, int64(4), info.Cores)
+}
+
+func TestGetCpuInfoAIX(t *testing.T) {
+	conn, err := mock.New(0, &inventory.Asset{}, mock.WithData(&mock.TomlData{
+		Commands: map[string]*mock.Command{
+			"prtconf": {
+				Stdout: "System Model: IBM,9009-42A\n" +
+					"Processor Type: PowerPC_POWER9\n" +
+					"Number Of Processors: 12\n" +
+					"Processor Clock Speed: 3800 MHz\n" +
+					"CPU Type: 64-bit\n",
+			},
+		},
+	}))
+	require.NoError(t, err)
+
+	info, err := getCpuInfoAIX(conn)
+	require.NoError(t, err)
+
+	assert.Equal(t, "IBM", info.Manufacturer)
+	assert.Equal(t, "PowerPC_POWER9", info.Model)
+	assert.Equal(t, int64(1), info.ProcessorCount)
+	assert.Equal(t, int64(12), info.Cores)
+}
+
 func TestGetCpuInfoLinuxArm(t *testing.T) {
 	conn, err := mock.New(0, &inventory.Asset{}, mock.WithPath("./procfs/testdata/cpu-info-aarch64.toml"))
 	require.NoError(t, err)

providers/os/resources/procfs/testdata/cpu-info-amd.toml

@@ -0,0 +1,54 @@
+[files."/proc/cpuinfo"]
+content = """
+processor	: 0
+vendor_id	: AuthenticAMD
+cpu family	: 25
+model		: 1
+model name	: AMD EPYC 7763 64-Core Processor
+stepping	: 1
+cpu MHz		: 2450.000
+cache size	: 512 KB
+physical id	: 0
+siblings	: 2
+core id		: 0
+cpu cores	: 2
+apicid		: 0
+initial apicid	: 0
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 13
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm rep_good nopl cpuid extd_apicid tsc_known_freq pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves
+bugs		: sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass
+bogomips	: 4890.86
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 48 bits physical, 48 bits virtual
+power management:
+
+processor	: 1
+vendor_id	: AuthenticAMD
+cpu family	: 25
+model		: 1
+model name	: AMD EPYC 7763 64-Core Processor
+stepping	: 1
+cpu MHz		: 2450.000
+cache size	: 512 KB
+physical id	: 0
+siblings	: 2
+core id		: 1
+cpu cores	: 2
+apicid		: 1
+initial apicid	: 1
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 13
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm rep_good nopl cpuid extd_apicid tsc_known_freq pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves
+bugs		: sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass
+bogomips	: 4890.86
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 48 bits physical, 48 bits virtual
+power management:
+"""