remote main pull and resolved conflcits

api/chalicelib/core/assist.py

@@ -78,6 +78,8 @@ def __get_live_sessions_ws(project_id, data):
     for s in _live_peers:
         s["live"] = True
         s["projectId"] = project_id
+        if "projectID" in s:
+            s.pop("projectID")
     return live_peers
 
 

backend/internal/integrations/integration/bugsnag.json

@@ -8718,7 +8718,7 @@
                 "timestamp": "2020-02-10T10:57:04.449Z",
                 "metaData": {
                     "status": 200,
-                    "request": "GET https://asayer-sessions-mobs.s3.amazonaws.com/72/521925111024389735.mob?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=ASIA6RAO3SOP7M3VQ76X%2F20200210%2Feu-central-1%2Fs3%2Faws4_request&X-Amz-Date=20200210T105704Z&X-Amz-Expires=100000&X-Amz-SignedHeaders=host&X-Amz-Security-Token=IQoJb3JpZ2luX2VjEFoaDGV1LWNlbnRyYWwtMSJHMEUCIEVe1WqkCTz4KIsdtiy2gqovOU%2B0ob%2FnonddeM3rR%2BQsAiEA17YmEYbn1LyP3pTgvVkeOIf8rvzg%2FuDsmU6xeRhZ0YMqyQEIExAAGgw5OTg2MTEwNjM3MTEiDOKUXz48dwdOjJOn0SqmAdsMmXq3Iiwo6JQGrFVkAIbIEKNnmrx9LnqEKrUWNzOK%2FdIkpzcSU3%2BOmZv2bBPVWMOkSlE61niH7JDPknexq03YMHrX9c1rTNvmd0amnORfIHomk%2FnEm2mddbb0YTG%2FmEAXTRw4ihLki9G06Skhenx%2BVAW4RlJtsIjgxiCMks55V06VTuha%2B%2BF%2FirITPIC4MnxbmNtHKtlAmWjGvDeEwq2rxamMkfQw6tqE8gU64AH4kxvtNVO%2FOQIHhEvyhAvoh82pmOjx0L0HeH5%2BeN1YZKO5%2FbCbIBTcwr5%2B0X%2BugKTAet0ya9O%2F8t5y%2BKb5dfriLV7AEwdmyFztdzNiv95bY9UkwEtrTUyMprX%2BPojz3QAFxnrKR%2Bzpd7%2FBDlWI2cdoEHK9yukmyNS0Ln7NOilOhRFwO1edwVdbkM3vmARUu4TQBVSLn9wdhBm5Fc%2FUoOTYrZHstQ0w6fp5a4CMaf2OEx8oxKoaAthtEvSnI0ReTqWY0iQMrOUBHOAAj9PTva%2B4Iv95PaNklDkfWCEMtWleNg%3D%3D&X-Amz-Signature=5b97d72871d43a4a43bf3732149a4b17ced2f324db17c27d8dbea5a9dae0f2ec"
+                    "request": "GET https://asayer-sessions-mobs.s3.amazonaws.com/72/521925111024389735.mob"
                 }
             },
             {

ee/api/.gitignore

@@ -216,7 +216,7 @@ Pipfile.lock
 /chalicelib/core/metadata.py
 /chalicelib/core/mobile.py
 /chalicelib/core/sessions_assignments.py
-#/chalicelib/core/sessions_metas.py
+#exp /chalicelib/core/sessions_metas.py
 /chalicelib/core/sessions_mobs.py
 #exp /chalicelib/core/significance.py
 /chalicelib/core/socket_ios.py

frontend/app/components/Client/ProfileSettings/ProfileSettings.js

@@ -59,7 +59,7 @@ export default class ProfileSettings extends React.PureComponent {
                     </div>
                 </div>
 
-                {isEnterprise && (
+                {isEnterprise && (account.admin || account.superAdmin) && (
                     <>
                         <div className="border-b my-10" />
                         <div className="flex items-center">

frontend/app/logger/index.js

@@ -1,7 +1,7 @@
 import { options } from 'App/dev/console';
 
 function log(...args) {
-  if (options.verbose) {
+  if (!window.env.PRODUCTION || options.verbose) {
     if (Object.keys(groupTm).length > 0) {
       console.groupEnd();
     }

peers/server.js

@@ -28,7 +28,8 @@ const peerServer = ExpressPeerServer(server, {
     debug: true,
     path: '/',
     proxied: true,
-    allow_discovery: false
+    allow_discovery: false,
+    concurrent_limit: 100000
 });
 peerServer.on('connection', peerConnection);
 peerServer.on('disconnect', peerDisconnect);

scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml

@@ -48,7 +48,7 @@ spec:
             - name: ch_port
               value: "{{ .Values.global.clickhouse.service.webPort }}"
             - name: sourcemaps_reader
-              value: "http://sourcemaps-reader-openreplay.{{.Release.Namespace}}.{{.Values.global.clusterDomain}}:9000/sourcemaps/%s/sourcemaps"
+              value: "http://sourcemapreader-openreplay.{{.Release.Namespace}}.{{.Values.global.clusterDomain}}:9000/sourcemaps/%s/sourcemaps"
             - name: ASSIST_URL
               value: "http://assist-openreplay.{{.Release.Namespace}}.{{.Values.global.clusterDomain}}:9001/assist/%s"
             - name: ASSIST_JWT_SECRET

scripts/helmcharts/openreplay/charts/sourcemapreader/values.yaml

@@ -95,7 +95,8 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
-env: {}
+env:
+  SMR_HOST: 0.0.0.0
 
 nodeSelector: {}
 

scripts/helmcharts/openreplay/templates/job.yaml

@@ -74,9 +74,13 @@ spec:
               echo "Copying enterprise code"
               cp -rf ee/scripts/* scripts/
             fi
+            echo "Changing RWX to proper permission"
+            chown 1001:1001 /mnt/efs
         volumeMounts:
         - name: shared
           mountPath: /opt/openreplay
+        - name: datadir
+          mountPath: /mnt/efs
       containers:
       - name: postgres
         env:
@@ -271,5 +275,16 @@ spec:
           name: db-migration-script
       - name: shared
         emptyDir: {}
+      {{- if eq .Values.global.pvcRWXName  "hostPath" }}
+      - name: datadir
+        hostPath:
+          # Ensure the file directory is created.
+          path: /mnt/efs
+          type: DirectoryOrCreate
+      {{- else }}
+      - name: datadir
+        persistentVolumeClaim:
+          claimName: "{{ .Values.global.pvcRWXName }}"
+      {{- end }}
       restartPolicy: Never
 {{- end}}

scripts/helmcharts/vars.yaml

@@ -43,19 +43,17 @@ kafka: &kafka
   extraEnvVars:
     - name: KAFKA_CFG_REPLICA_FETCH_MAX_BYTES
       value: "3145728"
-    # This value already exist in the kafka values.yaml file, so overriding in top
+    # This value already exists in the kafka values.yaml file, so overriding in top
     # - name: KAFKA_CFG_MESSAGE_MAX_BYTES
     #   value: "3000000"
 
-
 redis: &redis
   # enabled: false
   redisHost: "redis-master.db.svc.cluster.local"
   redisPort: "6379"
 
 minio:
-  # If you have extrenal s3 storage, like AWS, or GCP
-  # Disable it.
+  # Disable this if you use an external object storage service (s3)
   enabled: true
   global:
     minio:
@@ -94,7 +92,6 @@ ingress-nginx: &ingress-nginx
       force-ssl-redirect: false
       proxy-body-size: 10m
 
-
 # Application specific variables
 global:
   ingress: *ingress-nginx
@@ -121,6 +118,9 @@ global:
     vaultBucket: "vault-data"
     # This is only for enterpriseEdition
     quickwitBucket: "quickwit"
+    # if you're using one node installation, where
+    # you're using local s3, make sure these variables
+    # are same as minio.global.minio.accesskey and  secretKey
     accessKey: "changeMeMinioAccessKey"
     secretKey: "changeMeMinioPassword"
   email:
@@ -133,7 +133,6 @@ global:
     emailSslKey: ''
     emailSslCert: ''
     emailFrom: 'OpenReplay<do-not-reply@openreplay.com>'
-
   enterpriseEditionLicense: ""
   domainName: ""
 
@@ -150,7 +149,7 @@ chalice:
     # idp_name: ''
     # idp_tenantKey: ''
 
-# If you want to override something
+# Below is an example on how to override values
 # chartname:
 #   filedFrom chart/Values.yaml:
 #     key: value