fix in ifstat
This commit is contained in:
26
collect.py
26
collect.py
@@ -82,29 +82,28 @@ def scaleIostat_cpu():
|
|||||||
print(f"Error running command: {collect}")
|
print(f"Error running command: {collect}")
|
||||||
|
|
||||||
|
|
||||||
def coreIostat_cpu():
|
def ifstat():
|
||||||
command = ["iostat", "-c", "1", "1"]
|
command = ["ifstat", "-znq", "1", "1"]
|
||||||
filename = "cpuStat.csv"
|
|
||||||
|
|
||||||
|
filename = "ifStat.csv"
|
||||||
collect = runCollect(command)
|
collect = runCollect(command)
|
||||||
|
|
||||||
if collect:
|
if collect:
|
||||||
byline = re.split("\n", collect.strip())
|
# process collection string
|
||||||
data = byline[3].strip()
|
bylines = collect.split("\n")
|
||||||
lineData = data.split()
|
interfaces = bylines[0].split()
|
||||||
|
stats = bylines[2].split()
|
||||||
|
|
||||||
|
for nic in interfaces:
|
||||||
|
lineData = [getTimestamp(), nic, stats.pop(0), stats.pop(0)]
|
||||||
if lineData:
|
if lineData:
|
||||||
with open(filename, "a", newline="") as csvfile:
|
with open(filename, "a", newline="") as csvfile:
|
||||||
csv_writer = csv.writer(csvfile)
|
csv_writer = csv.writer(csvfile)
|
||||||
lineData.insert(0, "cpu")
|
|
||||||
lineData.insert(0, getTimestamp())
|
|
||||||
csv_writer.writerow(lineData)
|
csv_writer.writerow(lineData)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
print(f"Error running command: {collect}")
|
print(f"Error running command: {collect}")
|
||||||
|
|
||||||
|
|
||||||
def coreifstat():
|
def coreCPUstat():
|
||||||
command = ["iostat", "-C", "-t", "proc", "-d"]
|
command = ["iostat", "-C", "-t", "proc", "-d"]
|
||||||
filename = "cpuStat.csv"
|
filename = "cpuStat.csv"
|
||||||
|
|
||||||
@@ -194,14 +193,14 @@ def collect_data(minutes, interval):
|
|||||||
print(f" {i}", end="")
|
print(f" {i}", end="")
|
||||||
|
|
||||||
zpoolIostat()
|
zpoolIostat()
|
||||||
coreifstat()
|
ifstat()
|
||||||
|
|
||||||
if is_debian():
|
if is_debian():
|
||||||
scaleIostat_cpu()
|
scaleIostat_cpu()
|
||||||
scaleIostat_disk()
|
scaleIostat_disk()
|
||||||
|
|
||||||
if is_freebsd():
|
if is_freebsd():
|
||||||
coreIostat_cpu()
|
coreCPUstat()
|
||||||
|
|
||||||
if i == minutes:
|
if i == minutes:
|
||||||
break
|
break
|
||||||
@@ -209,6 +208,7 @@ def collect_data(minutes, interval):
|
|||||||
time.sleep(interval)
|
time.sleep(interval)
|
||||||
|
|
||||||
print("")
|
print("")
|
||||||
|
|
||||||
# kill gstat if freebsd
|
# kill gstat if freebsd
|
||||||
if is_freebsd():
|
if is_freebsd():
|
||||||
process.kill()
|
process.kill()
|
||||||
|
|||||||
Reference in New Issue
Block a user