From 91a88aa8fb5aad92159f14d00cd34fb386029700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Robotka?= <robotka.adrian@gmail.com>
Date: Sun, 31 May 2020 13:40:13 +0200
Subject: [PATCH] add commiter to meta data

---
 .gitlab-ci.yml | 2 +-
 generator.py   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b28394a..5917460 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
   - Docker build
 
 variables:
-  CONTAINER_IMAGE: "registry.kszk.bme.hu/kszk/monitoring/pupak:$CI_COMMIT_REF_NAME"
+  CONTAINER_IMAGE: "registry.kszk.bme.hu/monitoring/pupak:$CI_COMMIT_REF_NAME"
 
 pip:
   stage: Get dependencies
diff --git a/generator.py b/generator.py
index bd431ce..301c7d4 100644
--- a/generator.py
+++ b/generator.py
@@ -42,11 +42,14 @@ class Generator:
         """Make some generation meta info"""
         stream = os.popen('git -C ' + str(self.data_folder.absolute()) + ' rev-parse HEAD')
         git_hash = stream.read()
+        stream = os.popen('git -C ' + str(self.data_folder.absolute()) + ' log -1 --pretty=format:"%an"')
+        git_commiter = stream.read()
 
         output = "# This file is generated. Some meta:"
         output += "\n# Time: " + datetime.now().isoformat()
         output += "\n# Host: " + socket.gethostname()
-        output += "\n# Commit: " + git_hash
+        output += "\n# Data dir commiter: " + git_commiter
+        output += "\n# Data dir commit hash: " + git_hash.replace('\n', '')
         return output
 
     def collect_scrape_configs(self, output):
-- 
GitLab