From 0fc49b2023c4b16e77b7472a529874ddebed89eb Mon Sep 17 00:00:00 2001
From: zhangchunyang <zhangchunyang0123@gmail.com>
Date: Tue, 30 Jun 2020 10:44:52 +0800
Subject: [PATCH] [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 <zhangchunyang0123@gamil.com>
---
 .../common-services/DOLPHIN/1.3.0/alerts.json | 60 +++++++++----------
 .../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 2a9800e59a..4949f7da7c 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 a559085f03..183221a1c2 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