Skip to content

enh: add grafana and run-test to docker-compose.yml #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 18, 2025
Merged

Conversation

jiajingbin
Copy link
Contributor

@jiajingbin jiajingbin commented Apr 12, 2025

Description

Please briefly describe the code changes in this pull request.

Jira: https://jira.taosdata.com:18080/browse/TD-34524

Checklist

Please check the items in the checklist if applicable.

  • Is the user manual updated?
  • Are the test cases passed and automated?
  • Is there no significant decrease in test coverage?

@jiajingbin jiajingbin marked this pull request as draft April 12, 2025 12:14
@jiajingbin jiajingbin marked this pull request as ready for review April 14, 2025 05:50
@jiajingbin jiajingbin requested review from feici02 and Copilot April 14, 2025 08:14
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

@jiajingbin jiajingbin requested a review from Copilot April 14, 2025 08:17
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

Comments suppressed due to low confidence (2)

docker-compose/grafana/provisioning/datasources/tdengine.yml:6

  • The datasource configuration includes the URL in both the root and in secureJsonData; verify that this duplication is intentional and supported by Grafana's datasource requirements.
  url: "$TDENGINE_API"

docker-compose/docker-compose.yml:118

  • Ensure that marking the network as 'attachable: true' is intentional and appropriate for the intended deployment environment, particularly if swarm mode is not used.
    attachable: true

@jiajingbin jiajingbin changed the title enh: add grafana to docker-compose.yml enh: add grafana and run-test to docker-compose.yml Apr 15, 2025
@jiajingbin jiajingbin marked this pull request as draft April 15, 2025 02:55
@jiajingbin jiajingbin marked this pull request as ready for review April 18, 2025 06:30
@jiajingbin jiajingbin requested a review from Copilot April 18, 2025 06:30
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adds a Grafana datasource configuration and updates the docker-compose.yml to include new services for Grafana and run-test, along with corresponding client-node script adjustments for task creation, summary generation, MQTT data ingestion, and metric gathering.

  • Added Grafana datasource provisioning and new Grafana service
  • Updated docker-compose.yml with new service definitions and environment variable usage
  • Made minor modifications in client-node scripts to adjust task parameters and streamline MQTT host processing

Reviewed Changes

Copilot reviewed 6 out of 9 changed files in this pull request and generated no comments.

Show a summary per file
File Description
docker-compose/grafana/provisioning/datasources/tdengine.yml New datasource configuration for TDengine in Grafana
docker-compose/docker-compose.yml Expanded service definitions and updated environment setups
docker-compose/client-node/scripts/sync_center.py Updated task creation URLs with compression parameters
docker-compose/client-node/scripts/summary.py Added summary reporting functionality
docker-compose/client-node/scripts/mqtt_datain.py Adjusted naming scheme for topics and refined argument usage
docker-compose/client-node/scripts/get_metrics.py Added metrics fetching and task-stopping logic
Files not reviewed (3)
  • docker-compose/client-node/Dockerfile: Language not supported
  • docker-compose/client-node/config/query.json: Language not supported
  • docker-compose/client-node/scripts/generate_role_info.sh: Language not supported
Comments suppressed due to low confidence (2)

docker-compose/client-node/scripts/sync_center.py:29

  • The 'to' URL is missing a query parameter key before the compression value, unlike the 'from' URL that uses '&compression='. Consider updating it to include 'compression=' for consistency.
"to": f"taos+ws://{center_host}:6041/{center_dbname}?{compression_param}",

docker-compose/client-node/scripts/mqtt_datain.py:163

  • The variable name 'cliend_id' appears to be a typo. Consider renaming it to 'client_id'.
cliend_id = get_long_name(4, "numbers")

@feici02 feici02 merged commit f71b8d6 into main Apr 18, 2025
@feici02 feici02 deleted the enh/TD-34524 branch April 18, 2025 06:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants