Minor improvements

.gitlab-ci.yml

@@ -1,6 +1,5 @@
 variables:
   DOCKERHUB_REPO_NAME: grafana-email
-  # QUAY_REPO_NAME: grafana-email
   ENABLE_ARM64: 'true'
   ENABLE_ARMv7: 'true'
   ENABLE_ARMv6: 'true'

Dockerfile

@@ -1,5 +1,6 @@
 FROM alpine:latest
-LABEL maintainer="[email protected]"
+LABEL maintainer="[email protected]" \
+      ai.ix.repository="ix.ai/etherscan-exporter"
 
 WORKDIR /app
 

build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+echo "Setting VERSION='${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}' in src/constants.py"
+echo "VERSION = '${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}'" >> src/constants.py

src/constants.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+""" Constants declarations """
+
+VERSION = None

src/grafana-email.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-""" do shit """
+""" Connects to Grafana and retrieves the panels, which are then sent per Email """
 
 import logging
 import os
@@ -12,6 +12,7 @@
 import requests
 from PIL import Image
 import pygelf
+import constants
 
 
 LOG = logging.getLogger(__name__)
@@ -22,6 +23,8 @@
     datefmt='%Y-%m-%d %H:%M:%S'
 )
 
+FILENAME = os.path.splitext(sys.modules['__main__'].__file__)[0]
+
 
 def configure_logging():
     """ Configures the logging """
@@ -30,7 +33,8 @@ def configure_logging():
             host=os.environ.get('GELF_HOST'),
             port=int(os.environ.get('GELF_PORT', 12201)),
             debug=True,
-            include_extra_fields=True
+            include_extra_fields=True,
+            _ix_id=FILENAME
         )
         LOG.addHandler(GELF)
         LOG.info('Initialized logging with GELF enabled')
@@ -172,7 +176,8 @@ def send_email(self):
 
 if __name__ == '__main__':
     configure_logging()
-    LOG.info("Starting")
+    # pylint: disable=no-member
+    LOG.info("Starting {} {}".format(FILENAME, constants.VERSION))
     grafana = GrafanaEmail()
     grafana.get_panels()
     grafana.send_email()

src/requirements.txt

@@ -1,3 +1,3 @@
+requests==2.22.0
 pygelf==0.3.6
-requests
-pillow
+pillow>=6.2.1