From f14342bb07212d1a22b6528fa9ea9e6a64397a92 Mon Sep 17 00:00:00 2001
From: xbgmsharp <xbgmsharp@gmail.com>
Date: Fri, 29 Dec 2023 18:16:59 +0100
Subject: [PATCH] Fix grafana cron job. update cron_process_grafana_fn

---
 initdb/02_2_signalk_cron.sql               | 11 +++++++----
 initdb/02_3_2_signalk_public_functions.sql |  7 +++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/initdb/02_2_signalk_cron.sql b/initdb/02_2_signalk_cron.sql
index 4099760..efca72c 100644
--- a/initdb/02_2_signalk_cron.sql
+++ b/initdb/02_2_signalk_cron.sql
@@ -363,7 +363,7 @@ COMMENT ON FUNCTION
 CREATE FUNCTION cron_process_grafana_fn() RETURNS void AS $$
 DECLARE
     process_rec record;
-    metadata_rec record;
+    data_rec record;
     app_settings jsonb;
 BEGIN
     -- We run grafana provisioning only after the first received vessel metadata
@@ -375,11 +375,14 @@ BEGIN
             order by stored asc
     LOOP
         RAISE NOTICE '-> cron_process_grafana_fn [%]', process_rec.payload;
-        -- as we got data from the vessel we can do the grafana provisioning.
         -- Gather url from app settings
         app_settings := get_app_settings_fn();
-        SELECT * INTO metadata_rec FROM api.metadata WHERE id = process_rec.payload;
-        PERFORM grafana_py_fn(metadata_rec.name,metadata_rec.vessel_id,metadata_rec.owner_email,app_settings);
+        SELECT * INTO data_rec
+            FROM api.metadata m, auth.vessels v
+            WHERE id = process_rec.payload::INTEGER
+                AND m.vessel_id = v.vessel_id;
+        -- as we got data from the vessel we can do the grafana provisioning.
+        PERFORM grafana_py_fn(data_rec.name,data_rec.vessel_id,data_rec.owner_email,app_settings);
         -- update process_queue entry as processed
         UPDATE process_queue
             SET
diff --git a/initdb/02_3_2_signalk_public_functions.sql b/initdb/02_3_2_signalk_public_functions.sql
index 24ca881..0aba465 100644
--- a/initdb/02_3_2_signalk_public_functions.sql
+++ b/initdb/02_3_2_signalk_public_functions.sql
@@ -827,14 +827,15 @@ BEGIN
         name LIKE 'app.email%'
         OR name LIKE 'app.pushover%'
         OR name LIKE 'app.url'
-        OR name LIKE 'app.telegram%';
+        OR name LIKE 'app.telegram%'
+        OR name LIKE 'app.grafana_admin_uri';
 END;
 $get_app_settings$
 LANGUAGE plpgsql;
 -- Description
 COMMENT ON FUNCTION
     public.get_app_settings_fn
-    IS 'get application settings details, email, pushover, telegram';
+    IS 'get application settings details, email, pushover, telegram, grafana_admin_uri';
 
 DROP FUNCTION IF EXISTS get_app_url_fn;
 CREATE OR REPLACE FUNCTION get_app_url_fn(OUT app_settings jsonb)
@@ -1914,6 +1915,8 @@ BEGIN
     -- In correct order
     perform public.cron_process_new_notification_fn();
     perform public.cron_process_monitor_online_fn();
+    --perform public.cron_process_grafana_fn();
+    perform public.cron_process_pre_logbook_fn();
     perform public.cron_process_new_logbook_fn();
     perform public.cron_process_new_stay_fn();
     --perform public.cron_process_new_moorage_fn();