From 06f2e4b2363f5706e31590901a0116406e2da738 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Mon, 9 Aug 2021 11:44:51 +0200
Subject: [PATCH] copr-be: copr-ping: use system paths

So NRPE can execute/read those files.  Also update the log file format a
bit.
---
 roles/copr/backend/tasks/copr-ping.yml        | 34 +++++++++++++++----
 .../backend/templates/copr-ping-script.sh.j2  |  8 +++--
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/roles/copr/backend/tasks/copr-ping.yml b/roles/copr/backend/tasks/copr-ping.yml
index 4beb43de4f..e32a427003 100644
--- a/roles/copr/backend/tasks/copr-ping.yml
+++ b/roles/copr/backend/tasks/copr-ping.yml
@@ -2,8 +2,22 @@
 - set_fact:
     ping_user: copr-ping
     ping_scriptdir: /home/copr-ping
-    ping_log: /home/copr-ping/ping.log
+    ping_log: /var/log/copr-ping.log
     ping_script: copr-ping-script.sh
+    ping_check: copr-ping-check.py
+  tags: copr_ping
+
+- stat: path={{ ping_log }}
+  register: ping_log
+  tags: copr_ping
+
+- name: pre-create ping log file
+  file:
+    path: "{{ ping_log }}"
+    owner: "{{ ping_user }}"
+    group: nagios
+    mode: '0644'
+  when: not ping_log.stat.exists
   tags: copr_ping
 
 - name: create the user ping user
@@ -14,16 +28,22 @@
   dnf: name=copr-cli state=latest
   tags: copr_ping
 
-- name: install a stub script
+- name: install the ping script
   template:
-    dest: "{{ ping_scriptdir }}/{{ item }}"
-    src: "{{ item }}.j2"
+    dest: "{{ ping_scriptdir }}/{{ ping_script }}"
+    src: "{{ ping_script }}.j2"
+    owner: "{{ ping_user }}"
+    group: "{{ ping_user }}"
+    mode: 0700
+  tags: copr_ping
+
+- name: install the check script
+  template:
+    dest: "/usr/bin/{{ ping_check }}"
+    src: "{{ ping_check }}.j2"
     owner: "{{ ping_user }}"
     group: "{{ ping_user }}"
     mode: 0700
-  with_items:
-    - copr-ping-script.sh
-    - copr-ping-check.py
   tags: copr_ping
 
 - name: rebuild the copr-ping package periodically
diff --git a/roles/copr/backend/templates/copr-ping-script.sh.j2 b/roles/copr/backend/templates/copr-ping-script.sh.j2
index 298db9b821..432b9cae06 100644
--- a/roles/copr/backend/templates/copr-ping-script.sh.j2
+++ b/roles/copr/backend/templates/copr-ping-script.sh.j2
@@ -1,7 +1,11 @@
 #! /bin/sh
 
 start_time=$(date +%s)
-copr build-package @copr/copr-ping --name copr-ping
+output=$(copr build-package @copr/copr-ping --name copr-ping)
 exit_status=$?
-echo "start=$start_time stop=$(date +%s) exit_status=$exit_status" \
+stop_time=$(date +%s)
+build_id=$(echo "$output" | grep 'Created builds:' | cut -d' ' -f3)
+took=$(( stop_time - start_time ))
+
+echo "build_id=$build_id start=$start_time stop=$stop_time took=$took exit_status=$exit_status" \
     >> ~/ping.log