Use kafka-python 0.9.5 from monasca-common

To avoid version mismatch we stick we the old version of kafka-python
which is incubated in monasca-common.

(cherry picked from commit 3025485a39)

Change-Id: I30389f27ae25bf83a94ae8eb1f1911a3884fd168
Story: 2001036
Task: 4592
This commit is contained in:
Jakub Wachowski 2017-07-06 13:28:12 +02:00
parent 1a8335d088
commit 6d196569a0
3 changed files with 18 additions and 17 deletions

View File

@ -5,12 +5,12 @@ import logging
import monasca_agent.collector.checks as checks
try:
import kafka.client as client
import kafka.common as common
import kafka.consumer as consumer
import monasca_common.kafka_lib.client as client
import monasca_common.kafka_lib.common as common
import monasca_common.kafka_lib.consumer as consumer
except ImportError:
raise Exception('Missing python dependency: kafka (https://github.com/mumrah/kafka-python)')
raise Exception('Missing python dependency: monasca-common.\n Please '
'install with: pip install monasca-agent[kafka_plugin]')
log = logging.getLogger(__name__)

View File

@ -5,18 +5,17 @@ import logging
from os import path
import re
import subprocess as sp
from subprocess import CalledProcessError
from subprocess import STDOUT
from monasca_setup import agent_config
from oslo_utils import importutils
from monasca_setup import agent_config
from monasca_setup.detection import find_process_cmdline
from monasca_setup.detection import Plugin
from monasca_setup.detection import watch_process
from monasca_setup.detection.utils import check_output
from monasca_setup.detection.utils import find_addr_listening_on_port_over_tcp
from monasca_setup.detection import watch_process
log = logging.getLogger(__name__)
@ -71,8 +70,10 @@ class Kafka(Plugin):
log.error('Kafka process does not exist.')
elif not has_dependencies:
log.error(('Kafka process exists but required '
'dependency kafka-python is '
'not installed.'))
'dependency monasca-common is '
'not installed.\n\t'
'Please install with: '
'pip install monasca-agent[kafka_plugin]'))
elif not kafka_has_scripts:
log.error(('Kafka process exists, dependencies are installed '
'but neither %s nor %s '
@ -314,9 +315,4 @@ class Kafka(Plugin):
return self.config
def dependencies_installed(self):
try:
import kafka
except ImportError:
return False
return True
return importutils.try_import('monasca_common', False)

View File

@ -40,6 +40,11 @@ monasca_agent.collector.virt =
vsphere = monasca_agent.collector.virt.vmware.inspector:VsphereInspector
xenapi = monasca_agent.collector.virt.xenapi.inspector:XenapiInspector
# list of extra dependencies that are required by some plugin
# for details see #PEP0426
[extras]
kafka_plugin =
monasca-common >= 1.4.0
[global]
setup-hooks =