Skip to content
Snippets Groups Projects
Commit f23434ef authored by Robotka István Adrián's avatar Robotka István Adrián
Browse files

Merge branch 'commiter' into 'master'

add commiter to meta data

See merge request !4
parents fc94bde5 91a88aa8
No related branches found
No related tags found
1 merge request!4add commiter to meta data
Pipeline #4181 failed
......@@ -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
......
......@@ -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):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment