wu-sheng commented on code in PR #10115: URL: https://github.com/apache/skywalking/pull/10115#discussion_r1044911669
########## docs/en/setup/backend/backend-mysql-monitoring.md: ########## @@ -13,9 +13,9 @@ SkyWalking leverages prometheus/mysqld_exporter for collecting metrics data. It 2. Set up [OpenTelemetry Collector ](https://opentelemetry.io/docs/collector/getting-started/#docker). For details on Prometheus Receiver in OpenTelemetry Collector, refer to [here](../../../../test/e2e-v2/cases/mysql/prometheus-mysql-exporter/otel-collector-config.yaml). 3. Config SkyWalking [OpenTelemetry receiver](opentelemetry-receiver.md). -### MySQL Monitoring -MySQL monitoring provides monitoring of the status and resources of the MySQL server. MySQL cluster is cataloged as a `Layer: MYSQL` `Service` in OAP. -Each MySQL server is cataloged as an `Instance` in OAP. +### MySQL/MariaDB Monitoring +MySQL/MariaDB monitoring provides monitoring of the status and resources of the MySQL/MariaDB server. MySQL/MariaDB cluster is cataloged as a `Layer: MYSQL` `Service` in OAP. +Each MySQL/MariaDB server is cataloged as an `Instance` in OAP. Review Comment: In the slow SQL part, >Config MySQL to enable slow log.example. You should update MariaDB part, and link to your e2e example. ########## test/e2e-v2/cases/mariadb/mariadb-slowsql/docker-compose.yaml: ########## @@ -0,0 +1,124 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +version: '2.1' + +services: + oap: + extends: + file: ../../../script/docker-compose/base-compose.yml + service: oap + image: ghcr.io/apache/skywalking/oap:bcd9f7a56b99ca612711ed3a540bdae5f46e9171 + ports: + - 12800 + entrypoint: ['sh', '-c', '/download-mysql.sh /skywalking/oap-libs && chmod 777 /skywalking/docker-entrypoint.sh && /skywalking/docker-entrypoint.sh'] + networks: + - e2e + environment: + - TZ=Asia/Shanghai + - SW_CORE_TOPN_REPORT_PERIOD=1 + - SW_OTEL_RECEIVER=default + + mariadb: + image: mariadb:10.7.3 + networks: + - e2e + volumes: + - ../mariadb-slowsql/log:/var/lib/mysql + - ../mariadb-slowsql/my.cnf:/etc/mysql/my.cnf + environment: + - "MYSQL_ROOT_PASSWORD=password" + healthcheck: + test: "/usr/bin/mysql --user=root --password=password --execute \"SHOW DATABASES;\"" + interval: 5s + timeout: 60s + retries: 120 + + mysql-load: Review Comment: There are several mysql as prefix of the service names in docker compose, consider renaming them to MariaDB? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
