From 6ab5f38d33716b5856c4747ecfd02b68895d875b Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Tue, 20 Dec 2016 21:10:08 +0000 Subject: [PATCH] The column output may differ based on the locale settings. When run from init the mpstat output is in 24 time and does not have the AM/PM column. This change handles both possibilities. --- packages/base/any/onlp-snmpd/bin/onl-snmp-mpstat | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/base/any/onlp-snmpd/bin/onl-snmp-mpstat b/packages/base/any/onlp-snmpd/bin/onl-snmp-mpstat index e554a223..d7247f94 100755 --- a/packages/base/any/onlp-snmpd/bin/onl-snmp-mpstat +++ b/packages/base/any/onlp-snmpd/bin/onl-snmp-mpstat @@ -22,8 +22,9 @@ out = subprocess.check_output(['mpstat','1','1']) for line in out.split('\n'): if "%idle" in line: - # extract keys from header line, skipping over time and AM/PM - keys = line.split()[2:] + # extract keys from header line, skipping over time and AM/PM if present + tokens = line.split() + keys = tokens[tokens.index('CPU'):] if "Average" in line: vals = line.split()[1:]