From 036b17ae0eb601aeab5ac4f6b0288a638a3abc3d Mon Sep 17 00:00:00 2001
From: Alecto <Gui-U@users.noreply.github.com>
Date: Tue, 22 Oct 2024 13:27:28 +0200
Subject: [PATCH] Fix grafana container restart policy (#8577)

<!-- 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 -->
---
 changelog.d/20241022_114627_gui-u.md | 4 ++++
 docker-compose.yml                   | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 changelog.d/20241022_114627_gui-u.md

diff --git a/changelog.d/20241022_114627_gui-u.md b/changelog.d/20241022_114627_gui-u.md
new file mode 100644
index 00000000000..efa896e3328
--- /dev/null
+++ b/changelog.d/20241022_114627_gui-u.md
@@ -0,0 +1,4 @@
+### Fixed
+
+- Fix Grafana container restart policy
+  (<https://github.com/cvat-ai/cvat/pull/8577>)
diff --git a/docker-compose.yml b/docker-compose.yml
index 569e163e9fe..0d3f802c82f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -329,6 +329,7 @@ services:
 
   cvat_grafana:
     image: grafana/grafana-oss:10.1.2
+    restart: always
     container_name: cvat_grafana
     environment:
       <<: *clickhouse-env