diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index b13d97360ea8d0b6547a0e3b088a4ff134afbf71..99205b65d18e62a80a94d026382a034684095a77 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -48,6 +48,7 @@
 * Dashboard: Fix `Mesh-Service-Relation` metric `Throughput` and `Proxy Sidecar Internal Latency in Nanoseconds (Client Response)`.
 * Dashboard: Fix `Mesh-Instance-Relation` metric `Throughput`.
 * Enhance associations for the Event widget.
+* Add event widgets in dashboard where applicable.
 
 #### Documentation
 
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json
index cd3ed2a34b7cd3b0e4fe0d7fbb63f7e67454a0c9..36395714d455c48c475568eee42074ee026156b5 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json
@@ -22,7 +22,7 @@
       "children": [
         {
           "x": 0,
-          "y": 0,
+          "y": 12,
           "w": 24,
           "h": 52,
           "i": "12",
@@ -417,6 +417,15 @@
               ]
             }
           ]
+        },
+        {
+          "x": 0,
+          "y": 0,
+          "w": 24,
+          "h": 12,
+          "i": "13",
+          "type": "Event",
+          "eventAssociate": true
         }
       ],
       "layer": "BROWSER",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json
index c6ace41d696b05c96c2dc4dc7edcc536c85a9f90..a39ea5c3a88ef4763e8cc2f03e3a7d3b3a176c25 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json
@@ -22,7 +22,7 @@
       "children": [
         {
           "x": 0,
-          "y": 0,
+          "y": 12,
           "w": 24,
           "h": 52,
           "i": "12",
@@ -530,6 +530,15 @@
               ]
             }
           ]
+        },
+        {
+          "x": 0,
+          "y": 0,
+          "w": 24,
+          "h": 12,
+          "i": "13",
+          "type": "Event",
+          "eventAssociate": true
         }
       ],
       "layer": "BROWSER",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json
index 2ed34ae4bedbd56e1e6441a7aeab8fd8903cf80b..cb83c3f0d16aa6d66971070ef7aaea4f9384486d 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json
@@ -22,7 +22,7 @@
       "children": [
         {
           "x": 0,
-          "y": 0,
+          "y": 12,
           "w": 24,
           "h": 52,
           "i": "12",
@@ -182,6 +182,15 @@
               ]
             }
           ]
+        },
+        {
+          "x": 0,
+          "y": 0,
+          "w": 24,
+          "h": 12,
+          "i": "13",
+          "type": "Event",
+          "eventAssociate": true
         }
       ],
       "layer": "BROWSER",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json
index 0797595639f2bc509a261107902ab12ebbef3bda..09824cab8e4bdc0461e787e982d11ab1df66cd17 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json
@@ -22,7 +22,7 @@
       "children": [
         {
           "x": 0,
-          "y": 0,
+          "y": 12,
           "w": 24,
           "h": 52,
           "i": "4",
@@ -544,6 +544,14 @@
               ]
             }
           ]
+        },
+        {
+          "x": 0,
+          "y": 0,
+          "w": 24,
+          "h": 12,
+          "i": "5",
+          "type": "Event"
         }
       ],
       "layer": "FAAS",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json
index 7b8c738de63dcff42133c629da6094b9e37ec946..8216a141ba0f0bb7aebf23b27c00e3c810e2dd53 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json
@@ -22,7 +22,7 @@
       "children": [
         {
           "x": 0,
-          "y": 0,
+          "y": 12,
           "w": 24,
           "h": 52,
           "i": "0",
@@ -174,6 +174,15 @@
               ]
             }
           ]
+        },
+        {
+          "x": 0,
+          "y": 0,
+          "w": 24,
+          "h": 12,
+          "i": "1",
+          "type": "Event",
+          "eventAssociate": true
         }
       ],
       "layer": "FAAS",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json
index e49266d3a8ea537d1b557598a7e58d78f4e2c08c..9387f15acb47c3defa79327faee70652d854a8b7 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json
@@ -22,7 +22,7 @@
       "children": [
         {
           "x": 0,
-          "y": 0,
+          "y": 12,
           "w": 24,
           "h": 52,
           "i": "0",
@@ -644,6 +644,15 @@
               ]
             }
           ]
+        },
+        {
+          "x": 0,
+          "y": 0,
+          "w": 24,
+          "h": 12,
+          "i": "1",
+          "type": "Event",
+          "eventAssociate": true
         }
       ],
       "layer": "GENERAL",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json
index c6a391f6c78ea136f4d2ec05d98fa6640c046051..21f61298149ec4c7b6c0bc419a32ccadad59ac88 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json
@@ -22,7 +22,7 @@
       "children": [
         {
           "x": 0,
-          "y": 0,
+          "y": 12,
           "w": 24,
           "h": 52,
           "i": "4",
@@ -941,6 +941,15 @@
               ]
             }
           ]
+        },
+        {
+          "x": 0,
+          "y": 0,
+          "w": 24,
+          "h": 12,
+          "i": "5",
+          "type": "Event",
+          "eventAssociate": true
         }
       ],
       "layer": "GENERAL",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance.json
index 4f34582445b5cfbae139b8978c0d3b5267498d55..1fd4baf1ef0b2229393b50b10b433b3ad7672df9 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance.json
@@ -22,7 +22,7 @@
       "children": [
         {
           "x": 0,
-          "y": 0,
+          "y": 12,
           "w": 24,
           "h": 52,
           "i": "1",
@@ -597,6 +597,15 @@
               ]
             }
           ]
+        },
+        {
+          "x": 0,
+          "y": 0,
+          "w": 24,
+          "h": 12,
+          "i": "2",
+          "type": "Event",
+          "eventAssociate": true
         }
       ],
       "layer": "MESH",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json
index 8266843a3ecdaefdc19cfc62af9687c269e9a198..113267cc311fae784a38d79f7d9d783c844ed2d4 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json
@@ -22,7 +22,7 @@
       "children": [
         {
           "x": 0,
-          "y": 0,
+          "y": 12,
           "w": 24,
           "h": 51,
           "i": "0",
@@ -887,6 +887,15 @@
               ]
             }
           ]
+        },
+        {
+          "x": 0,
+          "y": 0,
+          "w": 24,
+          "h": 12,
+          "i": "1",
+          "type": "Event",
+          "eventAssociate": true
         }
       ],
       "layer": "MESH",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json
index 373af64749cc179278fa4062a0955c9289a7a55f..4e707d2376602bca32c0f13fadaa23aa67bdaffa 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json
@@ -22,18 +22,11 @@
       "children": [
         {
           "x": 0,
-          "y": 0,
+          "y": 12,
           "w": 24,
           "h": 51,
           "i": "10",
           "type": "Tab",
-          "metricTypes": [
-            ""
-          ],
-          "metrics": [
-            ""
-          ],
-          "activedTabIndex": 1,
           "children": [
             {
               "name": "Envoy Proxy",
@@ -61,8 +54,7 @@
                   ],
                   "metricTypes": [
                     "readLabeledMetricsValues"
-                  ],
-                  "moved": false
+                  ]
                 },
                 {
                   "x": 6,
@@ -82,7 +74,6 @@
                     "showXAxis": true,
                     "showYAxis": true
                   },
-                  "standard": {},
                   "metrics": [
                     "envoy_total_connections_used",
                     "envoy_parent_connections_used"
@@ -90,8 +81,7 @@
                   "metricTypes": [
                     "readMetricsValues",
                     "readMetricsValues"
-                  ],
-                  "moved": false
+                  ]
                 },
                 {
                   "x": 0,
@@ -116,8 +106,7 @@
                   ],
                   "metricTypes": [
                     "readLabeledMetricsValues"
-                  ],
-                  "moved": false
+                  ]
                 },
                 {
                   "x": 12,
@@ -142,8 +131,7 @@
                   ],
                   "metricTypes": [
                     "readLabeledMetricsValues"
-                  ],
-                  "moved": false
+                  ]
                 },
                 {
                   "x": 6,
@@ -168,8 +156,7 @@
                   ],
                   "metricTypes": [
                     "readLabeledMetricsValues"
-                  ],
-                  "moved": false
+                  ]
                 },
                 {
                   "x": 0,
@@ -205,7 +192,6 @@
                     "readMetricsValues",
                     "readMetricsValues"
                   ],
-                  "moved": false,
                   "metricConfig": [
                     {
                       "calculation": "byteToMB"
@@ -250,8 +236,7 @@
                   ],
                   "metricTypes": [
                     "readMetricsValues"
-                  ],
-                  "moved": false
+                  ]
                 },
                 {
                   "x": 12,
@@ -278,8 +263,7 @@
                   "metricTypes": [
                     "readMetricsValues",
                     "readMetricsValues"
-                  ],
-                  "moved": false
+                  ]
                 },
                 {
                   "x": 6,
@@ -304,8 +288,7 @@
                   ],
                   "metricTypes": [
                     "readLabeledMetricsValues"
-                  ],
-                  "moved": false
+                  ]
                 },
                 {
                   "x": 0,
@@ -330,8 +313,7 @@
                   ],
                   "metricTypes": [
                     "readLabeledMetricsValues"
-                  ],
-                  "moved": false
+                  ]
                 }
               ]
             },
@@ -344,19 +326,20 @@
                   "w": 24,
                   "h": 47,
                   "i": "0",
-                  "type": "Log",
-                  "metricTypes": [
-                    ""
-                  ],
-                  "metrics": [
-                    ""
-                  ],
-                  "moved": false
+                  "type": "Log"
                 }
               ]
             }
-          ],
-          "moved": false
+          ]
+        },
+        {
+          "x": 0,
+          "y": 0,
+          "w": 24,
+          "h": 12,
+          "i": "11",
+          "type": "Event",
+          "eventAssociate": true
         }
       ],
       "layer": "MESH_DP",
diff --git a/skywalking-ui b/skywalking-ui
index ec7a8bbfa9a2698a4ecb26588413e704a3f76016..017f5bf7094b29871d63f2a5b15761ca5520d253 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit ec7a8bbfa9a2698a4ecb26588413e704a3f76016
+Subproject commit 017f5bf7094b29871d63f2a5b15761ca5520d253