From 15a6ffaf7632780d056410df5b118f0665479fa3 Mon Sep 17 00:00:00 2001 From: Florent Date: Sun, 11 Feb 2024 12:48:27 +0100 Subject: [PATCH 1/4] Move merge_yaml.sh so it is installed with package v2 --- sources/extra_files/{loki-amd64 => loki}/.gitignore | 0 sources/extra_files/{loki-amd64 => loki}/merge_yaml.sh | 0 sources/patches/.gitignore | 2 -- 3 files changed, 2 deletions(-) rename sources/extra_files/{loki-amd64 => loki}/.gitignore (100%) rename sources/extra_files/{loki-amd64 => loki}/merge_yaml.sh (100%) delete mode 100644 sources/patches/.gitignore diff --git a/sources/extra_files/loki-amd64/.gitignore b/sources/extra_files/loki/.gitignore similarity index 100% rename from sources/extra_files/loki-amd64/.gitignore rename to sources/extra_files/loki/.gitignore diff --git a/sources/extra_files/loki-amd64/merge_yaml.sh b/sources/extra_files/loki/merge_yaml.sh similarity index 100% rename from sources/extra_files/loki-amd64/merge_yaml.sh rename to sources/extra_files/loki/merge_yaml.sh diff --git a/sources/patches/.gitignore b/sources/patches/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/sources/patches/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] From 1f7e94225ff680c5ed72940d4340a76a07a74eed Mon Sep 17 00:00:00 2001 From: Florent Date: Sun, 11 Feb 2024 13:31:03 +0100 Subject: [PATCH 2/4] Detect systemd service failure --- scripts/install | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index eee32e4..3803663 100755 --- a/scripts/install +++ b/scripts/install @@ -69,8 +69,8 @@ ynh_use_logrotate ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/loki.log" -ynh_systemd_action --service_name="$app-promtail" --action="start" --log_path="/var/log/$app/promtail.log" +ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/loki.log" --line_match="Loki started" +ynh_systemd_action --service_name="$app-promtail" --action="start" --log_path="/var/log/$app/promtail.log" --line_match="server listening on addresses" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index ab78921..5ea9c2e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -48,8 +48,8 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/loki.log" -ynh_systemd_action --service_name="$app-promtail" --action="start" --log_path="/var/log/$app/promtail.log" +ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/loki.log" --line_match="Loki started" +ynh_systemd_action --service_name="$app-promtail" --action="start" --log_path="/var/log/$app/promtail.log" --line_match="server listening on addresses" #================================================= # END OF SCRIPT diff --git a/scripts/upgrade b/scripts/upgrade index c13f548..32d593d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -80,8 +80,8 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/loki.log" -ynh_systemd_action --service_name="$app-promtail" --action="start" --log_path="/var/log/$app/promtail.log" +ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/loki.log" --line_match="Loki started" +ynh_systemd_action --service_name="$app-promtail" --action="start" --log_path="/var/log/$app/promtail.log" --line_match="server listening on addresses" #================================================= # END OF SCRIPT From 922e8e5c936f325aac13b733793bf9d3bdcecd29 Mon Sep 17 00:00:00 2001 From: Florent Date: Sun, 11 Feb 2024 15:29:50 +0100 Subject: [PATCH 3/4] bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ac06a0f..0a326fd 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Loki + Promtail" description.en = "Grafana Loki is a set of components that can be composed into a fully featured logging stack." description.fr = "Grafana Loki est un ensemble de composants qui peuvent être composés pour former une pile de journalisation complète." -version = "2.8.4~ynh2" +version = "2.8.4~ynh3" maintainers = ["fflorent"] From c7685c3153b8500bf4a5c094b83c21392b416976 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 11 Feb 2024 14:29:53 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5e33a29..1542403 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ A Loki-based logging stack consists of 3 components: - [Grafana](https://github.com/Yunohost-Apps/grafana_ynh) for querying and displaying the logs. -**Shipped version:** 2.8.4~ynh2 +**Shipped version:** 2.8.4~ynh3 ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index c081b2d..0b64d13 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ A Loki-based logging stack consists of 3 components: - [Grafana](https://github.com/Yunohost-Apps/grafana_ynh) for querying and displaying the logs. -**Version incluse :** 2.8.4~ynh2 +**Version incluse :** 2.8.4~ynh3 ## Documentations et ressources * Site officiel de l’app :