Fixing psutil version issue.

Bump Version

Change-Id: I6b93c85832632335a96d59912e2db795b0d90812

monagent/collector/checks_d/process.py

@@ -38,10 +38,7 @@ class ProcessCheck(AgentCheck):
             for string in search_string:
                 if exact_match:
                     try:
-                        if proc.name() == string:  # psutil >= 2.0
-                            found = True
-                    except TypeError:
-                        if proc.name == string:  # psutil < 2.0
+                        if proc.name() == string:
                             found = True
                     except psutil.NoSuchProcess:
                         self.log.warning('Process disappeared while scanning')
@@ -53,10 +50,7 @@ class ProcessCheck(AgentCheck):
                 else:
                     if not found:
                         try:
-                            try:
-                                cmdline = proc.cmdline()  # psutil >= 2.0
-                            except TypeError:
-                                cmdline = proc.cmdline  # psutil < 2.0
+                            cmdline = proc.cmdline()
 
                             if string in ' '.join(cmdline):
                                 found = True

monagent/common/version.py

@@ -1 +1 @@
-__version__ = '1.0.2'
+__version__ = '1.0.4'

packaging/Makefile

@@ -86,7 +86,6 @@ $(FPM_BUILD) -t deb \
 -d "sysstat" \
 -d "python-pycurl" \
 -d "python-requests (>= 0.8.2)" \
--d "python-psutil" \
 -d "python-httplib2" \
 -d "python-ntplib" \
 -d "python-yaml" \

requirements.txt

@@ -4,7 +4,7 @@ httplib2
 ntplib
 pymongo
 pylint
-psutil
+psutil>=2.0
 python-memcached
 PyYAML
 redis

setup.cfg

@@ -1,8 +1,8 @@
 [metadata]
 name=monasca-agent
-version=1.0.2
-maintainer=Hewlett Packard
-maintainer_email=hpcs-mon@hp.com
+version=1.0.4
+maintainer=monasca
+maintainer_email=monasca@lists.launchpad.net
 description-file = README.md
 home-page = https://github.com/stackforge/monasca-agent
 keywords=