Added missed websecure route for analytics (cvat-ai#20)

jasgnft · May 25, 2022 · cc73962 · cc73962
1 parent 5377973
commit cc73962
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Task creation progressbar bug (<https://github.com/cvat-ai/cvat/issues/12>)
 - Removed Python dependency ``open3d`` which brought different issues to the building process
+- Analytics not accessible when https is enabled (<https://github.com/cvat-ai/cvat/pull/20>)
 - Dataset import in an organization (<https://github.com/cvat-ai/cvat/pull/18>)
 
 ### Security

diff --git a/components/analytics/kibana_conf.yml b/components/analytics/kibana_conf.yml
@@ -8,6 +8,15 @@ http:
       - strip-prefix
       service: kibana
       rule: Host(`{{ env "CVAT_HOST" }}`) && PathPrefix(`/analytics`)
+    kibana_https:
+      entryPoints:
+      - websecure
+      middlewares:
+      - analytics-auth
+      - strip-prefix
+      service: kibana
+      tls: {}
+      rule: Host(`{{ env "CVAT_HOST" }}`) && PathPrefix(`/analytics`)
 
   middlewares:
     analytics-auth:

diff --git a/docker-compose.https.yml b/docker-compose.https.yml
@@ -21,6 +21,7 @@ services:
     command:
       - "--providers.docker.exposedByDefault=false"
       - "--providers.docker.network=cvat"
+      - '--providers.file.directory=/etc/traefik/rules'
       - "--entryPoints.web.address=:80"
       - "--entryPoints.web.http.redirections.entryPoint.to=websecure"
       - "--entryPoints.web.http.redirections.entryPoint.scheme=https"