diff --git a/monasca_transform/messaging/adapter.py b/monasca_transform/messaging/adapter.py index 63b4515..d344b1c 100644 --- a/monasca_transform/messaging/adapter.py +++ b/monasca_transform/messaging/adapter.py @@ -14,8 +14,8 @@ import abc import json -from kafka import KafkaClient -from kafka import SimpleProducer +from monasca_common.kafka_lib.client import KafkaClient +from monasca_common.kafka_lib.producer import SimpleProducer from monasca_common.simport import simport from oslo_config import cfg diff --git a/monasca_transform/processor/pre_hourly_processor.py b/monasca_transform/processor/pre_hourly_processor.py index 024121b..299ee5f 100644 --- a/monasca_transform/processor/pre_hourly_processor.py +++ b/monasca_transform/processor/pre_hourly_processor.py @@ -11,8 +11,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from kafka.common import OffsetRequest -from kafka import KafkaClient +from monasca_common.kafka_lib.client import KafkaClient +from monasca_common.kafka_lib.common import OffsetRequest from pyspark.sql import SQLContext from pyspark.streaming.kafka import KafkaUtils diff --git a/requirements.txt b/requirements.txt index 52ace30..539bd5a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,9 +5,8 @@ pbr>=1.8 # Apache-2.0 PyMySQL>=0.7.6 # MIT License six>=1.9.0 # MIT SQLAlchemy<1.1.0,>=1.0.10 # MIT -kafka-python<1.0.0,>=0.9.5 # Apache-2.0 stevedore>=1.17.1 # Apache-2.0 -monasca-common>=1.0.0 # Apache-2.0 +monasca-common>=1.4.0 # Apache-2.0 oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 oslo.log>=3.11.0 # Apache-2.0 oslo.service>=1.10.0 # Apache-2.0