Skip to content

Commit

Permalink
Fix grafana container restart policy (#8577)
Browse files Browse the repository at this point in the history
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->

<!-- Provide a general summary of your changes in the Title above -->

### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
Fixes #8576 

### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
I've tried it on my CVAT installation and it works.


### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [x] I have linked related issues (see [GitHub docs](

https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
<!--
- [ ] I have increased versions of npm packages if it is necessary

([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
-->
### License

- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Introduced a new service, `cvat_grafana`, for enhanced Grafana
container management.
- Configured automatic restart and integrated with ClickHouse
environment settings.
	- Added authentication options and plugin installations for Grafana.
	- Custom entrypoint script for setup of data sources and dashboards.

- **Bug Fixes**
- Resolved issues with the Grafana container restart policy to ensure
proper management.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
  • Loading branch information
Gui-U authored Oct 22, 2024
1 parent 1d4632c commit 036b17a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
4 changes: 4 additions & 0 deletions changelog.d/20241022_114627_gui-u.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Fixed

- Fix Grafana container restart policy
(<https://github.com/cvat-ai/cvat/pull/8577>)
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ services:

cvat_grafana:
image: grafana/grafana-oss:10.1.2
restart: always
container_name: cvat_grafana
environment:
<<: *clickhouse-env
Expand Down

0 comments on commit 036b17a

Please sign in to comment.