You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2024/04/30 03:17:05 UTC
(skywalking) branch master updated: fix typo (#12176)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 59cabc10a2 fix typo (#12176)
59cabc10a2 is described below
commit 59cabc10a214ae635e6e38dfd36f6c5df2323152
Author: Wan Kai <wa...@foxmail.com>
AuthorDate: Tue Apr 30 11:16:58 2024 +0800
fix typo (#12176)
---
docs/en/setup/backend/backend-activemq-monitoring.md | 4 ++--
.../src/main/resources/otel-rules/activemq/activemq-broker.yaml | 2 +-
.../resources/ui-initialized-templates/activemq/activemq-broker.json | 4 ++--
test/e2e-v2/cases/activemq/activemq-cases.yaml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/en/setup/backend/backend-activemq-monitoring.md b/docs/en/setup/backend/backend-activemq-monitoring.md
index 0f9f38af76..912e7dccb7 100644
--- a/docs/en/setup/backend/backend-activemq-monitoring.md
+++ b/docs/en/setup/backend/backend-activemq-monitoring.md
@@ -59,7 +59,7 @@ the OAP. In each cluster, the broker is represented as `Instance` and the destin
|--------------------------------------------|-----------|-------------------------------------------------------------------------|----------------------------------------------------------------------------------------------- |-------------------------|
| Uptime | sec | meter_activemq_broker_uptime | Uptime of the broker in day. | JMX Prometheus Exporter |
| State | | meter_activemq_broker_state | If slave broker 1 else 0. | JMX Prometheus Exporter |
-| Current Connentions | Count | meter_activemq_broker_current_connentions | The number of clients connected to the broker currently. | JMX Prometheus Exporter |
+| Current Connections | Count | meter_activemq_broker_current_connections | The number of clients connected to the broker currently. | JMX Prometheus Exporter |
| Current Producer Count | Count | meter_activemq_broker_current_producer_count | The number of producers currently attached to the broker. | JMX Prometheus Exporter |
| Current Consumer Count | Count | meter_activemq_broker_current_consumer_count | The number of consumers consuming messages from the broker. | JMX Prometheus Exporter |
| Producer Count | Count | meter_activemq_broker_producer_count | Number of message producers active on destinations. | JMX Prometheus Exporter |
@@ -104,4 +104,4 @@ the OAP. In each cluster, the broker is represented as `Instance` and the destin
You can customize your own metrics/expression/dashboard panel.
The metrics definition and expression rules are found
in `otel-rules/activemq/activemq-cluster.yaml, otel-rules/activemq/activemq-broker.yaml, otel-rules/activemq/activemq-destination.yaml`.
-The ActiveMQ dashboard panel configurations are found in `ui-initialized-templates/activemq`.
\ No newline at end of file
+The ActiveMQ dashboard panel configurations are found in `ui-initialized-templates/activemq`.
diff --git a/oap-server/server-starter/src/main/resources/otel-rules/activemq/activemq-broker.yaml b/oap-server/server-starter/src/main/resources/otel-rules/activemq/activemq-broker.yaml
index c3a2cd20e8..8a1ea65095 100644
--- a/oap-server/server-starter/src/main/resources/otel-rules/activemq/activemq-broker.yaml
+++ b/oap-server/server-starter/src/main/resources/otel-rules/activemq/activemq-broker.yaml
@@ -39,7 +39,7 @@ metricsRules:
- name: state
exp: org_apache_activemq_Broker_Slave.sum(['cluster','brokerName','service_instance_id'])
# The number of clients connected to the broker currently.
- - name: current_connentions
+ - name: current_connections
exp: org_apache_activemq_Broker_CurrentConnectionsCount.sum(['cluster','brokerName','service_instance_id'])
# The number of producers currently attached to the broker.
- name: current_producer_count
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/activemq/activemq-broker.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/activemq/activemq-broker.json
index c5094f6368..a7545dd05d 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/activemq/activemq-broker.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/activemq/activemq-broker.json
@@ -60,7 +60,7 @@
"i": "2",
"type": "Widget",
"expressions": [
- "meter_activemq_broker_current_connentions"
+ "meter_activemq_broker_current_connections"
],
"graph": {
"type": "Area",
@@ -352,4 +352,4 @@
"isRoot": false
}
}
-]
\ No newline at end of file
+]
diff --git a/test/e2e-v2/cases/activemq/activemq-cases.yaml b/test/e2e-v2/cases/activemq/activemq-cases.yaml
index 1ea23b5f02..433b7bac56 100644
--- a/test/e2e-v2/cases/activemq/activemq-cases.yaml
+++ b/test/e2e-v2/cases/activemq/activemq-cases.yaml
@@ -59,7 +59,7 @@ cases:
expected: expected/metrics-has-value-label-serviceinstanceid.yml
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression=meter_activemq_broker_state --service-name=activemq::activemq-cluster --instance-name=activemq-broker
expected: expected/metrics-has-value-label-serviceinstanceid.yml
- - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression=meter_activemq_broker_current_connentions --service-name=activemq::activemq-cluster --instance-name=activemq-broker
+ - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression=meter_activemq_broker_current_connections --service-name=activemq::activemq-cluster --instance-name=activemq-broker
expected: expected/metrics-has-value-label-serviceinstanceid.yml
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression=meter_activemq_broker_current_producer_count --service-name=activemq::activemq-cluster --instance-name=activemq-broker
expected: expected/metrics-has-value-label-serviceinstanceid.yml
@@ -130,4 +130,4 @@ cases:
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression=meter_activemq_destination_average_message_size --service-name=activemq::activemq-cluster --endpoint-name=testQueue
expected: expected/metrics-has-value-label-destinationtype.yml
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression=meter_activemq_destination_max_message_size --service-name=activemq::activemq-cluster --endpoint-name=testQueue
- expected: expected/metrics-has-value-label-destinationtype.yml
\ No newline at end of file
+ expected: expected/metrics-has-value-label-destinationtype.yml