Release v0.6.1

Update keycloak account status
Update grafana cron, Add keycloak provisioning to sync vessel_id as user attributs
2025-09-17 11:17:46 +00:00 · 2024-01-30 22:48:46 +01:00 · 2024-01-30 22:48:22 +01:00 · 2024-01-30 22:33:08 +01:00 · 2024-01-30 22:32:28 +01:00 · 2024-01-30 22:31:53 +01:00
54 changed files with 1819 additions and 1686 deletions
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ Effortless cloud based solution for storing and sharing your SignalK data. Allow
 [![release](https://img.shields.io/github/release/xbgmsharp/postgsail?include_prereleases=&sort=semver&color=blue)](https://github.com/xbgmsharp/postgsail/releases/latest)
 [![License](https://img.shields.io/github/license/xbgmsharp/postgsail)](#license)
 [![issues - postgsail](https://img.shields.io/github/issues/xbgmsharp/postgsail)](https://github.com/xbgmsharp/postgsail/issues)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)

 [![Test services db, api](https://github.com/xbgmsharp/postgsail/actions/workflows/db-test.yml/badge.svg)](https://github.com/xbgmsharp/postgsail/actions/workflows/db-test.yml)
 [![Test services db, api, web](https://github.com/xbgmsharp/postgsail/actions/workflows/frontend-test.yml/badge.svg)](https://github.com/xbgmsharp/postgsail/actions/workflows/frontend-test.yml)
@@ -19,6 +20,8 @@ postgsail-frontend:
 postgsail-telegram-bot:
 [![GitHub Release](https://img.shields.io/github/release/xbgmsharp/postgsail-telegram-bot.svg)](https://github.com/xbgmsharp/postgsail-telegram-bot/releases/latest)

+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8124/badge)](https://www.bestpractices.dev/projects/8124)
+
 ## Features

 - Automatically log your voyages without manually starting or stopping a trip.
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,6 +48,9 @@ services:
      PGRST_DB_POOL: 20
      PGRST_DB_URI: ${PGRST_DB_URI}
      PGRST_JWT_SECRET: ${PGRST_JWT_SECRET}
+      PGRST_SERVER_TIMING_ENABLED: 1
+      PGRST_DB_MAX_ROWS: 500
+      PGRST_JWT_CACHE_MAX_LIFETIME: 3600
    depends_on:
      - db
    logging:
@@ -75,10 +78,9 @@ services:
    env_file: .env
    environment:
      - GF_INSTALL_PLUGINS=pr0ps-trackmap-panel,fatcloud-windrose-panel
+      - GF_SECURITY_ADMIN_PASSWORD=${PGSAIL_GRAFANA_PASSWORD}
      - GF_USERS_ALLOW_SIGN_UP=false
      - GF_SMTP_ENABLED=false
-      - PGSAIL_GRAFANA_URI=db:5432
-      - PGSAIL_GRAFANA_PASSWORD=${PGSAIL_GRAFANA_PASSWORD}
    depends_on:
      - db
    logging:
--- a/docs/ERD/README.md
+++ b/docs/ERD/README.md
@@ -4,7 +4,7 @@ The Entity-Relationship Diagram (ERD) provides a graphical representation of dat
 ## A global overview
 Auto generated Mermaid diagram using [mermerd](https://github.com/KarnerTh/mermerd) and [MermaidJs](https://github.com/mermaid-js/mermaid).

-[PostgSail SQL Schema](https://github.com/xbgmsharp/postgsail/tree/main/ERD/postgsail.md "PostgSail SQL Schema")
+[PostgSail SQL Schema](https://github.com/xbgmsharp/postgsail/tree/main/docs/ERD/postgsail.md "PostgSail SQL Schema")

 ## Further
 There is 3 main schemas:
--- a/docs/ERD/mermerdConfig.yaml
+++ b/docs/ERD/mermerdConfig.yaml
--- a/docs/ERD/postgsail.md
+++ b/docs/ERD/postgsail.md
@@ -1,26 +1,26 @@
 ```mermaid
 erDiagram
    api_logbook {
-        text _from
-        double_precision _from_lat
-        double_precision _from_lng
+        text _from 
+        double_precision _from_lat 
+        double_precision _from_lng 
        integer _from_moorage_id "Link api.moorages with api.logbook via FOREIGN KEY and REFERENCES"
        timestamp_with_time_zone _from_time "{NOT_NULL}"
-        text _to
-        double_precision _to_lat
-        double_precision _to_lng
+        text _to 
+        double_precision _to_lat 
+        double_precision _to_lng 
        integer _to_moorage_id "Link api.moorages with api.logbook via FOREIGN KEY and REFERENCES"
-        timestamp_with_time_zone _to_time
-        boolean active
-        double_precision avg_speed
+        timestamp_with_time_zone _to_time 
+        boolean active 
+        double_precision avg_speed 
        numeric distance "in NM"
        interval duration "Best to use standard ISO 8601"
        jsonb extra "computed signalk metrics of interest, runTime, currentLevel, etc"
        integer id "{NOT_NULL}"
-        double_precision max_speed
-        double_precision max_wind_speed
-        text name
-        text notes
+        double_precision max_speed 
+        double_precision max_wind_speed 
+        text name 
+        text notes 
        geography track_geog "postgis geography type default SRID 4326 Unit: degres"
        jsonb track_geojson "store generated geojson with track metrics data using with LineString and Point features, we can not depend api.metrics table"
        geometry track_geom "postgis geometry type EPSG:4326 Unit: degres"
@@ -29,17 +29,19 @@ erDiagram

    api_metadata {
        boolean active "trigger monitor online/offline"
-        boolean active
-        double_precision beam
-        text client_id
+        boolean active 
+        double_precision beam 
+        text client_id 
+        text configuration 
        timestamp_with_time_zone created_at "{NOT_NULL}"
-        double_precision height
+        double_precision height 
        integer id "{NOT_NULL}"
-        double_precision length
-        numeric mmsi
-        text name
+        double_precision length 
+        numeric mmsi 
+        text name 
+        text platform 
        text plugin_version "{NOT_NULL}"
-        numeric ship_type
+        numeric ship_type 
        text signalk_version "{NOT_NULL}"
        timestamp_with_time_zone time "{NOT_NULL}"
        timestamp_with_time_zone updated_at "{NOT_NULL}"
@@ -48,48 +50,48 @@ erDiagram
    }

    api_metrics {
-        double_precision anglespeedapparent
-        text client_id
-        double_precision courseovergroundtrue
+        double_precision anglespeedapparent 
+        text client_id 
+        double_precision courseovergroundtrue 
        double_precision latitude "With CONSTRAINT but allow NULL value to be ignored silently by trigger"
        double_precision longitude "With CONSTRAINT but allow NULL value to be ignored silently by trigger"
-        jsonb metrics
-        double_precision speedoverground
-        status status "<sailing,motoring,moored,anchored>"
+        jsonb metrics 
+        double_precision speedoverground 
+        text status 
        timestamp_with_time_zone time "{NOT_NULL}"
        text vessel_id "{NOT_NULL}"
-        double_precision windspeedapparent
+        double_precision windspeedapparent 
    }

    api_moorages {
-        text country
+        text country 
        geography geog "postgis geography type default SRID 4326 Unit: degres"
-        boolean home_flag
+        boolean home_flag 
        integer id "{NOT_NULL}"
-        double_precision latitude
-        double_precision longitude
-        text name
-        jsonb nominatim
-        text notes
-        jsonb overpass
-        integer reference_count
+        double_precision latitude 
+        double_precision longitude 
+        text name 
+        jsonb nominatim 
+        text notes 
+        jsonb overpass 
+        integer reference_count 
        integer stay_code "Link api.stays_at with api.moorages via FOREIGN KEY and REFERENCES"
        interval stay_duration "Best to use standard ISO 8601"
        text vessel_id "{NOT_NULL}"
    }

    api_stays {
-        boolean active
+        boolean active 
        timestamp_with_time_zone arrived "{NOT_NULL}"
-        timestamp_with_time_zone departed
+        timestamp_with_time_zone departed 
        interval duration "Best to use standard ISO 8601"
        geography geog "postgis geography type default SRID 4326 Unit: degres"
        integer id "{NOT_NULL}"
-        double_precision latitude
-        double_precision longitude
+        double_precision latitude 
+        double_precision longitude 
        integer moorage_id "Link api.moorages with api.stays via FOREIGN KEY and REFERENCES"
-        text name
-        text notes
+        text name 
+        text notes 
        integer stay_code "Link api.stays_at with api.stays via FOREIGN KEY and REFERENCES"
        text vessel_id "{NOT_NULL}"
    }
@@ -104,10 +106,10 @@ erDiagram
        timestamp_with_time_zone created_at "{NOT_NULL}"
        citext email "{NOT_NULL}"
        text first "User first name with CONSTRAINT CHECK {NOT_NULL}"
+        integer id "{NOT_NULL}"
        text last "User last name with CONSTRAINT CHECK {NOT_NULL}"
        text pass "{NOT_NULL}"
-        jsonb preferences
-        integer public_id "{NOT_NULL}"
+        jsonb preferences 
        name role "{NOT_NULL}"
        timestamp_with_time_zone updated_at "{NOT_NULL}"
        text user_id "{NOT_NULL}"
@@ -115,14 +117,27 @@ erDiagram

    auth_otp {
        text otp_pass "{NOT_NULL}"
-        timestamp_with_time_zone otp_timestamp
+        timestamp_with_time_zone otp_timestamp 
        smallint otp_tries "{NOT_NULL}"
        citext user_email "{NOT_NULL}"
    }

+    auth_users {
+        timestamp_with_time_zone connected_at "{NOT_NULL}"
+        timestamp_with_time_zone created_at "{NOT_NULL}"
+        name email "{NOT_NULL}"
+        text first "{NOT_NULL}"
+        name id "{NOT_NULL}"
+        text last "{NOT_NULL}"
+        jsonb preferences 
+        name role "{NOT_NULL}"
+        timestamp_with_time_zone updated_at "{NOT_NULL}"
+        text user_id "{NOT_NULL}"
+    }
+
    auth_vessels {
        timestamp_with_time_zone created_at "{NOT_NULL}"
-        numeric mmsi
+        numeric mmsi "MMSI can be optional but if present must be a valid one and unique but must be in numeric range between 100000000 and 800000000"
        text name "{NOT_NULL}"
        citext owner_email "{NOT_NULL}"
        name role "{NOT_NULL}"
@@ -131,8 +146,8 @@ erDiagram
    }

    public_aistypes {
-        text description
-        numeric id
+        text description 
+        numeric id 
    }

    public_app_settings {
@@ -141,94 +156,94 @@ erDiagram
    }

    public_badges {
-        text description
-        text name
+        text description 
+        text name 
    }

    public_email_templates {
-        text email_content
-        text email_subject
-        text name
-        text pushover_message
-        text pushover_title
+        text email_content 
+        text email_subject 
+        text name 
+        text pushover_message 
+        text pushover_title 
    }

    public_geocoders {
-        text name
-        text reverse_url
-        text url
+        text name 
+        text reverse_url 
+        text url 
    }

    public_iso3166 {
-        text alpha_2
-        text alpha_3
-        text country
-        integer id
+        text alpha_2 
+        text alpha_3 
+        text country 
+        integer id 
    }

    public_mid {
-        text country
-        integer country_id
-        numeric id
+        text country 
+        integer country_id 
+        numeric id 
    }

    public_ne_10m_geography_marine_polys {
-        text changed
-        text featurecla
-        geometry geom
+        text changed 
+        text featurecla 
+        geometry geom 
        integer gid "{NOT_NULL}"
-        text label
-        double_precision max_label
-        double_precision min_label
-        text name
-        text name_ar
-        text name_bn
-        text name_de
-        text name_el
-        text name_en
-        text name_es
-        text name_fa
-        text name_fr
-        text name_he
-        text name_hi
-        text name_hu
-        text name_id
-        text name_it
-        text name_ja
-        text name_ko
-        text name_nl
-        text name_pl
-        text name_pt
-        text name_ru
-        text name_sv
-        text name_tr
-        text name_uk
-        text name_ur
-        text name_vi
-        text name_zh
-        text name_zht
-        text namealt
-        bigint ne_id
-        text note
-        smallint scalerank
-        text wikidataid
+        text label 
+        double_precision max_label 
+        double_precision min_label 
+        text name 
+        text name_ar 
+        text name_bn 
+        text name_de 
+        text name_el 
+        text name_en 
+        text name_es 
+        text name_fa 
+        text name_fr 
+        text name_he 
+        text name_hi 
+        text name_hu 
+        text name_id 
+        text name_it 
+        text name_ja 
+        text name_ko 
+        text name_nl 
+        text name_pl 
+        text name_pt 
+        text name_ru 
+        text name_sv 
+        text name_tr 
+        text name_uk 
+        text name_ur 
+        text name_vi 
+        text name_zh 
+        text name_zht 
+        text namealt 
+        bigint ne_id 
+        text note 
+        smallint scalerank 
+        text wikidataid 
    }

    public_process_queue {
        text channel "{NOT_NULL}"
        integer id "{NOT_NULL}"
        text payload "{NOT_NULL}"
-        timestamp_with_time_zone processed
+        timestamp_with_time_zone processed 
        text ref_id "either user_id or vessel_id {NOT_NULL}"
        timestamp_with_time_zone stored "{NOT_NULL}"
    }

    public_spatial_ref_sys {
-        character_varying auth_name
-        integer auth_srid
-        character_varying proj4text
+        character_varying auth_name 
+        integer auth_srid 
+        character_varying proj4text 
        integer srid "{NOT_NULL}"
-        character_varying srtext
+        character_varying srtext 
    }

    api_logbook }o--|| api_metadata : ""
--- a/docs/ERD/postgsail.pgerd.png
+++ b/docs/ERD/postgsail.pgerd.png
--- a/docs/ERD/signalk
+++ b/docs/ERD/signalk
--- a/docs/ERD/signalk
+++ b/docs/ERD/signalk
--- a/docs/ERD/signalk
+++ b/docs/ERD/signalk
--- a/docs/README.md
+++ b/docs/README.md
@@ -0,0 +1,2 @@
+
+Simple and scalable architecture.
--- a/2
+++ b/2
--- a/grafana/dashboards/TimescaleDB.json
+++ b/grafana/dashboards/TimescaleDB.json
--- a/grafana/dashboards/tpl/Electrical.json
+++ b/grafana/dashboards/tpl/Electrical.json
@@ -1689,7 +1689,7 @@
  },
  "timezone": "utc",
  "title": "Electrical System",
-  "uid": "rk0FTiIMk",
+  "uid": "pgsail_tpl_electrical",
  "version": 11,
  "weekStart": ""
 }
--- a/grafana/dashboards/tpl/Logbook.json
+++ b/grafana/dashboards/tpl/Logbook.json
@@ -466,7 +466,7 @@
  "timepicker": {},
  "timezone": "utc",
  "title": "Logbook",
-  "uid": "E_FUkx9nk",
+  "uid": "pgsail_tpl_logbook",
  "version": 1,
  "weekStart": ""
 }
--- a/grafana/dashboards/tpl/Monitor.json
+++ b/grafana/dashboards/tpl/Monitor.json
@@ -732,7 +732,7 @@
  },
  "timezone": "utc",
  "title": "Monitor",
-  "uid": "apqDcPjMz",
+  "uid": "pgsail_tpl_monitor",
  "version": 1,
  "weekStart": ""
 }
--- a/grafana/dashboards/tpl/RPI.json
+++ b/grafana/dashboards/tpl/RPI.json
@@ -1335,7 +1335,7 @@
  },
  "timezone": "",
  "title": "RPI System",
-  "uid": "4kxYm6j7k",
+  "uid": "pgsail_tpl_rpi",
  "version": 1,
  "weekStart": ""
 }
--- a/grafana/dashboards/tpl/Solar.json
+++ b/grafana/dashboards/tpl/Solar.json
@@ -629,7 +629,7 @@
  },
  "timezone": "utc",
  "title": "Solar System",
-  "uid": "62bzzlr7z",
+  "uid": "pgsail_tpl_solar",
  "version": 1,
  "weekStart": ""
 }
--- a/grafana/dashboards/tpl/Weather.json
+++ b/grafana/dashboards/tpl/Weather.json
@@ -1981,7 +1981,7 @@
    },
    "timezone": "utc",
    "title": "Weather",
-    "uid": "631a97c2e",
+    "uid": "pgsail_tpl_weather",
    "version": 1,
    "weekStart": ""
  }
--- a/grafana/dashboards/tpl/home.json
+++ b/grafana/dashboards/tpl/home.json
@@ -204,7 +204,7 @@
          "editorMode": "code",
          "format": "table",
          "rawQuery": true,
-          "rawSql": "SELECT latitude, longitude FROM api.metrics WHERE vessel_id = '${boat}' ORDER BY time ASC LIMIT 1;",
+          "rawSql": "SELECT latitude, longitude FROM api.metrics WHERE vessel_id = '${boat}' ORDER BY time DESC LIMIT 1;",
          "refId": "A",
          "sql": {
            "columns": [
@@ -291,7 +291,7 @@
  },
  "timezone": "browser",
  "title": "Home",
-  "uid": "d81aa15b",
+  "uid": "pgsail_tpl_home",
  "version": 1,
  "weekStart": ""
-}
+}
--- a/grafana/grafana.ini
+++ b/grafana/grafana.ini
@@ -3,19 +3,22 @@ allow_sign_up = false
 auto_assign_org = true
 auto_assign_org_role = Editor

-[auth.proxy]
-enabled = true
-header_name = X-WEBAUTH-USER
-header_property = email
-headers = Login:X-WEBAUTH-LOGIN
-auto_sign_up = true
-enable_login_token = true
-login_maximum_inactive_lifetime_duration = 12h
-login_maximum_lifetime_duration = 1d
-
 [dashboards]
-default_home_dashboard_path = /etc/grafana/dashboards/home.json
+default_home_dashboard_path = /etc/grafana/dashboards/tpl/home.json
+min_refresh_interval = 1m
+
+[alerting]
+enabled = false
+
+[unified_alerting]
+enabled = false

 [analytics]
 feedback_links_enabled = false
 reporting_enabled = false
+
+[news]
+news_feed_enabled = false
+
+[help]
+enabled = false
--- a/grafana/provisioning/dashboards/default.yaml
+++ b/grafana/provisioning/dashboards/default.yaml
@@ -20,6 +20,6 @@ providers:
    allowUiUpdates: true
    options:
      # <string, required> path to dashboard files on disk. Required when using the 'file' type
-      path: /etc/grafana/dashboards/
+      path: /etc/grafana/dashboards/tpl/
      # <bool> use folder names from filesystem to create folders in Grafana
      foldersFromFilesStructure: true
--- a/initdb/02_1_1_signalk_api_tables.sql
+++ b/initdb/02_1_1_signalk_api_tables.sql
@@ -21,6 +21,8 @@ CREATE TABLE IF NOT EXISTS api.metadata(
  plugin_version TEXT NOT NULL,
  signalk_version TEXT NOT NULL,
  time TIMESTAMPTZ NOT NULL, -- should be rename to last_update !?
+  platform TEXT NULL,
+  configuration TEXT NULL,
  active BOOLEAN DEFAULT True, -- trigger monitor online/offline
  created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
  updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
@@ -28,18 +30,16 @@ CREATE TABLE IF NOT EXISTS api.metadata(
 -- Description
 COMMENT ON TABLE
    api.metadata
-    IS 'Stores metadata from vessel';
+    IS 'Stores metadata received from vessel, aka signalk plugin';
 COMMENT ON COLUMN api.metadata.active IS 'trigger monitor online/offline';
-- Index
-CREATE INDEX metadata_vessel_id_idx ON api.metadata (vessel_id);
--CREATE INDEX metadata_mmsi_idx ON api.metadata (mmsi);
-- is unused index ?
-CREATE INDEX metadata_name_idx ON api.metadata (name);
+COMMENT ON COLUMN api.metadata.vessel_id IS 'vessel_id link auth.vessels with api.metadata';
+-- Duplicate Indexes
+--CREATE INDEX metadata_vessel_id_idx ON api.metadata (vessel_id);

 ---------------------------------------------------------------------------
 -- Metrics from signalk
 -- Create vessel status enum
-CREATE TYPE status AS ENUM ('sailing', 'motoring', 'moored', 'anchored');
+CREATE TYPE status_type AS ENUM ('sailing', 'motoring', 'moored', 'anchored');
 -- Table api.metrics
 CREATE TABLE IF NOT EXISTS api.metrics (
  time TIMESTAMPTZ NOT NULL,
@@ -51,8 +51,8 @@ CREATE TABLE IF NOT EXISTS api.metrics (
  courseOverGroundTrue DOUBLE PRECISION NULL,
  windSpeedApparent DOUBLE PRECISION NULL,
  angleSpeedApparent DOUBLE PRECISION NULL,
-  status status NULL,
-  metrics jsonb NULL,
+  status TEXT NULL,
+  metrics JSONB NULL,
  --CONSTRAINT valid_client_id CHECK (length(client_id) > 10),
  --CONSTRAINT valid_latitude CHECK (latitude >= -90 and latitude <= 90),
  --CONSTRAINT valid_longitude CHECK (longitude >= -180 and longitude <= 180),
@@ -131,6 +131,8 @@ COMMENT ON COLUMN api.logbook.duration IS 'Best to use standard ISO 8601';

 -- Index todo!
 CREATE INDEX logbook_vessel_id_idx ON api.logbook (vessel_id);
+CREATE INDEX logbook_from_time_idx ON api.logbook (_from_time);
+CREATE INDEX logbook_to_time_idx ON api.logbook (_to_time);
 CREATE INDEX logbook_from_moorage_id_idx ON api.logbook (_from_moorage_id);
 CREATE INDEX logbook_to_moorage_id_idx ON api.logbook (_to_moorage_id);
 CREATE INDEX ON api.logbook USING GIST ( track_geom );
@@ -162,6 +164,7 @@ CREATE TABLE IF NOT EXISTS api.stays(
 COMMENT ON TABLE
    api.stays
    IS 'Stores generated stays';
+COMMENT ON COLUMN api.stays.duration IS 'Best to use standard ISO 8601';

 -- Index
 CREATE INDEX stays_vessel_id_idx ON api.stays (vessel_id);
@@ -169,7 +172,6 @@ CREATE INDEX stays_moorage_id_idx ON api.stays (moorage_id);
 CREATE INDEX ON api.stays USING GIST ( geog );
 COMMENT ON COLUMN api.stays.geog IS 'postgis geography type default SRID 4326 Unit: degres';
 -- With other SRID ERROR: Only lon/lat coordinate systems are supported in geography.
-COMMENT ON COLUMN api.stays.duration IS 'Best to use standard ISO 8601';

 ---------------------------------------------------------------------------
 -- Moorages
@@ -256,6 +258,8 @@ CREATE FUNCTION metadata_upsert_trigger_fn() RETURNS trigger AS $metadata_upsert
                    ship_type = NEW.ship_type,
                    plugin_version = NEW.plugin_version,
                    signalk_version = NEW.signalk_version,
+                    platform = NEW.platform,
+                    configuration = NEW.configuration,
                    -- time = NEW.time, ignore the time sent by the vessel as it is out of sync sometimes.
                    time = NOW(), -- overwrite the time sent by the vessel
                    active = true
@@ -303,6 +307,22 @@ COMMENT ON FUNCTION
    public.metadata_notification_trigger_fn
    IS 'process metadata notification from vessel, monitoring_online';

+-- FUNCTION Metadata grafana provisioning for new vessel after insert
+DROP FUNCTION IF EXISTS metadata_grafana_trigger_fn;
+CREATE FUNCTION metadata_grafana_trigger_fn() RETURNS trigger AS $metadata_grafana$
+    DECLARE
+    BEGIN
+        RAISE NOTICE 'metadata_grafana_trigger_fn [%]', NEW;
+        INSERT INTO process_queue (channel, payload, stored, ref_id)
+            VALUES ('grafana', NEW.id, now(), NEW.vessel_id);
+        RETURN NULL;
+    END;
+$metadata_grafana$ LANGUAGE plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    public.metadata_grafana_trigger_fn
+    IS 'process metadata grafana provisioning from vessel';
+
 ---------------------------------------------------------------------------
 -- Trigger metadata table
 --
@@ -320,7 +340,15 @@ CREATE TRIGGER metadata_notification_trigger AFTER INSERT ON api.metadata
 -- Description
 COMMENT ON TRIGGER 
    metadata_notification_trigger ON api.metadata 
-    IS 'AFTER INSERT ON api.metadata run function metadata_update_trigger_fn for notification on new vessel';
+    IS 'AFTER INSERT ON api.metadata run function metadata_notification_trigger_fn for later notification on new vessel';
+
+-- Metadata trigger AFTER INSERT
+CREATE TRIGGER metadata_grafana_trigger AFTER INSERT ON api.metadata
+    FOR EACH ROW EXECUTE FUNCTION metadata_grafana_trigger_fn();
+-- Description
+COMMENT ON TRIGGER 
+    metadata_grafana_trigger ON api.metadata 
+    IS 'AFTER INSERT ON api.metadata run function metadata_grafana_trigger_fn for later grafana provisioning on new vessel';

 ---------------------------------------------------------------------------
 -- Trigger Functions metrics table
@@ -430,10 +458,10 @@ CREATE FUNCTION metrics_trigger_fn() RETURNS trigger AS $metrics$
            RAISE WARNING 'Metrics Insert first stay as no previous metrics exist, stay_id stay_id [%] [%] [%]', stay_id, NEW.status, NEW.time;
        END IF;
        -- Check if status is valid enum
-        SELECT NEW.status::name = any(enum_range(null::status)::name[]) INTO valid_status;
+        SELECT NEW.status::name = any(enum_range(null::status_type)::name[]) INTO valid_status;
        IF valid_status IS False THEN
            -- Ignore entry if status is invalid
-            RAISE WARNING 'Metrics Ignoring metric, invalid status [%]', NEW.status;
+            RAISE WARNING 'Metrics Ignoring metric, vessel_id [%], invalid status [%]', NEW.vessel_id, NEW.status;
            RETURN NULL;
        END IF;
        -- Check if speedOverGround is valid value
@@ -478,7 +506,7 @@ CREATE FUNCTION metrics_trigger_fn() RETURNS trigger AS $metrics$
                    WHERE id = stay_id;
                -- Add stay entry to process queue for further processing
                INSERT INTO process_queue (channel, payload, stored, ref_id)
-                    VALUES ('new_stay', stay_id, now(), current_setting('vessel.id', true));
+                    VALUES ('new_stay', stay_id, NOW(), current_setting('vessel.id', true));
                RAISE WARNING 'Metrics Updating Stay end current stay_id [%] [%] [%]', stay_id, NEW.status, NEW.time;
            ELSE
                RAISE WARNING 'Metrics Invalid stay_id [%] [%]', stay_id, NEW.time;
@@ -529,7 +557,7 @@ CREATE FUNCTION metrics_trigger_fn() RETURNS trigger AS $metrics$
                    WHERE id = logbook_id;
                -- Add logbook entry to process queue for later processing
                INSERT INTO process_queue (channel, payload, stored, ref_id)
-                    VALUES ('new_logbook', logbook_id, now(), current_setting('vessel.id', true));
+                    VALUES ('pre_logbook', logbook_id, NOW(), current_setting('vessel.id', true));
            ELSE
                RAISE WARNING 'Metrics Invalid logbook_id [%] [%] [%]', logbook_id, NEW.status, NEW.time;
            END IF;
@@ -540,7 +568,7 @@ $metrics$ LANGUAGE plpgsql;
 -- Description
 COMMENT ON FUNCTION
    public.metrics_trigger_fn
-    IS 'process metrics from vessel, generate new_logbook and new_stay.';
+    IS 'process metrics from vessel, generate pre_logbook and new_stay.';

 --
 -- Triggers logbook update on metrics insert
@@ -603,4 +631,64 @@ CREATE TRIGGER moorage_delete_trigger BEFORE DELETE ON api.moorages
 -- Description
 COMMENT ON TRIGGER moorage_delete_trigger
  ON api.moorages
-  IS 'Automatic update of name and stay_code on logbook and stays reference';
+  IS 'Automatic delete logbook and stays reference when delete a moorage';
+
+-- Function process_new on completed logbook
+DROP FUNCTION IF EXISTS logbook_completed_trigger_fn;
+CREATE FUNCTION logbook_completed_trigger_fn() RETURNS trigger AS $logbook_completed$
+    DECLARE
+    BEGIN
+        RAISE NOTICE 'logbook_completed_trigger_fn [%]', OLD;
+        RAISE NOTICE 'logbook_completed_trigger_fn [%] [%]', OLD._to_time, NEW._to_time;
+        -- Add logbook entry to process queue for later processing
+        --IF ( OLD._to_time <> NEW._to_time ) THEN
+            INSERT INTO process_queue (channel, payload, stored, ref_id)
+                VALUES ('new_logbook', NEW.id, NOW(), current_setting('vessel.id', true));
+        --END IF;
+        RETURN OLD; -- result is ignored since this is an AFTER trigger
+    END;
+$logbook_completed$ LANGUAGE plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    public.logbook_completed_trigger_fn
+    IS 'Automatic process_queue for completed logbook._to_time';
+
+-- Triggers logbook completed
+--CREATE TRIGGER logbook_completed_trigger AFTER UPDATE ON api.logbook
+--    FOR EACH ROW
+--    WHEN (OLD._to_time IS DISTINCT FROM NEW._to_time)
+--    EXECUTE FUNCTION logbook_completed_trigger_fn();
+-- Description
+--COMMENT ON TRIGGER logbook_completed_trigger
+--  ON api.logbook
+--  IS 'Automatic process_queue for completed logbook';
+
+-- Function process_new on completed Stay
+DROP FUNCTION IF EXISTS stay_completed_trigger_fn;
+CREATE FUNCTION stay_completed_trigger_fn() RETURNS trigger AS $stay_completed$
+    DECLARE
+    BEGIN
+        RAISE NOTICE 'stay_completed_trigger_fn [%]', OLD;
+        RAISE NOTICE 'stay_completed_trigger_fn [%] [%]', OLD.departed, NEW.departed;
+        -- Add stay entry to process queue for later processing
+        --IF ( OLD.departed <> NEW.departed ) THEN
+            INSERT INTO process_queue (channel, payload, stored, ref_id)
+                VALUES ('new_stay', NEW.id, NOW(), current_setting('vessel.id', true));
+        --END IF;
+        RETURN OLD; -- result is ignored since this is an AFTER trigger
+    END;
+$stay_completed$ LANGUAGE plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    public.stay_completed_trigger_fn
+    IS 'Automatic process_queue for completed stay.departed';
+
+-- Triggers stay completed
+--CREATE TRIGGER stay_completed_trigger AFTER UPDATE ON api.stays
+--    FOR EACH ROW
+--    WHEN (OLD.departed IS DISTINCT FROM NEW.departed)
+--    EXECUTE FUNCTION stay_completed_trigger_fn();
+-- Description
+--COMMENT ON TRIGGER stay_completed_trigger
+--  ON api.stays
+--  IS 'Automatic process_queue for completed stay';
--- a/initdb/02_1_2_signalk_api_functions.sql
+++ b/initdb/02_1_2_signalk_api_functions.sql
@@ -7,6 +7,12 @@
 --
 ---------------------------------------------------------------------------

+-- PostgREST Media Type Handlers
+CREATE DOMAIN "text/xml" AS xml;
+CREATE DOMAIN "application/geo+json" AS jsonb;
+CREATE DOMAIN "application/gpx+xml" AS xml;
+CREATE DOMAIN "application/vnd.google-earth.kml+xml" AS xml;
+
 ---------------------------------------------------------------------------
 -- Functions API schema
 -- Timelapse - replay logs
@@ -41,7 +47,7 @@ CREATE OR REPLACE FUNCTION api.timelapse_fn(
            WITH logbook as (
                SELECT track_geom
                    FROM api.logbook
-                    WHERE _from_time >= start_log::TIMESTAMPTZ
+                    WHERE _from_time >= start_date::TIMESTAMPTZ
                        AND _to_time <= end_date::TIMESTAMPTZ + interval '23 hours 59 minutes'
                        AND track_geom IS NOT NULL
                    ORDER BY _from_time ASC
@@ -69,7 +75,7 @@ CREATE OR REPLACE FUNCTION api.timelapse_fn(
        -- Return a GeoJSON MultiLineString
        -- result _geojson [null, null]
        --raise WARNING 'result _geojson %' , _geojson;
-        SELECT json_build_object(
+        SELECT jsonb_build_object(
            'type', 'FeatureCollection',
            'features', ARRAY[_geojson] ) INTO geojson;
    END;
@@ -79,6 +85,75 @@ COMMENT ON FUNCTION
    api.timelapse_fn
    IS 'Export all selected logs geometry `track_geom` to a geojson as MultiLineString with empty properties';

+DROP FUNCTION IF EXISTS api.timelapse2_fn;
+CREATE OR REPLACE FUNCTION api.timelapse2_fn(
+    IN start_log INTEGER DEFAULT NULL,
+    IN end_log INTEGER DEFAULT NULL,
+    IN start_date TEXT DEFAULT NULL,
+    IN end_date TEXT DEFAULT NULL,
+    OUT geojson JSONB) RETURNS JSONB AS $timelapse2$
+    DECLARE
+        _geojson jsonb;
+    BEGIN
+        -- Using sub query to force id order by
+        -- Merge GIS track_geom into a GeoJSON Points
+        IF start_log IS NOT NULL AND public.isnumeric(start_log::text) AND public.isnumeric(end_log::text) THEN
+            SELECT jsonb_agg(
+                        jsonb_build_object('type', 'Feature',
+                                            'properties', jsonb_build_object( 'notes', f->'properties'->>'notes'),
+                                            'geometry', jsonb_build_object( 'coordinates', f->'geometry'->'coordinates', 'type', 'Point'))
+                    ) INTO _geojson
+            FROM (
+                SELECT jsonb_array_elements(track_geojson->'features') AS f
+                    FROM api.logbook
+                    WHERE id >= start_log
+                        AND id <= end_log
+                        AND track_geojson IS NOT NULL
+                    ORDER BY _from_time ASC
+            ) AS sub
+            WHERE (f->'geometry'->>'type') = 'Point';
+        ELSIF start_date IS NOT NULL AND public.isdate(start_date::text) AND public.isdate(end_date::text) THEN
+            SELECT jsonb_agg(
+                        jsonb_build_object('type', 'Feature',
+                                            'properties', jsonb_build_object( 'notes', f->'properties'->>'notes'),
+                                            'geometry', jsonb_build_object( 'coordinates', f->'geometry'->'coordinates', 'type', 'Point'))
+                    ) INTO _geojson
+            FROM (
+                SELECT jsonb_array_elements(track_geojson->'features') AS f
+                    FROM api.logbook
+                    WHERE _from_time >= start_date::TIMESTAMPTZ
+                        AND _to_time <= end_date::TIMESTAMPTZ + interval '23 hours 59 minutes'
+                        AND track_geojson IS NOT NULL
+                    ORDER BY _from_time ASC
+            ) AS sub
+            WHERE (f->'geometry'->>'type') = 'Point';
+        ELSE
+            SELECT jsonb_agg(
+                        jsonb_build_object('type', 'Feature',
+                                            'properties', jsonb_build_object( 'notes', f->'properties'->>'notes'),
+                                            'geometry', jsonb_build_object( 'coordinates', f->'geometry'->'coordinates', 'type', 'Point'))
+                    ) INTO _geojson
+            FROM (
+                SELECT jsonb_array_elements(track_geojson->'features') AS f
+                    FROM api.logbook
+                    WHERE track_geojson IS NOT NULL
+                    ORDER BY _from_time ASC
+            ) AS sub
+            WHERE (f->'geometry'->>'type') = 'Point';
+        END IF;
+        -- Return a GeoJSON MultiLineString
+        -- result _geojson [null, null]
+        raise WARNING 'result _geojson %' , _geojson;
+        SELECT jsonb_build_object(
+            'type', 'FeatureCollection',
+            'features', _geojson ) INTO geojson;
+    END;
+$timelapse2$ LANGUAGE plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    api.timelapse2_fn
+    IS 'Export all selected logs geometry `track_geom` to a geojson as points with notes properties';
+
 -- export_logbook_geojson_fn
 DROP FUNCTION IF EXISTS api.export_logbook_geojson_fn;
 CREATE FUNCTION api.export_logbook_geojson_fn(IN _id integer, OUT geojson JSONB) RETURNS JSONB AS $export_logbook_geojson$
@@ -111,7 +186,7 @@ COMMENT ON FUNCTION
 -- https://opencpn.org/OpenCPN/info/gpxvalidation.html
 --
 DROP FUNCTION IF EXISTS api.export_logbook_gpx_fn;
-CREATE OR REPLACE FUNCTION api.export_logbook_gpx_fn(IN _id INTEGER) RETURNS pg_catalog.xml
+CREATE OR REPLACE FUNCTION api.export_logbook_gpx_fn(IN _id INTEGER) RETURNS "text/xml"
 AS $export_logbook_gpx$
    DECLARE
        app_settings jsonb;
@@ -169,7 +244,7 @@ COMMENT ON FUNCTION
 -- https://developers.google.com/kml/documentation/kml_tut
 -- TODO https://developers.google.com/kml/documentation/time#timespans
 DROP FUNCTION IF EXISTS api.export_logbook_kml_fn;
-CREATE OR REPLACE FUNCTION api.export_logbook_kml_fn(IN _id INTEGER) RETURNS pg_catalog.xml
+CREATE OR REPLACE FUNCTION api.export_logbook_kml_fn(IN _id INTEGER) RETURNS "text/xml"
 AS $export_logbook_kml$
    DECLARE
        logbook_rec record;
@@ -212,7 +287,7 @@ COMMENT ON FUNCTION
 DROP FUNCTION IF EXISTS api.export_logbooks_gpx_fn;
 CREATE OR REPLACE FUNCTION api.export_logbooks_gpx_fn(
    IN start_log INTEGER DEFAULT NULL,
-    IN end_log INTEGER DEFAULT NULL) RETURNS pg_catalog.xml
+    IN end_log INTEGER DEFAULT NULL) RETURNS "application/gpx+xml"
 AS $export_logbooks_gpx$
    declare
        merged_jsonb jsonb;
@@ -276,7 +351,7 @@ COMMENT ON FUNCTION
 DROP FUNCTION IF EXISTS api.export_logbooks_kml_fn;
 CREATE OR REPLACE FUNCTION api.export_logbooks_kml_fn(
    IN start_log INTEGER DEFAULT NULL,
-    IN end_log INTEGER DEFAULT NULL) RETURNS pg_catalog.xml
+    IN end_log INTEGER DEFAULT NULL) RETURNS "text/xml"
 AS $export_logbooks_kml$
 DECLARE
    _geom geometry;
@@ -334,7 +409,7 @@ COMMENT ON FUNCTION

 -- Find all log from and to moorage geopoint within 100m
 DROP FUNCTION IF EXISTS api.find_log_from_moorage_fn;
-CREATE OR REPLACE FUNCTION api.find_log_from_moorage_fn(IN _id INTEGER, OUT geojson JSON) RETURNS JSON AS $find_log_from_moorage$
+CREATE OR REPLACE FUNCTION api.find_log_from_moorage_fn(IN _id INTEGER, OUT geojson JSONB) RETURNS JSONB AS $find_log_from_moorage$
    DECLARE
        moorage_rec record;
        _geojson jsonb;
@@ -357,7 +432,7 @@ CREATE OR REPLACE FUNCTION api.find_log_from_moorage_fn(IN _id INTEGER, OUT geoj
                    1000 -- in meters ?
                );
        -- Return a GeoJSON filter on LineString
-        SELECT json_build_object(
+        SELECT jsonb_build_object(
            'type', 'FeatureCollection',
            'features', public.geojson_py_fn(_geojson, 'Point'::TEXT) ) INTO geojson;
    END;
@@ -368,7 +443,7 @@ COMMENT ON FUNCTION
    IS 'Find all log from moorage geopoint within 100m';

 DROP FUNCTION IF EXISTS api.find_log_to_moorage_fn;
-CREATE OR REPLACE FUNCTION api.find_log_to_moorage_fn(IN _id INTEGER, OUT geojson JSON) RETURNS JSON AS $find_log_to_moorage$
+CREATE OR REPLACE FUNCTION api.find_log_to_moorage_fn(IN _id INTEGER, OUT geojson JSONB) RETURNS JSONB AS $find_log_to_moorage$
    DECLARE
        moorage_rec record;
        _geojson jsonb;
@@ -391,7 +466,7 @@ CREATE OR REPLACE FUNCTION api.find_log_to_moorage_fn(IN _id INTEGER, OUT geojso
                    1000 -- in meters ?
                );
        -- Return a GeoJSON filter on LineString
-        SELECT json_build_object(
+        SELECT jsonb_build_object(
            'type', 'FeatureCollection',
            'features', public.geojson_py_fn(_geojson, 'Point'::TEXT) ) INTO geojson;
    END;
@@ -529,7 +604,7 @@ DROP FUNCTION IF EXISTS api.export_moorages_geojson_fn;
 CREATE FUNCTION api.export_moorages_geojson_fn(OUT geojson JSONB) RETURNS JSONB AS $export_moorages_geojson$
    DECLARE
    BEGIN
-        SELECT json_build_object(
+        SELECT jsonb_build_object(
            'type', 'FeatureCollection',
            'features',
                ( SELECT
@@ -552,7 +627,7 @@ COMMENT ON FUNCTION
    IS 'Export moorages as geojson';

 DROP FUNCTION IF EXISTS api.export_moorages_gpx_fn;
-CREATE FUNCTION api.export_moorages_gpx_fn() RETURNS pg_catalog.xml AS $export_moorages_gpx$
+CREATE FUNCTION api.export_moorages_gpx_fn() RETURNS "text/xml" AS $export_moorages_gpx$
    DECLARE
        app_settings jsonb;
    BEGIN
@@ -582,8 +657,8 @@ CREATE FUNCTION api.export_moorages_gpx_fn() RETURNS pg_catalog.xml AS $export_m
                            xmlelement(name type, 'WPT'),
                            xmlelement(name link, xmlattributes(concat(app_settings->>'app.url','moorage/', m.id) as href),
                                                        xmlelement(name text, m.name)),
-                            xmlelement(name extensions, xmlelement(name "postgsail:mooorage_id", 1),
-                                                        xmlelement(name "postgsail:link", concat(app_settings->>'app.url','moorage/', m.id)),
+                            xmlelement(name extensions, xmlelement(name "postgsail:mooorage_id", m.id),
+                                                        xmlelement(name "postgsail:link", concat(app_settings->>'app.url','/moorage/', m.id)),
                                                        xmlelement(name "opencpn:guid", uuid_generate_v4()),
                                                        xmlelement(name "opencpn:viz", '1'),
                                                        xmlelement(name "opencpn:scale_min_max", xmlattributes(true as UseScale, 30000 as ScaleMin, 0 as ScaleMax)
@@ -604,7 +679,7 @@ DROP FUNCTION IF EXISTS api.stats_logs_fn;
 CREATE OR REPLACE FUNCTION api.stats_logs_fn(
    IN start_date TEXT DEFAULT NULL,
    IN end_date TEXT DEFAULT NULL,
-    OUT stats JSON) RETURNS JSON AS $stats_logs$
+    OUT stats JSONB) RETURNS JSONB AS $stats_logs$
    DECLARE
        _start_date TIMESTAMPTZ DEFAULT '1970-01-01';
        _end_date TIMESTAMPTZ DEFAULT NOW();
@@ -748,6 +823,12 @@ CREATE OR REPLACE FUNCTION api.delete_logbook_fn(IN _id integer) RETURNS BOOLEAN
            SET notes = 'mark for deletion'
            WHERE l.vessel_id = current_setting('vessel.id', false)
                AND id = logbook_rec.id;
+        -- Update metrics status to moored
+        UPDATE api.metrics
+            SET status = 'moored'
+            WHERE time >= logbook_rec._from_time::TIMESTAMPTZ
+                AND time <= logbook_rec._to_time::TIMESTAMPTZ
+                AND vessel_id = current_setting('vessel.id', false);
        -- Get related stays
        SELECT id,departed,active INTO current_stays_id,current_stays_departed,current_stays_active
            FROM api.stays s
@@ -776,11 +857,82 @@ CREATE OR REPLACE FUNCTION api.delete_logbook_fn(IN _id integer) RETURNS BOOLEAN
        RAISE WARNING '-> delete_logbook_fn delete logbook [%]', logbook_rec.id;
        DELETE FROM api.stays WHERE id = current_stays_id;
        RAISE WARNING '-> delete_logbook_fn delete stays [%]', current_stays_id;
-        -- TODO should we subtract (-1) moorages ref count or reprocess it?!?
+        -- Clean up, Subtract (-1) moorages ref count
+        UPDATE api.moorages
+            SET reference_count = reference_count - 1
+            WHERE vessel_id = current_setting('vessel.id', false)
+                AND id = previous_stays_id;
        RETURN TRUE;
    END;
 $delete_logbook$ LANGUAGE plpgsql;
 -- Description
 COMMENT ON FUNCTION
    api.delete_logbook_fn
-    IS 'Delete a logbook and dependency stay';
+    IS 'Delete a logbook and dependency stay';
+
+CREATE OR REPLACE FUNCTION api.monitoring_history_fn(IN time_interval TEXT DEFAULT '24', OUT history_metrics JSONB) RETURNS JSONB AS $monitoring_history$
+    DECLARE
+        bucket_interval interval := '5 minutes';
+    BEGIN
+        RAISE NOTICE '-> monitoring_history_fn';
+        SELECT CASE time_interval
+            WHEN '24' THEN '5 minutes'
+            WHEN '48' THEN '2 hours'
+            WHEN '72' THEN '4 hours'
+            WHEN '168' THEN '7 hours'
+            ELSE '5 minutes'
+            END bucket INTO bucket_interval;
+        RAISE NOTICE '-> monitoring_history_fn % %', time_interval, bucket_interval;
+        WITH history_table AS (
+            SELECT time_bucket(bucket_interval::INTERVAL, time) AS time_bucket,
+                avg((metrics->'environment.water.temperature')::numeric) AS waterTemperature,
+                avg((metrics->'environment.inside.temperature')::numeric) AS insideTemperature,
+                avg((metrics->'environment.outside.temperature')::numeric) AS outsideTemperature,
+                avg((metrics->'environment.wind.speedOverGround')::numeric) AS windSpeedOverGround,
+                avg((metrics->'environment.inside.relativeHumidity')::numeric) AS insideHumidity,
+                avg((metrics->'environment.outside.relativeHumidity')::numeric) AS outsideHumidity,
+                avg((metrics->'environment.outside.pressure')::numeric) AS outsidePressure,
+                avg((metrics->'environment.inside.pressure')::numeric) AS insidePressure,
+                avg((metrics->'electrical.batteries.House.capacity.stateOfCharge')::numeric) AS batteryCharge,
+                avg((metrics->'electrical.batteries.House.voltage')::numeric) AS batteryVoltage,
+                avg((metrics->'environment.depth.belowTransducer')::numeric) AS depth
+                FROM api.metrics
+                WHERE time > (NOW() AT TIME ZONE 'UTC' - INTERVAL '1 hours' * time_interval::NUMERIC)
+                GROUP BY time_bucket
+                ORDER BY time_bucket asc
+        )
+        SELECT jsonb_agg(history_table) INTO history_metrics FROM history_table;
+    END
+$monitoring_history$ LANGUAGE plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    api.monitoring_history_fn
+    IS 'Export metrics from a time period 24h, 48h, 72h, 7d';
+
+CREATE OR REPLACE FUNCTION api.status_fn(out status jsonb) RETURNS JSONB AS $status_fn$
+    DECLARE
+        in_route BOOLEAN := False;
+    BEGIN
+        RAISE NOTICE '-> status_fn';
+        SELECT EXISTS ( SELECT id
+                        FROM api.logbook l
+                        WHERE active IS True
+                        LIMIT 1
+                    ) INTO in_route;
+        IF in_route IS True THEN
+            -- In route from <logbook.from_name> arrived at <>
+            SELECT jsonb_build_object('status', sa.description, 'location', m.name, 'departed', l._from_time) INTO status
+                from api.logbook l, api.stays_at sa, api.moorages m
+                where s.stay_code = sa.stay_code AND l._from_moorage_id = m.id AND l.active IS True;
+        ELSE
+            -- At <Stat_at.Desc> in <Moorage.name> departed at <>
+            SELECT jsonb_build_object('status', sa.description, 'location', m.name, 'arrived', s.arrived) INTO status
+                from api.stays s, api.stays_at sa, api.moorages m
+                where s.stay_code = sa.stay_code AND s.moorage_id = m.id AND s.active IS True;
+        END IF;
+    END
+$status_fn$ LANGUAGE plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    api.status_fn
+    IS 'generate vessel status';
--- a/initdb/02_1_3_signalk_api_views.sql
+++ b/initdb/02_1_3_signalk_api_views.sql
@@ -15,12 +15,12 @@
 -- security_invoker=true,security_barrier=true
 ---------------------------------------------------------------------------

-CREATE VIEW first_metric AS
+CREATE VIEW public.first_metric AS
    SELECT * 
        FROM api.metrics
        ORDER BY time ASC LIMIT 1;

-CREATE VIEW last_metric AS
+CREATE VIEW public.last_metric AS
    SELECT * 
        FROM api.metrics
        ORDER BY time DESC LIMIT 1;
@@ -59,7 +59,7 @@ COMMENT ON VIEW
    api.logs_view
    IS 'Logs web view';

-- Initial try of MATERIALIZED VIEW
+-- Initial try of MATERIALIZED VIEW - does not support RLS
 CREATE MATERIALIZED VIEW api.logs_mat_view AS
    SELECT id,
            name as "name",
@@ -106,7 +106,6 @@ COMMENT ON VIEW
    IS 'Log web view';

 -- Stays web view
-- TODO group by month
 DROP VIEW IF EXISTS api.stays_view;
 CREATE OR REPLACE VIEW api.stays_view WITH (security_invoker=true,security_barrier=true) AS
    SELECT s.id,
@@ -125,10 +124,11 @@ CREATE OR REPLACE VIEW api.stays_view WITH (security_invoker=true,security_barri
        _to._from_moorage_id AS "departed_to_moorage_id",
        _to._from AS "departed_to_moorage_name",
        s.notes AS "notes"
-    FROM api.stays s, api.stays_at sa, api.moorages m
-    LEFT JOIN api.logbook As _from ON _from._from_moorage_id = m.id
-    LEFT JOIN api.logbook AS _to ON _to._to_moorage_id = m.id
+    FROM api.stays_at sa, api.moorages m, api.stays s
+    LEFT JOIN api.logbook AS _from ON _from._from_time = s.departed
+    LEFT JOIN api.logbook AS _to ON _to._to_time = s.arrived
    WHERE s.departed IS NOT NULL
+        AND _from._to_moorage_id IS NOT NULL
        AND s.name IS NOT NULL
        AND s.stay_code = sa.stay_code
        AND s.moorage_id = m.id
@@ -156,10 +156,11 @@ CREATE OR REPLACE VIEW api.stay_view WITH (security_invoker=true,security_barrie
        _to._from_moorage_id AS "departed_to_moorage_id",
        _to._from AS "departed_to_moorage_name",
        s.notes AS "notes"
-    FROM api.stays s, api.stays_at sa, api.moorages m
-    LEFT JOIN api.logbook As _from ON _from._from_moorage_id = m.id
-    LEFT JOIN api.logbook AS _to ON _to._to_moorage_id = m.id
+    FROM api.stays_at sa, api.moorages m, api.stays s
+    LEFT JOIN api.logbook AS _from ON _from._from_time = s.departed
+    LEFT JOIN api.logbook AS _to ON _to._to_time = s.arrived
    WHERE s.departed IS NOT NULL
+        AND _from._to_moorage_id IS NOT NULL
        AND s.name IS NOT NULL
        AND s.stay_code = sa.stay_code
        AND s.moorage_id = m.id
@@ -235,14 +236,20 @@ COMMENT ON VIEW
    IS 'Moorage details web view';

 DROP VIEW IF EXISTS api.moorages_stays_view;
-CREATE OR REPLACE VIEW api.moorages_stays_view WITH (security_invoker=true,security_barrier=true) AS -- TODO
+CREATE OR REPLACE VIEW api.moorages_stays_view WITH (security_invoker=true,security_barrier=true) AS
    SELECT
-        _to.id AS _to_id,_to._to_time,
-        _from.id AS _from_id,_from._from_time,
-        m.stay_code,m.stay_duration,m.id
-        FROM api.moorages m
-        LEFT JOIN api.logbook As _from ON _from._from_moorage_id = m.id
-        LEFT JOIN api.logbook AS _to ON _to._to_moorage_id = m.id
+        _to.id AS _to_id,
+        _to._to_time,
+        _from.id AS _from_id,
+        _from._from_time,
+        s.stay_code,s.duration,m.id
+	    FROM api.stays_at sa, api.moorages m, api.stays s
+	    LEFT JOIN api.logbook AS _from ON _from._from_time = s.departed
+	    LEFT JOIN api.logbook AS _to ON _to._to_time = s.arrived
+	    WHERE s.departed IS NOT NULL
+	        AND s.name IS NOT NULL
+	        AND s.stay_code = sa.stay_code
+	        AND s.moorage_id = m.id
        ORDER BY _to._to_time DESC;
 -- Description
 COMMENT ON VIEW
@@ -371,22 +378,27 @@ CREATE VIEW api.monitoring_view WITH (security_invoker=true,security_barrier=tru
        metrics-> 'environment.inside.temperature' AS insideTemperature,
        metrics-> 'environment.outside.temperature' AS outsideTemperature,
        metrics-> 'environment.wind.speedOverGround' AS windSpeedOverGround,
-        metrics-> 'environment.wind.directionGround' AS windDirectionGround,
+        metrics-> 'environment.wind.directionTrue' AS windDirectionTrue,
        metrics-> 'environment.inside.relativeHumidity' AS insideHumidity,
        metrics-> 'environment.outside.relativeHumidity' AS outsideHumidity,
        metrics-> 'environment.outside.pressure' AS outsidePressure,
        metrics-> 'environment.inside.pressure' AS insidePressure,
        metrics-> 'electrical.batteries.House.capacity.stateOfCharge' AS batteryCharge,
        metrics-> 'electrical.batteries.House.voltage' AS batteryVoltage,
+        metrics-> 'environment.depth.belowTransducer' AS depth,
        jsonb_build_object(
            'type', 'Feature',
            'geometry', ST_AsGeoJSON(st_makepoint(longitude,latitude))::jsonb,
            'properties', jsonb_build_object(
                'name', current_setting('vessel.name', false),
                'latitude', m.latitude,
-                'longitude', m.longitude
+                'longitude', m.longitude,
+                'time', m.time,
+                'speedoverground', m.speedoverground,
+                'windspeedapparent', m.windspeedapparent
                )::jsonb ) AS geojson,
        current_setting('vessel.name', false) AS name
+        --( SELECT api.status_fn() ) AS status
    FROM api.metrics m
    ORDER BY time DESC LIMIT 1;
 COMMENT ON VIEW
--- a/initdb/02_2_signalk_cron.sql
+++ b/initdb/02_2_signalk_cron.sql
@@ -8,6 +8,36 @@ select current_database();
 -- connect to the DB
 \c signalk

+-- Check for new logbook pending validation
+CREATE FUNCTION cron_process_pre_logbook_fn() RETURNS void AS $$
+DECLARE
+    process_rec record;
+BEGIN
+    -- Check for new logbook pending update
+    RAISE NOTICE 'cron_process_pre_logbook_fn init loop';
+    FOR process_rec in
+        SELECT * FROM process_queue
+            WHERE channel = 'pre_logbook' AND processed IS NULL
+            ORDER BY stored ASC LIMIT 100
+    LOOP
+        RAISE NOTICE 'cron_process_pre_logbook_fn processing queue [%] for logbook id [%]', process_rec.id, process_rec.payload;
+        -- update logbook
+        PERFORM process_pre_logbook_fn(process_rec.payload::INTEGER);
+        -- update process_queue table , processed
+        UPDATE process_queue
+            SET
+                processed = NOW()
+            WHERE id = process_rec.id;
+        RAISE NOTICE 'cron_process_pre_logbook_fn processed queue [%] for logbook id [%]', process_rec.id, process_rec.payload;
+    END LOOP;
+END;
+$$ language plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    public.cron_process_pre_logbook_fn
+    IS 'init by pg_cron to check for new logbook pending update, if so perform process_logbook_valid_fn';
+
+
 -- Check for new logbook pending update
 CREATE FUNCTION cron_process_new_logbook_fn() RETURNS void AS $$
 declare
@@ -94,7 +124,7 @@ $$ language plpgsql;
 -- Description
 COMMENT ON FUNCTION
    public.cron_process_new_moorage_fn
-    IS 'init by pg_cron to check for new moorage pending update, if so perform process_moorage_queue_fn';
+    IS 'Deprecated, init by pg_cron to check for new moorage pending update, if so perform process_moorage_queue_fn';

 -- CRON Monitor offline pending notification
 create function cron_process_monitor_offline_fn() RETURNS void AS $$
@@ -329,6 +359,53 @@ COMMENT ON FUNCTION
    public.cron_process_new_notification_fn
    IS 'init by pg_cron to check for new event pending notifications, if so perform process_notification_queue_fn';

+-- CRON for new vessel metadata pending grafana provisioning
+CREATE FUNCTION cron_process_grafana_fn() RETURNS void AS $$
+DECLARE
+    process_rec record;
+    data_rec record;
+    app_settings jsonb;
+    user_settings jsonb;
+BEGIN
+    -- We run grafana provisioning only after the first received vessel metadata
+    -- Check for new vessel metadata pending grafana provisioning
+    RAISE NOTICE 'cron_process_grafana_fn';
+    FOR process_rec in
+        SELECT * from process_queue
+            where channel = 'grafana' and processed is null
+            order by stored asc
+    LOOP
+        RAISE NOTICE '-> cron_process_grafana_fn [%]', process_rec.payload;
+        -- Gather url from app settings
+        app_settings := get_app_settings_fn();
+        -- Get vessel details base on metadata id
+        SELECT * INTO data_rec
+            FROM api.metadata m, auth.vessels v
+            WHERE m.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);
+        -- Gather user settings
+        user_settings := get_user_settings_from_vesselid_fn(data_rec.vessel_id::TEXT);
+        RAISE DEBUG '-> DEBUG cron_process_grafana_fn get_user_settings_from_vesselid_fn [%]', user_settings;
+        -- add user in keycloak
+        PERFORM keycloak_auth_py_fn(data_rec.vessel_id, user_settings, app_settings);
+        -- Send notification
+        PERFORM send_notification_fn('grafana'::TEXT, user_settings::JSONB);
+        -- update process_queue entry as processed
+        UPDATE process_queue
+            SET
+                processed = NOW()
+            WHERE id = process_rec.id;
+        RAISE NOTICE '-> cron_process_grafana_fn updated process_queue table [%]', process_rec.id;
+    END LOOP;
+END;
+$$ language plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    public.cron_process_grafana_fn
+    IS 'init by pg_cron to check for new vessel pending grafana provisioning, if so perform grafana_py_fn';
+
 -- CRON for Vacuum database
 CREATE FUNCTION cron_vacuum_fn() RETURNS void AS $$
 -- ERROR:  VACUUM cannot be executed from a function
@@ -352,6 +429,8 @@ COMMENT ON FUNCTION
 CREATE FUNCTION cron_process_alerts_fn() RETURNS void AS $$
 DECLARE
    alert_rec record;
+    last_metric TIMESTAMPTZ;
+    metric_rec record;
 BEGIN
    -- Check for new event notification pending update
    RAISE NOTICE 'cron_process_alerts_fn';
@@ -361,9 +440,24 @@ BEGIN
            FROM auth.accounts a, auth.vessels v, api.metadata m
            WHERE m.vessel_id = v.vessel_id
                AND a.email = v.owner_email
-                AND (preferences->'alerting'->'enabled')::boolean = false
+                AND (a.preferences->'alerting'->'enabled')::boolean = True
+                AND m.active = True
    LOOP
        RAISE NOTICE '-> cron_process_alert_rec_fn for [%]', alert_rec;
+        PERFORM set_config('vessel.id', alert_rec.vessel_id, false);
+        --RAISE WARNING 'public.cron_process_alert_rec_fn() scheduler vessel.id %, user.id', current_setting('vessel.id', false), current_setting('user.id', false);
+        -- Get time from the last metrics entry
+        SELECT m.time INTO last_metric FROM api.metrics m WHERE vessel_id = alert_rec.vessel_id ORDER BY m.time DESC LIMIT 1;
+        -- Get all metrics from the last 10 minutes
+        FOR metric_rec in
+            SELECT *
+                FROM api.metrics m
+                WHERE vessel_id = alert_rec.vessel_id
+                    AND time >= last_metric - INTERVAL '10 MINUTES'
+                ORDER BY m.time DESC LIMIT 100
+        LOOP
+            RAISE NOTICE '-> cron_process_alert_rec_fn checking metrics [%]', metric_rec;
+        END LOOP;
    END LOOP;
 END;
 $$ language plpgsql;
@@ -437,7 +531,7 @@ DECLARE
    no_activity_rec record;
    user_settings jsonb;
 BEGIN
-    -- Check for vessel with no activity for more than 200 days
+    -- Check for vessel with no activity for more than 230 days
    RAISE NOTICE 'cron_process_no_activity_fn';
    FOR no_activity_rec in
        SELECT
@@ -445,7 +539,7 @@ BEGIN
            FROM auth.accounts a
            LEFT JOIN auth.vessels v ON v.owner_email = a.email
            LEFT JOIN api.metadata m ON v.vessel_id = m.vessel_id
-            WHERE m.time < NOW() AT TIME ZONE 'UTC' - INTERVAL '200 DAYS'
+            WHERE m.time < NOW() AT TIME ZONE 'UTC' - INTERVAL '230 DAYS'
    LOOP
        RAISE NOTICE '-> cron_process_no_activity_rec_fn for [%]', no_activity_rec;
        SELECT json_build_object('email', no_activity_rec.owner_email, 'recipient', no_activity_rec.first) into user_settings;
@@ -458,7 +552,7 @@ $no_activity$ language plpgsql;
 -- Description
 COMMENT ON FUNCTION
    public.cron_process_no_activity_fn
-    IS 'init by pg_cron, check for vessel with no activity for more than 200 days then send notification';
+    IS 'init by pg_cron, check for vessel with no activity for more than 230 days then send notification';

 -- CRON for deactivated/deletion
 CREATE FUNCTION cron_process_deactivated_fn() RETURNS void AS $deactivated$
--- a/initdb/02_3_1_signalk_public_tables.sql
+++ b/initdb/02_3_1_signalk_public_tables.sql
@@ -76,7 +76,7 @@ INSERT INTO public.email_templates VALUES
 ('monitor_online',
    'Boat went Online',
    E'__BOAT__ just came online\nFind more details at __APP_URL__/boats\n',
-    'Boat went Offline',
+    'Boat went Online',
    E'__BOAT__ just came online\nFind more details at __APP_URL__/boats\n'),
 ('new_badge',
    'New Badge!',
@@ -115,24 +115,29 @@ INSERT INTO public.email_templates VALUES
    E'Congratulations!\nYou have just connect your account to your vessel, @postgsail_bot.\n'),
 ('no_vessel',
    'PostgSail add your boat',
-    E'Hello __RECIPIENT__,\nYou have created an account on PostgSail but you have not created your boat yet.\nIf you need any assistance I would be happy to help. It is free and an open-source.\nThe PostgSail Team',
+    E'Hello __RECIPIENT__,\nYou created an account on PostgSail but you have not added your boat yet.\nIf you need any assistance, I would be happy to help. It is free and an open-source.\nThe PostgSail Team',
    'PostgSail next step',
    E'Hello,\nYou should create your vessel. Check your email!\n'),
 ('no_metadata',
    'PostgSail connect your boat',
-    E'Hello __RECIPIENT__,\nYou have created an account on PostgSail but you have not connected your boat yet.\nIf you need any assistance I would be happy to help. It is free and an open-source.\nThe PostgSail Team',
+    E'Hello __RECIPIENT__,\nYou created an account on PostgSail but you have not connected your boat yet.\nIf you need any assistance, I would be happy to help. It is free and an open-source.\nThe PostgSail Team',
    'PostgSail next step',
    E'Hello,\nYou should connect your vessel. Check your email!\n'),
 ('no_activity',
    'PostgSail boat inactivity',
-    E'Hello __RECIPIENT__,\nWe don\'t see any activity on your account, do you need any assistance?\nIf you need any assistance I would be happy to help. It is free and an open-source.\nThe PostgSail Team',
+    E'Hello __RECIPIENT__,\nWe don\'t see any activity on your account, do you need any assistance?\nIf you need any assistance, I would be happy to help. It is free and an open-source.\nThe PostgSail Team.',
    'PostgSail inactivity!',
    E'We detected inactivity. Check your email!\n'),
 ('deactivated',
    'PostgSail account deactivated',
    E'Hello __RECIPIENT__,\nYour account has been deactivated and all your data has been removed from PostgSail system.',
    'PostgSail deactivated!',
-    E'We removed your account. Check your email!\n');
+    E'We removed your account. Check your email!\n'),
+('grafana',
+    'PostgSail Grafana integration',
+    E'Hello __RECIPIENT__,\nCongratulations! You unlocked Grafana dashboard.\nSee more details at https://app.openplotter.cloud\nHappy sailing!\nFrancois',
+    'PostgSail Grafana!',
+    E'Congratulations!\nYou unlocked Grafana dashboard.\nSee more details at https://app.openplotter.cloud\n');

 ---------------------------------------------------------------------------
 -- Queue handling
@@ -178,7 +183,10 @@ $new_account_entry$ language plpgsql;

 create function new_account_otp_validation_entry_fn() returns trigger as $new_account_otp_validation_entry$
 begin
-    insert into process_queue (channel, payload, stored, ref_id) values ('email_otp', NEW.email, now(), NEW.user_id);
+    -- Add email_otp check only if not from oauth server
+    if (NEW.preferences->>'email_verified')::boolean IS NOT True then
+        insert into process_queue (channel, payload, stored, ref_id) values ('email_otp', NEW.email, now(), NEW.user_id);
+    end if;
    return NEW;
 END;
 $new_account_otp_validation_entry$ language plpgsql;
@@ -193,7 +201,7 @@ $new_vessel_entry$ language plpgsql;
 create function new_vessel_public_fn() returns trigger as $new_vessel_public$
 begin
    -- Update user settings with a public vessel name
-    perform api.update_user_preferences_fn('{public_vessel}', NEW.name);
+    perform api.update_user_preferences_fn('{public_vessel}', regexp_replace(NEW.name, '\W+', '', 'g'));
    return NEW;
 END;
 $new_vessel_public$ language plpgsql;
--- a/initdb/02_3_2_signalk_public_functions.sql
+++ b/initdb/02_3_2_signalk_public_functions.sql
@@ -14,7 +14,6 @@ CREATE SCHEMA IF NOT EXISTS public;
 -- Functions public schema
 -- process single cron event, process_[logbook|stay|moorage]_queue_fn()
 --
-
 CREATE OR REPLACE FUNCTION public.logbook_metrics_dwithin_fn(
    IN _start text,
    IN _end text,
@@ -40,7 +39,7 @@ $logbook_metrics_dwithin$ LANGUAGE plpgsql;
 -- Description
 COMMENT ON FUNCTION
    public.logbook_metrics_dwithin_fn
-    IS 'Check if all entries for a logbook are in stationary movement with 15 meters';
+    IS 'Check if all entries for a logbook are in stationary movement with 50 meters';

 -- Update a logbook with avg data 
 -- TODO using timescale function
@@ -145,8 +144,9 @@ CREATE FUNCTION public.logbook_update_geojson_fn(IN _id integer, IN _start text,
                time,
                courseovergroundtrue,
                speedoverground,
-                anglespeedapparent,
+                windspeedapparent,
                longitude,latitude,
+                '' AS notes,
                st_makepoint(longitude,latitude) AS geo_point
                FROM api.metrics m
                WHERE m.latitude IS NOT NULL
@@ -380,16 +380,7 @@ CREATE OR REPLACE FUNCTION process_logbook_queue_fn(IN _id integer) RETURNS void
        log_settings jsonb;
        user_settings jsonb;
        geojson jsonb;
-        _invalid_time boolean;
-        _invalid_interval boolean;
-        _invalid_distance boolean;
-        count_metric numeric;
-        previous_stays_id numeric;
-        current_stays_departed text;
-        current_stays_id numeric;
-        current_stays_active boolean;
        extra_json jsonb;
-        geo jsonb;
    BEGIN
        -- If _id is not NULL
        IF _id IS NULL OR _id < 1 THEN
@@ -414,89 +405,22 @@ CREATE OR REPLACE FUNCTION process_logbook_queue_fn(IN _id integer) RETURNS void
        PERFORM set_config('vessel.id', logbook_rec.vessel_id, false);
        --RAISE WARNING 'public.process_logbook_queue_fn() scheduler vessel.id %, user.id', current_setting('vessel.id', false), current_setting('user.id', false);

-        -- Check if all metrics are within 50meters base on geo loc
-        count_metric := logbook_metrics_dwithin_fn(logbook_rec._from_time::TEXT, logbook_rec._to_time::TEXT, logbook_rec._from_lng::NUMERIC, logbook_rec._from_lat::NUMERIC);
-        RAISE NOTICE '-> process_logbook_queue_fn logbook_metrics_dwithin_fn count:[%]', count_metric;
-
        -- Calculate logbook data average and geo
        -- Update logbook entry with the latest metric data and calculate data
        avg_rec := logbook_update_avg_fn(logbook_rec.id, logbook_rec._from_time::TEXT, logbook_rec._to_time::TEXT);
        geo_rec := logbook_update_geom_distance_fn(logbook_rec.id, logbook_rec._from_time::TEXT, logbook_rec._to_time::TEXT);

-        -- Avoid/ignore/delete logbook stationary movement or time sync issue
-        -- Check time start vs end
-        SELECT logbook_rec._to_time::TIMESTAMPTZ < logbook_rec._from_time::TIMESTAMPTZ INTO _invalid_time;
-        -- Is distance is less than 0.010
-        SELECT geo_rec._track_distance < 0.010 INTO _invalid_distance;
-        -- Is duration is less than 100sec
-        SELECT (logbook_rec._to_time::TIMESTAMPTZ - logbook_rec._from_time::TIMESTAMPTZ) < (100::text||' secs')::interval INTO _invalid_interval;
-        -- if stationary fix data metrics,logbook,stays,moorage
-        IF _invalid_time IS True OR _invalid_distance IS True
-            OR _invalid_interval IS True OR count_metric = avg_rec.count_metric
-            OR avg_rec.count_metric <= 2 THEN
-            RAISE NOTICE '-> process_logbook_queue_fn invalid logbook data id [%], _invalid_time [%], _invalid_distance [%], _invalid_interval [%], count_metric_in_zone [%], count_metric_log [%]',
-                logbook_rec.id, _invalid_time, _invalid_distance, _invalid_interval, count_metric, avg_rec.count_metric;
-            -- Update metrics status to moored
-            UPDATE api.metrics
-                SET status = 'moored'
-                WHERE time >= logbook_rec._from_time::TIMESTAMPTZ
-                    AND time <= logbook_rec._to_time::TIMESTAMPTZ
-                    AND vessel_id = current_setting('vessel.id', false);
-            -- Update logbook
-            UPDATE api.logbook
-                SET notes = 'invalid logbook data, stationary need to fix metrics?'
-                WHERE id = logbook_rec.id;
-            -- Get related stays
-            SELECT id,departed,active INTO current_stays_id,current_stays_departed,current_stays_active
-                FROM api.stays s
-                WHERE s.vessel_id = current_setting('vessel.id', false)
-                    AND s.arrived = logbook_rec._to_time;
-            -- Update related stays
-            UPDATE api.stays
-                SET notes = 'invalid stays data, stationary need to fix metrics?'
-                WHERE vessel_id = current_setting('vessel.id', false)
-                    AND arrived = logbook_rec._to_time;
-            -- Find previous stays
-            SELECT id INTO previous_stays_id
-				FROM api.stays s
-                WHERE s.vessel_id = current_setting('vessel.id', false)
-                    AND s.arrived < logbook_rec._to_time
-                    ORDER BY s.arrived DESC LIMIT 1;
-            -- Update previous stays with the departed time from current stays
-            --  and set the active state from current stays
-            UPDATE api.stays
-                SET departed = current_stays_departed::TIMESTAMPTZ,
-                    active = current_stays_active
-                WHERE vessel_id = current_setting('vessel.id', false)
-                    AND id = previous_stays_id;
-            -- Clean up, remove invalid logbook and stay entry
-            DELETE FROM api.logbook WHERE id = logbook_rec.id;
-            RAISE WARNING '-> process_logbook_queue_fn delete invalid logbook [%]', logbook_rec.id;
-            DELETE FROM api.stays WHERE id = current_stays_id;
-            RAISE WARNING '-> process_logbook_queue_fn delete invalid stays [%]', current_stays_id;
-            -- TODO should we subtract (-1) moorages ref count or reprocess it?!?
-            RETURN;
-        END IF;
-
        -- Do we have an existing moorage within 300m of the new log
        -- generate logbook name, concat _from_location and _to_location from moorage name
        from_moorage := process_lat_lon_fn(logbook_rec._from_lng::NUMERIC, logbook_rec._from_lat::NUMERIC);
        to_moorage := process_lat_lon_fn(logbook_rec._to_lng::NUMERIC, logbook_rec._to_lat::NUMERIC);
        SELECT CONCAT(from_moorage.moorage_name, ' to ' , to_moorage.moorage_name) INTO log_name;
-        -- Generate logbook name, concat _from_location and _to_location
-        -- geo reverse _from_lng _from_lat
-        -- geo reverse _to_lng _to_lat
-        --geo := reverse_geocode_py_fn('nominatim', logbook_rec._from_lng::NUMERIC, logbook_rec._from_lat::NUMERIC);
-        --from_name := geo->>'name';
-        --geo := reverse_geocode_py_fn('nominatim', logbook_rec._to_lng::NUMERIC, logbook_rec._to_lat::NUMERIC);
-        --to_name := geo->>'name';
-        --SELECT CONCAT(from_name, ' to ' , to_name) INTO log_name;

        -- Process `propulsion.*.runTime` and `navigation.log`
        -- Calculate extra json
        extra_json := logbook_update_extra_json_fn(logbook_rec.id, logbook_rec._from_time::TEXT, logbook_rec._to_time::TEXT);

-        RAISE NOTICE 'Updating valid logbook entry [%] [%] [%]', logbook_rec.id, logbook_rec._from_time, logbook_rec._to_time;
+        RAISE NOTICE 'Updating valid logbook entry logbook id:[%] start:[%] end:[%]', logbook_rec.id, logbook_rec._from_time, logbook_rec._to_time;
        UPDATE api.logbook
            SET
                duration = (logbook_rec._to_time::TIMESTAMPTZ - logbook_rec._from_time::TIMESTAMPTZ),
@@ -510,7 +434,8 @@ CREATE OR REPLACE FUNCTION process_logbook_queue_fn(IN _id integer) RETURNS void
                name = log_name,
                track_geom = geo_rec._track_geom,
                distance = geo_rec._track_distance,
-                extra = extra_json
+                extra = extra_json,
+                notes = NULL -- reset pre_log process
            WHERE id = logbook_rec.id;

        -- GeoJSON require track_geom field
@@ -531,8 +456,8 @@ CREATE OR REPLACE FUNCTION process_logbook_queue_fn(IN _id integer) RETURNS void
        -- Process badges
        RAISE NOTICE '-> debug process_logbook_queue_fn user_settings [%]', user_settings->>'email'::TEXT;
        PERFORM set_config('user.email', user_settings->>'email'::TEXT, false);
-        PERFORM badges_logbook_fn(logbook_rec.id);
-        PERFORM badges_geom_fn(logbook_rec.id);
+        PERFORM badges_logbook_fn(logbook_rec.id, logbook_rec._to_time::TEXT);
+        PERFORM badges_geom_fn(logbook_rec.id, logbook_rec._to_time::TEXT);
    END;
 $process_logbook_queue$ LANGUAGE plpgsql;
 -- Description
@@ -603,6 +528,9 @@ CREATE OR REPLACE FUNCTION process_stay_queue_fn(IN _id integer) RETURNS void AS
                    select sum(departed-arrived) from api.stays where moorage_id = moorage.moorage_id
                )
            WHERE id = moorage.moorage_id;
+
+        -- Process badges
+        PERFORM badges_moorages_fn();
    END;
 $process_stay_queue$ LANGUAGE plpgsql;
 -- Description
@@ -712,7 +640,7 @@ $process_moorage_queue$ LANGUAGE plpgsql;
 -- Description
 COMMENT ON FUNCTION
    public.process_moorage_queue_fn
-    IS 'Handle moorage insert or update from stays';
+    IS 'Handle moorage insert or update from stays, deprecated';

 -- process new account notification
 DROP FUNCTION IF EXISTS process_account_queue_fn;
@@ -750,7 +678,7 @@ $process_account_queue$ LANGUAGE plpgsql;
 -- Description
 COMMENT ON FUNCTION
    public.process_account_queue_fn
-    IS 'process new account notification';
+    IS 'process new account notification, deprecated';

 -- process new account otp validation notification
 DROP FUNCTION IF EXISTS process_account_otp_validation_queue_fn;
@@ -790,7 +718,7 @@ $process_account_otp_validation_queue$ LANGUAGE plpgsql;
 -- Description
 COMMENT ON FUNCTION
    public.process_account_otp_validation_queue_fn
-    IS 'process new account otp validation notification';
+    IS 'process new account otp validation notification, deprecated';

 -- process new event notification
 DROP FUNCTION IF EXISTS process_notification_queue_fn;
@@ -843,7 +771,7 @@ $process_notification_queue$ LANGUAGE plpgsql;
 -- Description
 COMMENT ON FUNCTION
    public.process_notification_queue_fn
-    IS 'process new event type notification';
+    IS 'process new event type notification, new_account, new_vessel, email_otp';

 -- process new vessel notification
 DROP FUNCTION IF EXISTS process_vessel_queue_fn;
@@ -882,7 +810,7 @@ $process_vessel_queue$ LANGUAGE plpgsql;
 -- Description
 COMMENT ON FUNCTION
    public.process_vessel_queue_fn
-    IS 'process new vessel notification';
+    IS 'process new vessel notification, deprecated';

 -- Get application settings details from a log entry
 DROP FUNCTION IF EXISTS get_app_settings_fn;
@@ -899,14 +827,16 @@ 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'
+        OR name LIKE 'app.keycloak_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)
@@ -1063,7 +993,7 @@ COMMENT ON FUNCTION
 ---------------------------------------------------------------------------
 -- Badges
 --
-CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETURNS VOID AS $badges_logbook$
+CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id INTEGER, IN logbook_time TEXT) RETURNS VOID AS $badges_logbook$
    DECLARE
        _badges jsonb;
        _exist BOOLEAN := null;
@@ -1081,7 +1011,7 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
            select count(*) into total from api.logbook l where vessel_id = current_setting('vessel.id', false);
            if total >= 1 then
                -- Add badge
-                badge := '{"Helmsman": {"log": '|| logbook_id ||', "date":"' || NOW()::timestamp || '"}}';
+                badge := '{"Helmsman": {"log": '|| logbook_id ||', "date":"' || logbook_time || '"}}';
                -- Get existing badges
                SELECT preferences->'badges' INTO _badges FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
                -- Merge badges
@@ -1105,7 +1035,7 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
            --RAISE WARNING '-> Wake Maker max_wind_speed %', max_wind_speed;
           if max_wind_speed >= 15 then
                -- Create badge
-                badge := '{"Wake Maker": {"log": '|| logbook_id ||', "date":"' || NOW()::timestamp || '"}}';
+                badge := '{"Wake Maker": {"log": '|| logbook_id ||', "date":"' || logbook_time || '"}}';
                --RAISE WARNING '-> Wake Maker max_wind_speed badge %', badge;
                -- Get existing badges
                SELECT preferences->'badges' INTO _badges FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
@@ -1130,7 +1060,7 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
            --RAISE WARNING '-> Stormtrooper max_wind_speed %', max_wind_speed;
            if max_wind_speed >= 30 then
                -- Create badge
-                badge := '{"Stormtrooper": {"log": '|| logbook_id ||', "date":"' || NOW()::timestamp || '"}}';
+                badge := '{"Stormtrooper": {"log": '|| logbook_id ||', "date":"' || logbook_time || '"}}';
                --RAISE WARNING '-> Stormtrooper max_wind_speed badge %', badge;
                -- Get existing badges
                SELECT preferences->'badges' INTO _badges FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
@@ -1153,7 +1083,7 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
            select l.distance into distance from api.logbook l where l.id = logbook_id AND l.distance >= 100 and vessel_id = current_setting('vessel.id', false);
            if distance >= 100 then
                -- Create badge
-                badge := '{"Navigator Award": {"log": '|| logbook_id ||', "date":"' || NOW()::timestamp || '"}}';
+                badge := '{"Navigator Award": {"log": '|| logbook_id ||', "date":"' || logbook_time || '"}}';
                -- Get existing badges
                SELECT preferences->'badges' INTO _badges FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
                -- Merge badges
@@ -1174,7 +1104,7 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
            select sum(l.distance) into distance from api.logbook l where vessel_id = current_setting('vessel.id', false);
            if distance >= 1000 then
                -- Create badge
-                badge := '{"Captain Award": {"log": '|| logbook_id ||', "date":"' || NOW()::timestamp || '"}}';
+                badge := '{"Captain Award": {"log": '|| logbook_id ||', "date":"' || logbook_time || '"}}';
                -- Get existing badges
                SELECT preferences->'badges' INTO _badges FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
                -- Merge badges
@@ -1281,7 +1211,7 @@ COMMENT ON FUNCTION
    public.badges_moorages_fn
    IS 'check moorages for new badges, eg: Explorer, Mooring Pro, Anchormaster';

-CREATE OR REPLACE FUNCTION public.badges_geom_fn(IN logbook_id integer) RETURNS VOID AS $badges_geom$
+CREATE OR REPLACE FUNCTION public.badges_geom_fn(IN logbook_id INTEGER, IN logbook_time TEXT) RETURNS VOID AS $badges_geom$
    DECLARE
        _badges jsonb;
        _exist BOOLEAN := false;
@@ -1310,7 +1240,7 @@ CREATE OR REPLACE FUNCTION public.badges_geom_fn(IN logbook_id integer) RETURNS
            --RAISE WARNING 'geography_marine [%]', _exist;
            if _exist is false then
                -- Create badge
-                badge := '{"' || marine_rec.name || '": {"log": '|| logbook_id ||', "date":"' || NOW()::timestamp || '"}}';
+                badge := '{"' || marine_rec.name || '": {"log": '|| logbook_id ||', "date":"' || logbook_time || '"}}';
                -- Get existing badges
                SELECT preferences->'badges' INTO _badges FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
                -- Merge badges
@@ -1333,8 +1263,8 @@ COMMENT ON FUNCTION
    public.badges_geom_fn
    IS 'check geometry logbook for new badges, eg: Tropic, Alaska, Geographic zone';

-DROP FUNCTION IF EXISTS public.process_logbook_valid_fn;
-CREATE OR REPLACE FUNCTION public.process_logbook_valid_fn(IN _id integer) RETURNS void AS $process_logbook_valid$
+DROP FUNCTION IF EXISTS public.process_pre_logbook_fn;
+CREATE OR REPLACE FUNCTION public.process_pre_logbook_fn(IN _id integer) RETURNS void AS $process_pre_logbook$
    DECLARE
        logbook_rec record;
        avg_rec record;
@@ -1342,15 +1272,17 @@ CREATE OR REPLACE FUNCTION public.process_logbook_valid_fn(IN _id integer) RETUR
        _invalid_time boolean;
        _invalid_interval boolean;
        _invalid_distance boolean;
+        _invalid_ratio boolean;
        count_metric numeric;
        previous_stays_id numeric;
        current_stays_departed text;
        current_stays_id numeric;
        current_stays_active boolean;
+        timebucket boolean;
    BEGIN
        -- If _id is not NULL
        IF _id IS NULL OR _id < 1 THEN
-            RAISE WARNING '-> process_logbook_valid_fn invalid input %', _id;
+            RAISE WARNING '-> process_pre_logbook_fn invalid input %', _id;
            RETURN;
        END IF;
        -- Get the logbook record with all necessary fields exist
@@ -1364,16 +1296,16 @@ CREATE OR REPLACE FUNCTION public.process_logbook_valid_fn(IN _id integer) RETUR
                AND _to_lat IS NOT NULL;
        -- Ensure the query is successful
        IF logbook_rec.vessel_id IS NULL THEN
-            RAISE WARNING '-> process_logbook_valid_fn invalid logbook %', _id;
+            RAISE WARNING '-> process_pre_logbook_fn invalid logbook %', _id;
            RETURN;
        END IF;

        PERFORM set_config('vessel.id', logbook_rec.vessel_id, false);
        --RAISE WARNING 'public.process_logbook_queue_fn() scheduler vessel.id %, user.id', current_setting('vessel.id', false), current_setting('user.id', false);

-        -- Check if all metrics are within 10meters base on geo loc
+        -- Check if all metrics are within 50meters base on geo loc
        count_metric := logbook_metrics_dwithin_fn(logbook_rec._from_time::TEXT, logbook_rec._to_time::TEXT, logbook_rec._from_lng::NUMERIC, logbook_rec._from_lat::NUMERIC);
-        RAISE NOTICE '-> process_logbook_valid_fn logbook_metrics_dwithin_fn count:[%]', count_metric;
+        RAISE NOTICE '-> process_pre_logbook_fn logbook_metrics_dwithin_fn count:[%]', count_metric;

        -- Calculate logbook data average and geo
        -- Update logbook entry with the latest metric data and calculate data
@@ -1387,11 +1319,18 @@ CREATE OR REPLACE FUNCTION public.process_logbook_valid_fn(IN _id integer) RETUR
        SELECT geo_rec._track_distance < 0.010 INTO _invalid_distance;
        -- Is duration is less than 100sec
        SELECT (logbook_rec._to_time::TIMESTAMPTZ - logbook_rec._from_time::TIMESTAMPTZ) < (100::text||' secs')::interval INTO _invalid_interval;
+        -- If we have less than 15 metrics
+        -- Is within metrics represent more or equal than 60% of the total entry
+        IF count_metric::NUMERIC <= 15 THEN
+            SELECT (count_metric::NUMERIC / avg_rec.count_metric::NUMERIC) >= 0.60 INTO _invalid_ratio;
+        END IF;
        -- if stationary fix data metrics,logbook,stays,moorage
        IF _invalid_time IS True OR _invalid_distance IS True
-            OR _invalid_interval IS True OR count_metric = avg_rec.count_metric THEN
-            RAISE NOTICE '-> process_logbook_queue_fn invalid logbook data id [%], _invalid_time [%], _invalid_distance [%], _invalid_interval [%], within count_metric == total count_metric [%]',
-                logbook_rec.id, _invalid_time, _invalid_distance, _invalid_interval, count_metric;
+            OR _invalid_interval IS True OR count_metric = avg_rec.count_metric
+            OR _invalid_ratio IS True
+            OR avg_rec.count_metric <= 3 THEN
+            RAISE NOTICE '-> process_pre_logbook_fn invalid logbook data id [%], _invalid_time [%], _invalid_distance [%], _invalid_interval [%], count_metric_in_zone [%], count_metric_log [%], _invalid_ratio [%]',
+                logbook_rec.id, _invalid_time, _invalid_distance, _invalid_interval, count_metric, avg_rec.count_metric, _invalid_ratio;
            -- Update metrics status to moored
            UPDATE api.metrics
                SET status = 'moored'
@@ -1428,19 +1367,40 @@ CREATE OR REPLACE FUNCTION public.process_logbook_valid_fn(IN _id integer) RETUR
                    AND id = previous_stays_id;
            -- Clean up, remove invalid logbook and stay entry
            DELETE FROM api.logbook WHERE id = logbook_rec.id;
-            RAISE WARNING '-> process_logbook_queue_fn delete invalid logbook [%]', logbook_rec.id;
+            RAISE WARNING '-> process_pre_logbook_fn delete invalid logbook [%]', logbook_rec.id;
            DELETE FROM api.stays WHERE id = current_stays_id;
-            RAISE WARNING '-> process_logbook_queue_fn delete invalid stays [%]', current_stays_id;
-            -- TODO should we subtract (-1) moorages ref count or reprocess it?!?
+            RAISE WARNING '-> process_pre_logbook_fn delete invalid stays [%]', current_stays_id;
            RETURN;
        END IF;

+        --IF (logbook_rec.notes IS NULL) THEN -- run one time only
+        --    -- If duration is over 24h or number of entry is over 400, check for stays and potential multiple logs with stationary location
+        --    IF (logbook_rec._to_time::TIMESTAMPTZ - logbook_rec._from_time::TIMESTAMPTZ) > INTERVAL '24 hours'
+        --        OR avg_rec.count_metric > 400 THEN
+        --        timebucket := public.logbook_metrics_timebucket_fn('15 minutes'::TEXT, logbook_rec.id, logbook_rec._from_time::TIMESTAMPTZ, logbook_rec._to_time::TIMESTAMPTZ);
+        --        -- If true exit current process as the current logbook need to be re-process.
+        --        IF timebucket IS True THEN
+        --            RETURN;
+        --        END IF;
+        --    ELSE
+        --        timebucket := public.logbook_metrics_timebucket_fn('5 minutes'::TEXT, logbook_rec.id, logbook_rec._from_time::TIMESTAMPTZ, logbook_rec._to_time::TIMESTAMPTZ);
+        --        -- If true exit current process as the current logbook need to be re-process.
+        --        IF timebucket IS True THEN
+        --            RETURN;
+        --        END IF;
+        --    END IF;
+        --END IF;
+
+        -- Add logbook entry to process queue for later processing
+        INSERT INTO process_queue (channel, payload, stored, ref_id)
+            VALUES ('new_logbook', logbook_rec.id, NOW(), current_setting('vessel.id', true));
+
    END;
-$process_logbook_valid$ LANGUAGE plpgsql;
+$process_pre_logbook$ LANGUAGE plpgsql;
 -- Description
 COMMENT ON FUNCTION
-    public.process_logbook_queue_fn
-    IS 'Avoid/ignore/delete logbook stationary movement or time sync issue';
+    public.process_pre_logbook_fn
+    IS 'Detect/Avoid/ignore/delete logbook stationary movement or time sync issue';

 DROP FUNCTION IF EXISTS process_lat_lon_fn;
 CREATE OR REPLACE FUNCTION process_lat_lon_fn(IN lon NUMERIC, IN lat NUMERIC,
@@ -1459,10 +1419,9 @@ CREATE OR REPLACE FUNCTION process_lat_lon_fn(IN lon NUMERIC, IN lat NUMERIC,
        geo jsonb;
        overpass jsonb;
    BEGIN
-        RAISE NOTICE 'process_lat_lon_fn';
-        -- If _id is valid, not NULL
+        RAISE NOTICE '-> process_lat_lon_fn';
        IF lon IS NULL OR lat IS NULL THEN
-            RAISE WARNING '-> process_lat_lon_fn invalid input lon,lat %', _id;
+            RAISE WARNING '-> process_lat_lon_fn invalid input lon %, lat %', lon, lat;
            --return NULL;
        END IF;

@@ -1490,7 +1449,7 @@ CREATE OR REPLACE FUNCTION process_lat_lon_fn(IN lon NUMERIC, IN lat NUMERIC,
            END IF;
        END LOOP;

-        -- if with in 200m use existing name and stay_code
+        -- if with in 300m use existing name and stay_code
        -- else insert new entry
        IF existing_rec.id IS NOT NULL AND existing_rec.id > 0 THEN
            RAISE NOTICE '-> process_lat_lon_fn found close by moorage using existing name and stay_code %', existing_rec;
@@ -1501,7 +1460,7 @@ CREATE OR REPLACE FUNCTION process_lat_lon_fn(IN lon NUMERIC, IN lat NUMERIC,
            RAISE NOTICE '-> process_lat_lon_fn create new moorage';
            -- query overpass api to guess moorage type
            overpass := overpass_py_fn(lon::NUMERIC, lat::NUMERIC);
-            RAISE NOTICE '-> process_lat_lon_fn overpass name:[%] type:[%]', overpass->'name', overpass->'seamark:type';
+            RAISE NOTICE '-> process_lat_lon_fn overpass name:[%] seamark:type:[%]', overpass->'name', overpass->'seamark:type';
            moorage_type = 1; -- Unknown
            IF overpass->>'seamark:type' = 'harbour' AND overpass->>'seamark:harbour:category' = 'marina' then
                moorage_type = 4; -- Dock
@@ -1557,6 +1516,207 @@ COMMENT ON FUNCTION
    public.process_lat_lon_fn
    IS 'Add or Update moorage base on lat/lon';

+CREATE OR REPLACE FUNCTION public.logbook_metrics_timebucket_fn(
+    IN bucket_interval TEXT,
+    IN _id INTEGER,
+    IN _start TIMESTAMPTZ,
+    IN _end TIMESTAMPTZ,
+    OUT timebucket boolean) AS $logbook_metrics_timebucket$
+DECLARE
+    time_rec record;
+    stay_rec record;
+    log_rec record;
+    geo_rec record;
+    ref_time timestamptz;
+    stay_id integer;
+    stay_lat DOUBLE PRECISION;
+    stay_lng DOUBLE PRECISION;
+    stay_arv timestamptz;
+    in_interval boolean := False;
+    log_id integer;
+    log_lat DOUBLE PRECISION;
+    log_lng DOUBLE PRECISION;
+    log_start timestamptz;
+    in_log boolean := False;
+BEGIN
+    timebucket := False;
+    -- Agg metrics over a bucket_interval
+    RAISE NOTICE '-> logbook_metrics_timebucket_fn Starting loop by [%], _start[%], _end[%]', bucket_interval, _start, _end;
+    for time_rec in
+        WITH tbl_bucket AS (
+            SELECT time_bucket(bucket_interval::INTERVAL, time) AS time_bucket,
+                    avg(speedoverground) AS speed,
+                    last(latitude, time) AS lat,
+                    last(longitude, time) AS lng,
+                    st_makepoint(avg(longitude),avg(latitude)) AS geo_point
+                FROM api.metrics m
+                WHERE
+                    m.latitude IS NOT NULL
+                    AND m.longitude IS NOT NULL
+                    AND m.time >= _start::TIMESTAMPTZ
+                    AND m.time <= _end::TIMESTAMPTZ
+                    AND m.vessel_id = current_setting('vessel.id', false)
+                GROUP BY time_bucket
+                ORDER BY time_bucket asc
+            ),
+        tbl_bucket2 AS (
+                SELECT time_bucket,
+                    speed,
+                    geo_point,lat,lng,
+                    LEAD(time_bucket,1) OVER (
+                        ORDER BY time_bucket asc
+                    ) time_interval,
+                    LEAD(geo_point,1) OVER (
+                        ORDER BY time_bucket asc
+                    ) geo_interval
+                FROM tbl_bucket
+                WHERE speed <= 0.5
+            )
+        SELECT time_bucket,
+                speed,
+                geo_point,lat,lng,
+                time_interval,
+                bucket_interval,
+                (bucket_interval::interval * 2) AS min_interval,
+                (time_bucket - time_interval) AS diff_interval,
+                (time_bucket - time_interval)::INTERVAL < (bucket_interval::interval * 2)::INTERVAL AS to_be_process
+        FROM tbl_bucket2
+        WHERE (time_bucket - time_interval)::INTERVAL < (bucket_interval::interval * 2)::INTERVAL
+    loop
+        RAISE NOTICE '-> logbook_metrics_timebucket_fn ref_time [%] interval [%] bucket_interval[%]', ref_time, time_rec.time_bucket, bucket_interval;
+        select ref_time + bucket_interval::interval * 1 >= time_rec.time_bucket into in_interval;
+        RAISE NOTICE '-> logbook_metrics_timebucket_fn ref_time+inverval[%] interval [%], in_interval [%]', ref_time + bucket_interval::interval * 1, time_rec.time_bucket, in_interval;
+        if ST_DWithin(Geography(ST_MakePoint(stay_lng, stay_lat)), Geography(ST_MakePoint(time_rec.lng, time_rec.lat)), 50) IS True then
+            in_interval := True;
+        end if;
+        if ST_DWithin(Geography(ST_MakePoint(log_lng, log_lat)), Geography(ST_MakePoint(time_rec.lng, time_rec.lat)), 50) IS False then
+            in_interval := False;
+        end if;
+        if in_interval is true then
+            ref_time := time_rec.time_bucket;
+        end if;
+        RAISE NOTICE '-> logbook_metrics_timebucket_fn ref_time is stay within of next point %', ST_DWithin(Geography(ST_MakePoint(stay_lng, stay_lat)), Geography(ST_MakePoint(time_rec.lng, time_rec.lat)), 50);
+        RAISE NOTICE '-> logbook_metrics_timebucket_fn ref_time is NOT log within of next point %', ST_DWithin(Geography(ST_MakePoint(log_lng, log_lat)), Geography(ST_MakePoint(time_rec.lng, time_rec.lat)), 50);
+        if time_rec.time_bucket::TIMESTAMPTZ < _start::TIMESTAMPTZ + bucket_interval::interval * 1 then
+            in_interval := True;
+        end if;
+        RAISE NOTICE '-> logbook_metrics_timebucket_fn ref_time is NOT before start[%] or +interval[%]', (time_rec.time_bucket::TIMESTAMPTZ < _start::TIMESTAMPTZ), (time_rec.time_bucket::TIMESTAMPTZ < _start::TIMESTAMPTZ + bucket_interval::interval * 1);
+        continue when in_interval is True;
+
+        RAISE NOTICE '-> logbook_metrics_timebucket_fn after continue stay_id[%], in_log[%]', stay_id, in_log;
+        if stay_id is null THEN
+            RAISE NOTICE '-> Close current logbook logbook_id ref_time [%] time_rec.time_bucket [%]', ref_time, time_rec.time_bucket;
+            -- Close current logbook
+            geo_rec := logbook_update_geom_distance_fn(_id, _start::TEXT, time_rec.time_bucket::TEXT);
+            UPDATE api.logbook
+                SET
+                    active = false,
+                    _to_time = time_rec.time_bucket,
+                    _to_lat = time_rec.lat,
+                    _to_lng = time_rec.lng,
+                    track_geom = geo_rec._track_geom,
+                    notes = 'updated time_bucket'
+                WHERE id = _id;
+            -- Add logbook entry to process queue for later processing
+            INSERT INTO process_queue (channel, payload, stored, ref_id)
+                VALUES ('pre_logbook', _id, NOW(), current_setting('vessel.id', true));
+            RAISE WARNING '-> Updated existing logbook logbook_id [%] [%] and add to process_queue', _id, time_rec.time_bucket;
+            -- Add new stay
+            INSERT INTO api.stays
+                (vessel_id, active, arrived, latitude, longitude, notes)
+                VALUES (current_setting('vessel.id', false), false, time_rec.time_bucket, time_rec.lat, time_rec.lng, 'autogenerated time_bucket')
+                RETURNING id, latitude, longitude, arrived INTO stay_id, stay_lat, stay_lng, stay_arv;
+            RAISE WARNING '-> Add new stay stay_id [%] [%]', stay_id, time_rec.time_bucket;
+            timebucket := True;
+        elsif in_log is false THEN
+            -- Close current stays
+            UPDATE api.stays
+                SET
+                    active = false,
+                    departed = ref_time,
+                    notes = 'autogenerated time_bucket'
+                WHERE id = stay_id;
+            -- Add stay entry to process queue for further processing
+            INSERT INTO process_queue (channel, payload, stored, ref_id)
+                VALUES ('new_stay', stay_id, now(), current_setting('vessel.id', true));
+            RAISE WARNING '-> Updated existing stays stay_id [%] departed [%] and add to process_queue', stay_id, ref_time;
+            -- Add new logbook
+            INSERT INTO api.logbook
+                (vessel_id, active, _from_time, _from_lat, _from_lng, notes)
+                VALUES (current_setting('vessel.id', false), false, ref_time, stay_lat, stay_lng, 'autogenerated time_bucket')
+                RETURNING id, _from_lat, _from_lng, _from_time INTO log_id, log_lat, log_lng, log_start;
+            RAISE WARNING '-> Add new logbook, logbook_id [%] [%]', log_id, ref_time;
+            in_log := true;
+            stay_id := 0;
+            stay_lat := null;
+            stay_lng := null;
+            timebucket := True;
+        elsif in_log is true THEN
+            RAISE NOTICE '-> Close current logbook logbook_id [%], ref_time [%], time_rec.time_bucket [%]', log_id, ref_time, time_rec.time_bucket;
+            -- Close current logbook
+            geo_rec := logbook_update_geom_distance_fn(_id, log_start::TEXT, time_rec.time_bucket::TEXT);
+            UPDATE api.logbook
+                SET
+                    active = false,
+                    _to_time = time_rec.time_bucket,
+                    _to_lat = time_rec.lat,
+                    _to_lng = time_rec.lng,
+                    track_geom = geo_rec._track_geom,
+                    notes = 'autogenerated time_bucket'
+                WHERE id = log_id;
+            -- Add logbook entry to process queue for later processing
+            INSERT INTO process_queue (channel, payload, stored, ref_id)
+                VALUES ('pre_logbook', log_id, NOW(), current_setting('vessel.id', true));
+            RAISE WARNING '-> Update Existing logbook logbook_id [%] [%] and add to process_queue', log_id, time_rec.time_bucket;
+            -- Add new stay
+            INSERT INTO api.stays
+                (vessel_id, active, arrived, latitude, longitude, notes)
+                VALUES (current_setting('vessel.id', false), false, time_rec.time_bucket, time_rec.lat, time_rec.lng, 'autogenerated time_bucket')
+                RETURNING id, latitude, longitude, arrived INTO stay_id, stay_lat, stay_lng, stay_arv;
+            RAISE WARNING '-> Add new stay stay_id [%] [%]', stay_id, time_rec.time_bucket;
+            in_log := false;
+            log_id := null;
+            log_lat := null;
+            log_lng := null;
+            timebucket := True;
+        end if;
+        RAISE WARNING '-> Update new ref_time [%]', ref_time;
+        ref_time := time_rec.time_bucket;
+    end loop;
+
+    RAISE NOTICE '-> logbook_metrics_timebucket_fn Ending loop stay_id[%], in_log[%]', stay_id, in_log;
+    if in_log is true then
+        RAISE NOTICE '-> Ending log ref_time [%] interval [%]', ref_time, time_rec.time_bucket;
+    end if;
+    if stay_id > 0 then
+        RAISE NOTICE '-> Ending stay ref_time [%] interval [%]', ref_time, time_rec.time_bucket;
+        select * into stay_rec from api.stays s where arrived = _end;
+        -- Close current stays
+        UPDATE api.stays
+            SET
+                active = false,
+                arrived = stay_arv,
+                notes = 'updated time_bucket'
+            WHERE id = stay_rec.id;
+        -- Add stay entry to process queue for further processing
+        INSERT INTO process_queue (channel, payload, stored, ref_id)
+            VALUES ('new_stay', stay_rec.id, now(), current_setting('vessel.id', true));
+        RAISE WARNING '-> Ending Update Existing stays stay_id [%] arrived [%] and add to process_queue', stay_rec.id, stay_arv;
+        delete from api.stays where id = stay_id;
+        RAISE WARNING '-> Ending Delete Existing stays stay_id [%]', stay_id;
+        stay_arv := null;
+        stay_id := null;
+        stay_lat := null;
+        stay_lng := null;
+        timebucket := True;
+    end if;
+END;
+$logbook_metrics_timebucket$ LANGUAGE plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    public.logbook_metrics_timebucket_fn
+    IS 'Check if all entries for a logbook are in stationary movement per time bucket of 15 or 5 min, speed < 0.6knot, d_within 50m of the stay point';
+
 ---------------------------------------------------------------------------
 -- TODO add alert monitoring for Battery

@@ -1649,6 +1809,12 @@ BEGIN
    --RAISE WARNING 'public.check_jwt() user_role vessel.id [%]', current_setting('vessel.id', false);
    --RAISE WARNING 'public.check_jwt() user_role vessel.name [%]', current_setting('vessel.name', false);
  ELSIF _role = 'vessel_role' THEN
+    SELECT current_setting('request.path', true) into _path;
+    --RAISE WARNING 'req path %', current_setting('request.path', true);
+    -- Function allow without defined vessel like for anonymous role
+    IF _path ~ '^\/rpc\/(oauth_\w+)$' THEN
+        RETURN;
+    END IF;
    -- Extract vessel_id from jwt token
    SELECT current_setting('request.jwt.claims', true)::json->>'vid' INTO _vid;
    -- Check the vessel and user exist
@@ -1666,7 +1832,7 @@ BEGIN
    --RAISE WARNING 'public.check_jwt() user_role vessel.name %', current_setting('vessel.name', false);
    --RAISE WARNING 'public.check_jwt() user_role vessel.id %', current_setting('vessel.id', false);
  ELSIF _role = 'api_anonymous' THEN
-    RAISE WARNING 'public.check_jwt() api_anonymous';
+    --RAISE WARNING 'public.check_jwt() api_anonymous';
    -- Check if path is the a valid allow anonymous path
    SELECT current_setting('request.path', true) ~ '^/(logs_view|log_view|rpc/timelapse_fn|monitoring_view|stats_logs_view|stats_moorages_view|rpc/stats_logs_fn)$' INTO _ppath;
    if _ppath is True then
@@ -1703,7 +1869,7 @@ BEGIN
            END IF;
            -- Check if boat name match public_vessel name
            boat := '^' || _pvessel || '$';
-            IF _ptype ~ '^public_(logs|timelapse)$' AND _pid IS NOT NULL THEN
+            IF _ptype ~ '^public_(logs|timelapse)$' AND _pid > 0 THEN
                WITH log as (
                    SELECT vessel_id from api.logbook l where l.id = _pid
                )
@@ -1757,6 +1923,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();
@@ -1769,17 +1937,17 @@ $$ language plpgsql;
 CREATE OR REPLACE FUNCTION public.delete_account_fn(IN _email TEXT, IN _vessel_id TEXT) RETURNS BOOLEAN
 AS $delete_account$
 BEGIN
-    select count(*) from api.metrics m where vessel_id = _vessel_id;
+    --select count(*) from api.metrics m where vessel_id = _vessel_id;
    delete from api.metrics m where vessel_id = _vessel_id;
-    select * from api.metadata m where vessel_id = _vessel_id;
-    delete from api.logbook l where vessel_id = _vessel_id;
+    --select * from api.metadata m where vessel_id = _vessel_id;
    delete from api.moorages m where vessel_id = _vessel_id;
+    delete from api.logbook l where vessel_id = _vessel_id;
    delete from api.stays s where vessel_id = _vessel_id;
    delete from api.metadata m where vessel_id = _vessel_id;
-    select * from auth.vessels v where vessel_id = _vessel_id;
+    --select * from auth.vessels v where vessel_id = _vessel_id;
    delete from auth.vessels v where vessel_id = _vessel_id;
-    select * from auth.accounts a where email  = _email;
-    delete from auth.accounts a where email  = _email;
+    --select * from auth.accounts a where email = _email;
+    delete from auth.accounts a where email = _email;
    RETURN True;
 END
 $delete_account$ language plpgsql;
--- a/initdb/02_3_3_signalk_public_functions_helpers.sql
+++ b/initdb/02_3_3_signalk_public_functions_helpers.sql
@@ -151,3 +151,48 @@ $jsonb_diff_val$ LANGUAGE plpgsql;
 COMMENT ON FUNCTION
    public.jsonb_diff_val
    IS 'Compare two jsonb objects';
+
+---------------------------------------------------------------------------
+-- uuid v7 helpers
+--
+-- https://gist.github.com/kjmph/5bd772b2c2df145aa645b837da7eca74
+CREATE OR REPLACE FUNCTION public.timestamp_from_uuid_v7(_uuid uuid)
+RETURNS timestamp without time zone
+LANGUAGE sql
+-- Based off IETF draft, https://datatracker.ietf.org/doc/draft-peabody-dispatch-new-uuid-format/
+IMMUTABLE PARALLEL SAFE STRICT LEAKPROOF
+AS $$
+  SELECT to_timestamp(('x0000' || substr(_uuid::text, 1, 8) || substr(_uuid::text, 10, 4))::bit(64)::bigint::numeric / 1000);
+$$
+;
+-- Description
+COMMENT ON FUNCTION
+    public.timestamp_from_uuid_v7
+    IS 'extract the timestamp from the uuid.';
+
+create or replace function public.uuid_generate_v7()
+returns uuid
+as $$
+begin
+  -- use random v4 uuid as starting point (which has the same variant we need)
+  -- then overlay timestamp
+  -- then set version 7 by flipping the 2 and 1 bit in the version 4 string
+  return encode(
+    set_bit(
+      set_bit(
+        overlay(uuid_send(gen_random_uuid())
+                placing substring(int8send(floor(extract(epoch from clock_timestamp()) * 1000)::bigint) from 3)
+                from 1 for 6
+        ),
+        52, 1
+      ),
+      53, 1
+    ),
+    'hex')::uuid;
+end
+$$
+language plpgsql volatile;
+-- Description
+COMMENT ON FUNCTION
+    public.uuid_generate_v7
+    IS 'Generate UUID v7, Based off IETF draft, https://datatracker.ietf.org/doc/draft-peabody-dispatch-new-uuid-format/';
--- a/initdb/02_3_3_signalk_public_functions_py.sql
+++ b/initdb/02_3_3_signalk_public_functions_py.sql
@@ -381,11 +381,11 @@ AS $reverse_geoip_py$
    #plpy.notice('IP [{}] [{}]'.format(_ip, r.status_code))
    if r.status_code == 200:
        #plpy.notice('Got [{}] [{}]'.format(r.text, r.status_code))
-        return r.json();
+        return r.json()
    else:
        plpy.error('Failed to get ip details')
-    return '{}'
-$reverse_geoip_py$ LANGUAGE plpython3u;
+    return {}
+$reverse_geoip_py$ IMMUTABLE strict TRANSFORM FOR TYPE jsonb LANGUAGE plpython3u;
 -- Description
 COMMENT ON FUNCTION
    public.reverse_geoip_py_fn
@@ -434,7 +434,7 @@ IMMUTABLE STRICT;
 -- Description
 COMMENT ON FUNCTION
    public.geojson_py_fn
-    IS 'Parse geojson using plpython3u (should be done in PGSQL)';
+    IS 'Parse geojson using plpython3u (should be done in PGSQL), deprecated';

 DROP FUNCTION IF EXISTS overpass_py_fn;
 CREATE OR REPLACE FUNCTION overpass_py_fn(IN lon NUMERIC, IN lat NUMERIC,
@@ -442,7 +442,7 @@ CREATE OR REPLACE FUNCTION overpass_py_fn(IN lon NUMERIC, IN lat NUMERIC,
 AS $overpass_py$
    """
    Return https://overpass-turbo.eu seamark details within 400m
-    https://overpass-turbo.eu/s/1D91
+    https://overpass-turbo.eu/s/1EaG
    https://wiki.openstreetmap.org/wiki/Key:seamark:type
    """
    import requests
@@ -452,6 +452,12 @@ AS $overpass_py$
    headers = {'User-Agent': 'PostgSail', 'From': 'xbgmsharp@gmail.com'}
    payload = """
    [out:json][timeout:20];
+    is_in({0},{1})->.result_areas;
+    (
+      area.result_areas["seamark:type"~"(mooring|harbour)"][~"^seamark:.*:category$"~"."];
+      area.result_areas["leisure"="marina"][~"name"~"."];
+    );
+    out tags;
    nwr(around:400.0,{0},{1})->.all;
    (
        nwr.all["seamark:type"~"(mooring|harbour)"][~"^seamark:.*:category$"~"."];
@@ -459,7 +465,7 @@ AS $overpass_py$
        nwr.all["leisure"="marina"];
        nwr.all["natural"~"(bay|beach)"];
    );
-    out tags qt;
+    out tags;
    """.format(lat, lon)
    data = urllib.parse.quote(payload, safe="");
    url = f'https://overpass-api.de/api/interpreter?data={data}'.format(data)
@@ -473,12 +479,290 @@ AS $overpass_py$
        if r_dict["elements"]:
            if "tags" in r_dict["elements"][0] and r_dict["elements"][0]["tags"]:
                return r_dict["elements"][0]["tags"]; # return the first element
-        return '{}'
+        return {}
    else:
        plpy.notice('overpass-api Failed to get overpass-api details')
-    return '{}'
+    return {}
 $overpass_py$ IMMUTABLE strict TRANSFORM FOR TYPE jsonb LANGUAGE plpython3u;
 -- Description
 COMMENT ON FUNCTION
    public.overpass_py_fn
    IS 'Return https://overpass-turbo.eu seamark details within 400m using plpython3u';
+
+---------------------------------------------------------------------------
+-- Provision Grafana SQL
+--
+CREATE OR REPLACE FUNCTION grafana_py_fn(IN _v_name TEXT, IN _v_id TEXT,
+    IN _u_email TEXT, IN app JSONB) RETURNS VOID
+AS $grafana_py$
+	"""
+	https://grafana.com/docs/grafana/latest/developers/http_api/
+	Create organization base on vessel name
+	Create user base on user email
+	Add user to organization
+	Add data_source to organization
+	Add dashboard to organization
+    Update organization preferences
+	"""
+	import requests
+	import json
+	import re
+
+	grafana_uri = None
+	if 'app.grafana_admin_uri' in app and app['app.grafana_admin_uri']:
+		grafana_uri = app['app.grafana_admin_uri']
+	else:
+		plpy.error('Error no grafana_admin_uri defined, check app settings')
+		return None
+
+	# add vessel org
+	headers = {'User-Agent': 'PostgSail', 'From': 'xbgmsharp@gmail.com',
+	'Accept': 'application/json', 'Content-Type': 'application/json'}
+	path = 'api/orgs'
+	url = f'{grafana_uri}/{path}'.format(grafana_uri,path)
+	data_dict = {'name':_v_name}
+	data = json.dumps(data_dict)
+	r = requests.post(url, data=data, headers=headers)
+	#print(r.text)
+	plpy.notice(r.json())
+	if r.status_code == 200 and "orgId" in r.json():
+		org_id = r.json()['orgId']
+	else:
+		plpy.error('Error grafana add vessel org %', r.json())
+		return None
+
+	# add user to vessel org
+	path = 'api/admin/users'
+	url = f'{grafana_uri}/{path}'.format(grafana_uri,path)
+	data_dict = {'orgId':org_id, 'email':_u_email, 'password':'asupersecretpassword'}
+	data = json.dumps(data_dict)
+	r = requests.post(url, data=data, headers=headers)
+	#print(r.text)
+	plpy.notice(r.json())
+	if r.status_code == 200 and "id" in r.json():
+		user_id = r.json()['id']
+	else:
+		plpy.error('Error grafana add user to vessel org')
+		return
+
+	# read data_source
+	path = 'api/datasources/1'
+	url = f'{grafana_uri}/{path}'.format(grafana_uri,path)
+	r = requests.get(url, headers=headers)
+	#print(r.text)
+	plpy.notice(r.json())
+	data_source = r.json()
+	data_source['id'] = 0
+	data_source['orgId'] = org_id
+	data_source['uid'] = "ds_" + _v_id
+	data_source['name'] = "ds_" + _v_id
+	data_source['secureJsonData'] = {}
+	data_source['secureJsonData']['password'] = 'password'
+	data_source['readOnly'] = True
+	del data_source['secureJsonFields']
+
+	# add data_source to vessel org
+	path = 'api/datasources'
+	url = f'{grafana_uri}/{path}'.format(grafana_uri,path)
+	data = json.dumps(data_source)
+	headers['X-Grafana-Org-Id'] = str(org_id)
+	r = requests.post(url, data=data, headers=headers)
+	plpy.notice(r.json())
+	del headers['X-Grafana-Org-Id']
+	if r.status_code != 200 and "id" not in r.json():
+		plpy.error('Error grafana add data_source to vessel org')
+		return
+
+	dashboards_tpl = [ 'pgsail_tpl_electrical', 'pgsail_tpl_logbook', 'pgsail_tpl_monitor', 'pgsail_tpl_rpi', 'pgsail_tpl_solar', 'pgsail_tpl_weather', 'pgsail_tpl_home']
+	for dashboard in dashboards_tpl:
+		# read dashboard template by uid
+		path = 'api/dashboards/uid'
+		url = f'{grafana_uri}/{path}/{dashboard}'.format(grafana_uri,path,dashboard)
+		if 'X-Grafana-Org-Id' in headers:
+			del headers['X-Grafana-Org-Id']
+		r = requests.get(url, headers=headers)
+		plpy.notice(r.json())
+		if r.status_code != 200 and "id" not in r.json():
+			plpy.error('Error grafana read dashboard template')
+			return
+		new_dashboard = r.json()
+		del new_dashboard['meta']
+		new_dashboard['dashboard']['version'] = 0
+		new_dashboard['dashboard']['id'] = 0
+		new_uid = re.sub(r'pgsail_tpl_(.*)', r'postgsail_\1', new_dashboard['dashboard']['uid'])
+		new_dashboard['dashboard']['uid'] = f'{new_uid}_{_v_id}'.format(new_uid,_v_id)
+		# add dashboard to vessel org
+		path = 'api/dashboards/db'
+		url = f'{grafana_uri}/{path}'.format(grafana_uri,path)
+		data = json.dumps(new_dashboard)
+		new_data = data.replace('PCC52D03280B7034C', data_source['uid'])
+		headers['X-Grafana-Org-Id'] = str(org_id)
+		r = requests.post(url, data=new_data, headers=headers)
+		plpy.notice(r.json())
+		if r.status_code != 200 and "id" not in r.json():
+			plpy.error('Error grafana add dashboard to vessel org')
+			return
+
+	# Update Org Prefs
+	path = 'api/org/preferences'
+	url = f'{grafana_uri}/{path}'.format(grafana_uri,path)
+	home_dashboard = {}
+	home_dashboard['timezone'] = 'utc'
+	home_dashboard['homeDashboardUID'] = f'postgsail_home_{_v_id}'.format(_v_id)
+	data = json.dumps(home_dashboard)
+	headers['X-Grafana-Org-Id'] = str(org_id)
+	r = requests.patch(url, data=data, headers=headers)
+	plpy.notice(r.json())
+	if r.status_code != 200:
+		plpy.error('Error grafana update org preferences')
+		return
+
+	plpy.notice('Done')
+$grafana_py$ TRANSFORM FOR TYPE jsonb LANGUAGE plpython3u;
+-- Description
+COMMENT ON FUNCTION
+    public.grafana_py_fn
+    IS 'Grafana Organization,User,data_source,dashboards provisioning via HTTP API using plpython3u';
+
+-- https://stackoverflow.com/questions/65517230/how-to-set-user-attribute-value-in-keycloak-using-api
+DROP FUNCTION IF EXISTS keycloak_py_fn;
+CREATE OR REPLACE FUNCTION keycloak_py_fn(IN user_id TEXT, IN vessel_id TEXT,
+    IN app JSONB) RETURNS JSONB
+AS $keycloak_py$
+    """
+    Add vessel_id user attribute to keycloak user {user_id}
+    """
+    import requests
+    import json
+    import urllib.parse
+
+    safe_uri = host = user = pwd = None
+    if 'app.keycloak_uri' in app and app['app.keycloak_uri']:
+        #safe_uri = urllib.parse.quote(app['app.keycloak_uri'], safe=':/?&=')
+        _ = urllib.parse.urlparse(app['app.keycloak_uri'])
+        host = _.netloc.split('@')[-1]
+        user = _.netloc.split(':')[0]
+        pwd = _.netloc.split(':')[1].split('@')[0]
+    else:
+        plpy.error('Error no keycloak_uri defined, check app settings')
+        return None
+
+    if not host or not user or not pwd:
+        plpy.error('Error parsing keycloak_uri, check app settings')
+        return None
+
+    _headers = {'User-Agent': 'PostgSail', 'From': 'xbgmsharp@gmail.com'}
+    _payload = {'client_id':'admin-cli','grant_type':'password','username':user,'password':pwd}
+    url = f'{_.scheme}://{host}/realms/master/protocol/openid-connect/token'.format(_.scheme, host)
+    r = requests.post(url, headers=_headers, data=_payload, timeout=(5, 60))
+    #print(r.text)
+    #plpy.notice(url)
+    if r.status_code == 200 and 'access_token' in r.json():
+        response = r.json()
+        plpy.notice(response)
+        _headers['Authorization'] = 'Bearer '+ response['access_token']
+        _headers['Content-Type'] = 'application/json'
+        _payload = { 'attributes': {'vessel_id': vessel_id} }
+        url = f'{keycloak_uri}/admin/realms/postgsail/users/{user_id}'.format(keycloak_uri,user_id)
+        #plpy.notice(url)
+        #plpy.notice(_payload)
+        data = json.dumps(_payload)
+        r = requests.put(url, headers=_headers, data=data, timeout=(5, 60))
+        if r.status_code != 204:
+            plpy.notice("Error updating user: {status} [{text}]".format(
+                status=r.status_code, text=r.text))
+            return None
+        else:
+            plpy.notice("Updated user : {user} [{text}]".format(user=user_id, text=r.text))
+    else:
+        plpy.notice(f'Error getting admin access_token: {status} [{text}]'.format(
+                status=r.status_code, text=r.text))
+    return None
+$keycloak_py$ strict TRANSFORM FOR TYPE jsonb LANGUAGE plpython3u;
+-- Description
+COMMENT ON FUNCTION
+    public.keycloak_py_fn
+    IS 'Return set oauth user attribute into keycloak using plpython3u';
+
+DROP FUNCTION IF EXISTS keycloak_auth_py_fn;
+CREATE OR REPLACE FUNCTION keycloak_auth_py_fn(IN _v_id TEXT,
+    IN _user JSONB, IN app JSONB) RETURNS JSONB
+AS $keycloak_auth_py$
+    """
+    Addkeycloak user
+    """
+    import requests
+    import json
+    import urllib.parse
+
+    safe_uri = host = user = pwd = None
+    if 'app.keycloak_uri' in app and app['app.keycloak_uri']:
+        #safe_uri = urllib.parse.quote(app['app.keycloak_uri'], safe=':/?&=')
+        _ = urllib.parse.urlparse(app['app.keycloak_uri'])
+        host = _.netloc.split('@')[-1]
+        user = _.netloc.split(':')[0]
+        pwd = _.netloc.split(':')[1].split('@')[0]
+    else:
+        plpy.error('Error no keycloak_uri defined, check app settings')
+        return none
+
+    if not host or not user or not pwd:
+        plpy.error('Error parsing keycloak_uri, check app settings')
+        return None
+
+    if not 'email' in _user and _user['email']:
+        plpy.error('Error parsing user email, check user settings')
+        return none
+
+    if not _v_id:
+        plpy.error('Error parsing vessel_id')
+        return none
+
+    _headers = {'User-Agent': 'PostgSail', 'From': 'xbgmsharp@gmail.com'}
+    _payload = {'client_id':'admin-cli','grant_type':'password','username':user,'password':pwd}
+    url = f'{_.scheme}://{host}/realms/master/protocol/openid-connect/token'.format(_.scheme, host)
+    r = requests.post(url, headers=_headers, data=_payload, timeout=(5, 60))
+    #print(r.text)
+    #plpy.notice(url)
+    if r.status_code == 200 and 'access_token' in r.json():
+        response = r.json()
+        plpy.notice(response)
+        _headers['Authorization'] = 'Bearer '+ response['access_token']
+        _headers['Content-Type'] = 'application/json'
+        url = f'{_.scheme}://{host}/admin/realms/postgsail/users'.format(_.scheme, host)
+        _payload = {
+            "enabled": "true",
+            "email": _user['email'],
+            "firstName": _user['recipient'],
+            "attributes": {"vessel_id": _v_id},
+            "emailVerified": True,
+            "requiredActions":["UPDATE_PROFILE", "UPDATE_PASSWORD"]
+        }
+        plpy.notice(_payload)
+        data = json.dumps(_payload)
+        r = requests.post(url, headers=_headers, data=data, timeout=(5, 60))
+        if r.status_code != 201:
+            #print("Error creating user: {status}".format(status=r.status_code))
+            plpy.error(f'Error creating user: {user} {status}'.format(user=_payload['email'], status=r.status_code))
+            return None
+        else:
+            #print("Created user : {u}]".format(u=_payload['email']))
+            plpy.notice('Created user : {u} {t}, {l}'.format(u=_payload['email'], t=r.text, l=r.headers['location']))
+            user_url = "{user_url}/execute-actions-email".format(user_url=r.headers['location'])
+            _payload = ["UPDATE_PASSWORD"]
+            plpy.notice(_payload)
+            data = json.dumps(_payload)
+            r = requests.put(user_url, headers=_headers, data=data, timeout=(5, 60))
+            if r.status_code != 204:
+              plpy.error('Error execute-actions-email: {u} {s}'.format(u=_user['email'], s=r.status_code))
+            else:
+              plpy.notice('execute-actions-email: {u} {s}'.format(u=_user['email'], s=r.status_code))
+            return None
+    else:
+        plpy.error(f'Error getting admin access_token: {status}'.format(status=r.status_code))
+    return None
+$keycloak_auth_py$ strict TRANSFORM FOR TYPE jsonb LANGUAGE plpython3u;
+-- Description
+COMMENT ON FUNCTION
+    public.keycloak_auth_py_fn
+    IS 'Return set oauth user attribute into keycloak using plpython3u';
--- a/initdb/02_4_signalk_auth.sql
+++ b/initdb/02_4_signalk_auth.sql
@@ -21,7 +21,8 @@ CREATE EXTENSION IF NOT EXISTS "pgcrypto"; -- provides cryptographic functions

 DROP TABLE IF EXISTS auth.accounts CASCADE;
 CREATE TABLE IF NOT EXISTS auth.accounts (
-  public_id     INT UNIQUE NOT NULL GENERATED ALWAYS AS IDENTITY,
+  id            INT UNIQUE GENERATED ALWAYS AS IDENTITY,
+  --id            TEXT NOT NULL UNIQUE DEFAULT uuid_generate_v7(),
  user_id       TEXT NOT NULL UNIQUE DEFAULT RIGHT(gen_random_uuid()::text, 12),
  email         CITEXT PRIMARY KEY CHECK ( email ~* '^.+@.+\..+$' ),
  first         TEXT NOT NULL CHECK (length(pass) < 512),
@@ -60,32 +61,56 @@ CREATE TABLE IF NOT EXISTS auth.vessels (
  vessel_id   TEXT NOT NULL UNIQUE DEFAULT RIGHT(gen_random_uuid()::text, 12),
 --  user_id       TEXT NOT NULL REFERENCES auth.accounts(user_id) ON DELETE RESTRICT,
  owner_email CITEXT PRIMARY KEY REFERENCES auth.accounts(email) ON DELETE RESTRICT,
--  mmsi		    TEXT UNIQUE, -- Should be a numeric range between 100000000 and 800000000.
  mmsi        NUMERIC UNIQUE, -- MMSI can be optional but if present must be a valid one and unique
  name        TEXT NOT NULL CHECK (length(name) >= 3 AND length(name) < 512),
--  pass        text not null check (length(pass) < 512), -- unused
  role        name not null check (length(role) < 512),
  created_at  TIMESTAMPTZ NOT NULL DEFAULT NOW(),
  updated_at  TIMESTAMPTZ NOT NULL DEFAULT NOW()
--  CONSTRAINT valid_length_mmsi CHECK (length(mmsi) < 10 OR length(mmsi) = 0)
  CONSTRAINT valid_range_mmsi CHECK (mmsi > 100000000 AND mmsi < 800000000)
 );
 -- Description
 COMMENT ON TABLE
    auth.vessels
    IS 'vessels table link to accounts email user_id column';
-- Indexes
-CREATE INDEX vessels_vesselid_idx ON auth.vessels (vessel_id);
+COMMENT ON COLUMN
+    auth.vessels.mmsi
+    IS 'MMSI can be optional but if present must be a valid one and unique but must be in numeric range between 100000000 and 800000000';

 CREATE TRIGGER vessels_moddatetime
-	BEFORE UPDATE ON auth.vessels
-	FOR EACH ROW
-	EXECUTE PROCEDURE moddatetime (updated_at);
+  BEFORE UPDATE ON auth.vessels
+  FOR EACH ROW
+  EXECUTE PROCEDURE moddatetime (updated_at);
 -- Description
 COMMENT ON TRIGGER vessels_moddatetime
  ON auth.vessels
  IS 'Automatic update of updated_at on table modification';

+CREATE TABLE auth.users (
+  id            NAME PRIMARY KEY DEFAULT current_setting('request.jwt.claims', true)::json->>'sub',
+  email         NAME NOT NULL DEFAULT current_setting('request.jwt.claims', true)::json->>'email',
+  user_id       TEXT NOT NULL UNIQUE DEFAULT RIGHT(gen_random_uuid()::text, 12),
+  first         TEXT NOT NULL DEFAULT current_setting('request.jwt.claims', true)::json->>'given_name',
+  last          TEXT NOT NULL DEFAULT current_setting('request.jwt.claims', true)::json->>'family_name',
+  role          NAME NOT NULL DEFAULT 'user_role' CHECK (length(role) < 512),
+  preferences   JSONB NULL DEFAULT '{"email_notifications":true, "email_valid": true, "email_verified": true}',
+  created_at    TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+  updated_at    TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+  connected_at  TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+-- Description
+COMMENT ON TABLE
+    auth.users
+    IS 'Keycloak Oauth user, map user details from access token';
+
+CREATE TRIGGER user_moddatetime
+  BEFORE UPDATE ON auth.users
+  FOR EACH ROW
+  EXECUTE PROCEDURE moddatetime (updated_at);
+-- Description
+COMMENT ON TRIGGER user_moddatetime
+  ON auth.users
+  IS 'Automatic update of updated_at on table modification';
+
 create or replace function
 auth.check_role_exists() returns trigger as $$
 begin
@@ -263,6 +288,96 @@ begin
 end;
 $$ language plpgsql security definer;

+---------------------------------------------------------------------------
+-- API account Oauth functions
+--
+-- oauth is on your exposed schema
+create or replace function
+api.oauth() returns void as $$
+declare
+  _exist boolean;
+begin
+  -- Ensure we have the required key/value in the access token
+  if current_setting('request.jwt.claims', true)::json->>'sub' is null OR
+     current_setting('request.jwt.claims', true)::json->>'email' is null THEN
+    return;
+  end if;
+  -- check email exist
+  select exists( select email from auth.users
+     where id = current_setting('request.jwt.claims', true)::json->>'sub'
+    ) INTO _exist;
+  if NOT FOUND then
+	  RAISE WARNING 'Register new oauth user email:[%]', current_setting('request.jwt.claims', true)::json->>'email';
+    -- insert new user, default value from the oauth access token
+	  INSERT INTO auth.users (role, preferences)
+	    VALUES ('user_role', '{"email_notifications":true, "email_valid": true, "email_verified": true}');
+  end if;
+end;
+$$ language plpgsql security definer;
+-- Description
+COMMENT ON FUNCTION
+    api.oauth
+    IS 'openid/oauth user register entry point';
+
+create or replace function
+api.oauth_vessel(in _mmsi text, in _name text) returns void as $$
+declare
+  _exist boolean;
+  vessel_name text := _name;
+  vessel_mmsi text := _mmsi;
+  _vessel_id text := null;
+  vessel_rec record;
+  app_settings jsonb;
+  _user_id text := null;
+begin
+  RAISE WARNING 'oauth_vessel:[%]', current_setting('user.email', true);
+  RAISE WARNING 'oauth_vessel:[%]', current_setting('request.jwt.claims', true)::json->>'email';
+  -- Ensure we have the required key/value in the access token
+  if current_setting('request.jwt.claims', true)::json->>'sub' is null OR
+     current_setting('request.jwt.claims', true)::json->>'email' is null THEN
+    return;
+  end if;
+
+  -- check email exist
+  select exists( select email from auth.accounts
+     where email = current_setting('request.jwt.claims', true)::json->>'email'
+    ) INTO _exist;
+  if _exist is False then
+    RAISE WARNING 'Register new oauth user email:[%]', current_setting('request.jwt.claims', true)::json->>'email';
+    -- insert new user, default value from the oauth access token
+    INSERT INTO auth.users VALUES(DEFAULT) RETURNING user_id INTO _user_id;
+    -- insert new user to account table from the oauth access token
+    INSERT INTO auth.accounts (email, first, last, pass, user_id, role, preferences)
+      VALUES (current_setting('request.jwt.claims', true)::json->>'email',
+      current_setting('request.jwt.claims', true)::json->>'given_name',
+      current_setting('request.jwt.claims', true)::json->>'family_name',
+      current_setting('request.jwt.claims', true)::json->>'sub',
+      _user_id, 'user_role', '{"email_notifications":true, "email_valid": true, "email_verified": true}');
+  end if;
+
+  IF public.isnumeric(vessel_mmsi) IS False THEN
+    vessel_mmsi = NULL;
+  END IF;
+  -- check vessel exist
+  SELECT * INTO vessel_rec
+    FROM auth.vessels vessel
+    WHERE vessel.owner_email = current_setting('request.jwt.claims', true)::json->>'email';
+  IF vessel_rec IS NULL THEN
+      RAISE WARNING 'Register new vessel name:[%] mmsi:[%] for [%]', vessel_name, vessel_mmsi, current_setting('request.jwt.claims', true)::json->>'email';
+      INSERT INTO auth.vessels (owner_email, mmsi, name, role)
+        VALUES (current_setting('request.jwt.claims', true)::json->>'email', vessel_mmsi::NUMERIC, vessel_name, 'vessel_role') RETURNING vessel_id INTO _vessel_id;
+      -- Gather url from app settings
+      app_settings := get_app_settings_fn();
+      -- set oauth user vessel_id attributes for token generation
+      PERFORM keycloak_py_fn(current_setting('request.jwt.claims', true)::json->>'sub'::TEXT, _vessel_id::TEXT, app_settings);
+  END IF;
+end;
+$$ language plpgsql security definer;
+-- Description
+COMMENT ON FUNCTION
+    api.oauth_vessel
+    IS 'user and vessel register entry point from signalk plugin';
+
 ---------------------------------------------------------------------------
 -- API vessel helper functions
 -- register_vessel should be on your exposed schema
@@ -289,7 +404,7 @@ begin
  IF vessel_rec IS NULL THEN
      RAISE WARNING 'Register new vessel name:[%] mmsi:[%] for [%]', vessel_name, vessel_mmsi, vessel_email;
      INSERT INTO auth.vessels (owner_email, mmsi, name, role)
-	      VALUES (vessel_email, vessel_mmsi::NUMERIC, vessel_name, 'vessel_role') RETURNING vessel_id INTO _vessel_id;
+        VALUES (vessel_email, vessel_mmsi::NUMERIC, vessel_name, 'vessel_role') RETURNING vessel_id INTO _vessel_id;
    vessel_rec.role := 'vessel_role';
    vessel_rec.owner_email = vessel_email;
    vessel_rec.vessel_id = _vessel_id;
--- a/initdb/02_5_signalk_api_deps.sql
+++ b/initdb/02_5_signalk_api_deps.sql
@@ -242,16 +242,17 @@ $vessel_details$
 DECLARE
 BEGIN
     RETURN ( WITH tbl AS (
-                SELECT mmsi,ship_type,length,beam,height,plugin_version FROM api.metadata WHERE vessel_id = current_setting('vessel.id', false)
+                SELECT mmsi,ship_type,length,beam,height,plugin_version,platform FROM api.metadata WHERE vessel_id = current_setting('vessel.id', false)
                )
                SELECT json_build_object(
                        'ship_type', (SELECT ais.description FROM aistypes ais, tbl t WHERE t.ship_type = ais.id),
                        'country', (SELECT mid.country FROM mid, tbl t WHERE LEFT(cast(t.mmsi as text), 3)::NUMERIC = mid.id),
                        'alpha_2', (SELECT o.alpha_2 FROM mid m, iso3166 o, tbl t WHERE LEFT(cast(t.mmsi as text), 3)::NUMERIC = m.id AND m.country_id = o.id),
-                        'length', t.ship_type,
+                        'length', t.length,
                        'beam', t.beam,
                        'height', t.height,
-                        'plugin_version', t.plugin_version)
+                        'plugin_version', t.plugin_version,
+                        'platform', t.platform)
                        FROM tbl t
            );
 END;
@@ -265,8 +266,8 @@ DROP VIEW IF EXISTS api.eventlogs_view;
 CREATE VIEW api.eventlogs_view WITH (security_invoker=true,security_barrier=true) AS
    SELECT pq.*
        FROM public.process_queue pq
-        WHERE ref_id = current_setting('user.id', true)
-            OR ref_id = current_setting('vessel.id', true)
+        WHERE channel <> 'pre_logbook' AND (ref_id = current_setting('user.id', true)
+            OR ref_id = current_setting('vessel.id', true))
        ORDER BY id ASC;
 -- Description
 COMMENT ON VIEW
@@ -315,7 +316,8 @@ BEGIN
        RETURN False;
    END IF;

-    IF _type ~ '^public_(logs|timelapse)$' AND _id IS NOT NULL THEN
+    RAISE WARNING '-> ispublic_fn _type [%], _id [%]', _type, _id;
+    IF _type ~ '^public_(logs|timelapse)$' AND _id > 0 THEN
        WITH log as (
            SELECT vessel_id from api.logbook l where l.id = _id
        )
--- a/initdb/02_5_signalk_auth_otp.sql
+++ b/initdb/02_5_signalk_auth_otp.sql
@@ -22,7 +22,8 @@ COMMENT ON TABLE
    IS 'Stores temporal otp code for up to 15 minutes';
 -- Indexes
 CREATE INDEX otp_pass_idx ON auth.otp (otp_pass);
-CREATE INDEX otp_user_email_idx ON auth.otp (user_email);
+-- Duplicate Indexes
+--CREATE INDEX otp_user_email_idx ON auth.otp (user_email);

 DROP FUNCTION IF EXISTS public.generate_uid_fn;
 CREATE OR REPLACE FUNCTION public.generate_uid_fn(size INT) RETURNS TEXT
--- a/initdb/02_6_signalk_roles.sql
+++ b/initdb/02_6_signalk_roles.sql
@@ -40,6 +40,9 @@ grant execute on function api.telegram_otp_fn(text) to api_anonymous;
 --grant execute on function api.generate_otp_fn(text) to api_anonymous;
 grant execute on function api.ispublic_fn(text,text,integer) to api_anonymous;
 grant execute on function api.timelapse_fn to api_anonymous;
+grant execute on function api.stats_logs_fn to api_anonymous;
+grant execute on function api.stats_stays_fn to api_anonymous;
+grant execute on function api.status_fn to api_anonymous;
 -- Allow read on TABLES on API schema
 --GRANT SELECT ON TABLE api.metrics,api.logbook,api.moorages,api.stays,api.metadata,api.stays_at TO api_anonymous;
 -- Allow read on VIEWS on API schema
@@ -90,6 +93,7 @@ GRANT SELECT ON TABLE auth.accounts TO grafana_auth;
 GRANT SELECT ON TABLE auth.vessels TO grafana_auth;
 -- GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public TO grafana_auth;
 GRANT EXECUTE ON FUNCTION public.citext_eq(citext, citext) TO grafana_auth;
+GRANT ALL ON SCHEMA public TO grafana_auth; -- Important if grafana database in pg

 -- User:
 -- nologin, web api only
@@ -152,6 +156,9 @@ GRANT EXECUTE ON FUNCTION public.stay_in_progress_fn(text) to vessel_role;
 GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA _timescaledb_internal TO vessel_role;
 -- on metrics st_makepoint
 GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public TO vessel_role;
+-- Oauth registration
+GRANT EXECUTE ON FUNCTION api.oauth() TO vessel_role;
+GRANT EXECUTE ON FUNCTION api.oauth_vessel(text,text) TO vessel_role;

 --- Scheduler:
 -- TODO: currently cron function are run as super user, switch to scheduler role.
@@ -278,6 +285,10 @@ CREATE POLICY api_scheduler_role ON api.stays TO scheduler
 CREATE POLICY grafana_role ON api.stays TO grafana
    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (false);
+-- Allow anonymous to select based on the vessel.id
+CREATE POLICY api_anonymous_role ON api.stays TO api_anonymous
+    USING (vessel_id = current_setting('vessel.id', false))
+    WITH CHECK (false);

 -- Be sure to enable row level security on the table
 ALTER TABLE api.moorages ENABLE ROW LEVEL SECURITY;
@@ -301,6 +312,10 @@ CREATE POLICY api_scheduler_role ON api.moorages TO scheduler
 CREATE POLICY grafana_role ON api.moorages TO grafana
    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (false);
+-- Allow anonymous to select based on the vessel.id
+CREATE POLICY api_anonymous_role ON api.moorages TO api_anonymous
+    USING (vessel_id = current_setting('vessel.id', false))
+    WITH CHECK (false);

 -- Be sure to enable row level security on the table
 ALTER TABLE auth.vessels ENABLE ROW LEVEL SECURITY;
--- a/initdb/04pgcron.sql
+++ b/initdb/04pgcron.sql
@@ -10,19 +10,23 @@ CREATE EXTENSION IF NOT EXISTS pg_cron; -- provides a simple cron-based job sche
 -- TRUNCATE table jobs
 --TRUNCATE TABLE cron.job CONTINUE IDENTITY RESTRICT;

-- Create a every 5 minutes or minute job cron_process_new_logbook_fn ??
-SELECT cron.schedule('cron_new_logbook', '*/5 * * * *', 'select public.cron_process_new_logbook_fn()');
+-- Create a every 5 minutes or minute job cron_process_pre_logbook_fn ??
+SELECT cron.schedule('cron_pre_logbook', '*/5 * * * *', 'select public.cron_process_pre_logbook_fn()');
+--UPDATE cron.job SET database = 'signalk' where jobname = 'cron_pre_logbook';
+
+-- Create a every 6 minutes or minute job cron_process_new_logbook_fn ??
+SELECT cron.schedule('cron_new_logbook', '*/6 * * * *', 'select public.cron_process_new_logbook_fn()');
 --UPDATE cron.job SET database = 'signalk' where jobname = 'cron_new_logbook';

-- Create a every 5 minute job cron_process_new_stay_fn
-SELECT cron.schedule('cron_new_stay', '*/6 * * * *', 'select public.cron_process_new_stay_fn()');
+-- Create a every 7 minute job cron_process_new_stay_fn
+SELECT cron.schedule('cron_new_stay', '*/7 * * * *', 'select public.cron_process_new_stay_fn()');
 --UPDATE cron.job SET database = 'signalk' where jobname = 'cron_new_stay';

 -- Create a every 6 minute job cron_process_new_moorage_fn, delay from stay to give time to generate geo reverse location, eg: name
 --SELECT cron.schedule('cron_new_moorage', '*/7 * * * *', 'select public.cron_process_new_moorage_fn()');
 --UPDATE cron.job SET database = 'signalk' where jobname = 'cron_new_moorage';

-- Create a every 10 minute job cron_process_monitor_offline_fn
+-- Create a every 11 minute job cron_process_monitor_offline_fn
 SELECT cron.schedule('cron_monitor_offline', '*/11 * * * *', 'select public.cron_process_monitor_offline_fn()');
 --UPDATE cron.job SET database = 'signalk' where jobname = 'cron_monitor_offline';

@@ -42,18 +46,25 @@ SELECT cron.schedule('cron_monitor_online', '*/10 * * * *', 'select public.cron_
 --SELECT cron.schedule('cron_new_account_otp', '*/6 * * * *', 'select public.cron_process_new_account_otp_validation_fn()');
 --UPDATE cron.job SET database = 'signalk' where jobname = 'cron_new_account_otp';

+-- Create a every 5 minute job cron_process_grafana_fn
+SELECT cron.schedule('cron_grafana', '*/5 * * * *', 'select public.cron_process_grafana_fn()');
+
 -- Notification
 -- Create a every 1 minute job cron_process_new_notification_queue_fn, new_account, new_vessel, _new_account_otp
-SELECT cron.schedule('cron_new_notification', '*/2 * * * *', 'select public.cron_process_new_notification_fn()');
+SELECT cron.schedule('cron_new_notification', '*/1 * * * *', 'select public.cron_process_new_notification_fn()');
 --UPDATE cron.job SET database = 'signalk' where jobname = 'cron_new_notification';

 -- Maintenance
-- Vacuum database at “At 01:01 on Sunday.”
-SELECT cron.schedule('cron_vacuum', '1 1 * * 0', 'VACUUM (FULL, VERBOSE, ANALYZE, INDEX_CLEANUP) api.logbook,api.stays,api.moorages,api.metadata,api.metrics;');
-- Remove all jobs log at “At 02:02 on Sunday.”
+-- Vacuum database schema api at "At 01:31 on Sunday."
+SELECT cron.schedule('cron_vacuum_api', '31 1 * * 0', 'VACUUM (FULL, VERBOSE, ANALYZE, INDEX_CLEANUP) api.logbook,api.stays,api.moorages,api.metadata,api.metrics;');
+-- Vacuum database schema auth at "At 01:01 on Sunday."
+SELECT cron.schedule('cron_vacuum_auth', '1 1 * * 0', 'VACUUM (FULL, VERBOSE, ANALYZE, INDEX_CLEANUP) auth.accounts,auth.vessels,auth.otp;');
+-- Remove old jobs log at "At 02:02 on Sunday."
 SELECT cron.schedule('job_run_details_cleanup', '2 2 * * 0', 'select public.job_run_details_cleanup_fn()');
-- Rebuilding indexes at “first day of each month at 23:01.”
-SELECT cron.schedule('cron_reindex', '1 23 1 * *', 'REINDEX TABLE api.logbook; REINDEX TABLE api.stays; REINDEX TABLE api.moorages; REINDEX TABLE api.metadata; REINDEX TABLE api.metrics;');
+-- Rebuilding indexes schema api at "first day of each month at 23:15."
+SELECT cron.schedule('cron_reindex_api', '15 23 1 * *', 'REINDEX TABLE CONCURRENTLY api.logbook; REINDEX TABLE CONCURRENTLY api.stays; REINDEX TABLE CONCURRENTLY api.moorages; REINDEX TABLE CONCURRENTLY api.metadata;');
+-- Rebuilding indexes schema auth at "first day of each month at 23:01."
+SELECT cron.schedule('cron_reindex_auth', '1 23 1 * *', 'REINDEX TABLE CONCURRENTLY auth.accounts; REINDEX TABLE CONCURRENTLY auth.vessels; REINDEX TABLE CONCURRENTLY auth.otp;');
 -- Any other maintenance require?

 -- OTP
@@ -74,9 +85,9 @@ SELECT cron.schedule('cron_no_activity', '5 8 */4 * 0', 'select public.cron_proc
 -- Cron job settings
 UPDATE cron.job SET database = 'signalk';
 UPDATE cron.job SET username = 'username'; -- TODO update to scheduler, pending process_queue update
--UPDATE cron.job SET username = 'username' where jobname = 'cron_vacuum'; -- TODO Update to superuser for vaccuum permissions
+--UPDATE cron.job SET username = 'username' where jobname = 'cron_vacuum'; -- TODO Update to superuser for vacuum permissions
 UPDATE cron.job SET nodename = '/var/run/postgresql/'; -- VS default localhost ??
-UPDATE cron.job	SET database = 'postgresql' WHERE jobname = 'job_run_details_cleanup_fn';
+UPDATE cron.job	SET database = 'postgres' WHERE jobname = 'job_run_details_cleanup';
 -- check job lists
 SELECT * FROM cron.job;
 -- unschedule by job id
--- a/initdb/99env.sh
+++ b/initdb/99env.sh
@@ -17,6 +17,8 @@ INSERT INTO app_settings (name, value) VALUES
        ('app.pushover_app_token', '${PGSAIL_PUSHOVER_APP_TOKEN}'),
        ('app.pushover_app_url', '${PGSAIL_PUSHOVER_APP_URL}'),
        ('app.telegram_bot_token', '${PGSAIL_TELEGRAM_BOT_TOKEN}'),
+        ('app.grafana_admin_uri', '${PGSAIL_GRAFANA_ADMIN_URI}'),
+        ('app.keycloak_uri', '${PGSAIL_KEYCLOAK_URI}'),
        ('app.url', '${PGSAIL_APP_URL}'),
        ('app.version', '${PGSAIL_VERSION}');
 -- Update comment with version
--- a/initdb/PGSAIL_VERSION
+++ b/initdb/PGSAIL_VERSION
@@ -1 +1 @@
-0.5.0
+0.6.1
--- a/openapi.json
+++ b/openapi.json
--- a/tests/index.js
+++ b/tests/index.js
@@ -604,8 +604,12 @@ request.set('User-Agent', 'PostgSail unit tests');
      // Override client_id
      data[i]['client_id'] = test.vessel_metadata.client_id;
    }
-    // Force last entry to be back in time from previous, it should be ignore silently
-    data.at(-1).time = moment.utc(data.at(-2).time).subtract(1, 'minutes').format();
+    // The last entry are invalid and should be ignore.
+    // - Invalid status
+    // - Invalid speedoverground
+    // - Invalid time previous time is duplicate
+    // Force last valid entry to be back in time from previous, it should be ignore silently
+    data.at(-1).time = moment.utc(data.at(-3).time).subtract(1, 'minutes').format();
    //console.log(data[0]);

    it('/metrics?select=time', function(done) {
@@ -625,7 +629,7 @@ request.set('User-Agent', 'PostgSail unit tests');
          res.header['content-type'].should.match(new RegExp('json','g'));
          res.header['server'].should.match(new RegExp('postgrest','g'));
          should.exist(res.body);
-          res.body.length.should.match(test.vessel_metrics['metrics'].length-1);
+          res.body.length.should.match(test.vessel_metrics['metrics'].length-3);
          done(err);
        });
    });
--- a/tests/index5.js
+++ b/tests/index5.js
@@ -50,6 +50,24 @@ var moment = require("moment");
      payload: null,
      res: {},
    },
+    timelapse_full: {
+      url: "/rpc/timelapse_fn",
+      header: { name: "x-is-public", value: btoa("kapla,public_timelapse,0") },
+      payload: null,
+      res: {},
+    },
+    stats_logs: {
+      url: "/rpc/stats_logs_fn",
+      header: { name: "x-is-public", value: btoa("kapla,public_stats,0") },
+      payload: null,
+      res: {},
+    },
+    stats_stays: {
+      url: "/rpc/stats_stay_fn",
+      header: { name: "x-is-public", value: btoa("kapla,public_stats,0") },
+      payload: null,
+      res: {},
+    },
    export_gpx: {
      url: "/rpc/export_logbook_gpx_fn",
      header: { name: "x-is-public", value: btoa("kapla,public_logs,0") },
@@ -79,11 +97,29 @@ var moment = require("moment");
      res: {},
    },
    timelapse: {
+      url: "/rpc/timelapse_fn",
+      header: { name: "x-is-public", value: btoa("aava,public_timelapse,3") },
+      payload: null,
+      res: {},
+    },
+    timelapse_full: {
      url: "/rpc/timelapse_fn",
      header: { name: "x-is-public", value: btoa("aava,public_timelapse,0") },
      payload: null,
      res: {},
    },
+    stats_logs: {
+      url: "/rpc/stats_logs_fn",
+      header: { name: "x-is-public", value: btoa("aava,public_stats,0") },
+      payload: null,
+      res: {},
+    },
+    stats_stays: {
+      url: "/rpc/stats_stay_fn",
+      header: { name: "x-is-public", value: btoa("kapla,public_stats,0") },
+      payload: null,
+      res: {},
+    },
    export_gpx: {
      url: "/rpc/export_logbook_gpx_fn",
      header: { name: "x-is-public", value: btoa("aava,public_logs,0") },
@@ -97,7 +133,7 @@ var moment = require("moment");
    request = supertest.agent(test.cname);
    request.set("User-Agent", "PostgSail unit tests");

-    describe("Get JWT api_anonymous", function () {
+    describe("With no JWT as api_anonymous", function () {
      it("/logs_view, api_anonymous no jwt token", function (done) {
        // Reset agent so we do not save cookies
        request = supertest.agent(test.cname);
@@ -156,7 +192,7 @@ var moment = require("moment");
          .set("Accept", "application/json")
          .end(function (err, res) {
            console.log(res.text);
-            res.status.should.equal(404);
+            res.status.should.equal(404); // return 404 as it is not enable in user settings.
            should.exist(res.header["content-type"]);
            should.exist(res.header["server"]);
            res.header["content-type"].should.match(new RegExp("json", "g"));
--- a/tests/metrics_sample_aava.json
+++ b/tests/metrics_sample_aava.json
@@ -573,7 +573,31 @@
 		"courseovergroundtrue" : 197.6,
 		"windspeedapparent" : 15.9,
 		"anglespeedapparent" : 31.0,
+		"status" : "ais-sart",
+		"metrics" : {}
+	},
+	{
+		"time" : "2022-07-31T12:14:29.168Z",
+		"client_id" : "vessels.urn:mrn:imo:mmsi:987654321",
+		"latitude" : 59.7124174,
+		"longitude" : 24.7289112,
+		"speedoverground" : 55.7,
+		"courseovergroundtrue" : 197.6,
+		"windspeedapparent" : 15.9,
+		"anglespeedapparent" : 31.0,
 		"status" : "anchored",
-		"metrics" : {"navigation.log": 17442506, "navigation.trip.log": 81321, "navigation.headingTrue": 3.571, "navigation.gnss.satellites": 10, "environment.depth.belowKeel": 13.749, "navigation.magneticVariation": 0.1414, "navigation.speedThroughWater": 3.07, "environment.water.temperature": 313.15, "electrical.batteries.1.current": 43.9, "electrical.batteries.1.voltage": 14.54, "navigation.gnss.antennaAltitude": 2.05, "network.n2k.ngt-1.130356.errorID": 0, "network.n2k.ngt-1.130356.modelID": 14, "environment.depth.belowTransducer": 13.75, "electrical.batteries.1.temperature": 299.82, "environment.depth.transducerToKeel": -0.001, "navigation.gnss.horizontalDilution": 0.8, "network.n2k.ngt-1.130356.ch1.rxLoad": 4, "network.n2k.ngt-1.130356.ch1.txLoad": 0, "network.n2k.ngt-1.130356.ch2.rxLoad": 0, "network.n2k.ngt-1.130356.ch2.txLoad": 40, "network.n2k.ngt-1.130356.ch1.deleted": 0, "network.n2k.ngt-1.130356.ch2.deleted": 0, "network.n2k.ngt-1.130356.ch2Bandwidth": 4, "network.n2k.ngt-1.130356.ch1.bandwidth": 3, "network.n2k.ngt-1.130356.ch1.rxDropped": 0, "network.n2k.ngt-1.130356.ch2.rxDropped": 0, "network.n2k.ngt-1.130356.ch1.rxFiltered": 0, "network.n2k.ngt-1.130356.ch2.rxFiltered": 0, "network.n2k.ngt-1.130356.ch1.rxBandwidth": 5, "network.n2k.ngt-1.130356.ch1.txBandwidth": 0, "network.n2k.ngt-1.130356.ch2.rxBandwidth": 0, "network.n2k.ngt-1.130356.ch2.txBandwidth": 10, "network.n2k.ngt-1.130356.uniChannelCount": 2, "network.n2k.ngt-1.130356.indiChannelCount": 2, "network.n2k.ngt-1.130356.ch1.BufferLoading": 0, "network.n2k.ngt-1.130356.ch2.bufferLoading": 0, "network.n2k.ngt-1.130356.ch1.PointerLoading": 0, "network.n2k.ngt-1.130356.ch2.pointerLoading": 0}
+		"metrics" : {}
+	},
+	{
+		"time" : "2022-07-31T12:14:29.168Z",
+		"client_id" : "vessels.urn:mrn:imo:mmsi:987654321",
+		"latitude" : 59.7124174,
+		"longitude" : 24.7289112,
+		"speedoverground" : 5.7,
+		"courseovergroundtrue" : 197.6,
+		"windspeedapparent" : 15.9,
+		"anglespeedapparent" : 31.0,
+		"status" : "anchored",
+		"metrics" : {}
 	}
 ]}
--- a/tests/metrics_sample_kapla.json
+++ b/tests/metrics_sample_kapla.json
@@ -633,7 +633,31 @@
 		"courseovergroundtrue" : 122.0,
 		"windspeedapparent" : 7.2,
 		"anglespeedapparent" : 10.0,
+		"status" : "unknown",
+		"metrics" : {}
+	},
+	{
+		"time" : "2022-07-30T15:41:28.867Z",
+		"client_id" : "vessels.urn:mrn:imo:mmsi:123456789",
+		"latitude" : 59.86,
+		"longitude" : 23.365766666666666,
+		"speedoverground" : 60.0,
+		"courseovergroundtrue" : 122.0,
+		"windspeedapparent" : 7.2,
+		"anglespeedapparent" : 10.0,
 		"status" : "anchored",
-		"metrics" : {"environment.wind.speedTrue": 0.63, "navigation.speedThroughWater": 3.2255674838104293, "performance.velocityMadeGood": -2.242978345998959, "environment.wind.angleTrueWater": 2.3038346131585485, "environment.depth.belowTransducer": 17.73, "navigation.courseOverGroundMagnetic": 2.129127154994025, "navigation.courseRhumbline.crossTrackError": 0}
+		"metrics" : {}
+	},
+	{
+		"time" : "2022-07-30T15:41:28.867Z",
+		"client_id" : "vessels.urn:mrn:imo:mmsi:123456789",
+		"latitude" : 59.86,
+		"longitude" : 23.365766666666666,
+		"speedoverground" : 0.0,
+		"courseovergroundtrue" : 122.0,
+		"windspeedapparent" : 7.2,
+		"anglespeedapparent" : 10.0,
+		"status" : "anchored",
+		"metrics" : {}
 	}
 ]}
--- a/tests/sql/anonymous.sql.output
+++ b/tests/sql/anonymous.sql.output
@@ -15,6 +15,9 @@ ispublic_fn | f
 -[ RECORD 1 ]--
 ispublic_fn | t

+-[ RECORD 1 ]--
+ispublic_fn | f
+
 -[ RECORD 1 ]--
 ispublic_fn | t

--- a/tests/sql/badges.sql
+++ b/tests/sql/badges.sql
@@ -27,10 +27,10 @@ SELECT set_config('user.email', 'demo+kapla@openplotter.cloud', false);
 --SELECT set_config('vessel.client_id', 'vessels.urn:mrn:imo:mmsi:123456789', false);

 \echo 'Process badge'
-SELECT badges_logbook_fn(5);
-SELECT badges_logbook_fn(6);
-SELECT badges_geom_fn(5);
-SELECT badges_geom_fn(6);
+SELECT badges_logbook_fn(5,NOW()::TEXT);
+SELECT badges_logbook_fn(6,NOW()::TEXT);
+SELECT badges_geom_fn(5,NOW()::TEXT);
+SELECT badges_geom_fn(6,NOW()::TEXT);

 \echo 'Check badges for user'
 SELECT jsonb_object_keys ( a.preferences->'badges' ) FROM auth.accounts a;
--- a/tests/sql/cron_post_jobs.sql
+++ b/tests/sql/cron_post_jobs.sql
@@ -31,7 +31,7 @@ SELECT name,_from_time IS NOT NULL AS _from_time,_to_time IS NOT NULL AS _to_tim
 \echo 'stays'
 SELECT count(*) FROM api.stays WHERE vessel_id = current_setting('vessel.id', false);
 \echo 'stays'
-SELECT active,name,geog,stay_code FROM api.stays WHERE vessel_id = current_setting('vessel.id', false);
+SELECT active,name IS NOT NULL AS name,geog,stay_code FROM api.stays WHERE vessel_id = current_setting('vessel.id', false);

 -- Test event logs view for user
 \echo 'eventlogs_view'
@@ -69,3 +69,8 @@ SELECT extra FROM api.logbook l WHERE id = 1 AND vessel_id = current_setting('ve
 --SELECT api.export_logbook_geojson_fn(1);
 --SELECT api.export_logbook_gpx_fn(1);
 --SELECT api.export_logbook_kml_fn(1);
+
+-- Check history
+--\echo 'monitoring history fn'
+--select api.monitoring_history_fn();
+--select api.monitoring_history_fn('24');
--- a/tests/sql/cron_post_jobs.sql.output
+++ b/tests/sql/cron_post_jobs.sql.output
@@ -27,7 +27,7 @@ duration       | PT27M
 avg_speed      | 3.6357142857142852
 max_speed      | 6.1
 max_wind_speed | 22.1
-notes          | new log note
+notes          | 
 extra          | {"metrics": {"propulsion.main.runTime": 10}, "observations": {"seaState": -1, "visibility": -1, "cloudCoverage": -1}}
 -[ RECORD 2 ]--+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 name           | Norra hamnen to Ekenäs
@@ -50,23 +50,23 @@ count | 3
 stays
 -[ RECORD 1 ]-------------------------------------------------
 active    | t
-name      | 
+name      | f
 geog      | 
 stay_code | 2
 -[ RECORD 2 ]-------------------------------------------------
 active    | f
-name      | 0 days stay at Pojoviken in November 2023
+name      | t
 geog      | 0101000020E6100000B0DEBBE0E68737404DA938FBF0094E40
 stay_code | 2
 -[ RECORD 3 ]-------------------------------------------------
 active    | f
-name      | 0 days stay at Norra hamnen in November 2023
+name      | t
 geog      | 0101000020E6100000029A081B9E6E37404A5658830AFD4D40
 stay_code | 4

 eventlogs_view
 -[ RECORD 1 ]
-count | 11
+count | 12

 stats_logs_fn
 SELECT 1
--- a/tests/sql/cron_run_jobs.sql
+++ b/tests/sql/cron_run_jobs.sql
@@ -12,9 +12,14 @@ select current_database();
 \x on

 -- Check the number of process pending
+\echo 'Check the number of process pending'
 -- Should be 22
 SELECT count(*) as jobs from public.process_queue pq where pq.processed is null;
 --set role scheduler
 SELECT public.run_cron_jobs();
 -- Check any pending job
 SELECT count(*) as any_pending_jobs from public.process_queue pq where pq.processed is null;
+
+-- Check the number of metrics entries
+\echo 'Check the number of metrics entries'
+SELECT count(*) as metrics_count from api.metrics;
--- a/tests/sql/cron_run_jobs.sql.output
+++ b/tests/sql/cron_run_jobs.sql.output
@@ -5,12 +5,17 @@

 You are now connected to database "signalk" as user "username".
 Expanded display is on.
+Check the number of process pending
 -[ RECORD 1 ]
-jobs | 24
+jobs | 26

 -[ RECORD 1 ]-+-
 run_cron_jobs | 

 -[ RECORD 1 ]----+--
-any_pending_jobs | 0
+any_pending_jobs | 2
+
+Check the number of metrics entries
+-[ RECORD 1 ]-+----
+metrics_count | 172

--- a/tests/sql/grafana.sql
+++ b/tests/sql/grafana.sql
@@ -65,7 +65,7 @@ SELECT l.id, l.name, l.from, l.to, l.distance, l.duration, l._from_moorage_id, l

 \echo 'api.stays'
 --SELECT * FROM api.stays s;
-SELECT m.id, m.vessel_id IS NOT NULL AS vessel_id, m.moorage_id, m.active, m.name, m.latitude, m.longitude, m.geog, m.arrived IS NOT NULL AS arrived, m.departed IS NOT NULL AS departed, m.duration, m.stay_code, m.notes FROM api.stays AS m;
+SELECT m.id, m.vessel_id IS NOT NULL AS vessel_id, m.moorage_id, m.active, m.name IS NOT NULL AS name, m.latitude, m.longitude, m.geog, m.arrived IS NOT NULL AS arrived, m.departed IS NOT NULL AS departed, m.duration, m.stay_code, m.notes FROM api.stays AS m;

 \echo 'stays_view'
 --SELECT * FROM api.stays_view s;
--- a/tests/sql/grafana.sql.output
+++ b/tests/sql/grafana.sql.output
@@ -148,7 +148,7 @@ id         | 3
 vessel_id  | t
 moorage_id | 
 active     | t
-name       | 
+name       | f
 latitude   | 59.86
 longitude  | 23.365766666666666
 geog       | 
@@ -162,7 +162,7 @@ id         | 1
 vessel_id  | t
 moorage_id | 1
 active     | f
-name       | patch stay name 3
+name       | t
 latitude   | 60.077666666666666
 longitude  | 23.530866666666668
 geog       | 0101000020E6100000B0DEBBE0E68737404DA938FBF0094E40
@@ -176,7 +176,7 @@ id         | 2
 vessel_id  | t
 moorage_id | 2
 active     | f
-name       | 0 days stay at Norra hamnen in November 2023
+name       | t
 latitude   | 59.97688333333333
 longitude  | 23.4321
 geog       | 0101000020E6100000029A081B9E6E37404A5658830AFD4D40
--- a/tests/sql/summary.sql
+++ b/tests/sql/summary.sql
@@ -81,6 +81,10 @@ select * from pg_policies;
 SELECT public.reverse_geocode_py_fn('nominatim', 1.4440116666666667, 38.82985166666667);
 \echo 'Test geoip reverse_geoip_py_fn'
 --SELECT reverse_geoip_py_fn('62.74.13.231');
+\echo 'Test opverpass API overpass_py_fn'
+SELECT public.overpass_py_fn(2.19917, 41.386873333333334); -- Port Olimpic
+SELECT public.overpass_py_fn(1.92574333333, 41.258915); -- Port de la Ginesta
+SELECT public.overpass_py_fn(23.4321, 59.9768833333333); -- Norra hamnen

 -- List details product versions
 SELECT api.versions_fn();
--- a/tests/sql/summary.sql.output
+++ b/tests/sql/summary.sql.output
@@ -6,10 +6,10 @@
 You are now connected to database "signalk" as user "username".
 Expanded display is on.
 -[ RECORD 1 ]--+-------------------------------
-server_version | 15.5 (Debian 15.5-1.pgdg110+1)
+server_version | 16.1 (Debian 16.1-1.pgdg110+1)

 -[ RECORD 1 ]--------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-postgis_full_version | POSTGIS="3.4.0 0874ea3" [EXTENSION] PGSQL="150" GEOS="3.9.0-CAPI-1.16.2" PROJ="7.2.1 NETWORK_ENABLED=OFF URL_ENDPOINT=https://cdn.proj.org USER_WRITABLE_DIRECTORY=/var/lib/postgresql/.local/share/proj DATABASE_PATH=/usr/share/proj/proj.db" LIBXML="2.9.10" LIBJSON="0.15" LIBPROTOBUF="1.3.3" WAGYU="0.5.0 (Internal)"
+postgis_full_version | POSTGIS="3.4.1 ca035b9" [EXTENSION] PGSQL="160" GEOS="3.9.0-CAPI-1.16.2" PROJ="7.2.1 NETWORK_ENABLED=OFF URL_ENDPOINT=https://cdn.proj.org USER_WRITABLE_DIRECTORY=/var/lib/postgresql/.local/share/proj DATABASE_PATH=/usr/share/proj/proj.db" LIBXML="2.9.10" LIBJSON="0.15" LIBPROTOBUF="1.3.3" WAGYU="0.5.0 (Internal)"

 -[ RECORD 1 ]--------------------------------------------------------------------------------------
 Name        | citext
@@ -48,12 +48,12 @@ Schema      | pg_catalog
 Description | PL/Python3U untrusted procedural language
 -[ RECORD 8 ]--------------------------------------------------------------------------------------
 Name        | postgis
-Version     | 3.4.0
+Version     | 3.4.1
 Schema      | public
 Description | PostGIS geometry and geography spatial types and functions
 -[ RECORD 9 ]--------------------------------------------------------------------------------------
 Name        | timescaledb
-Version     | 2.12.2
+Version     | 2.13.1
 Schema      | public
 Description | Enables scalable inserts and complex queries for time-series data (Community Edition)
 -[ RECORD 10 ]-------------------------------------------------------------------------------------
@@ -96,24 +96,24 @@ laninline     | 0
 lanvalidator  | 2248
 lanacl        | 
 -[ RECORD 4 ]-+-----------
-oid           | 13542
+oid           | 13545
 lanname       | plpgsql
 lanowner      | 10
 lanispl       | t
 lanpltrusted  | t
-lanplcallfoid | 13539
-laninline     | 13540
-lanvalidator  | 13541
+lanplcallfoid | 13542
+laninline     | 13543
+lanvalidator  | 13544
 lanacl        | 
 -[ RECORD 5 ]-+-----------
-oid           | 18283
+oid           | 18297
 lanname       | plpython3u
 lanowner      | 10
 lanispl       | t
 lanpltrusted  | t
-lanplcallfoid | 18280
-laninline     | 18281
-lanvalidator  | 18282
+lanplcallfoid | 18294
+laninline     | 18295
+lanvalidator  | 18296
 lanacl        | 

 -[ RECORD 1 ]+-----------
@@ -243,6 +243,8 @@ schema_auth | accounts
 -[ RECORD 2 ]---------
 schema_auth | otp
 -[ RECORD 3 ]---------
+schema_auth | users
+-[ RECORD 4 ]---------
 schema_auth | vessels

 (0 rows)
@@ -321,213 +323,6 @@ cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | true
 -[ RECORD 9 ]------------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | metrics
-policyname | api_user_role
-permissive | PERMISSIVE
-roles      | {user_role}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, true))
-with_check | (vessel_id = current_setting('vessel.id'::text, false))
-[ RECORD 10 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | metrics
-policyname | api_scheduler_role
-permissive | PERMISSIVE
-roles      | {scheduler}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | (vessel_id = current_setting('vessel.id'::text, false))
-[ RECORD 11 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | metrics
-policyname | grafana_role
-permissive | PERMISSIVE
-roles      | {grafana}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | false
-[ RECORD 12 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | metrics
-policyname | api_anonymous_role
-permissive | PERMISSIVE
-roles      | {api_anonymous}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | false
-[ RECORD 13 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | logbook
-policyname | admin_all
-permissive | PERMISSIVE
-roles      | {username}
-cmd        | ALL
-qual       | true
-with_check | true
-[ RECORD 14 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | logbook
-policyname | api_vessel_role
-permissive | PERMISSIVE
-roles      | {vessel_role}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | true
-[ RECORD 15 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | logbook
-policyname | api_user_role
-permissive | PERMISSIVE
-roles      | {user_role}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, true))
-with_check | (vessel_id = current_setting('vessel.id'::text, false))
-[ RECORD 16 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | logbook
-policyname | api_scheduler_role
-permissive | PERMISSIVE
-roles      | {scheduler}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | (vessel_id = current_setting('vessel.id'::text, false))
-[ RECORD 17 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | logbook
-policyname | grafana_role
-permissive | PERMISSIVE
-roles      | {grafana}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | false
-[ RECORD 18 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | logbook
-policyname | api_anonymous_role
-permissive | PERMISSIVE
-roles      | {api_anonymous}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | false
-[ RECORD 19 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | stays
-policyname | admin_all
-permissive | PERMISSIVE
-roles      | {username}
-cmd        | ALL
-qual       | true
-with_check | true
-[ RECORD 20 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | stays
-policyname | api_vessel_role
-permissive | PERMISSIVE
-roles      | {vessel_role}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | true
-[ RECORD 21 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | stays
-policyname | api_user_role
-permissive | PERMISSIVE
-roles      | {user_role}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, true))
-with_check | (vessel_id = current_setting('vessel.id'::text, false))
-[ RECORD 22 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | stays
-policyname | api_scheduler_role
-permissive | PERMISSIVE
-roles      | {scheduler}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | (vessel_id = current_setting('vessel.id'::text, false))
-[ RECORD 23 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | stays
-policyname | grafana_role
-permissive | PERMISSIVE
-roles      | {grafana}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | false
-[ RECORD 24 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | moorages
-policyname | admin_all
-permissive | PERMISSIVE
-roles      | {username}
-cmd        | ALL
-qual       | true
-with_check | true
-[ RECORD 25 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | moorages
-policyname | api_vessel_role
-permissive | PERMISSIVE
-roles      | {vessel_role}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | true
-[ RECORD 26 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | moorages
-policyname | api_user_role
-permissive | PERMISSIVE
-roles      | {user_role}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, true))
-with_check | (vessel_id = current_setting('vessel.id'::text, false))
-[ RECORD 27 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | moorages
-policyname | api_scheduler_role
-permissive | PERMISSIVE
-roles      | {scheduler}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | (vessel_id = current_setting('vessel.id'::text, false))
-[ RECORD 28 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | moorages
-policyname | grafana_role
-permissive | PERMISSIVE
-roles      | {grafana}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | false
-[ RECORD 29 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | auth
-tablename  | vessels
-policyname | admin_all
-permissive | PERMISSIVE
-roles      | {username}
-cmd        | ALL
-qual       | true
-with_check | true
-[ RECORD 30 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | auth
-tablename  | vessels
-policyname | api_user_role
-permissive | PERMISSIVE
-roles      | {user_role}
-cmd        | ALL
-qual       | ((vessel_id = current_setting('vessel.id'::text, true)) AND ((owner_email)::text = current_setting('user.email'::text, true)))
-with_check | ((vessel_id = current_setting('vessel.id'::text, true)) AND ((owner_email)::text = current_setting('user.email'::text, true)))
-[ RECORD 31 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | auth
-tablename  | vessels
-policyname | grafana_role
-permissive | PERMISSIVE
-roles      | {grafana}
-cmd        | ALL
-qual       | ((owner_email)::text = current_setting('user.email'::text, true))
-with_check | false
-[ RECORD 32 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
 tablename  | vessels
 policyname | grafana_proxy_role
@@ -536,7 +331,61 @@ roles      | {grafana_auth}
 cmd        | ALL
 qual       | true
 with_check | false
-[ RECORD 33 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 10 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metrics
+policyname | api_user_role
+permissive | PERMISSIVE
+roles      | {user_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, true))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 11 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metrics
+policyname | api_scheduler_role
+permissive | PERMISSIVE
+roles      | {scheduler}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 12 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metrics
+policyname | grafana_role
+permissive | PERMISSIVE
+roles      | {grafana}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | false
+-[ RECORD 13 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metrics
+policyname | api_anonymous_role
+permissive | PERMISSIVE
+roles      | {api_anonymous}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | false
+-[ RECORD 14 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | logbook
+policyname | admin_all
+permissive | PERMISSIVE
+roles      | {username}
+cmd        | ALL
+qual       | true
+with_check | true
+-[ RECORD 15 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | logbook
+policyname | api_vessel_role
+permissive | PERMISSIVE
+roles      | {vessel_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | true
+-[ RECORD 16 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
 tablename  | accounts
 policyname | admin_all
@@ -545,8 +394,179 @@ roles      | {username}
 cmd        | ALL
 qual       | true
 with_check | true
+-[ RECORD 17 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | logbook
+policyname | api_user_role
+permissive | PERMISSIVE
+roles      | {user_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, true))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 18 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | logbook
+policyname | api_scheduler_role
+permissive | PERMISSIVE
+roles      | {scheduler}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 19 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | logbook
+policyname | grafana_role
+permissive | PERMISSIVE
+roles      | {grafana}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | false
+-[ RECORD 20 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | logbook
+policyname | api_anonymous_role
+permissive | PERMISSIVE
+roles      | {api_anonymous}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | false
+-[ RECORD 21 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | stays
+policyname | admin_all
+permissive | PERMISSIVE
+roles      | {username}
+cmd        | ALL
+qual       | true
+with_check | true
+-[ RECORD 22 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | stays
+policyname | api_vessel_role
+permissive | PERMISSIVE
+roles      | {vessel_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | true
+-[ RECORD 23 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | stays
+policyname | api_user_role
+permissive | PERMISSIVE
+roles      | {user_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, true))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 24 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | stays
+policyname | api_scheduler_role
+permissive | PERMISSIVE
+roles      | {scheduler}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 25 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | stays
+policyname | grafana_role
+permissive | PERMISSIVE
+roles      | {grafana}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | false
+-[ RECORD 26 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | stays
+policyname | api_anonymous_role
+permissive | PERMISSIVE
+roles      | {api_anonymous}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | false
+-[ RECORD 27 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | moorages
+policyname | admin_all
+permissive | PERMISSIVE
+roles      | {username}
+cmd        | ALL
+qual       | true
+with_check | true
+-[ RECORD 28 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | moorages
+policyname | api_vessel_role
+permissive | PERMISSIVE
+roles      | {vessel_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | true
+-[ RECORD 29 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | moorages
+policyname | api_user_role
+permissive | PERMISSIVE
+roles      | {user_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, true))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 30 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | moorages
+policyname | api_scheduler_role
+permissive | PERMISSIVE
+roles      | {scheduler}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 31 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | moorages
+policyname | grafana_role
+permissive | PERMISSIVE
+roles      | {grafana}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | false
+-[ RECORD 32 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | moorages
+policyname | api_anonymous_role
+permissive | PERMISSIVE
+roles      | {api_anonymous}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | false
+-[ RECORD 33 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | auth
+tablename  | vessels
+policyname | admin_all
+permissive | PERMISSIVE
+roles      | {username}
+cmd        | ALL
+qual       | true
+with_check | true
 -[ RECORD 34 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
+tablename  | vessels
+policyname | api_user_role
+permissive | PERMISSIVE
+roles      | {user_role}
+cmd        | ALL
+qual       | ((vessel_id = current_setting('vessel.id'::text, true)) AND ((owner_email)::text = current_setting('user.email'::text, true)))
+with_check | ((vessel_id = current_setting('vessel.id'::text, true)) AND ((owner_email)::text = current_setting('user.email'::text, true)))
+-[ RECORD 35 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | auth
+tablename  | vessels
+policyname | grafana_role
+permissive | PERMISSIVE
+roles      | {grafana}
+cmd        | ALL
+qual       | ((owner_email)::text = current_setting('user.email'::text, true))
+with_check | false
+-[ RECORD 36 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | auth
 tablename  | accounts
 policyname | api_user_role
 permissive | PERMISSIVE
@@ -554,7 +574,7 @@ roles      | {user_role}
 cmd        | ALL
 qual       | ((email)::text = current_setting('user.email'::text, true))
 with_check | ((email)::text = current_setting('user.email'::text, true))
-[ RECORD 35 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 37 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
 tablename  | accounts
 policyname | api_scheduler_role
@@ -563,7 +583,7 @@ roles      | {scheduler}
 cmd        | ALL
 qual       | ((email)::text = current_setting('user.email'::text, true))
 with_check | ((email)::text = current_setting('user.email'::text, true))
-[ RECORD 36 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 38 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
 tablename  | accounts
 policyname | grafana_proxy_role
@@ -572,7 +592,7 @@ roles      | {grafana_auth}
 cmd        | ALL
 qual       | true
 with_check | false
-[ RECORD 37 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 39 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | public
 tablename  | process_queue
 policyname | admin_all
@@ -581,7 +601,7 @@ roles      | {username}
 cmd        | ALL
 qual       | true
 with_check | true
-[ RECORD 38 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 40 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | public
 tablename  | process_queue
 policyname | api_vessel_role
@@ -590,7 +610,7 @@ roles      | {vessel_role}
 cmd        | ALL
 qual       | ((ref_id = current_setting('user.id'::text, true)) OR (ref_id = current_setting('vessel.id'::text, true)))
 with_check | true
-[ RECORD 39 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 41 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | public
 tablename  | process_queue
 policyname | api_user_role
@@ -599,7 +619,7 @@ roles      | {user_role}
 cmd        | ALL
 qual       | ((ref_id = current_setting('user.id'::text, true)) OR (ref_id = current_setting('vessel.id'::text, true)))
 with_check | ((ref_id = current_setting('user.id'::text, true)) OR (ref_id = current_setting('vessel.id'::text, true)))
-[ RECORD 40 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 42 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | public
 tablename  | process_queue
 policyname | api_scheduler_role
@@ -614,13 +634,23 @@ Test nominatim reverse_geocode_py_fn
 reverse_geocode_py_fn | {"name": "Spain", "country_code": "es"}

 Test geoip reverse_geoip_py_fn
+Test opverpass API overpass_py_fn
+-[ RECORD 1 ]--+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+overpass_py_fn | {"fee": "yes", "vhf": "09", "name": "Port Olímpic", "phone": "+34 933561016", "leisure": "marina", "website": "https://portolimpic.barcelona/", "wikidata": "Q171204", "wikipedia": "ca:Port Olímpic de Barcelona", "addr:street": "Moll de Xaloc", "power_supply": "yes", "seamark:type": "harbour", "addr:postcode": "08005", "internet_access": "wlan", "wikimedia_commons": "Category:Port Olímpic (Barcelona)", "sanitary_dump_station": "yes", "seamark:harbour:category": "marina"}
+
+-[ RECORD 1 ]--+----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+overpass_py_fn | {"name": "Port de la Ginesta", "type": "multipolygon", "leisure": "marina", "name:ca": "Port de la Ginesta", "wikidata": "Q16621038", "wikipedia": "ca:Port Ginesta"}
+
+-[ RECORD 1 ]--+----------------------------------------------
+overpass_py_fn | {"name": "Norra hamnen", "leisure": "marina"}
+
 -[ RECORD 1 ]----------------------------------------------------------------------------------------------------------------------------------------------
-versions_fn | {"api_version" : "0.5.0", "sys_version" : "PostgreSQL 15.5", "timescaledb" : "2.12.2", "postgis" : "3.4.0", "postgrest" : "PostgREST 11.2.2"}
+versions_fn | {"api_version" : "0.6.1", "sys_version" : "PostgreSQL 16.1", "timescaledb" : "2.13.1", "postgis" : "3.4.1", "postgrest" : "PostgREST 12.0.2"}

 -[ RECORD 1 ]-----------------
-api_version | 0.5.0
-sys_version | PostgreSQL 15.5
-timescaledb | 2.12.2
-postgis     | 3.4.0
-postgrest   | PostgREST 11.2.2
+api_version | 0.6.1
+sys_version | PostgreSQL 16.1
+timescaledb | 2.13.1
+postgis     | 3.4.1
+postgrest   | PostgREST 12.0.2

--- a/tests/sql/telegram.sql
+++ b/tests/sql/telegram.sql
@@ -36,7 +36,7 @@ SET vessel.name = 'kapla';
 --SET vessel.client_id = 'vessels.urn:mrn:imo:mmsi:123456789';
 --SELECT * FROM api.vessels_view v;
 SELECT name, mmsi, created_at IS NOT NULL as created_at, last_contact IS NOT NULL as last_contact FROM api.vessels_view v;
-SELECT name,geojson,watertemperature,insidetemperature,outsidetemperature FROM api.monitoring_view m;
+SELECT name,geojson->'geometry' as geometry,watertemperature,insidetemperature,outsidetemperature FROM api.monitoring_view m;

 SET "user.email" = 'demo+aava@openplotter.cloud';
 SELECT set_config('vessel.id', :'vessel_id_aava', false) IS NOT NULL as vessel_id;
@@ -45,4 +45,4 @@ SET vessel.name = 'aava';
 --SET vessel.client_id = 'vessels.urn:mrn:imo:mmsi:787654321';
 --SELECT * FROM api.vessels_view v;
 SELECT name, mmsi, created_at IS NOT NULL as created_at, last_contact IS NOT NULL as last_contact FROM api.vessels_view v;
-SELECT name,geojson,watertemperature,insidetemperature,outsidetemperature FROM api.monitoring_view m;
+SELECT name,geojson->'geometry' as geometry,watertemperature,insidetemperature,outsidetemperature FROM api.monitoring_view m;
--- a/tests/sql/telegram.sql.output
+++ b/tests/sql/telegram.sql.output
@@ -37,9 +37,9 @@ mmsi         |
 created_at   | t
 last_contact | t

-[ RECORD 1 ]------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 1 ]------+--------------------------------------------------------
 name               | kapla
-geojson            | {"type": "Feature", "geometry": {"type": "Point", "coordinates": [23.365766667, 59.86]}, "properties": {"name": "kapla", "latitude": 59.86, "longitude": 23.365766666666666}}
+geometry           | {"type": "Point", "coordinates": [23.365766667, 59.86]}
 watertemperature   | 
 insidetemperature  | 
 outsidetemperature | 
@@ -55,9 +55,9 @@ mmsi         | 787654321
 created_at   | t
 last_contact | t

-[ RECORD 1 ]------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 1 ]------+------------------------------------------------------------
 name               | aava
-geojson            | {"type": "Feature", "geometry": {"type": "Point", "coordinates": [2.2934791, 41.465333283]}, "properties": {"name": "aava", "latitude": 41.46533328333334, "longitude": 2.2934791}}
+geometry           | {"type": "Point", "coordinates": [2.2934791, 41.465333283]}
 watertemperature   | 280.25
 insidetemperature  | 
 outsidetemperature | 
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -9,6 +9,11 @@ if [[ -z "${PGSAIL_API_URI}" ]]; then
  exit 1
 fi

+# psql
+if [[ ! -x "/usr/bin/psql" ]]; then
+    apt update && apt -y install postgresql-client
+fi
+
 # go install
 if [[ ! -x "/usr/bin/go" || ! -x "/root/go/bin/mermerd" ]]; then
    #wget -q https://go.dev/dl/go1.21.4.linux-arm64.tar.gz && \
@@ -133,6 +138,7 @@ else
    exit 1
 fi

+# Monitoring API unit tests
 $mymocha index4.js --reporter ./node_modules/mochawesome --reporter-options reportDir=output/,reportFilename=report4.html
 if [ $? -eq 0 ]; then
    echo OK
@@ -141,15 +147,7 @@ else
    exit 1
 fi

-$mymocha index5.js --reporter ./node_modules/mochawesome --reporter-options reportDir=output/,reportFilename=report5.html
-if [ $? -eq 0 ]; then
-    echo OK
-else
-    echo mocha index5.js
-    exit 1
-fi
-
-# Monitoring unit tests
+# Monitoring SQL unit tests
 psql ${PGSAIL_DB_URI} < sql/monitoring.sql > output/monitoring.sql.output
 diff sql/monitoring.sql.output output/monitoring.sql.output > /dev/null
 #diff -u sql/monitoring.sql.output output/monitoring.sql.output | wc -l
@@ -162,6 +160,28 @@ else
    exit 1
 fi

+# Anonymous API unit tests
+$mymocha index5.js --reporter ./node_modules/mochawesome --reporter-options reportDir=output/,reportFilename=report5.html
+if [ $? -eq 0 ]; then
+    echo OK
+else
+    echo mocha index5.js
+    exit 1
+fi
+
+# Anonymous SQL unit tests
+psql ${PGSAIL_DB_URI} < sql/anonymous.sql > output/anonymous.sql.output
+diff sql/anonymous.sql.output output/anonymous.sql.output > /dev/null
+#diff -u sql/anonymous.sql.output output/anonymous.sql.output | wc -l
+#echo 0
+if [ $? -eq 0 ]; then
+    echo SQL anonymous.sql OK
+else
+    echo SQL anonymous.sql FAILED
+    diff -u sql/anonymous.sql.output output/anonymous.sql.output
+    exit 1
+fi
+
 # Download and update openapi documentation
 wget ${PGSAIL_API_URI} -O openapi.json
 #echo 0
@@ -174,11 +194,11 @@ else
 fi

 # Generate and update mermaid schema documentation
-/root/go/bin/mermerd --runConfig ../ERD/mermerdConfig.yaml
+/root/go/bin/mermerd --runConfig ../docs/ERD/mermerdConfig.yaml
 echo $?
 echo 0
 if [ $? -eq 0 ]; then
-    cp postgsail.md ../ERD/postgsail.md
+    cp postgsail.md ../docs/ERD/postgsail.md
    echo postgsail.md OK
 else
    echo postgsail.md FAILED
Author	SHA1	Message	Date
xbgmsharp	22466430ac	Release v0.6.1	2024-01-30 22:48:46 +01:00
xbgmsharp	643c16ad3f	Update keycloak account status	2024-01-30 22:48:22 +01:00
xbgmsharp	59a3c41b4a	Update grafana cron, Add keycloak provisioning to sync vessel_id as user attributs	2024-01-30 22:33:08 +01:00
xbgmsharp	371eb6c720	Update message template. Update grafana notification	2024-01-30 22:32:28 +01:00
xbgmsharp	c2ffe9777c	Update get_app_settings_fn, add keycloak URI	2024-01-30 22:31:53 +01:00
xbgmsharp	c0261791f5	Add keycloak python user integration	2024-01-30 21:55:30 +01:00
xbgmsharp	e727954f83	Update api.vessel_details_fn, fix length	2024-01-29 21:45:26 +01:00
xbgmsharp	22b04334f8	Udpatr frontend, dump 0.0.9-beta3	2024-01-26 16:33:42 +01:00
xbgmsharp	a5ec4c0039	Update monitoring_view, remove status	2024-01-26 13:05:44 +01:00
xbgmsharp	6a63f7d02f	Update cron comment, Add deprecated comment	2024-01-26 11:32:50 +01:00
xbgmsharp	2fec2e650c	Update frontend to latest beta	2024-01-26 11:32:05 +01:00
xbgmsharp	ed8514bfb1	Update Grafana default dashboard. Update uuid for provisioning. Fix metric order to get display the latest know vessel position vs the first one	2024-01-26 11:31:08 +01:00
xbgmsharp	f25e735674	Update overpass_py return jsonb versus a string when there is no value	2024-01-22 21:55:38 +01:00
xbgmsharp	c1b71cabd8	Fix test versions	2024-01-19 11:41:58 +01:00
xbgmsharp	495e25b838	Release 0.6.0	2024-01-19 11:35:29 +01:00
xbgmsharp	a547271496	Update cron_process_grafana_fn, fix SQL error	2024-01-19 09:23:03 +01:00
xbgmsharp	3a1d0baef8	Update grafana cron job, add notification	2024-01-19 00:13:17 +01:00
xbgmsharp	628de57b5f	Update teamplate table, add grafana notification	2024-01-19 00:12:47 +01:00
xbgmsharp	9a5f27d21e	Update api.timelapse_fn, fix typo using date. add api.timelapse2_fn to export geojson with notes	2024-01-18 23:54:47 +01:00
xbgmsharp	7892b615e0	Update frontend to latest beta	2024-01-18 22:29:41 +01:00
xbgmsharp	2c2f5d8605	Expose vessel status via API	2024-01-18 22:11:28 +01:00
xbgmsharp	47eda3dcaf	Disable stationary detection in pre logbook, still some issue	2024-01-18 22:11:01 +01:00
xbgmsharp	0c0279767f	Add comment for process_pre_logbook_fn	2024-01-17 23:03:57 +01:00
xbgmsharp	98e28aacea	Updates tests, Update test with rls for anynomous role. Upgrade timescaledb version,	2024-01-17 20:27:23 +01:00
xbgmsharp	b04d336c0d	Update permissions, add ROW LEVEL SECURITY for anonymous access. Allow anonymous role for public access Allow vessel role to new function for oauth	2024-01-17 20:25:51 +01:00
xbgmsharp	288c458c5a	Update anonymous tests	2024-01-17 20:24:58 +01:00
xbgmsharp	d3dd46c834	Renane process_logbook_valid_fn to process_pre_logbook_fn	2024-01-17 20:20:49 +01:00
xbgmsharp	d0bc468ce7	Allow anonymous access for complete timelapse	2024-01-17 20:18:40 +01:00
xbgmsharp	3f51e89303	Update formating	2024-01-16 14:12:13 +01:00
xbgmsharp	000c5651e2	Add PostgREST Media Type Handlers support	2024-01-15 21:44:44 +01:00
xbgmsharp	4bec738826	Add new procedure, api.monitoring_history_fn	2024-01-13 23:23:53 +01:00
xbgmsharp	012812c898	Update eventlogs_view tests, as we skip pre-logbook check from user	2024-01-13 11:45:10 +01:00
xbgmsharp	1c04822cf8	Add cron_process_grafana_fn comment	2024-01-13 11:44:32 +01:00
xbgmsharp	50f018100b	Update api.eventlogs_view, ignore pre_logbook check from user	2024-01-12 23:31:00 +01:00
xbgmsharp	13c461a038	Expose metadata platform to frontend	2024-01-12 23:28:16 +01:00
xbgmsharp	8763448523	fix sql versions , update versions	2024-01-12 22:53:21 +01:00
xbgmsharp	e02aaf3676	Update grafana dashboards path	2024-01-12 22:50:57 +01:00
xbgmsharp	ae61072ba4	Update default grafana config and refactor provisioning files	2024-01-12 22:47:28 +01:00
xbgmsharp	242a5554ea	0.6.0-beta	2024-01-12 22:34:00 +01:00
xbgmsharp	39888e1957	Update PostgSail and PostgREST version	2024-01-12 22:33:38 +01:00
xbgmsharp	666f69c42a	Update API and SQL documentation	2024-01-12 22:31:19 +01:00
xbgmsharp	77f41251c5	Fix error from `480417917d`	2024-01-12 22:22:49 +01:00
xbgmsharp	40a1e0fa39	Fix python error from `0a09d7bbfc`	2024-01-12 22:19:40 +01:00
xbgmsharp	5cf2d10757	Fix syntax error from `489fb9562b`	2024-01-12 22:13:54 +01:00
xbgmsharp	0dd6410589	Fix docker compose PGRST_SERVER_TIMING_ENABLED contains true	2024-01-12 22:07:16 +01:00
xbgmsharp	682c68a108	Add new postgsail settings app.keycloak_uri	2024-01-12 21:54:51 +01:00
xbgmsharp	5d1db984b8	Update postgrest container with new parameters Update,fix grafana container, set properly the admin password	2024-01-12 21:53:01 +01:00
xbgmsharp	0a09d7bbfc	Update keycloak_py, make uri and host,user,pass dynamic form config	2024-01-12 17:40:59 +01:00
xbgmsharp	14cc4f5ed2	Update cron_process_grafana_fn, add formating and comment for clarification.	2024-01-12 17:39:54 +01:00
xbgmsharp	ff23f5c2ad	Update open api documentation	2024-01-10 22:47:01 +01:00
xbgmsharp	489fb9562b	Trigger email otp validation only if the user is not coming for the oauth server	2024-01-10 22:39:16 +01:00
xbgmsharp	8c32345342	Feat: Allow signalk plugin webapp to register user and vessel to database via oauth	2024-01-10 22:38:04 +01:00
xbgmsharp	480417917d	Feat: initial implementation for oauth support via Keycloak server or other	2024-01-10 22:37:11 +01:00
xbgmsharp	e557ed49a5	Add keycloak_py_fn. This function link the postgsail user with the oauth keycloak server	2024-01-09 22:04:22 +01:00
xbgmsharp	a3475dfe99	Update UUID v7 function	2024-01-09 22:03:45 +01:00
xbgmsharp	e670e11cd5	update ERd diagram	2024-01-07 22:18:44 +01:00
xbgmsharp	88de5003c2	feat: Add new metadata fields platform and configuration. This allow to do pre-defined configuration for well know device like Victron VenusOS decives.	2024-01-07 22:16:52 +01:00
xbgmsharp	c46a428fc2	Update tests, add more invalid metrics to be ignored, add sql metrics count check	2023-12-31 21:13:40 +01:00
xbgmsharp	db3bd6b06f	Update metrics_trigger_fn, silently ignore invalid status.	2023-12-31 21:09:42 +01:00
xbgmsharp	4ea7a1b019	Update API documentation	2023-12-29 18:48:11 +01:00
xbgmsharp	ce106074dc	Feat: Update tests for pre logbook check and grafana cron job support	2023-12-29 18:26:22 +01:00
xbgmsharp	e7d8229e83	Feat: Add grafana cron job	2023-12-29 18:23:07 +01:00
xbgmsharp	f14342bb07	Fix grafana cron job. update cron_process_grafana_fn	2023-12-29 18:16:59 +01:00
xbgmsharp	c4fbf7682d	refactor documentation	2023-12-29 18:15:08 +01:00
xbgmsharp	f8c1f43f48	Fix typo	2023-12-29 12:16:43 +01:00
xbgmsharp	0d5089af2d	Add new settings for Grafana HTTP API URL	2023-12-29 11:43:49 +01:00
xbgmsharp	da1952ed31	Feat: Add pre_logbook validation	2023-12-29 11:35:22 +01:00
xbgmsharp	a5d5585366	feat: Add pre logbook check. Split logbook process function	2023-12-29 11:34:19 +01:00
xbgmsharp	5f9a889a44	Feat: Add grafana provisioning on first contact from vessel Feat: Add pre logbook validation	2023-12-29 11:32:57 +01:00
xbgmsharp	f9719bd174	Feat: Add cron for pre logbook check Feat: Add cron for Grafana provisioning	2023-12-29 11:28:57 +01:00
xbgmsharp	8d1b8cb389	fix: Update template email message	2023-12-29 11:27:00 +01:00
xbgmsharp	acfd058d3b	feat: Add uuid v7 helpers	2023-12-29 11:26:16 +01:00
xbgmsharp	eeae7c40c6	Feat: Add proper Grafana provisioning via HTTP API	2023-12-29 11:24:54 +01:00
xbgmsharp	2bbf27f3ad	Update frontend	2023-12-29 11:24:18 +01:00
xbgmsharp	2ba81a935f	Update reindex conr_job to use CONCURENTLY options, remove metrics reindex as managed by timescale.	2023-12-03 17:02:05 +01:00
xbgmsharp	0fbac67895	Remove Duplicate Indexes	2023-12-01 23:51:13 +01:00
xbgmsharp	228b234582	Disable remove duplicate index	2023-12-01 22:25:12 +01:00
xbgmsharp	75c8a9506a	Update tests, fix check on stay name, add anonymous/public access tests, update badges format	2023-12-01 22:06:01 +01:00
xbgmsharp	2b48a66cd2	Update overpass_py_fn, Enforce area with a proper name tag	2023-12-01 22:01:11 +01:00
xbgmsharp	e642049e93	Update versions. PostgreSQL-16.1 Postgis-3.4.1 Timescaledb-2.13 PostgSail-0.5.2	2023-12-01 21:59:11 +01:00
xbgmsharp	94e123c95e	Update badges processing, update time properties to be at the logbook date	2023-12-01 13:15:12 +01:00
xbgmsharp	9787328990	Update badges, set badges time to log time versus processed time Add dereprecated comment to unused functions.	2023-11-30 22:16:49 +01:00
xbgmsharp	de62d936d5	Update api.monitoring_view, add new properties wind and speed in to the geojson.	2023-11-30 21:50:21 +01:00
xbgmsharp	293a33da08	Update overpass_py_fn, improve geo location detection, first check against area, then find around with 400m	2023-11-30 21:47:56 +01:00
xbgmsharp	2b105db5c7	Update public.logbook_update_geojson_fn, fix geojson properties for the wind and add notes geojson properties for each Point. Update process_logbook_queue_fn, improve invalid logbook detection mostly do to multiple GPS, remove logbook with more than 60% of metric are with 100m.	2023-11-30 16:10:50 +01:00
xbgmsharp	af003d5a62	Update api.export_moorages_gpx_fn, fix moorage id and url path. Update api.delete_logbook_fn, set api.metrics to moored and substract -1 to moorage count	2023-11-30 15:53:50 +01:00
xbgmsharp	ecc9fd6d9f	Update comment order	2023-11-30 12:50:46 +01:00
xbgmsharp	df5f667b41	Update README	2023-11-29 22:14:47 +01:00
xbgmsharp	1bfa04a057	Update pgcron jobs. Fix clean_up process logs. Add vaccum for auth schema. Add reindex for api schema. Run notificiation every minute instead of 2	2023-11-29 22:00:19 +01:00
xbgmsharp	a1e8827479	Release 0.5.1	2023-11-27 22:50:31 +01:00
xbgmsharp	d837dc57fb	Update test version	2023-11-27 22:50:21 +01:00
xbgmsharp	90e8b24321	Update openapi documentation	2023-11-27 22:50:04 +01:00
xbgmsharp	a1ccfd5f7c	Update frontend pre-release 0.8.0-beta2	2023-11-27 22:49:15 +01:00
xbgmsharp	6ecb345758	Fix Enforce public vessel name to be alphanumeric. Fix typo for pushover notification	2023-11-27 22:44:26 +01:00
xbgmsharp	0709bc83c4	Fix api.monitoring_view, api.stays_view, api.stay_view and api.moorages_stays_view	2023-11-27 22:43:27 +01:00
@@ -1 +1 @@
 .5.0
 .6.1