Move analytics into components

cvat-ai · Oct 17, 2018 · e0a0be0 · e0a0be0
1 parent e836b8f
commit e0a0be0
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 11 deletions.
diff --git a/components/README.md b/components/README.md
@@ -3,3 +3,4 @@
 * [NVIDIA CUDA](cuda/README.md)
 * [OpenVINO](openvino/README.md)
 * [Tensorflow Object Detector](tf_annotation/README.md)
+* [Analytics](analytics/README.md)
diff --git a/analytics/README.md → components/analytics/README.md b/analytics/README.md → components/analytics/README.md
@@ -1,4 +1,18 @@
-# Analytics for Computer Vision Annotation Tool (CVAT)
+## Analytics for Computer Vision Annotation Tool (CVAT)
+
+It is possible to proxy annotation logs from client to ELK. To do that run the following command below:
+
+### Build docker image
+```bash
+# From project root directory
+docker-compose -f docker-compose.yml -f components/analytics/docker-compose.analytics.yml build
+```
+
+### Run docker container
+```bash
+# From project root directory
+docker-compose -f docker-compose.yml -f components/analytics/docker-compose.analytics.yml up -d
+```
 
 At the moment it is not possible to save advanced settings. Below values should be specified manually.
 

diff --git a/analytics/docker-compose.yml → ...ts/analytics/docker-compose.analytics.yml b/analytics/docker-compose.yml → ...ts/analytics/docker-compose.analytics.yml
@@ -8,7 +8,7 @@ services:
         aliases:
           - elasticsearch
     build:
-      context: ./analytics/elasticsearch
+      context: ./components/analytics/elasticsearch
       args:
         ELK_VERSION: 6.4.0
     volumes:
@@ -23,7 +23,7 @@ services:
         aliases:
           - kibana
     build:
-      context: ./analytics/kibana
+      context: ./components/analytics/kibana
       args:
         ELK_VERSION: 6.4.0
     depends_on: ['cvat_elasticsearch']
@@ -32,7 +32,7 @@ services:
   cvat_kibana_setup:
     container_name: cvat_kibana_setup
     image: cvat
-    volumes: ['./analytics/kibana:/home/django/kibana:ro']
+    volumes: ['./components/analytics/kibana:/home/django/kibana:ro']
     depends_on: ['cvat']
     working_dir: '/home/django'
     entrypoint: ['bash', 'wait-for-it.sh', 'elasticsearch:9200', '-t', '0', '--',
@@ -49,7 +49,7 @@ services:
         aliases:
           - logstash
     build:
-      context: ./analytics/logstash
+      context: ./components/analytics/logstash
       args:
         ELK_VERSION: 6.4.0
         http_proxy:  ${http_proxy}

diff --git a/analytics/elasticsearch/Dockerfile → ...onents/analytics/elasticsearch/Dockerfile b/analytics/elasticsearch/Dockerfile → ...onents/analytics/elasticsearch/Dockerfile
diff --git a/analytics/elasticsearch/elasticsearch.yml → ...analytics/elasticsearch/elasticsearch.yml b/analytics/elasticsearch/elasticsearch.yml → ...analytics/elasticsearch/elasticsearch.yml
diff --git a/analytics/kibana/Dockerfile → components/analytics/kibana/Dockerfile b/analytics/kibana/Dockerfile → components/analytics/kibana/Dockerfile
diff --git a/analytics/kibana/export.json → components/analytics/kibana/export.json b/analytics/kibana/export.json → components/analytics/kibana/export.json
diff --git a/analytics/kibana/kibana.yml → components/analytics/kibana/kibana.yml b/analytics/kibana/kibana.yml → components/analytics/kibana/kibana.yml
diff --git a/analytics/kibana/setup.py → components/analytics/kibana/setup.py b/analytics/kibana/setup.py → components/analytics/kibana/setup.py
diff --git a/analytics/logstash/Dockerfile → components/analytics/logstash/Dockerfile b/analytics/logstash/Dockerfile → components/analytics/logstash/Dockerfile
diff --git a/analytics/logstash/logstash.conf → components/analytics/logstash/logstash.conf b/analytics/logstash/logstash.conf → components/analytics/logstash/logstash.conf
diff --git a/components/cuda/README.md b/components/cuda/README.md
@@ -30,10 +30,12 @@ docker info | grep 'Runtimes'   # output should contains 'nvidia'
 
 ### Build docker image
 ```bash
-docker-compose -f docker-compose.yml -f docker-compose.cuda.yml build
+# From project root directory
+docker-compose -f docker-compose.yml -f components/cuda/docker-compose.cuda.yml build
 ```
 
 ### Run docker container
 ```bash
-docker-compose -f docker-compose.yml -f docker-compose.cuda.yml up -d
+# From project root directory
+docker-compose -f docker-compose.yml -f components/cuda/docker-compose.cuda.yml up -d
 ```
diff --git a/docker-compose.cuda.yml → components/cuda/docker-compose.cuda.yml b/docker-compose.cuda.yml → components/cuda/docker-compose.cuda.yml
diff --git a/components/openvino/README.md b/components/openvino/README.md
@@ -12,10 +12,12 @@
 
 ### Build docker image
 ```bash
-docker-compose -f docker-compose.yml -f docker-compose.openvino.yml build
+# From project root directory
+docker-compose -f docker-compose.yml -f components/openvino/docker-compose.openvino.yml build
 ```
 
 ### Run docker container
 ```bash
-docker-compose -f docker-compose.yml -f docker-compose.openvino.yml up -d
+# From project root directory
+docker-compose -f docker-compose.yml -f components/openvino/docker-compose.openvino.yml up -d
 ```
diff --git a/docker-compose.openvino.yml → ...ents/openvino/docker-compose.openvino.yml b/docker-compose.openvino.yml → ...ents/openvino/docker-compose.openvino.yml
diff --git a/components/tf_annotation/README.md b/components/tf_annotation/README.md
@@ -30,10 +30,12 @@
 
 ### Build docker image
 ```bash
-docker-compose -f docker-compose.yml -f docker-compose.tf_annotation.yml build
+# From project root directory
+docker-compose -f docker-compose.yml -f components/tf_annotation/docker-compose.tf_annotation.yml build
 ```
 
 ### Run docker container
 ```bash
-docker-compose -f docker-compose.yml -f docker-compose.tf_annotation.yml up -d
+# From project root directory
+docker-compose -f docker-compose.yml -f components/tf_annotation/docker-compose.tf_annotation.yml up -d
 ```
diff --git a/docker-compose.tf_annotation.yml → ...notation/docker-compose.tf_annotation.yml b/docker-compose.tf_annotation.yml → ...notation/docker-compose.tf_annotation.yml