Merge branch 'master' into benchmark/queue-usage-validation

Author: wu-sheng

oap-server/server-starter/src/main/resources/otel-rules/oap.yaml

@@ -68,8 +68,8 @@ metricsRules:
     exp: >
       metrics_aggregation.tagEqual('dimensionality', 'minute').sum(['service', 'host_name', 'level']).increase('PT1M')
       .tag({tags -> if (tags['level'] == '1') {tags.level = 'L1 aggregation'} }).tag({tags -> if (tags['level'] == '2') {tags.level = 'L2 aggregation'} })
-  - name: instance_metrics_aggregation_queue_used_percentage
-    exp: metrics_aggregation_queue_used_percentage.sum(['service', 'host_name', 'level', 'slot'])
+  - name: instance_metrics_aggregation_queue_used_per_ten_thousand
+    exp: 100 * metrics_aggregation_queue_used_percentage.sum(['service', 'host_name', 'level', 'slot'])
   - name: instance_persistence_execute_percentile
     exp: persistence_timer_bulk_execute_latency.sum(['le', 'service', 'host_name']).increase('PT1M').histogram().histogram_percentile([50,75,90,95,99])
   - name: instance_persistence_prepare_percentile

oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-instance.json

@@ -470,7 +470,7 @@
                   "i": "22",
                   "type": "Widget",
                   "expressions": [
-                    "sort_values(meter_oap_instance_metrics_aggregation_queue_used_percentage{level='1'},10,des,avg)"
+                    "sort_values(meter_oap_instance_metrics_aggregation_queue_used_per_ten_thousand{level='1'},10,des,avg)/100"
                   ],
                   "graph": {
                     "type": "Line",
@@ -492,7 +492,7 @@
                   "i": "23",
                   "type": "Widget",
                   "expressions": [
-                    "sort_values(meter_oap_instance_metrics_aggregation_queue_used_percentage{level='2'},10,des,avg)"
+                    "sort_values(meter_oap_instance_metrics_aggregation_queue_used_per_ten_thousand{level='2'},10,des,avg)/100"
                   ],
                   "graph": {
                     "type": "Line",