From 093e68cb9177579635143da7672d7654b63e81d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 22 Oct 2021 18:27:43 +0300 Subject: [PATCH] [mem][solaris] improve prtconf memory size scraping Accept uppercase Memory, that's how it appears to be at least in Solaris 11.3 and OpenIndiana oi_151a7. --- mem/mem_solaris.go | 2 +- v3/mem/mem_solaris.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mem/mem_solaris.go b/mem/mem_solaris.go index 0c27bd0..4d152f4 100644 --- a/mem/mem_solaris.go +++ b/mem/mem_solaris.go @@ -67,7 +67,7 @@ func zoneName() (string, error) { return strings.TrimSpace(string(out)), nil } -var globalZoneMemoryCapacityMatch = regexp.MustCompile(`memory size: ([\d]+) Megabytes`) +var globalZoneMemoryCapacityMatch = regexp.MustCompile(`[Mm]emory size: ([\d]+) Megabytes`) func globalZoneMemoryCapacity() (uint64, error) { prtconf, err := exec.LookPath("prtconf") diff --git a/v3/mem/mem_solaris.go b/v3/mem/mem_solaris.go index 91831d4..6dc849e 100644 --- a/v3/mem/mem_solaris.go +++ b/v3/mem/mem_solaris.go @@ -67,7 +67,7 @@ func zoneName() (string, error) { return strings.TrimSpace(string(out)), nil } -var globalZoneMemoryCapacityMatch = regexp.MustCompile(`memory size: ([\d]+) Megabytes`) +var globalZoneMemoryCapacityMatch = regexp.MustCompile(`[Mm]emory size: ([\d]+) Megabytes`) func globalZoneMemoryCapacity() (uint64, error) { prtconf, err := exec.LookPath("prtconf")