From b7e4995c009a0957ac1bb3b8d7399ca973a4e1a3 Mon Sep 17 00:00:00 2001 From: Santiago Perez Date: Thu, 29 Sep 2022 13:41:29 +0200 Subject: [PATCH 1/6] #307 fix docker replace_config when config file is a volume --- docker/rootfs/replace_config.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/docker/rootfs/replace_config.py b/docker/rootfs/replace_config.py index 3bf545e..6ecaeaf 100644 --- a/docker/rootfs/replace_config.py +++ b/docker/rootfs/replace_config.py @@ -10,8 +10,11 @@ filedata = filedata.replace("prom2teamsgroupalertsby", os.environ.get("PROM2TEAMS_GROUP_ALERTS_BY")) filedata = filedata.replace("prom2teamslogslevel", os.environ.get("PROM2TEAMS_LOGLEVEL")) -with open('/opt/prom2teams/config.ini', 'w') as file: - file.write(filedata) +try: + with open('/opt/prom2teams/config.ini', 'w') as file: + file.write(filedata) +except: + pass with open('/opt/prom2teams/uwsgi.ini', 'r') as file: uwsgi_filedata = file.read() @@ -22,6 +25,8 @@ uwsgi_filedata = uwsgi_filedata.replace("uwsgihost", os.environ.get("UWSGI_HOST")) uwsgi_filedata = uwsgi_filedata.replace("uwsgiprotocol", os.environ.get("UWSGI_PROTOCOL")) - -with open('/opt/prom2teams/uwsgi.ini', 'w') as file: - file.write(uwsgi_filedata) +try: + with open('/opt/prom2teams/uwsgi.ini', 'w') as file: + file.write(uwsgi_filedata) +except: + pass From de742467013444e78992f48cc07f2dce747394e6 Mon Sep 17 00:00:00 2001 From: Santiago Perez Date: Mon, 21 Nov 2022 11:57:28 +0100 Subject: [PATCH 2/6] #307 fix replace_config with external configfile --- docker/rootfs/replace_config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/rootfs/replace_config.py b/docker/rootfs/replace_config.py index 6ecaeaf..a8b7a79 100644 --- a/docker/rootfs/replace_config.py +++ b/docker/rootfs/replace_config.py @@ -13,7 +13,7 @@ try: with open('/opt/prom2teams/config.ini', 'w') as file: file.write(filedata) -except: +except (PermissionError, OSError) as error: pass with open('/opt/prom2teams/uwsgi.ini', 'r') as file: @@ -28,5 +28,5 @@ try: with open('/opt/prom2teams/uwsgi.ini', 'w') as file: file.write(uwsgi_filedata) -except: - pass +except (PermissionError, OSError) as error: + pass From d21c7648125784f9c81bc09988b8ef9f6f708115 Mon Sep 17 00:00:00 2001 From: Santiago Perez Date: Mon, 21 Nov 2022 11:59:25 +0100 Subject: [PATCH 3/6] update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e86fb56..7b5eb80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog). ## [Unreleased](https://github.com/idealista/prom2teams/tree/develop) +## [4.2.1](https://github.com/idealista/prom2teams/tree/4.2.1) +[Full Changelog](https://github.com/idealista/prom2teams/compare/4.2.0...4.2.1) +### Fixed +- *[#307](https://github.com/idealista/prom2teams/pull/307) Update prom2teams replace_config with exception control* @santi-eidu ## [4.2.0](https://github.com/idealista/prom2teams/tree/4.2.0) [Full Changelog](https://github.com/idealista/prom2teams/compare/4.1.0...4.2.0) ### Added From 05f7f6d42c19eb1a884a0f9d36e031f9742d6ac0 Mon Sep 17 00:00:00 2001 From: Santiago Perez Date: Wed, 7 Dec 2022 15:49:43 +0100 Subject: [PATCH 4/6] #307 fix replace_config.py with tmp config files --- docker/rootfs/{config.ini => config.ini.tmp} | 0 docker/rootfs/prom2teams_start.sh | 11 ++++++++++- docker/rootfs/replace_config.py | 19 +++++++------------ docker/rootfs/{uwsgi.ini => uwsgi.ini.tmp} | 0 4 files changed, 17 insertions(+), 13 deletions(-) rename docker/rootfs/{config.ini => config.ini.tmp} (100%) rename docker/rootfs/{uwsgi.ini => uwsgi.ini.tmp} (100%) diff --git a/docker/rootfs/config.ini b/docker/rootfs/config.ini.tmp similarity index 100% rename from docker/rootfs/config.ini rename to docker/rootfs/config.ini.tmp diff --git a/docker/rootfs/prom2teams_start.sh b/docker/rootfs/prom2teams_start.sh index f68c534..9bdd8bd 100644 --- a/docker/rootfs/prom2teams_start.sh +++ b/docker/rootfs/prom2teams_start.sh @@ -1,3 +1,12 @@ #!/bin/sh python /opt/prom2teams/replace_config.py -uwsgi /opt/prom2teams/uwsgi.ini \ No newline at end of file + +if [ ! -f "/opt/prom2teams/config.ini" ]; then + mv /opt/prom2teams/config.ini.tmp /opt/prom2teams/config.ini +fi + +if [[ ! -f "/opt/prom2teams/uwsgi.ini" ]]; then + mv /opt/prom2teams/uwsgi.ini.tmp /opt/prom2teams/uwsgi.ini +fi + +uwsgi /opt/prom2teams/uwsgi.ini diff --git a/docker/rootfs/replace_config.py b/docker/rootfs/replace_config.py index a8b7a79..3866818 100644 --- a/docker/rootfs/replace_config.py +++ b/docker/rootfs/replace_config.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import os -with open('/opt/prom2teams/config.ini', 'r') as file: +with open('/opt/prom2teams/config.ini.tmp', 'r') as file: filedata = file.read() filedata = filedata.replace("prom2teamsport", os.environ.get("PROM2TEAMS_PORT")) @@ -10,13 +10,11 @@ filedata = filedata.replace("prom2teamsgroupalertsby", os.environ.get("PROM2TEAMS_GROUP_ALERTS_BY")) filedata = filedata.replace("prom2teamslogslevel", os.environ.get("PROM2TEAMS_LOGLEVEL")) -try: - with open('/opt/prom2teams/config.ini', 'w') as file: - file.write(filedata) -except (PermissionError, OSError) as error: - pass -with open('/opt/prom2teams/uwsgi.ini', 'r') as file: +with open('/opt/prom2teams/config.ini.tmp', 'w') as file: + file.write(filedata) + +with open('/opt/prom2teams/uwsgi.ini.tmp', 'r') as file: uwsgi_filedata = file.read() uwsgi_filedata = uwsgi_filedata.replace("uwsgiprocesses", os.environ.get("UWSGI_PROCESSES")) @@ -25,8 +23,5 @@ uwsgi_filedata = uwsgi_filedata.replace("uwsgihost", os.environ.get("UWSGI_HOST")) uwsgi_filedata = uwsgi_filedata.replace("uwsgiprotocol", os.environ.get("UWSGI_PROTOCOL")) -try: - with open('/opt/prom2teams/uwsgi.ini', 'w') as file: - file.write(uwsgi_filedata) -except (PermissionError, OSError) as error: - pass +with open('/opt/prom2teams/uwsgi.ini.tmp', 'w') as file: + file.write(uwsgi_filedata) diff --git a/docker/rootfs/uwsgi.ini b/docker/rootfs/uwsgi.ini.tmp similarity index 100% rename from docker/rootfs/uwsgi.ini rename to docker/rootfs/uwsgi.ini.tmp From ff08be3e415e46cfae0d2dd40f672e19a02daa81 Mon Sep 17 00:00:00 2001 From: Santiago Perez Date: Wed, 7 Dec 2022 15:53:05 +0100 Subject: [PATCH 5/6] #307 fix typo --- docker/rootfs/prom2teams_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/rootfs/prom2teams_start.sh b/docker/rootfs/prom2teams_start.sh index 9bdd8bd..6ae4230 100644 --- a/docker/rootfs/prom2teams_start.sh +++ b/docker/rootfs/prom2teams_start.sh @@ -5,7 +5,7 @@ if [ ! -f "/opt/prom2teams/config.ini" ]; then mv /opt/prom2teams/config.ini.tmp /opt/prom2teams/config.ini fi -if [[ ! -f "/opt/prom2teams/uwsgi.ini" ]]; then +if [ ! -f "/opt/prom2teams/uwsgi.ini" ]; then mv /opt/prom2teams/uwsgi.ini.tmp /opt/prom2teams/uwsgi.ini fi From 2e8b25993a07de9cf6120aa891b0976f1409237c Mon Sep 17 00:00:00 2001 From: Santiago Perez Date: Wed, 7 Dec 2022 15:53:15 +0100 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b5eb80..a79e835 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch ## [4.2.1](https://github.com/idealista/prom2teams/tree/4.2.1) [Full Changelog](https://github.com/idealista/prom2teams/compare/4.2.0...4.2.1) ### Fixed -- *[#307](https://github.com/idealista/prom2teams/pull/307) Update prom2teams replace_config with exception control* @santi-eidu +- *[#307](https://github.com/idealista/prom2teams/pull/307) Update prom2teams replace_config with tmp config files* @santi-eidu ## [4.2.0](https://github.com/idealista/prom2teams/tree/4.2.0) [Full Changelog](https://github.com/idealista/prom2teams/compare/4.1.0...4.2.0) ### Added