Merge remote-tracking branch 'upstream/dev' into spilit

docker/build/README.md

@@ -25,6 +25,8 @@ The default **zookeeper** is created in the `docker-compose.yml`.
 
 Access the Web UI：http://192.168.xx.xx:12345/dolphinscheduler
 
+The default username is `admin` and the default password is `dolphinscheduler123`
+
 #### Or via Environment Variables **`DATABASE_HOST`** **`DATABASE_PORT`** **`DATABASE_DATABASE`** **`ZOOKEEPER_QUORUM`**
 
 You can specify **existing postgres and zookeeper service**. Example:
@@ -264,7 +266,7 @@ This environment variable sets reserved memory for `worker-server`. The default
 
 This environment variable sets port for `worker-server`. The default value is `1234`.
 
-**`WORKER_GROUP`**
+**`WORKER_GROUPS`**
 
 This environment variable sets group for `worker-server`. The default value is `default`.
 

docker/build/README_zh_CN.md

@@ -263,7 +263,7 @@ Dolphin Scheduler映像使用了几个容易遗漏的环境变量。虽然这些
 
 配置`worker-server`的端口，默认值 `1234`。
 
-**`WORKER_GROUP`**
+**`WORKER_GROUPS`**
 
 配置`worker-server`的分组，默认值 `default`。
 

docker/build/conf/dolphinscheduler/worker.properties.tpl

@@ -31,7 +31,7 @@ worker.reserved.memory=${WORKER_RESERVED_MEMORY}
 worker.listen.port=${WORKER_LISTEN_PORT}
 
 # default worker group
-worker.groups=${WORKER_GROUP}
+worker.groups=${WORKER_GROUPS}
 
 # default worker weight
 worker.weight=${WORKER_WEIGHT}

docker/build/startup-init-conf.sh

@@ -73,7 +73,7 @@ export WORKER_HEARTBEAT_INTERVAL=${WORKER_HEARTBEAT_INTERVAL:-"10"}
 export WORKER_MAX_CPULOAD_AVG=${WORKER_MAX_CPULOAD_AVG:-"100"}
 export WORKER_RESERVED_MEMORY=${WORKER_RESERVED_MEMORY:-"0.1"}
 export WORKER_LISTEN_PORT=${WORKER_LISTEN_PORT:-"1234"}
-export WORKER_GROUP=${WORKER_GROUP:-"default"}
+export WORKER_GROUPS=${WORKER_GROUPS:-"default"}
 export WORKER_WEIGHT=${WORKER_WEIGHT:-"100"}
 export ALERT_LISTEN_HOST=${ALERT_LISTEN_HOST:-"127.0.0.1"}
 

docker/docker-swarm/docker-compose.yml

@@ -160,7 +160,7 @@ services:
       WORKER_HEARTBEAT_INTERVAL: "10"
       WORKER_MAX_CPULOAD_AVG: "100"
       WORKER_RESERVED_MEMORY: "0.1"
-      WORKER_GROUP: "default"
+      WORKER_GROUPS: "default"
       WORKER_WEIGHT: "100"
       DOLPHINSCHEDULER_DATA_BASEDIR_PATH: /tmp/dolphinscheduler
       ALERT_LISTEN_HOST: dolphinscheduler-alert

docker/docker-swarm/docker-stack.yml

@@ -154,7 +154,7 @@ services:
       WORKER_HEARTBEAT_INTERVAL: "10"
       WORKER_MAX_CPULOAD_AVG: "100"
       WORKER_RESERVED_MEMORY: "0.1"
-      WORKER_GROUP: "default"
+      WORKER_GROUPS: "default"
       WORKER_WEIGHT: "100"
       DOLPHINSCHEDULER_DATA_BASEDIR_PATH: /tmp/dolphinscheduler
       ALERT_LISTEN_HOST: dolphinscheduler-alert

docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml

@@ -30,6 +30,6 @@ data:
   WORKER_MAX_CPULOAD_AVG: {{ .Values.worker.configmap.WORKER_MAX_CPULOAD_AVG | quote }}
   WORKER_RESERVED_MEMORY: {{ .Values.worker.configmap.WORKER_RESERVED_MEMORY | quote }}
   WORKER_LISTEN_PORT: {{ .Values.worker.configmap.WORKER_LISTEN_PORT | quote }}
-  WORKER_GROUP: {{ .Values.worker.configmap.WORKER_GROUP | quote }}
+  WORKER_GROUPS: {{ .Values.worker.configmap.WORKER_GROUPS | quote }}
   WORKER_WEIGHT: {{ .Values.worker.configmap.WORKER_WEIGHT | quote }}
 {{- end }}

docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml

@@ -102,11 +102,11 @@ spec:
                 configMapKeyRef:
                   name: {{ include "dolphinscheduler.fullname" . }}-worker
                   key: WORKER_LISTEN_PORT
-            - name: WORKER_GROUP
+            - name: WORKER_GROUPS
               valueFrom:
                 configMapKeyRef:
                   name: {{ include "dolphinscheduler.fullname" . }}-worker
-                  key: WORKER_GROUP
+                  key: WORKER_GROUPS
             - name: WORKER_WEUGHT
               valueFrom:
                 configMapKeyRef:

docker/kubernetes/dolphinscheduler/values.yaml

@@ -207,7 +207,7 @@ worker:
     WORKER_MAX_CPULOAD_AVG: "100"
     WORKER_RESERVED_MEMORY: "0.1"
     WORKER_LISTEN_PORT: "1234"
-    WORKER_GROUP: "default"
+    WORKER_GROUPS: "default"
     WORKER_WEIGHT: "100"
   ## Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated.
   ## More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes

dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java

@@ -34,7 +34,7 @@ public class ScriptAlertChannel implements AlertChannel {
         AlertData alertData = alertinfo.getAlertData();
         Map<String, String> paramsMap = alertinfo.getAlertParams();
         if (null == paramsMap) {
-            return new AlertResult("false", "ding talk params is null");
+            return new AlertResult("false", "script params is null");
         }
         return new ScriptSender(paramsMap).sendScriptAlert(alertData.getTitle(),alertData.getContent());
     }