added option to select protocol. Added more docker makefile commands to make ease of dev easier.

Author: oliverisaac

Dockerfile

@@ -2,8 +2,11 @@ FROM python:3.9-slim
 
 COPY requirements.txt /requirements.txt
 
-RUN pip install -r /requirements.txt
+RUN pip install -r /requirements.txt && mkdir /app
 
-ADD LICENSE run.py script/* /
+WORKDIR /app
 
-ENTRYPOINT [ "python3", "/run.py" ]
+COPY LICENSE run.py /app/
+COPY script /app/script
+
+ENTRYPOINT [ "python3", "./run.py" ]

Makefile

@@ -26,3 +26,9 @@ docker-build:
 docker-push: docker-build
 	docker push ${DOCKER_REPO}:latest
 	docker push ${DOCKER_REPO}:${DOCKER_TAG}
+
+docker-run: docker-build
+	docker run --mount 'type=bind,source=${PWD},target=/data' ${DOCKER_REPO}:${DOCKER_TAG} --config /data/config.yml --bind /data/example.csv
+
+docker-explore: docker-build
+	docker run -it --entrypoint /bin/bash --mount 'type=bind,source=${PWD},target=/data' ${DOCKER_REPO}:${DOCKER_TAG} -o vi

run.py

@@ -35,7 +35,7 @@ def setup_logger():
     )
     handler = logging.StreamHandler()
     handler.setFormatter(formatter)
-    logger.setLevel(logging.INFO)
+    logger.setLevel(logging.DEBUG)
     logger.addHandler(handler)
 
 if __name__ == "__main__":

script/config.py

@@ -14,6 +14,7 @@ def __init__(self, config_path):
 
     GRAFANA_AUTH = ""
     GRAFANA_URL = ""
+    GRAFANA_PROTOCOL = "http"
 
     LDAP_SERVER_URL = ""
     LDAP_PORT = ""
@@ -46,6 +47,8 @@ def load_config(self, config_path):
             config["grafana"]["password"]
         )
         self.GRAFANA_URL = config["grafana"]["url"]
+        if config["grafana"]["protocol"]:
+            self.GRAFANA_PROTOCOL = config["grafana"]["protocol"]
 
         self.LDAP_SERVER_URL = config["ldap"]["url"]
         self.LDAP_PORT = config["ldap"]["port"]

script/grafana.py

@@ -15,7 +15,8 @@ def setup_grafana(config_dict):
     configuration = config_dict
     grafana_api = GrafanaFace(
         auth=configuration.GRAFANA_AUTH,
-        host=configuration.GRAFANA_URL
+        host=configuration.GRAFANA_URL,
+        protocol=configuration.GRAFANA_PROTOCOL
     )