Skip to content

Commit adcdd01

Browse files
authored
Support Flink monitoring (#13172)
1 parent 6273cb2 commit adcdd01

30 files changed

+2721
-30
lines changed

.github/workflows/skywalking.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,8 @@ jobs:
664664
config: test/e2e-v2/cases/activemq/e2e.yaml
665665
- name: Kong
666666
config: test/e2e-v2/cases/kong/e2e.yaml
667+
- name: Flink
668+
config: test/e2e-v2/cases/flink/e2e.yaml
667669

668670
- name: UI Menu BanyanDB
669671
config: test/e2e-v2/cases/menu/banyandb/e2e.yaml

docs/en/changes/changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* Support `hot/warm/cold` stages TTL query in the status API.
1212
* PromQL Service: traffic query support `limit` and regex match.
1313
* Fix an edge case of HashCodeSelector(Integer#MIN_VALUE causes ArrayIndexOutOfBoundsException).
14+
* Support Flink monitoring.
1415

1516
#### UI
1617

docs/en/setup/backend/backend-clickhouse-monitoring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ the metrics to
2121
.
2222
2. Set up [OpenTelemetry Collector ](https://opentelemetry.io/docs/collector/getting-started/#docker). For details on
2323
Prometheus Receiver in OpenTelemetry Collector, refer
24-
to [here](../../../../test/e2e-v2/cases/mysql/prometheus-mysql-exporter/otel-collector-config.yaml).
24+
to [here](../../../../test/e2e-v2/cases/clickhouse/clickhouse-prometheus-endpoint/otel-collector-config.yaml).
2525
3. Config SkyWalking [OpenTelemetry receiver](opentelemetry-receiver.md).
2626

2727
### ClickHouse Monitoring

docs/en/setup/backend/backend-flink-monitoring.md

Lines changed: 105 additions & 0 deletions
Large diffs are not rendered by default.

docs/en/setup/backend/opentelemetry-receiver.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,7 @@ for identification of the metric data.
6060
| Metrics of ClickHouse | otel-rules/clickhouse/clickhouse-service.yaml | ClickHouse(embedded prometheus endpoint) -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server |
6161
| Metrics of RocketMQ | otel-rules/rocketmq/rocketmq-cluster.yaml | rocketmq-exporter -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server |
6262
| Metrics of RocketMQ | otel-rules/rocketmq/rocketmq-broker.yaml | rocketmq-exporter -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server |
63-
| Metrics of RocketMQ | otel-rules/rocketmq/rocketmq-topic.yaml | rocketmq-exporter -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server |
63+
| Metrics of RocketMQ | otel-rules/rocketmq/rocketmq-topic.yaml | rocketmq-exporter -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server |
64+
| Metrics of Flink | otel-rules/flink/flink-jobManager.yaml | flink jobManager -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server |
65+
| Metrics of Flink | otel-rules/flink/flink-taskManager.yaml | flink taskManager -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server |
66+
| Metrics of Flink | otel-rules/flink/flink-job.yaml | flink jobManager & flink taskManager-> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server |

docs/en/swip/SWIP-9.md

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.

docs/menu.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,10 @@ catalog:
152152
path: "/en/setup/backend/dashboards-so11y-java-agent"
153153
- name: "SkyWalking Go Agent self telemetry"
154154
path: "/en/setup/backend/dashboards-so11y-go-agent"
155+
- name: "Data Processing Engine"
156+
catalog:
157+
- name: "Flink"
158+
path: "/en/setup/backend/backend-flink-monitoring.md"
155159
- name: "Configuration Vocabulary"
156160
path: "/en/setup/backend/configuration-vocabulary"
157161
- name: "Advanced Setup"

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Layer.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,12 @@ public enum Layer {
251251
* The self observability of SkyWalking Go Agent,
252252
* which provides the abilities to measure the tracing performance and error statistics of plugins.
253253
*/
254-
SO11Y_GO_AGENT(41, true);
254+
SO11Y_GO_AGENT(41, true),
255+
256+
/**
257+
* Apache Flink is a framework and distributed processing engine for stateful computations over unbounded and bounded data streams
258+
*/
259+
FLINK(42, true);
255260

256261
private final int value;
257262
/**

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/management/ui/template/UITemplateInitializer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public class UITemplateInitializer {
7979
Layer.SO11Y_JAVA_AGENT.name(),
8080
Layer.KONG.name(),
8181
Layer.SO11Y_GO_AGENT.name(),
82+
Layer.FLINK.name(),
8283
"custom"
8384
};
8485
private final UITemplateManagementService uiTemplateManagementService;

oap-server/server-starter/src/main/resources/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ receiver-otel:
370370
selector: ${SW_OTEL_RECEIVER:default}
371371
default:
372372
enabledHandlers: ${SW_OTEL_RECEIVER_ENABLED_HANDLERS:"otlp-metrics,otlp-logs"}
373-
enabledOtelMetricsRules: ${SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES:"apisix,nginx/*,k8s/*,istio-controlplane,vm,mysql/*,postgresql/*,oap,aws-eks/*,windows,aws-s3/*,aws-dynamodb/*,aws-gateway/*,redis/*,elasticsearch/*,rabbitmq/*,mongodb/*,kafka/*,pulsar/*,bookkeeper/*,rocketmq/*,clickhouse/*,activemq/*,kong/*"}
373+
enabledOtelMetricsRules: ${SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES:"apisix,nginx/*,k8s/*,istio-controlplane,vm,mysql/*,postgresql/*,oap,aws-eks/*,windows,aws-s3/*,aws-dynamodb/*,aws-gateway/*,redis/*,elasticsearch/*,rabbitmq/*,mongodb/*,kafka/*,pulsar/*,bookkeeper/*,rocketmq/*,clickhouse/*,activemq/*,kong/*,flink/*"}
374374

375375
receiver-zipkin:
376376
selector: ${SW_RECEIVER_ZIPKIN:-}

0 commit comments

Comments
 (0)