Removes kafka check from healthcheck
bug 801
Change-Id: Ia966da925695c4e56f490820e627c36a02c81a81
Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>
diff --git a/osm_mon/cmd/mon_healthcheck.py b/osm_mon/cmd/mon_healthcheck.py
index cc6fd8f..99ec1d3 100644
--- a/osm_mon/cmd/mon_healthcheck.py
+++ b/osm_mon/cmd/mon_healthcheck.py
@@ -20,15 +20,11 @@
# contact: bdiaz@whitestack.com or glavado@whitestack.com
##
import argparse
-import asyncio
import logging
import subprocess
import sys
import requests
-from aiokafka import AIOKafkaConsumer
-
-from osm_mon.core.config import Config
log = logging.getLogger(__name__)
@@ -36,13 +32,11 @@
def main():
parser = argparse.ArgumentParser(prog='osm-mon-healthcheck')
parser.add_argument('--config-file', nargs='?', help='MON configuration file')
- args = parser.parse_args()
- cfg = Config(args.config_file)
+ # args = parser.parse_args()
+ # cfg = Config(args.config_file)
if not _processes_running():
sys.exit(1)
- if not _is_kafka_ok(cfg.get('message', 'host'), cfg.get('message', 'port')):
- sys.exit(1)
if not _is_prometheus_exporter_ok():
sys.exit(1)
sys.exit(0)
@@ -60,6 +54,7 @@
processes_running = ps.decode().split('\n')
for p in processes_to_check:
if not _contains_process(processes_running, p):
+ log.error("Process %s not running!" % p)
return False
return True
@@ -74,22 +69,5 @@
return False
-def _is_kafka_ok(host, port):
- async def _test_kafka(loop):
- consumer = AIOKafkaConsumer(
- 'healthcheck',
- loop=loop, bootstrap_servers='{}:{}'.format(host, port))
- await consumer.start()
- await consumer.stop()
-
- try:
- loop = asyncio.get_event_loop()
- loop.run_until_complete(_test_kafka(loop))
- return True
- except Exception:
- log.exception("MON can not connect to Kafka")
- return False
-
-
if __name__ == '__main__':
main()