This is an automated email from the ASF dual-hosted git repository. hanahmily pushed a commit to branch so11y-identity in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit b1ccc1a662e37da2a1478aefb2abe8017c568565 Author: Gao Hongtao <[email protected]> AuthorDate: Tue Jun 16 21:57:31 2020 +0800 Reduce the length of metric name Signed-off-by: Gao Hongtao <[email protected]> --- .../src/main/resources/fetcher-prom-rules/self.yaml | 10 +++++----- .../src/main/resources/ui-initialized-templates.yml | 6 +++--- test/e2e/e2e-test/docker/base-compose.yml | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/oap-server/server-bootstrap/src/main/resources/fetcher-prom-rules/self.yaml b/oap-server/server-bootstrap/src/main/resources/fetcher-prom-rules/self.yaml index 2a703c0..f0f0368 100644 --- a/oap-server/server-bootstrap/src/main/resources/fetcher-prom-rules/self.yaml +++ b/oap-server/server-bootstrap/src/main/resources/fetcher-prom-rules/self.yaml @@ -241,7 +241,7 @@ metricsRules: - service instance: - instance - - name: instance_persistence_timer_execute_latency_percentile + - name: instance_persistence_execute_percentile scope: SERVICE_INSTANCE operation: avgHistogramPercentile percentiles: [50, 70, 90, 99] @@ -254,7 +254,7 @@ metricsRules: - service instance: - instance - - name: instance_persistence_timer_prepare_latency_percentile + - name: instance_persistence_prepare_percentile scope: SERVICE_INSTANCE operation: avgHistogramPercentile percentiles: [50, 70, 90, 99] @@ -267,7 +267,7 @@ metricsRules: - service instance: - instance - - name: instance_persistence_timer_bulk_error_count + - name: instance_persistence_error_count scope: SERVICE_INSTANCE operation: avg sources: @@ -279,7 +279,7 @@ metricsRules: - service instance: - instance - - name: instance_persistence_timer_execute_count + - name: instance_persistence_execute_count scope: SERVICE_INSTANCE operation: avg sources: @@ -291,7 +291,7 @@ metricsRules: - service instance: - instance - - name: instance_persistence_timer_prepare_count + - name: instance_persistence_prepare_count scope: SERVICE_INSTANCE operation: avg sources: diff --git a/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates.yml b/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates.yml index c36261c..e178383 100644 --- a/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates.yml +++ b/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates.yml @@ -1025,7 +1025,7 @@ templates: "entityType": "ServiceInstance", "independentSelector": false, "metricType": "REGULAR_VALUE", - "metricName": "meter_instance_persistence_timer_prepare_count,meter_instance_persistence_timer_execute_count,meter_instance_persistence_timer_bulk_error_count", + "metricName": "meter_instance_persistence_prepare_count,meter_instance_persistence_execute_count,meter_instance_persistence_error_count", "queryMetricType": "readMetricsValues", "chartType": "ChartLine", "unit": "Per 5 Minutes" @@ -1040,7 +1040,7 @@ templates: "unit": "Millisecond", "queryMetricType": "readLabeledMetricsValues", "chartType": "ChartLine", - "metricName": "meter_instance_persistence_timer_prepare_latency_percentile", + "metricName": "meter_instance_persistence_prepare_percentile", "metricLabels": "50,70,90,99", "labelsIndex": "50,70,90,99" }, @@ -1051,7 +1051,7 @@ templates: "entityType": "ServiceInstance", "independentSelector": false, "metricType": "LABELED_VALUE", - "metricName": "meter_instance_persistence_timer_execute_latency_percentile", + "metricName": "meter_instance_persistence_execute_percentile", "queryMetricType": "readLabeledMetricsValues", "chartType": "ChartLine", "metricLabels": "50,70,90,99", diff --git a/test/e2e/e2e-test/docker/base-compose.yml b/test/e2e/e2e-test/docker/base-compose.yml index 78b20d0..3f9154d 100644 --- a/test/e2e/e2e-test/docker/base-compose.yml +++ b/test/e2e/e2e-test/docker/base-compose.yml @@ -34,6 +34,8 @@ services: SW_STORAGE_INFLUXDB_URL: http://influxdb:8086 JAVA_OPTS: >- -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap,destfile=/jacoco/oap.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* + SW_PROMETHEUS_FETCHER_ACTIVE: true + SW_TELEMETRY: prometheus healthcheck: test: ["CMD", "sh", "-c", "nc -zn 127.0.0.1 11800"] interval: 5s
