Merge remote-tracking branch 'origin/api-v1.5.5' into dev

api/chalicelib/core/telemetry.py

@@ -27,7 +27,8 @@ def compute():
                     t_projects=COALESCE((SELECT COUNT(*) FROM public.projects WHERE deleted_at ISNULL), 0),
                     t_sessions=COALESCE((SELECT COUNT(*) FROM public.sessions), 0),
                     t_users=COALESCE((SELECT COUNT(*) FROM public.users WHERE deleted_at ISNULL), 0)
-                RETURNING *,(SELECT email FROM public.users WHERE role='owner' LIMIT 1);"""
+                RETURNING t_integrations,t_projects,t_sessions,t_users,user_id,opt_out,
+                    (SELECT openreplay_version()) AS version_number,(SELECT email FROM public.users WHERE role = 'owner' LIMIT 1);"""
         )
         data = cur.fetchone()
         requests.post('https://api.openreplay.com/os/telemetry', json={"stats": [process_data(data)]})

ee/api/chalicelib/core/telemetry.py

@@ -50,7 +50,9 @@ def compute():
                          FROM public.tenants
                      ) AS all_tenants
                 WHERE tenants.tenant_id = all_tenants.tenant_id
-                RETURNING *,(SELECT email FROM users_ee WHERE role = 'owner' AND users_ee.tenant_id = tenants.tenant_id LIMIT 1);"""
+                RETURNING t_integrations,t_projects,t_sessions,t_users,user_id,opt_out,
+                    (SELECT openreplay_version()) AS version_number,
+                    (SELECT email FROM public.users WHERE role = 'owner' AND users.tenant_id=tenants.tenant_id LIMIT 1);"""
         )
         data = cur.fetchall()
         requests.post('https://api.openreplay.com/os/telemetry',

ee/scripts/helm/db/init_dbs/postgresql/1.6.0/1.6.0.sql

@@ -2,7 +2,7 @@ BEGIN;
 CREATE OR REPLACE FUNCTION openreplay_version()
     RETURNS text AS
 $$
-SELECT 'v1.5.5-ee'
+SELECT 'v1.6.0-ee'
 $$ LANGUAGE sql IMMUTABLE;
 
 

ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql

@@ -7,7 +7,7 @@ CREATE EXTENSION IF NOT EXISTS pgcrypto;
 CREATE OR REPLACE FUNCTION openreplay_version()
     RETURNS text AS
 $$
-SELECT 'v1.5.5-ee'
+SELECT 'v1.6.0-ee'
 $$ LANGUAGE sql IMMUTABLE;
 
 

scripts/helm/db/init_dbs/postgresql/1.6.0/1.6.0.sql

@@ -2,7 +2,7 @@ BEGIN;
 CREATE OR REPLACE FUNCTION openreplay_version()
     RETURNS text AS
 $$
-SELECT 'v1.5.5'
+SELECT 'v1.6.0'
 $$ LANGUAGE sql IMMUTABLE;
 
 

scripts/helm/db/init_dbs/postgresql/init_schema.sql

@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS events;
 CREATE OR REPLACE FUNCTION openreplay_version()
     RETURNS text AS
 $$
-SELECT 'v1.5.5'
+SELECT 'v1.6.0'
 $$ LANGUAGE sql IMMUTABLE;
 
 -- --- accounts.sql ---

scripts/helmcharts/init.sh

@@ -15,7 +15,7 @@ fatal()
     exit 1
 }
 
-version="v1.5.5"
+version="v1.6.0"
 usr=`whoami`
 
 # Installing k3s

scripts/helmcharts/openreplay/Chart.yaml

@@ -22,7 +22,7 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 # Ref: https://github.com/helm/helm/issues/7858#issuecomment-608114589
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"
 
 dependencies:
   - name: ingress-nginx

scripts/helmcharts/openreplay/charts/alerts/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"

scripts/helmcharts/openreplay/charts/assets/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"

scripts/helmcharts/openreplay/charts/assist/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"

scripts/helmcharts/openreplay/charts/chalice/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"

scripts/helmcharts/openreplay/charts/db/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"

scripts/helmcharts/openreplay/charts/ender/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"

scripts/helmcharts/openreplay/charts/http/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"

scripts/helmcharts/openreplay/charts/integrations/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"

scripts/helmcharts/openreplay/charts/peers/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"

scripts/helmcharts/openreplay/charts/sink/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"

scripts/helmcharts/openreplay/charts/storage/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.5.5"
+AppVersion: "v1.6.0"

scripts/helmcharts/vars.yaml

@@ -1,4 +1,4 @@
-fromVersion: "v1.5.5"
+fromVersion: "v1.6.0"
 # Databases specific variables
 postgresql: &postgres
   # For generating passwords