Skip to content

Refactor alert plugins and simplify its usage #6723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CalvinKirs merged 1 commit into from
Nov 9, 2021
Merged

Refactor alert plugins and simplify its usage #6723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# limitations under the License.
#

dolphinscheduler/dolphinscheduler-alert @kezhenxu94
dolphinscheduler/dolphinscheduler-e2e @kezhenxu94
dolphinscheduler/dolphinscheduler-registry @kezhenxu94
dolphinscheduler/dolphinscheduler-standalone-server @kezhenxu94
30 changes: 0 additions & 30 deletions docker/build/conf/dolphinscheduler/alert.properties.tpl
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion docker/build/startup-init-conf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ export ALERT_LISTEN_HOST=${ALERT_LISTEN_HOST:-"localhost"}
# Alert Server
#============================================================================
export ALERT_SERVER_OPTS=${ALERT_SERVER_OPTS:-"-Xms512m -Xmx512m -Xmn256m"}
export ALERT_PLUGIN_DIR=${ALERT_PLUGIN_DIR:-"lib/plugin/alert"}

#============================================================================
# Api Server
Expand Down
1 change: 0 additions & 1 deletion docker/docker-swarm/config.env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ ALERT_LISTEN_HOST=dolphinscheduler-alert
# Alert Server
#============================================================================
ALERT_SERVER_OPTS=-Xms512m -Xmx512m -Xmn256m
ALERT_PLUGIN_DIR=lib/plugin/alert

#============================================================================
# Api Server
Expand Down
3 changes: 1 addition & 2 deletions docker/kubernetes/dolphinscheduler/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@ alert:
## Configmap
configmap:
ALERT_SERVER_OPTS: "-Xms512m -Xmx512m -Xmn256m"
ALERT_PLUGIN_DIR: "lib/plugin/alert"
## 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
livenessProbe:
Expand Down Expand Up @@ -411,4 +410,4 @@ ingress:
path: "/dolphinscheduler"
tls:
enabled: false
secretName: "dolphinscheduler-tls"
secretName: "dolphinscheduler-tls"
34 changes: 0 additions & 34 deletions .../src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertPlugin.java
View file
Open in desktop

This file was deleted.

140 changes: 0 additions & 140 deletions ...rc/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions ...-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertPlugin.java
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions ...ishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertPlugin.java
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions ...ert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertPlugin.java
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions ...http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertPluginTest.java
View file
Open in desktop

This file was deleted.

Loading