chore: update to v0.4.2 (#161)

Co-authored-by: GitHub Actions <hexf00@users.noreply.github.com>
dream-num · Oct 29, 2024 · 2cafeaf · 2cafeaf
1 parent 809c92c
commit 2cafeaf
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 9 deletions.
diff --git a/charts/collaboration-demo/values.yaml b/charts/collaboration-demo/values.yaml
@@ -11,7 +11,7 @@ image:
   repository: release/univer-collaboration-lite
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.4.1 # VERSION
+  tag: 0.4.2 # VERSION
 
 imagePullSecrets: []
 nameOverride: ""

diff --git a/charts/collaboration-server/templates/deployment.yaml b/charts/collaboration-server/templates/deployment.yaml
@@ -72,6 +72,8 @@ spec:
               value: {{ .Values.sentry.tracesSampleRate | quote }}
             - name: SENTRY_ENVIRONMENT
               value: {{ .Values.sentry.environment | quote }}
+            - name: STATS_ADDR
+              value: {{ .Values.stats | quote }}
 
       {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/charts/collaboration-server/values.yaml b/charts/collaboration-server/values.yaml
@@ -12,7 +12,7 @@ image:
   repository: release/univer-collaboration
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.4.1 # VERSION
+  tag: 0.4.2 # VERSION
 
 imagePullSecrets: []
 nameOverride: ""
@@ -70,3 +70,5 @@ affinity: {}
 
 istio:
   enabled: false
+
+stats: "https://www.univer.ai/univer-cloud/stats/report"
diff --git a/charts/univer-stack/values.yaml b/charts/univer-stack/values.yaml
@@ -95,7 +95,7 @@ collaboration-demo:
 worker:
   image:
     repository: release/worker-exchange
-    tag: 0.4.0 # VERSION
+    tag: 0.4.2 # VERSION
   temporalServer:
     host: temporal-frontend:7233
     namespace: univer

diff --git a/charts/universer/config/config.yml b/charts/universer/config/config.yml
@@ -9,6 +9,8 @@ server:
   grpc:
     addr: 0.0.0.0:{{ .Values.service.grpc }}
     timeout: 10s
+  stats:
+    addr: {{ .Values.service.stats.addr }}
 data:
   database:
     maxOpenConns: {{ .Values.config.database.maxOpenConns }}
@@ -24,6 +26,7 @@ data:
     cluster:
       {{- toYaml . | nindent 6 }}
     {{- end }}
+    syncEvent: {{ .Values.config.rabbitmq.syncEvent }}
   clickhouse:
     dsn: clickhouse://clickhouse:clickhouse@clickhouse:9000/univer?dial_timeout=10s&read_timeout=20s
   temporal:
@@ -150,4 +153,8 @@ entitlementConf:
 workspace:
 {{- with .Values.config.workspace }}
   {{- toYaml . | nindent 2 }}
+{{- end }}
+statsConf:
+{{- with .Values.config.statsConf }}
+  {{- toYaml . | nindent 2 }}
 {{- end }}
diff --git a/charts/universer/values.yaml b/charts/universer/values.yaml
@@ -12,7 +12,7 @@ image:
   repository: release/universer
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.4.1 # VERSION
+  tag: 0.4.2 # VERSION
 
 imagePullSecrets: []
 nameOverride: ""
@@ -35,6 +35,8 @@ service:
   type: ClusterIP
   http: 8000
   grpc: 9000
+  stats:
+    addr: "https://www.univer.ai/univer-cloud/stats/report"
 
 ingress:
   enabled: false
@@ -93,6 +95,7 @@ config:
     port: 5672
     username: guest
     password: guest
+    syncEvent: false
     cluster:
       enabled: false
       addr: ""
@@ -166,6 +169,7 @@ config:
       defaultShareScope: ""
       defaultShareRole: ""
       enableObjInherit: false
+      customerStrategies: ""
     admin:
       userIDs: []
   apiLimit:
@@ -230,6 +234,9 @@ config:
       timeout: 10
   workspace:
     enabled: false
+  statsConf:
+    timeInterval: 10
+    maxRecords: 10000
 
 license:
   LICENSE: ""

diff --git a/docker-compose/.env b/docker-compose/.env
@@ -1,10 +1,10 @@
 EDITION=release
 
 # version
-UNIVERSER_VERSION=0.4.1
-COLLABORATION_SERVER_VERSION=0.4.1
-UNIVER_WORKER_EXCHANGE_VERSION=0.4.0
-UNIVER_DEMO_UI_VERSION=0.4.1
+UNIVERSER_VERSION=0.4.2
+COLLABORATION_SERVER_VERSION=0.4.2
+UNIVER_WORKER_EXCHANGE_VERSION=0.4.2
+UNIVER_DEMO_UI_VERSION=0.4.2
 UNIVERSER_SQL_VERSION=0.0.12
 POSTGRES_VERSION=16.1
 MYSQL_VERSION=8.3.0
@@ -109,10 +109,15 @@ AUTH_PERMISSION_ENABLED=false
 AUTH_PERMISSION_DEFAULT_SHARE_SCOPE=
 AUTH_PERMISSION_DEFAULT_SHARE_ROLE=
 AUTH_PERMISSION_ENABLE_OBJ_INHERIT=false
+AUTH_PERMISSION_CUSTOMER_STRATEGIES=
 
 # usip about
 USIP_ENBALED=false
 USIP_URI_CREDENTIAL=
 USIP_URI_USERINFO=
 USIP_URI_ROLE=
 USIP_URI_COLLABORATORS=
+
+#stats
+# If you want not to report stats, comment the following line
+STATS_ADDR=https://www.univer.ai/univer-cloud/stats/report
diff --git a/docker-compose/configs/config.yaml.template b/docker-compose/configs/config.yaml.template
@@ -7,6 +7,9 @@ server:
   grpc:
     addr: 0.0.0.0:9000
     timeout: 10s
+  stats:
+    addr: ${STATS_ADDR}
+
 data:
   database:
     maxOpenConns: 100
@@ -18,6 +21,7 @@ data:
     replicaDSN: ${DATABASE_REPLICA_DSN}
   rabbitmq:
     addr: amqp://${RABBITMQ_USERNAME}:${RABBITMQ_PASSWORD}@${RABBITMQ_HOST}:${RABBITMQ_PORT}/
+    syncEvent: false
     cluster:
       enabled: ${RABBITMQ_CLUSTER_ENABLED}
       username: "${RABBITMQ_CLUSTER_USERNAME}"
@@ -71,6 +75,7 @@ auth:
     defaultShareScope: "${AUTH_PERMISSION_DEFAULT_SHARE_SCOPE}"
     defaultShareRole: "${AUTH_PERMISSION_DEFAULT_SHARE_ROLE}"
     enableObjInherit: ${AUTH_PERMISSION_ENABLE_OBJ_INHERIT}
+    customerStrategies: ${AUTH_PERMISSION_CUSTOMER_STRATEGIES}
 apiLimit:
   method:
     tokens: 600
@@ -102,3 +107,6 @@ postHogConf:
   enabled: false
 entitlementConf:
   enable: false
+statsConf:
+  maxRecords: 10000
+  timeInterval: 10
diff --git a/docker-compose/run.sh b/docker-compose/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RELEASE_TIME="1729239096" # RELEASE_TIME
+RELEASE_TIME="1730208421" # RELEASE_TIME
 
 PLATFORM=$(uname)
 SED="sed -i"
@@ -117,10 +117,14 @@ init_config() {
     s='s|${DATABASE_REPLICA_DSN}|'$DATABASE_REPLICA_DSN'|'
     $SED -e "$s" ./configs/config.yaml
 
+    # echo "" >> .env
+
     while IFS='=' read -r name value ; do
         # Replace variable with value. 
         $SED -e 's|${'"${name}"'}|'"${value}"'|' ./configs/config.yaml
     done < .env
+
+    $SED '${/^$/d;}' .env
 }
 
 start() {