This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 1.3.1-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 2031528addbdb5c9503932450f223bf6399abf18
Author: zhangchunyang <zhangchunyang0...@gmail.com>
AuthorDate: Tue Jun 30 10:44:52 2020 +0800
[bugfix] 1. fix alert.json includes repeated tag 'DOLPHIN_ALERT' 2.
metainfo.xml The version number of the RPM package is no longer specified in
the metainfo.xml (#3032)
Co-authored-by: zhangchunyang1024 <zhangchunyang0...@gamil.com>
---
.../common-services/DOLPHIN/1.3.0/alerts.json | 60 ++++++++++------------
.../common-services/DOLPHIN/1.3.0/metainfo.xml | 4 +-
2 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.0/alerts.json
b/ambari_plugin/common-services/DOLPHIN/1.3.0/alerts.json
index 2a9800e..4949f7d 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.3.0/alerts.json
+++ b/ambari_plugin/common-services/DOLPHIN/1.3.0/alerts.json
@@ -28,6 +28,33 @@
}
}
],
+ "DOLPHIN_LOGGER": [
+ {
+ "name": "dolphin_logger_port_check",
+ "label": "dolphin_logger_port_check",
+ "description": "dolphin_logger_port_check.",
+ "interval": 10,
+ "scope": "ANY",
+ "source": {
+ "type": "PORT",
+ "uri": "{{dolphin-common/loggerserver.rpc.port}}",
+ "default_port": 50051,
+ "reporting": {
+ "ok": {
+ "text": "TCP OK - {0:.3f}s response on port {1}"
+ },
+ "warning": {
+ "text": "TCP OK - {0:.3f}s response on port {1}",
+ "value": 1.5
+ },
+ "critical": {
+ "text": "Connection failed: {0} to {1}:{2}",
+ "value": 5.0
+ }
+ }
+ }
+ }
+ ],
"DOLPHIN_MASTER": [
{
"name": "DOLPHIN_MASTER_CHECK",
@@ -126,39 +153,6 @@
]
}
}
- ],
- "DOLPHIN_ALERT": [
- {
- "name": "DOLPHIN_DOLPHIN_LOGGER_CHECK",
- "label": "check dolphin scheduler alert status",
- "description": "",
- "interval":10,
- "scope": "HOST",
- "enabled": true,
- "source": {
- "type": "SCRIPT",
- "path":
"DOLPHIN/1.3.0/package/alerts/alert_dolphin_scheduler_status.py",
- "parameters": [
-
- {
- "name": "connection.timeout",
- "display_name": "Connection Timeout",
- "value": 5.0,
- "type": "NUMERIC",
- "description": "The maximum time before this alert is considered
to be CRITICAL",
- "units": "seconds",
- "threshold": "CRITICAL"
- },
- {
- "name": "alertName",
- "display_name": "alertName",
- "value": "DOLPHIN_LOGGER",
- "type": "STRING",
- "description": "alert name"
- }
- ]
- }
- }
]
}
}
\ No newline at end of file
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.0/metainfo.xml
b/ambari_plugin/common-services/DOLPHIN/1.3.0/metainfo.xml
index a559085..183221a 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.3.0/metainfo.xml
+++ b/ambari_plugin/common-services/DOLPHIN/1.3.0/metainfo.xml
@@ -103,7 +103,7 @@
<osFamily>any</osFamily>
<packages>
<package>
-
<name>apache-dolphinscheduler-incubating-1.3.0*</name>
+ <name>apache-dolphinscheduler-incubating*</name>
</package>
</packages>
</osSpecific>
@@ -134,4 +134,4 @@
</quickLinksConfigurations>
</service>
</services>
-</metainfo>
+</metainfo>
\ No newline at end of file
