From 718ca6d6eadb8461e17581028b240051dff19a84 Mon Sep 17 00:00:00 2001 From: xbgmsharp Date: Mon, 31 Mar 2025 13:28:17 +0200 Subject: [PATCH] Update grafana SQL tests - Deprecated client_id - Update configuration - Add available_keys --- tests/sql/grafana.sql | 8 ++++---- tests/sql/grafana.sql.output | 27 +++++++++++++++------------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/tests/sql/grafana.sql b/tests/sql/grafana.sql index d12d762..0c5df3b 100644 --- a/tests/sql/grafana.sql +++ b/tests/sql/grafana.sql @@ -20,7 +20,7 @@ SELECT current_user, current_setting('user.email', true), current_setting('vesse --SELECT a.pass,v.name,m.client_id FROM auth.accounts a JOIN auth.vessels v ON a.email = 'demo+kapla@openplotter.cloud' AND a.role = 'user_role' AND cast(a.preferences->>'email_valid' as Boolean) = True AND v.owner_email = a.email JOIN api.metadata m ON m.vessel_id = v.vessel_id; --SELECT a.pass,v.name,m.client_id FROM auth.accounts a JOIN auth.vessels v ON a.email = 'demo+kapla@openplotter.cloud' AND a.role = 'user_role' AND v.owner_email = a.email JOIN api.metadata m ON m.vessel_id = v.vessel_id; \echo 'link vessel and user based on current_setting' -SELECT v.name,m.client_id FROM auth.accounts a JOIN auth.vessels v ON a.role = 'user_role' AND v.owner_email = a.email JOIN api.metadata m ON m.vessel_id = v.vessel_id ORDER BY a.id DESC; +SELECT v.name, m.vessel_id IS NOT NULL AS vessel_id FROM auth.accounts a JOIN auth.vessels v ON a.role = 'user_role' AND v.owner_email = a.email JOIN api.metadata m ON m.vessel_id = v.vessel_id ORDER BY a.id DESC; \echo 'auth.accounts details' SELECT a.user_id IS NOT NULL AS user_id, a.email, a.first, a.last, a.pass IS NOT NULL AS pass, a.role, a.preferences->'telegram'->'chat' AS telegram, a.preferences->'pushover_user_key' AS pushover_user_key FROM auth.accounts AS a ORDER BY a.id DESC; @@ -29,7 +29,7 @@ SELECT a.user_id IS NOT NULL AS user_id, a.email, a.first, a.last, a.pass IS NOT SELECT v.vessel_id IS NOT NULL AS vessel_id, v.owner_email, v.mmsi, v.name, v.role FROM auth.vessels AS v; \echo 'api.metadata details' -- -SELECT m.id, m.name, m.mmsi, m.client_id, m.length, m.beam, m.height, m.ship_type, m.plugin_version, m.signalk_version, m.time IS NOT NULL AS time, m.active FROM api.metadata AS m; +SELECT m.id, m.name, m.mmsi, m.length, m.beam, m.height, m.ship_type, m.plugin_version, m.signalk_version, m.time IS NOT NULL AS time, m.active, configuration IS NOT NULL AS configuration, available_keys FROM api.metadata AS m ORDER BY m.name DESC; -- -- grafana @@ -48,14 +48,14 @@ SELECT set_config('vessel.id', :'vessel_id', false) IS NOT NULL as vessel_id; --SELECT current_user, current_setting('user.email', true), current_setting('vessel.client_id', true), current_setting('vessel.id', true); SELECT current_user, current_setting('user.email', true); -SELECT v.name AS __text, m.client_id AS __value FROM auth.vessels v JOIN api.metadata m ON v.owner_email = 'demo+kapla@openplotter.cloud' and m.vessel_id = v.vessel_id; +SELECT v.name AS __text, m.vessel_id IS NOT NULL AS __value FROM auth.vessels v JOIN api.metadata m ON v.owner_email = 'demo+kapla@openplotter.cloud' and m.vessel_id = v.vessel_id; \echo 'auth.vessels details' --SELECT * FROM auth.vessels v; SELECT v.vessel_id IS NOT NULL AS vessel_id, v.owner_email, v.mmsi, v.name, v.role FROM auth.vessels AS v; --SELECT * FROM api.metadata m; \echo 'api.metadata details' -SELECT m.id, m.name, m.mmsi, m.client_id, m.length, m.beam, m.height, m.ship_type, m.plugin_version, m.signalk_version, m.time IS NOT NULL AS time, m.active FROM api.metadata AS m; +SELECT m.id, m.name, m.mmsi, m.length, m.beam, m.height, m.ship_type, m.plugin_version, m.signalk_version, m.time IS NOT NULL AS time, m.active, configuration IS NOT NULL AS configuration, available_keys FROM api.metadata AS m; \echo 'api.logs_view' --SELECT * FROM api.logbook l; diff --git a/tests/sql/grafana.sql.output b/tests/sql/grafana.sql.output index 5065e12..e690822 100644 --- a/tests/sql/grafana.sql.output +++ b/tests/sql/grafana.sql.output @@ -13,12 +13,12 @@ current_setting | current_setting | link vessel and user based on current_setting --[ RECORD 1 ]---------------------------------------------------------------- +-[ RECORD 1 ]---- name | aava -client_id | vessels.urn:mrn:imo:mmsi:787654321 --[ RECORD 2 ]---------------------------------------------------------------- +vessel_id | t +-[ RECORD 2 ]---- name | kapla -client_id | vessels.urn:mrn:signalk:uuid:5b4f7543-7153-4840-b139-761310b242fd +vessel_id | t auth.accounts details -[ RECORD 1 ]-----+----------------------------- @@ -55,11 +55,10 @@ name | aava role | vessel_role api.metadata details --[ RECORD 1 ]---+------------------------------------------------------------------ +-[ RECORD 1 ]---+---------------- id | 1 name | kapla mmsi | 123456789 -client_id | vessels.urn:mrn:signalk:uuid:5b4f7543-7153-4840-b139-761310b242fd length | 12 beam | 10 height | 24 @@ -68,11 +67,12 @@ plugin_version | 0.0.1 signalk_version | signalk_version time | t active | t --[ RECORD 2 ]---+------------------------------------------------------------------ +configuration | t +available_keys | +-[ RECORD 2 ]---+---------------- id | 2 name | aava mmsi | 787654321 -client_id | vessels.urn:mrn:imo:mmsi:787654321 length | 12 beam | 10 height | 24 @@ -81,6 +81,8 @@ plugin_version | 1.0.2 signalk_version | 1.20.0 time | t active | t +configuration | f +available_keys | [] SET ROLE grafana current_setting @@ -93,9 +95,9 @@ vessel_id | t current_user | grafana current_setting | demo+kapla@openplotter.cloud --[ RECORD 1 ]-------------------------------------------------------------- +-[ RECORD 1 ]-- __text | kapla -__value | vessels.urn:mrn:signalk:uuid:5b4f7543-7153-4840-b139-761310b242fd +__value | t auth.vessels details -[ RECORD 1 ]----------------------------- @@ -106,11 +108,10 @@ name | kapla role | vessel_role api.metadata details --[ RECORD 1 ]---+------------------------------------------------------------------ +-[ RECORD 1 ]---+---------------- id | 1 name | kapla mmsi | 123456789 -client_id | vessels.urn:mrn:signalk:uuid:5b4f7543-7153-4840-b139-761310b242fd length | 12 beam | 10 height | 24 @@ -119,6 +120,8 @@ plugin_version | 0.0.1 signalk_version | signalk_version time | t active | t +configuration | t +available_keys | api.logs_view -[ RECORD 1 ]----+-----------------------