Skip to content

Process metrics are added to report total CPU and Memory usage of a s… #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
osiegmar merged 3 commits into from
Feb 19, 2017
Merged

Process metrics are added to report total CPU and Memory usage of a s… #16

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fed6cb
Process metrics are added to report total CPU and Memory usage of a s…
Feb 9, 2017
ea54709
process-name action is updated as append to remove comma-sperated par…
Feb 19, 2017
a98388b
Merge branch 'master' into master
osiegmar Feb 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions cloudwatchmon/cli/put_instance_stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import re
import sys
import time
import subprocess

CLIENT_NAME = 'CloudWatch-PutInstanceData'
FileCache.CLIENT_NAME = CLIENT_NAME
Expand Down Expand Up @@ -306,6 +307,12 @@ def config_parser():
action='store_true',
help='Reports disk inode utilization in percentages.')

process_group = parser.add_argument_group('process metrics')
process_group.add_argument('--process-name',
metavar='PROCNAME',
action='append',
help='Report CPU and Memory utilization metrics of processes.')

exclusive_group = parser.add_mutually_exclusive_group()
exclusive_group.add_argument('--from-cron',
action='store_true',
Expand Down Expand Up @@ -421,6 +428,20 @@ def add_disk_metrics(args, metrics):
metrics.add_metric('InodeUtilization', 'Percent',
disk.inode_util, disk.mount, disk.file_system)

def add_process_metrics(args, metrics):
process_names = args.process_name
for process_name in process_names:
processes = subprocess.Popen(["ps", "axco", "command,pcpu,pmem"], stdout=subprocess.PIPE)
total_cpu = 0.0
total_mem = 0.0
for line in processes.stdout:
if re.search(process_name, line):
out = line.split()
total_cpu += float(out[1])
total_mem += float(out[2])
metrics.add_metric(process_name+'-CpuUtilization', 'Percent', total_cpu)
metrics.add_metric(process_name+'-MemoryUtilization', 'Percent', total_mem)


def add_static_file_metrics(args, metrics):
with open(args.from_file[0]) as f:
Expand Down Expand Up @@ -456,6 +477,7 @@ def validate_args(args):
args.swap_util or args.swap_used
report_disk_data = args.disk_path is not None
report_loadavg_data = args.loadavg or args.loadavg_percpu
report_process_data = args.process_name is not None

if report_disk_data:
if not args.disk_space_util and not args.disk_space_used and \
Expand All @@ -477,7 +499,7 @@ def validate_args(args):
raise ValueError('No metrics specified for collection and '
'submission to CloudWatch.')

return report_disk_data, report_mem_data, report_loadavg_data
return report_disk_data, report_mem_data, report_loadavg_data, report_process_data


def main():
Expand All @@ -495,7 +517,7 @@ def main():
return 0

try:
report_disk_data, report_mem_data, report_loadavg_data = \
report_disk_data, report_mem_data, report_loadavg_data, report_process_data = \
validate_args(args)

# avoid a storm of calls at the beginning of a minute
Expand Down Expand Up @@ -541,6 +563,9 @@ def main():
if report_disk_data:
add_disk_metrics(args, metrics)

if report_process_data:
add_process_metrics(args, metrics)

if args.verbose:
print('Request:\n' + str(metrics))

Expand Down