You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@senssoft.apache.org by ar...@apache.org on 2016/12/16 17:11:10 UTC
[52/58] [abbrv] incubator-senssoft-tap git commit: Fixing merge
conflicts for docker and master branches
Fixing merge conflicts for docker and master branches
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/commit/56a289c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/tree/56a289c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/diff/56a289c0
Branch: refs/heads/master
Commit: 56a289c0781db3f4b07eacb0d061f915e326a076
Parents: 107c43e 6a81d1e
Author: Arthi Vezhavendan <ar...@gmail.com>
Authored: Tue Nov 22 12:03:53 2016 -0500
Committer: Arthi Vezhavendan <ar...@gmail.com>
Committed: Tue Nov 22 12:03:53 2016 -0500
----------------------------------------------------------------------
.dockerignore | 25 ++
.gitignore | 3 +
app_mgr/distillviews.py | 2 +
docker-compose.yml | 66 +++++-
docker/db/Dockerfile | 21 ++
docker/db/sql.sh | 17 ++
docker/distill/Dockerfile | 50 ++++
docker/distill/distill.conf | 29 +++
docker/distill/distill/__init__.py | 45 ++++
docker/distill/distill/algorithms/__init__.py | 14 ++
.../distill/algorithms/graphs/__init__.py | 14 ++
.../distill/distill/algorithms/graphs/graph.py | 24 ++
.../distill/algorithms/graphs/tests/__init__.py | 22 ++
.../distill/algorithms/stats/__init__.py | 14 ++
docker/distill/distill/algorithms/stats/hist.py | 183 +++++++++++++++
.../distill/algorithms/stats/tests/__init__.py | 22 ++
.../distill/algorithms/tests/__init__.py | 14 ++
docker/distill/distill/app.py | 216 +++++++++++++++++
docker/distill/distill/config.cfg | 57 +++++
docker/distill/distill/models/__init__.py | 14 ++
docker/distill/distill/models/brew.py | 235 +++++++++++++++++++
docker/distill/distill/models/stout.py | 149 ++++++++++++
docker/distill/distill/models/tests/__init__.py | 22 ++
docker/distill/distill/models/userale.py | 137 +++++++++++
docker/distill/distill/server.py | 29 +++
docker/distill/distill/tests/__init__.py | 21 ++
docker/distill/distill/tests/basic_test.py | 24 ++
docker/distill/distill/tests/distill_test.py | 43 ++++
docker/distill/distill/utils/__init__.py | 0
docker/distill/distill/utils/exceptions.py | 25 ++
docker/distill/distill/utils/query_builder.py | 35 +++
docker/distill/distill/utils/tests/__init__.py | 21 ++
docker/distill/distill/utils/validation.py | 39 +++
docker/distill/distill/version.py | 22 ++
docker/distill/requirements.txt | 22 ++
docker/distill/setup.cfg | 30 +++
docker/distill/setup.py | 87 +++++++
docker/es/Dockerfile | 62 +++++
docker/es/elasticsearch.yml | 94 ++++++++
docker/es/logging.yml | 85 +++++++
docker/kibana/Dockerfile | 60 +++++
docker/kibana/entrypoint.sh | 24 ++
docker/kibana/kibana.yml | 79 +++++++
docker/logstash/Dockerfile | 46 ++++
docker/logstash/logstash.conf | 78 ++++++
docker/logstash/userale.json | 152 ++++++++++++
docker/tap/Dockerfile | 63 +++++
docker/tap/README.md | 2 +
docker/tap/neon_counts.js | 2 +
docker/tap/neon_graph.js | 2 +
docker/webserver/Dockerfile | 34 +++
docker/webserver/gunicorn.cfg | 27 +++
docker/webserver/nginx.conf | 57 +++++
docker/webserver/supervisord.conf | 28 +++
.../nodes/0/indices/.kibana/0/index/_0.cfe | Bin 0 -> 363 bytes
.../nodes/0/indices/.kibana/0/index/_0.cfs | Bin 0 -> 2290 bytes
.../nodes/0/indices/.kibana/0/index/_0.si | Bin 0 -> 387 bytes
.../nodes/0/indices/.kibana/0/index/write.lock | 0
.../indices/.kibana/0/translog/translog-10.ckp | Bin 0 -> 20 bytes
.../indices/.kibana/0/translog/translog-10.tlog | Bin 0 -> 43 bytes
.../indices/.kibana/0/translog/translog-11.ckp | Bin 0 -> 20 bytes
.../indices/.kibana/0/translog/translog-11.tlog | Bin 0 -> 43 bytes
.../indices/.kibana/0/translog/translog-12.ckp | Bin 0 -> 20 bytes
.../indices/.kibana/0/translog/translog-12.tlog | Bin 0 -> 43 bytes
.../indices/.kibana/0/translog/translog-13.tlog | Bin 0 -> 43 bytes
.../0/indices/.kibana/0/translog/translog.ckp | Bin 0 -> 20 bytes
.../nodes/0/indices/userale/0/index/_0.cfe | Bin 0 -> 363 bytes
.../nodes/0/indices/userale/0/index/_0.cfs | Bin 0 -> 6382 bytes
.../nodes/0/indices/userale/0/index/_0.si | Bin 0 -> 387 bytes
.../nodes/0/indices/userale/0/index/_1.cfe | Bin 0 -> 363 bytes
.../nodes/0/indices/userale/0/index/_1.cfs | Bin 0 -> 5637 bytes
.../nodes/0/indices/userale/0/index/_1.si | Bin 0 -> 387 bytes
.../nodes/0/indices/userale/0/index/write.lock | 0
.../indices/userale/0/translog/translog-10.ckp | Bin 0 -> 20 bytes
.../indices/userale/0/translog/translog-10.tlog | Bin 0 -> 43 bytes
.../indices/userale/0/translog/translog-11.ckp | Bin 0 -> 20 bytes
.../indices/userale/0/translog/translog-11.tlog | Bin 0 -> 43 bytes
.../indices/userale/0/translog/translog-12.tlog | Bin 0 -> 43 bytes
.../0/indices/userale/0/translog/translog-9.ckp | Bin 0 -> 20 bytes
.../indices/userale/0/translog/translog-9.tlog | Bin 0 -> 43 bytes
.../0/indices/userale/0/translog/translog.ckp | Bin 0 -> 20 bytes
es/data/SensSoft/nodes/0/node.lock | 0
es/logs/SensSoft.log | 45 ++++
es/logs/SensSoft_deprecation.log | 0
es/logs/SensSoft_index_indexing_slowlog.log | 0
es/logs/SensSoft_index_search_slowlog.log | 0
gulpfile.babel.js | 24 +-
results.txt | 1 +
semantic.json | 2 +-
tap/settings/settings.py | 2 +-
tasks/build.js | 12 +
tasks/styles.js | 2 +-
92 files changed, 2765 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/blob/56a289c0/app_mgr/distillviews.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/blob/56a289c0/docker-compose.yml
----------------------------------------------------------------------
diff --cc docker-compose.yml
index 400e03b,f44a98b..5ed59c0
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -17,10 -17,66 +17,66 @@@
version: "2"
services:
+ db:
+ container_name: tap-db
+ build: ./docker/db
+ ports:
+ - "5432:5432"
tap:
+ container_name: tap-web
+ build: ./docker/tap
+ command: bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
+ ports:
+ - "8000:8000"
+ depends_on:
+ - db
+ links:
+ - db:db
+ distill:
build:
- context: .
- dockerfile: Dockerfile
- container_name: tap
+ context: .
+ dockerfile: ./docker/distill/Dockerfile
+ container_name: distill
+ ports:
+ - 8090:8090
+ depends_on:
+ - elasticsearch
+ links:
+ - elasticsearch
+ # Web server
+ #webserver:
+ # build: ./docker/webserver
+ # container_name: webserver
+ # links:
+ # - distill
+ # ELK Stack
+ elasticsearch:
+ build: ./docker/es
+ container_name: elastic
+ ports:
+ - 9200:9200
+ - 9300:9300
+ volumes:
+ - ./es/data:/usr/share/elasticsearch/data
+ - ./es/logs:/usr/share/elasticsearch/logs
+ kibana:
+ build: ./docker/kibana
+ container_name: kibana
+ ports:
+ - 5601:5601
+ depends_on:
+ - elasticsearch
+ links:
+ - elasticsearch
+ logstash:
+ build: ./docker/logstash
+ container_name: logstash
ports:
- - 8000:8000
+ - 8888:8888
+ command: logstash -f /etc/logstash/conf.d/logstash.conf
+ volumes:
+ - ./userale:/var/log/sennsoft
+ depends_on:
+ - elasticsearch
+ links:
- - elasticsearch
++ - elasticsearch
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/blob/56a289c0/gulpfile.babel.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/blob/56a289c0/tasks/build.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/blob/56a289c0/tasks/styles.js
----------------------------------------------------------------------