Reformat MON to standardized format
Change-Id: I5869a8c1d0a53c5f6ad6b8859e6469d447bfb63d
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/osm_mon/cmd/mon_collector.py b/osm_mon/cmd/mon_collector.py
index 8732269..30e6676 100644
--- a/osm_mon/cmd/mon_collector.py
+++ b/osm_mon/cmd/mon_collector.py
@@ -31,16 +31,18 @@
def main():
- parser = argparse.ArgumentParser(prog='osm-mon-collector')
- parser.add_argument('--config-file', nargs='?', help='MON configuration file')
+ parser = argparse.ArgumentParser(prog="osm-mon-collector")
+ parser.add_argument("--config-file", nargs="?", help="MON configuration file")
args = parser.parse_args()
cfg = Config(args.config_file)
root = logging.getLogger()
- root.setLevel(logging.getLevelName(cfg.get('global', 'loglevel')))
+ root.setLevel(logging.getLevelName(cfg.get("global", "loglevel")))
ch = logging.StreamHandler(sys.stdout)
- ch.setLevel(logging.getLevelName(cfg.get('global', 'loglevel')))
- formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s', '%m/%d/%Y %I:%M:%S %p')
+ ch.setLevel(logging.getLevelName(cfg.get("global", "loglevel")))
+ formatter = logging.Formatter(
+ "%(asctime)s - %(name)s - %(levelname)s - %(message)s", "%m/%d/%Y %I:%M:%S %p"
+ )
ch.setFormatter(formatter)
root.addHandler(ch)
@@ -59,5 +61,5 @@
log.error("Failed to start MON Collector")
-if __name__ == '__main__':
+if __name__ == "__main__":
main()
diff --git a/osm_mon/cmd/mon_dashboarder.py b/osm_mon/cmd/mon_dashboarder.py
index e7748cd..c3c588c 100644
--- a/osm_mon/cmd/mon_dashboarder.py
+++ b/osm_mon/cmd/mon_dashboarder.py
@@ -32,16 +32,18 @@
def main():
- parser = argparse.ArgumentParser(prog='osm-policy-agent')
- parser.add_argument('--config-file', nargs='?', help='POL configuration file')
+ parser = argparse.ArgumentParser(prog="osm-policy-agent")
+ parser.add_argument("--config-file", nargs="?", help="POL configuration file")
args = parser.parse_args()
cfg = Config(args.config_file)
root = logging.getLogger()
- root.setLevel(logging.getLevelName(cfg.get('global', 'loglevel')))
+ root.setLevel(logging.getLevelName(cfg.get("global", "loglevel")))
ch = logging.StreamHandler(sys.stdout)
- ch.setLevel(logging.getLevelName(cfg.get('global', 'loglevel')))
- formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s', '%m/%d/%Y %I:%M:%S %p')
+ ch.setLevel(logging.getLevelName(cfg.get("global", "loglevel")))
+ formatter = logging.Formatter(
+ "%(asctime)s - %(name)s - %(levelname)s - %(message)s", "%m/%d/%Y %I:%M:%S %p"
+ )
ch.setFormatter(formatter)
root.addHandler(ch)
@@ -62,5 +64,5 @@
log.error("Failed to start MON Dashboarder")
-if __name__ == '__main__':
+if __name__ == "__main__":
main()
diff --git a/osm_mon/cmd/mon_evaluator.py b/osm_mon/cmd/mon_evaluator.py
index ca2df2e..b1c0e2a 100644
--- a/osm_mon/cmd/mon_evaluator.py
+++ b/osm_mon/cmd/mon_evaluator.py
@@ -31,16 +31,18 @@
def main():
- parser = argparse.ArgumentParser(prog='osm-mon-evaluator')
- parser.add_argument('--config-file', nargs='?', help='MON configuration file')
+ parser = argparse.ArgumentParser(prog="osm-mon-evaluator")
+ parser.add_argument("--config-file", nargs="?", help="MON configuration file")
args = parser.parse_args()
cfg = Config(args.config_file)
root = logging.getLogger()
- root.setLevel(logging.getLevelName(cfg.get('global', 'loglevel')))
+ root.setLevel(logging.getLevelName(cfg.get("global", "loglevel")))
ch = logging.StreamHandler(sys.stdout)
- ch.setLevel(logging.getLevelName(cfg.get('global', 'loglevel')))
- formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s', '%m/%d/%Y %I:%M:%S %p')
+ ch.setLevel(logging.getLevelName(cfg.get("global", "loglevel")))
+ formatter = logging.Formatter(
+ "%(asctime)s - %(name)s - %(levelname)s - %(message)s", "%m/%d/%Y %I:%M:%S %p"
+ )
ch.setFormatter(formatter)
root.addHandler(ch)
@@ -59,5 +61,5 @@
log.error("Failed to start MON Evaluator")
-if __name__ == '__main__':
+if __name__ == "__main__":
main()
diff --git a/osm_mon/cmd/mon_healthcheck.py b/osm_mon/cmd/mon_healthcheck.py
index 99ec1d3..7eae4c2 100644
--- a/osm_mon/cmd/mon_healthcheck.py
+++ b/osm_mon/cmd/mon_healthcheck.py
@@ -30,8 +30,8 @@
def main():
- parser = argparse.ArgumentParser(prog='osm-mon-healthcheck')
- parser.add_argument('--config-file', nargs='?', help='MON configuration file')
+ 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)
@@ -49,9 +49,9 @@
return True
return False
- processes_to_check = ['osm-mon-collector', 'osm-mon-evaluator', 'osm-mon-server']
- ps = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE).communicate()[0]
- processes_running = ps.decode().split('\n')
+ processes_to_check = ["osm-mon-collector", "osm-mon-evaluator", "osm-mon-server"]
+ ps = subprocess.Popen(["ps", "aux"], stdout=subprocess.PIPE).communicate()[0]
+ 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)
@@ -61,7 +61,7 @@
def _is_prometheus_exporter_ok():
try:
- r = requests.get('http://localhost:8000')
+ r = requests.get("http://localhost:8000")
r.raise_for_status()
return True
except Exception:
@@ -69,5 +69,5 @@
return False
-if __name__ == '__main__':
+if __name__ == "__main__":
main()
diff --git a/osm_mon/cmd/mon_server.py b/osm_mon/cmd/mon_server.py
index e5bca31..7d676d7 100644
--- a/osm_mon/cmd/mon_server.py
+++ b/osm_mon/cmd/mon_server.py
@@ -32,16 +32,18 @@
def main():
- parser = argparse.ArgumentParser(prog='osm-mon-server')
- parser.add_argument('--config-file', nargs='?', help='MON configuration file')
+ parser = argparse.ArgumentParser(prog="osm-mon-server")
+ parser.add_argument("--config-file", nargs="?", help="MON configuration file")
args = parser.parse_args()
cfg = Config(args.config_file)
root = logging.getLogger()
- root.setLevel(logging.getLevelName(cfg.get('global', 'loglevel')))
+ root.setLevel(logging.getLevelName(cfg.get("global", "loglevel")))
ch = logging.StreamHandler(sys.stdout)
- ch.setLevel(logging.getLevelName(cfg.get('global', 'loglevel')))
- formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s', '%m/%d/%Y %I:%M:%S %p')
+ ch.setLevel(logging.getLevelName(cfg.get("global", "loglevel")))
+ formatter = logging.Formatter(
+ "%(asctime)s - %(name)s - %(levelname)s - %(message)s", "%m/%d/%Y %I:%M:%S %p"
+ )
ch.setFormatter(formatter)
root.addHandler(ch)
@@ -61,5 +63,5 @@
log.error("Failed to start MON Server")
-if __name__ == '__main__':
+if __name__ == "__main__":
main()
diff --git a/osm_mon/cmd/mon_utils.py b/osm_mon/cmd/mon_utils.py
index 9640543..83dd130 100644
--- a/osm_mon/cmd/mon_utils.py
+++ b/osm_mon/cmd/mon_utils.py
@@ -25,14 +25,16 @@
logging.debug("wait_till_commondb_is_ready")
- while(True):
+ while True:
commondb_url = config.conf["database"].get("uri")
try:
commondb = pymongo.MongoClient(commondb_url)
commondb.server_info()
break
except Exception:
- logging.info("{} process is waiting for commondb to come up...".format(process_name))
+ logging.info(
+ "{} process is waiting for commondb to come up...".format(process_name)
+ )
time.sleep(commondb_wait_time)
@@ -40,7 +42,7 @@
logging.debug("wait_till_kafka_is_ready")
- while(True):
+ while True:
kafka_ready = False
try:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
@@ -55,17 +57,25 @@
== 0
):
# Get the list of topics. If kafka is not ready exception will be thrown.
- consumer = kafka.KafkaConsumer(group_id=config.conf["message"].get("group_id"),
- bootstrap_servers=[config.conf.get("message", {}).get("host",
- "kafka") + ":" + config.conf["message"]
- .get("port")])
+ consumer = kafka.KafkaConsumer(
+ group_id=config.conf["message"].get("group_id"),
+ bootstrap_servers=[
+ config.conf.get("message", {}).get("host", "kafka")
+ + ":"
+ + config.conf["message"].get("port")
+ ],
+ )
all_topics = consumer.topics()
logging.debug("Number of topics found: %s", len(all_topics))
# Send dummy message in kafka topics. If kafka is not ready exception will be thrown.
- producer = kafka.KafkaProducer(bootstrap_servers=[config.conf.get("message", {}).get("host",
- "kafka") + ":" + config.conf["message"]
- .get("port")])
+ producer = kafka.KafkaProducer(
+ bootstrap_servers=[
+ config.conf.get("message", {}).get("host", "kafka")
+ + ":"
+ + config.conf["message"].get("port")
+ ]
+ )
mon_topics = ["alarm_request", "users", "project"]
for mon_topic in mon_topics:
producer.send(mon_topic, key=b"echo", value=b"dummy message")
@@ -79,11 +89,15 @@
if kafka_ready:
break
else:
- logging.info("{} process is waiting for kafka to come up...".format(process_name))
+ logging.info(
+ "{} process is waiting for kafka to come up...".format(process_name)
+ )
time.sleep(kafka_wait_time)
-def wait_till_core_services_are_ready(config, process_name="osm-mon", commondb_wait_time=5, kafka_wait_time=5):
+def wait_till_core_services_are_ready(
+ config, process_name="osm-mon", commondb_wait_time=5, kafka_wait_time=5
+):
logging.debug("wait_till_core_services_are_ready")