You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@senssoft.apache.org by ms...@apache.org on 2017/06/22 16:16:18 UTC
[1/6] incubator-senssoft-distill git commit: Deleted old ELK
dockerfiles and updated version number to 0.0.5 until release is confirmed
Repository: incubator-senssoft-distill
Updated Branches:
refs/heads/elk5.4-upgrade [created] 9f745a79a
Deleted old ELK dockerfiles and updated version number to 0.0.5 until release is confirmed
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/commit/2a8d3e72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/tree/2a8d3e72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/diff/2a8d3e72
Branch: refs/heads/elk5.4-upgrade
Commit: 2a8d3e7237d19558ecce9630c6b67671e6e2cff8
Parents: 6b9c21a
Author: msbeard <ms...@apache.org>
Authored: Thu Jun 22 11:09:31 2017 -0400
Committer: msbeard <ms...@apache.org>
Committed: Thu Jun 22 11:09:31 2017 -0400
----------------------------------------------------------------------
.dockerignore | 2 -
.gitignore | 6 +-
CHANGELOG.rst | 18 +++--
Dockerfile | 35 ---------
MANIFEST.in | 13 +++-
distill/version.py | 2 +-
doc_requirements.txt | 17 -----
docker/distill/Dockerfile | 35 +++++++++
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 -------------------------------------
requirements.txt | 7 --
setup.cfg | 13 +++-
setup.py | 123 +++++++++++++++++++++++-------
test_requirements.txt | 21 -----
21 files changed, 167 insertions(+), 805 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/.dockerignore
----------------------------------------------------------------------
diff --git a/.dockerignore b/.dockerignore
index e2dfc86..422b669 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -18,8 +18,6 @@
LICENSE
NOTICE
env
-userale
-es
docs
doc_requirements.txt
docker
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index a597142..fb05fa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,10 +26,6 @@ setup_tools
# Flask instance folder
instance/
-# Docker stuff
-es/
-userale/
-
# Scrapy stuff:
.scrapy
@@ -49,7 +45,7 @@ coverage.xml
# Distribution / packaging
.Python
-env/
+env*/
build/
develop-eggs/
dist/
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/CHANGELOG.rst
----------------------------------------------------------------------
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4f3281c..310115f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -21,29 +21,35 @@
Changelog
=========
-0.1.3 (2016-09-19)
+0.0.5 (2017-06-30)
+------------------
+* Updated elasticsearch-dsl to 5.4.1
+* Removed all support for UserALE 3.0
+* General cleanup
+
+0.0.4 (2016-09-19)
------------------
* Moved to Apache.
* Updated all documentation.
* Added License headers
* Docker compose file added to assist deployment of ELK stack with Distill
-0.1.2 (2016-07-22)
+0.0.3 (2016-07-22)
------------------
* Moved CRUD operations from UserAle model to Brew model.
* Added API specs to segment UserAle data from Elasticsearch
* Added deployment instructions
-0.1.1 (2016-06-14)
+0.0.2 (2016-06-14)
------------------
* Completed index route for status endpoint which lists all applications registered and their document count segmented by type.
* Updated setup.py to reference deploy scripts
-* Example configuration to deploy Distll with Gunicorn and Nginx for Linux/Mac users
+* Example configuration to deploy Distill with Gunicorn and Nginx for Linux/Mac users
* Added UserAle and Stout classes.
* Updated requirements.txt for deployment.
-0.1.0 (2016-04-01)
+0.0.1 (2016-04-01)
------------------
-Initial release.
\ No newline at end of file
+Initial alpha release.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 807ff3a..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM python:2
-
-# install system wide deps
-RUN apt-get -yqq update
-
-# Add code
-WORKDIR /app
-
-ADD ./requirements.txt /app
-
-# Install Distill dependencies
-RUN pip install -r requirements.txt
-
-# Expose Ports
-EXPOSE 8090
-
-# Rest
-ADD . /app
-RUN python setup.py develop
-CMD python distill/server.py
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/MANIFEST.in
----------------------------------------------------------------------
diff --git a/MANIFEST.in b/MANIFEST.in
index 6334d32..54c3542 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,12 @@
include MANIFEST.in
+include README.md
+include CHANGELOG.md
+include LICENSE.txt
include setup.py
-include README.txt
-include CHANGELOG.txt
-include LICENSE.txt
\ No newline at end of file
+
+# Include all sources
+graft distill
+
+# Exclude
+global-exclude *.py[co]
+global-exclude __pycache__
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/distill/version.py
----------------------------------------------------------------------
diff --git a/distill/version.py b/distill/version.py
index 1088c72..ad2632f 100644
--- a/distill/version.py
+++ b/distill/version.py
@@ -19,4 +19,4 @@ This file is imported by ``Distill.__init__``,
and parsed by ``setup.py``.
"""
-__version__ = "0.1.4"
+__version__ = "0.0.5"
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/doc_requirements.txt
----------------------------------------------------------------------
diff --git a/doc_requirements.txt b/doc_requirements.txt
deleted file mode 100644
index e1c9809..0000000
--- a/doc_requirements.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Sphinx==1.4.6
-sphinx-rtd-theme==0.1.9
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/docker/distill/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/distill/Dockerfile b/docker/distill/Dockerfile
new file mode 100644
index 0000000..807ff3a
--- /dev/null
+++ b/docker/distill/Dockerfile
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM python:2
+
+# install system wide deps
+RUN apt-get -yqq update
+
+# Add code
+WORKDIR /app
+
+ADD ./requirements.txt /app
+
+# Install Distill dependencies
+RUN pip install -r requirements.txt
+
+# Expose Ports
+EXPOSE 8090
+
+# Rest
+ADD . /app
+RUN python setup.py develop
+CMD python distill/server.py
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/docker/es/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/es/Dockerfile b/docker/es/Dockerfile
deleted file mode 100644
index b84b637..0000000
--- a/docker/es/Dockerfile
+++ /dev/null
@@ -1,62 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Ubuntu Xenial 16.04 [LTS]
-FROM ubuntu:16.04
-
-# install system wide deps
-RUN apt-get -yqq update
-RUN apt-get -yqq install openjdk-8-jre
-
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
-
-ENV ELASTICSEARCH_VERSION 2.3.5
-ENV ELASTICSEARCH_REPO_BASE http://packages.elasticsearch.org/elasticsearch/2.x/debian
-
-RUN echo "deb $ELASTICSEARCH_REPO_BASE stable main" > /etc/apt/sources.list.d/elasticsearch.list
-
-# install elasticsearch
-RUN set -x \
- && apt-get -yqq update \
- && apt-get -yqq install --no-install-recommends elasticsearch=$ELASTICSEARCH_VERSION \
- && rm -rf /var/lib/apt/lists/*
-
-ENV PATH /usr/share/elasticsearch/bin:$PATH
-
-WORKDIR /usr/share/elasticsearch
-
-RUN set -ex \
- && for path in \
- ./data \
- ./logs \
- ./config \
- ./config/scripts \
- ; do \
- mkdir -p "$path"; \
- chown -R elasticsearch:elasticsearch "$path"; \
- done
-
-COPY elasticsearch.yml /usr/share/elasticsearch/config
-COPY logging.yml /usr/share/elasticsearch/config
-
-USER elasticsearch
-
-# Install Elastic-HQ
-RUN plugin install royrusso/elasticsearch-HQ/2.0.3
-
-CMD ["elasticsearch"]
-
-# Run on ports 9200 & 9300
-EXPOSE 9200 9300
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/docker/es/elasticsearch.yml
----------------------------------------------------------------------
diff --git a/docker/es/elasticsearch.yml b/docker/es/elasticsearch.yml
deleted file mode 100644
index 6126feb..0000000
--- a/docker/es/elasticsearch.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-# ======================== Elasticsearch Configuration =========================
-#
-# NOTE: Elasticsearch comes with reasonable defaults for most settings.
-# Before you set out to tweak and tune the configuration, make sure you
-# understand what are you trying to accomplish and the consequences.
-#
-# The primary way of configuring a node is via this file. This template lists
-# the most important settings you may want to configure for a production cluster.
-#
-# Please see the documentation for further information on configuration options:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration.html>
-#
-# ---------------------------------- Cluster -----------------------------------
-#
-# Use a descriptive name for your cluster:
-#
-cluster.name: SensSoft
-#
-# ------------------------------------ Node ------------------------------------
-#
-# Use a descriptive name for the node:
-#
-node.name: soft-01
-#
-# Add custom attributes to the node:
-#
-# node.rack: r1
-#
-# ----------------------------------- Paths ------------------------------------
-#
-# Path to directory where to store the data (separate multiple locations by comma):
-#
-path.data: /usr/share/elasticsearch/data
-#
-# Path to log files:
-#
-path.logs: /usr/share/elasticsearch/logs
-#
-# ----------------------------------- Memory -----------------------------------
-#
-# Lock the memory on startup:
-#
-# bootstrap.mlockall: true
-#
-# Make sure that the `ES_HEAP_SIZE` environment variable is set to about half the memory
-# available on the system and that the owner of the process is allowed to use this limit.
-#
-# Elasticsearch performs poorly when the system is swapping the memory.
-#
-# ---------------------------------- Network -----------------------------------
-#
-# Set the bind address to a specific IP (IPv4 or IPv6):
-#
-network.host: 0.0.0.0
-#
-# Set a custom port for HTTP:
-#
-# http.port: 9200
-#
-# For more information, see the documentation at:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-network.html>
-#
-# --------------------------------- Discovery ----------------------------------
-#
-# Pass an initial list of hosts to perform discovery when new node is started:
-# The default list of hosts is ["127.0.0.1", "[::1]"]
-#
-# discovery.zen.ping.unicast.hosts: ["host1", "host2"]
-#
-# Prevent the "split brain" by configuring the majority of nodes (total number of nodes / 2 + 1):
-#
-# discovery.zen.minimum_master_nodes: 3
-#
-# For more information, see the documentation at:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-discovery.html>
-#
-# ---------------------------------- Gateway -----------------------------------
-#
-# Block initial recovery after a full cluster restart until N nodes are started:
-#
-# gateway.recover_after_nodes: 3
-#
-# For more information, see the documentation at:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-gateway.html>
-#
-# ---------------------------------- Various -----------------------------------
-#
-# Disable starting multiple nodes on a single system:
-#
-# node.max_local_storage_nodes: 1
-#
-# Require explicit names when deleting indices:
-#
-# action.destructive_requires_name: true
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/docker/es/logging.yml
----------------------------------------------------------------------
diff --git a/docker/es/logging.yml b/docker/es/logging.yml
deleted file mode 100644
index 939aa1e..0000000
--- a/docker/es/logging.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
-es.logger.level: INFO
-rootLogger: ${es.logger.level}, console, file
-logger:
- # log action execution errors for easier debugging
- action: DEBUG
-
- # deprecation logging, turn to DEBUG to see them
- deprecation: INFO, deprecation_log_file
-
- # reduce the logging for aws, too much is logged under the default INFO
- com.amazonaws: WARN
- # aws will try to do some sketchy JMX stuff, but its not needed.
- com.amazonaws.jmx.SdkMBeanRegistrySupport: ERROR
- com.amazonaws.metrics.AwsSdkMetrics: ERROR
-
- org.apache.http: INFO
-
- # gateway
- #gateway: DEBUG
- #index.gateway: DEBUG
-
- # peer shard recovery
- #indices.recovery: DEBUG
-
- # discovery
- #discovery: TRACE
-
- index.search.slowlog: TRACE, index_search_slow_log_file
- index.indexing.slowlog: TRACE, index_indexing_slow_log_file
-
-additivity:
- index.search.slowlog: false
- index.indexing.slowlog: false
- deprecation: false
-
-appender:
- console:
- type: console
- layout:
- type: consolePattern
- conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
-
- file:
- type: dailyRollingFile
- file: ${path.logs}/${cluster.name}.log
- datePattern: "'.'yyyy-MM-dd"
- layout:
- type: pattern
- conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %.10000m%n"
-
- # Use the following log4j-extras RollingFileAppender to enable gzip compression of log files.
- # For more information see https://logging.apache.org/log4j/extras/apidocs/org/apache/log4j/rolling/RollingFileAppender.html
- #file:
- #type: extrasRollingFile
- #file: ${path.logs}/${cluster.name}.log
- #rollingPolicy: timeBased
- #rollingPolicy.FileNamePattern: ${path.logs}/${cluster.name}.log.%d{yyyy-MM-dd}.gz
- #layout:
- #type: pattern
- #conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
-
- deprecation_log_file:
- type: dailyRollingFile
- file: ${path.logs}/${cluster.name}_deprecation.log
- datePattern: "'.'yyyy-MM-dd"
- layout:
- type: pattern
- conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
-
- index_search_slow_log_file:
- type: dailyRollingFile
- file: ${path.logs}/${cluster.name}_index_search_slowlog.log
- datePattern: "'.'yyyy-MM-dd"
- layout:
- type: pattern
- conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
-
- index_indexing_slow_log_file:
- type: dailyRollingFile
- file: ${path.logs}/${cluster.name}_index_indexing_slowlog.log
- datePattern: "'.'yyyy-MM-dd"
- layout:
- type: pattern
- conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/docker/kibana/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/kibana/Dockerfile b/docker/kibana/Dockerfile
deleted file mode 100644
index e37cfa0..0000000
--- a/docker/kibana/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Ubuntu Xenial 16.04 [LTS]
-FROM ubuntu:16.04
-
-# install system wide deps
-RUN apt-get -yqq update
-RUN apt-get -yqq install netcat
-
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
-
-ENV KIBANA_VERSION 4.5.4
-ENV KIBANA_REPO_BASE http://packages.elasticsearch.org/kibana/4.5/debian
-
-RUN echo "deb $KIBANA_REPO_BASE stable main" > /etc/apt/sources.list.d/kibana.list
-
-# install kibana
-RUN set -x \
- && apt-get -yqq update \
- && apt-get -yqq install --no-install-recommends kibana=$KIBANA_VERSION \
- && rm -rf /var/lib/apt/lists/*
-
-ENV PATH /opt/kibana/bin:$PATH
-
-WORKDIR /opt/kibana
-
-RUN set -ex \
- && for path in \
- ./config \
- ; do \
- chown -R kibana:kibana "$path"; \
- done
-
-COPY kibana.yml /opt/kibana/config
-
-COPY entrypoint.sh /tmp/entrypoint.sh
-RUN chmod +x /tmp/entrypoint.sh
-
-# Install Sense plugin
-RUN kibana plugin --install elastic/sense
-
-USER kibana
-
-CMD ["/tmp/entrypoint.sh"]
-
-# Run on port 5601
-EXPOSE 5601
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/docker/kibana/entrypoint.sh
----------------------------------------------------------------------
diff --git a/docker/kibana/entrypoint.sh b/docker/kibana/entrypoint.sh
deleted file mode 100644
index 02bd91f..0000000
--- a/docker/kibana/entrypoint.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Wait for the Elasticsearch container to be ready before starting Kibana.
-echo "Stalling for Elasticsearch"
-while true; do
- nc -q 1 elasticsearch 9200 2>/dev/null && break
-done
-
-echo "Starting Kibana"
-exec kibana
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/docker/kibana/kibana.yml
----------------------------------------------------------------------
diff --git a/docker/kibana/kibana.yml b/docker/kibana/kibana.yml
deleted file mode 100644
index 8bc978f..0000000
--- a/docker/kibana/kibana.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-# Kibana is served by a back end server. This controls which port to use.
-server.port: 5601
-
-# The host to bind the server to.
-server.host: "0.0.0.0"
-
-# If you are running kibana behind a proxy, and want to mount it at a path,
-# specify that path here. The basePath can't end in a slash.
-# server.basePath: ""
-
-# The maximum payload size in bytes on incoming server requests.
-# server.maxPayloadBytes: 1048576
-
-# The Elasticsearch instance to use for all your queries.
-elasticsearch.url: "http://elasticsearch:9200"
-
-# preserve_elasticsearch_host true will send the hostname specified in `elasticsearch`. If you set it to false,
-# then the host you use to connect to *this* Kibana instance will be sent.
-elasticsearch.preserveHost: true
-
-# Kibana uses an index in Elasticsearch to store saved searches, visualizations
-# and dashboards. It will create a new index if it doesn't already exist.
-kibana.index: ".kibana"
-
-# The default application to load.
-kibana.defaultAppId: "discover"
-
-# If your Elasticsearch is protected with basic auth, these are the user credentials
-# used by the Kibana server to perform maintenance on the kibana_index at startup. Your Kibana
-# users will still need to authenticate with Elasticsearch (which is proxied through
-# the Kibana server)
-# elasticsearch.username: "user"
-# elasticsearch.password: "pass"
-
-# SSL for outgoing requests from the Kibana Server to the browser (PEM formatted)
-# server.ssl.cert: /path/to/your/server.crt
-# server.ssl.key: /path/to/your/server.key
-
-# Optional setting to validate that your Elasticsearch backend uses the same key files (PEM formatted)
-# elasticsearch.ssl.cert: /path/to/your/client.crt
-# elasticsearch.ssl.key: /path/to/your/client.key
-
-# If you need to provide a CA certificate for your Elasticsearch instance, put
-# the path of the pem file here.
-# elasticsearch.ssl.ca: /path/to/your/CA.pem
-
-# Set to false to have a complete disregard for the validity of the SSL
-# certificate.
-# elasticsearch.ssl.verify: true
-
-# Time in milliseconds to wait for elasticsearch to respond to pings, defaults to
-# request_timeout setting
-# elasticsearch.pingTimeout: 1500
-
-# Time in milliseconds to wait for responses from the back end or elasticsearch.
-# This must be > 0
-# elasticsearch.requestTimeout: 30000
-
-# Time in milliseconds for Elasticsearch to wait for responses from shards.
-# Set to 0 to disable.
-# elasticsearch.shardTimeout: 0
-
-# Time in milliseconds to wait for Elasticsearch at Kibana startup before retrying
-# elasticsearch.startupTimeout: 5000
-
-# Set the path to where you would like the process id file to be created.
-# pid.file: /var/run/kibana.pid
-
-# If you would like to send the log output to a file you can set the path below.
-logging.dest: stdout
-
-# Set this to true to suppress all logging output.
-# logging.silent: false
-
-# Set this to true to suppress all logging output except for error messages.
-logging.quiet: true
-
-# Set this to true to log all events, including system usage information and all requests.
-# logging.verbose: false
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/docker/logstash/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/logstash/Dockerfile b/docker/logstash/Dockerfile
deleted file mode 100644
index bd5929b..0000000
--- a/docker/logstash/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Ubuntu Xenial 16.04 [LTS]
-FROM ubuntu:16.04
-
-# install system wide deps
-RUN apt-get -yqq update
-RUN apt-get -yqq install openjdk-8-jre
-RUN apt-get -yqq install wget
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
-
-ENV LOGSTASH_VERSION 1:2.3.4-1
-ENV LOGSTASH_REPO_BASE http://packages.elasticsearch.org/logstash/2.3/debian
-
-RUN echo "deb $LOGSTASH_REPO_BASE stable main" > /etc/apt/sources.list.d/logstash.list
-
-# install logstash
-RUN set -x \
- && apt-get -yqq update \
- && apt-get -yqq install --no-install-recommends logstash=$LOGSTASH_VERSION \
- && rm -rf /var/lib/apt/lists/*
-
-ENV PATH /opt/logstash/bin:$PATH
-
-# Get GeoIP DB
-#RUN set -x \
-# && wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz \
-# && gunzip GeoIP.dat.gz \
-# && mkdir -p /usr/share/GeoIP \
-# && mv GeoIP.dat /usr/share/GeoIP
-
-ADD logstash.conf /etc/logstash/conf.d/logstash.conf
-ADD userale.json /etc/logstash/conf.d/userale.json
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/docker/logstash/logstash.conf
----------------------------------------------------------------------
diff --git a/docker/logstash/logstash.conf b/docker/logstash/logstash.conf
deleted file mode 100644
index ca831f5..0000000
--- a/docker/logstash/logstash.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-input {
- http {
- codec => "json"
- port => 8000
- response_headers => {
- "Access-Control-Allow-Origin" => "*"
- "Access-Control-Allow-Headers" => "Origin, X-Requested-With, Content-Type, Accept"
- }
- }
-
- file {
- path => [
- "/var/log/sennsoft/*.log"
- ]
- codec => "json"
- start_position => "beginning"
- sincedb_path => "/dev/null"
- }
-}
-
-## Add your filters / logstash plugins configuration here
-filter {
- mutate {
- remove_field => [ "message", "@version", "@timestamp"]
- }
-
- grok {
- match => [ "useraleVersion", "(?<major_ver>\d+).(?<minor_ver>\d+)(.(?<patch_ver>\d+))?" ]
- match => [ "toolVersion", "(?<tool_major_ver>\d+).(?<tool_minor_ver>\d+)(.(?<tool_patch_ver>\d+))?" ]
- }
-
- #dns {
- # add_field => [ "hostname", "%{host}" ]
- #}
-
- #dns {
- # resolve => [ "host" ]
- # action => [ "replace" ]
- #}
-
- #geoip {
- # source => "host"
- # database => "/usr/share/GeoIP/GeoIP.dat"
- # target => "geoip"
- #}
-}
-
-output {
- # Output data to Elasticsearch instance
- elasticsearch {
- hosts => "elasticsearch:9200"
- action => "index"
- index => "userale"
- document_type => "logs"
- manage_template => true
- template_overwrite => true
- template => "/etc/logstash/conf.d/userale.json"
- template_name => "userale"
- }
-
- # Debug
- stdout { codec => rubydebug }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/docker/logstash/userale.json
----------------------------------------------------------------------
diff --git a/docker/logstash/userale.json b/docker/logstash/userale.json
deleted file mode 100644
index 3d53d7b..0000000
--- a/docker/logstash/userale.json
+++ /dev/null
@@ -1,152 +0,0 @@
-{
- "template" : "userale",
- "order" : 1,
- "settings" : {
- "number_of_shards" : 1,
- "number_of_replicas" : 0,
- "index.refresh_interval" : "5s"
- },
- "mappings" : {
- "_default_" : {
- "_all" : {
- "enabled" : false
- },
- "properties" : {
- "geoip" : {
- "properties" : {
- "ip" : {
- "type" : "ip"
- },
- "country_code2" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "country_code3" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "country_name" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "continent_code" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "region_name" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "city_name" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "postal_code" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "latitude" : {
- "type" : "double"
- },
- "longitude" : {
- "type" : "double"
- },
- "dma_code" : {
- "type" : "integer"
- },
- "area_code" : {
- "type" : "long"
- },
- "timezone" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "real_region_name" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "location" : {
- "doc_values" : true,
- "type" : "geo_point"
- }
- }
- }
- }
- },
- "logs" : {
- "properties" : {
- "userAction" : {
- "type" : "boolean"
- },
- "type" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "clientTime" : {
- "type" : "date",
- "format" : "strict_date_optional_time||epoch_millis"
- },
- "target" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "path" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "details" : {
- "type" : "object"
- },
- "location" : {
- "type" : "object",
- "properties" : {
- "x" : {
- "type" : "integer"
- },
- "y" : {
- "type" : "integer"
- }
- }
- },
- "userId" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "session" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "toolName" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "toolVersion" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "useraleVersion" : {
- "index" : "not_analyzed",
- "type" : "string"
- },
- "major_ver" : {
- "type" : "integer"
- },
- "minor_ver" : {
- "type" : "integer"
- },
- "patch_ver" : {
- "type" : "integer"
- },
- "tool_major_ver" : {
- "type" : "integer"
- },
- "tool_minor_ver" : {
- "type" : "integer"
- },
- "tool_patch_ver" : {
- "type" : "integer"
- }
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 5137ad9..8afd240 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,10 +13,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Flask==0.10.1
-#networkx==1.11
-elasticsearch-dsl==2.0.0
-#numpy>=1.10.0
-#scipy>=0.17.0
-pandas>=0.18.1
-pytest>=3.0.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/setup.cfg
----------------------------------------------------------------------
diff --git a/setup.cfg b/setup.cfg
index 08020f4..b854127 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,11 +14,14 @@
# limitations under the License.
[egg_info]
-tag_build = 0.1.4
-tag_svn_revision = false
+tag_build = .dev
+tag_date = 1
[aliases]
test=pytest
+docs = build_sphinx
+daily = egg_info --tag-date sdist
+release = egg_info --tag-build=".rc" sdist bdist_wheel bdist_egg
[tool:pytest]
addopts = --verbose --ignore=build --ignore=setup.py --ignore=dist --junitxml=test-report.xml --cov-report xml --cov=distill distill/.
@@ -28,3 +31,9 @@ norecursedirs = *.eggs *env* .git
source-dir = docs
build-dir = docs/_build
all_files = 1
+
+[upload_sphinx]
+upload-dir = docs/_build/html
+
+[bdist_wheel]
+universal = 1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index dc7f9f3..e8814db 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
# limitations under the License.
from __future__ import absolute_import
-from setuptools import setup, find_packages
+import setuptools
import io
import os
import sys
@@ -24,10 +24,42 @@ if sys.version_info[:2] < (2, 7):
raise ImportError(m % sys.version_info[:2])
if sys.argv[-1] == 'setup.py':
- print ("To install, run 'python setup.py install'")
- print ()
+ print("To install, run 'python setup.py install'\n")
+ print("To run tests, run 'python setup.py test'\n")
+ print("To build docs, run 'python setup.py docs'\n")
+ print("To clean, run 'python setup.py clean'\n")
+class CleanCommand(setuptools.Command):
+ """
+ A command class to clean up build artifacts, including log files
+
+ python setup.py clean
+ """
+ description = "clean build artifacts"
+ user_options = []
+
+ def initialize_options(self):
+ """
+ Initialize Clean Command
+ """
+ self.cwd = None
+
+ def finalize_options(self):
+ """
+ Set Current Working directory for Clean Command
+
+ """
+ self.cwd = os.getcwd()
+
+ def run(self):
+ """
+ Execute Clean Command
+ """
+ assert os.getcwd() == self.cwd, 'Must be in package root: %s' % self.cwd
+ os.system('rm -rf ./docs/build ./build ./dist ./*.egg-info')
+ os.system('rm -rf ./*.log html_cov .coverage *.html')
+
def read(*filenames, **kwargs):
encoding = kwargs.get('encoding', 'utf-8')
sep = kwargs.get('sep', '\n')
@@ -48,39 +80,78 @@ def get_version():
raise RuntimeError('No version info found.')
-setup(
+setup_requires = [
+ 'pip >= 9.0.1',
+ 'setuptools >= 34.0',
+ 'pytest-runner',
+]
+
+install_requires = [
+ 'elasticsearch-dsl >= 5.0.0',
+ 'Flask >= 0.12.2',
+ 'celery',
+ 'pandas',
+]
+
+tests_require = [
+ 'pytest >= 3.0.0',
+ 'pytest-pylint',
+ 'pytest-html',
+ 'pytest-cov',
+]
+
+docs_require = [
+ 'Sphinx >= 1.5.2',
+ 'sphinx-rtd-theme >= 0.1.9',
+]
+
+extras_require = {
+ 'docker': [
+ 'docker-compose >= 1.12.0, < 1.13',
+ ],
+ 'test' : tests_require,
+ 'doc' : docs_require,
+ 'monitor': [
+ 'flower'
+ ]
+}
+
+classifiers = [
+ 'Development Status :: 4 - Beta',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Science/Research',
+ 'License :: OSI Approved :: Apache Software License',
+ 'Natural Language :: English',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.5',
+ 'Environment :: Web Environment',
+ 'Framework :: Flask',
+ 'Framework :: Pytest',
+ 'Topic :: Internet :: Log Analysis'
+]
+
+setuptools.setup(
name="Distill",
version=get_version(),
- url="https://github.com/apache/incubator-senssoft-distill",
+ url="http://senssoft.incubator.apache.org",
license="Apache Software License 2.0",
author="Michelle Beard",
author_email="msbeard@apache.org",
description="An analytical framework for UserALE.",
long_description=__doc__,
- classifiers=[
- 'Development Status :: 4 - Beta',
- 'Intended Audience :: Developers',
- 'Intended Audience :: Science/Research',
- 'License :: OSI Approved :: Apache Software License',
- 'Natural Language :: English',
- 'Operating System :: OS Independent',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.5',
- 'Environment :: Web Environment',
- 'Framework :: Flask',
- 'Framework :: Pytest',
- 'Topic :: Internet :: Log Analysis'
- ],
+ classifiers=classifiers,
keywords="stout userale tap distill",
- packages=find_packages(exclude=['examples', 'tests']),
+ packages=setuptools.find_packages(exclude=['examples', 'tests']),
include_package_data=True,
zip_safe=False,
- setup_requires=['pytest-runner'],
- tests_require=['pytest>=3.0.0', 'pytest-pylint', 'coverage'],
- install_requires=['Flask==0.10.1',
- 'elasticsearch-dsl==2.0.0',
- 'pandas>=0.18.1'],
+ cmdclass={
+ 'clean': CleanCommand,
+ },
+ setup_requires=setup_requires,
+ tests_require=tests_require,
+ install_requires=install_requires,
entry_points={
'console_scripts': [
'dev = distill.server:dev_server'
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/2a8d3e72/test_requirements.txt
----------------------------------------------------------------------
diff --git a/test_requirements.txt b/test_requirements.txt
deleted file mode 100644
index 3201881..0000000
--- a/test_requirements.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-pylint==1.6.4
-pytest==3.0.3
-pytest-cov==2.4.0
-pytest-runner==2.9
-pytest-pylint
-coverage==4.2
[3/6] incubator-senssoft-distill git commit: #SENSSOFT-193: Cleaning
up directory structure including tests
Posted by ms...@apache.org.
#SENSSOFT-193: Cleaning up directory structure including tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/commit/81f24142
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/tree/81f24142
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/diff/81f24142
Branch: refs/heads/elk5.4-upgrade
Commit: 81f24142afdeca6320531aec7ee1e8728a96f8d8
Parents: 713c740
Author: msbeard <ms...@apache.org>
Authored: Thu Jun 22 11:31:24 2017 -0400
Committer: msbeard <ms...@apache.org>
Committed: Thu Jun 22 11:31:24 2017 -0400
----------------------------------------------------------------------
distill/config.cfg | 57 ------------------------------------------
distill/config/config.cfg | 57 ++++++++++++++++++++++++++++++++++++++++++
tests/__init__.py | 21 ----------------
tests/basic_test.py | 25 ------------------
tests/distill_test.py | 41 ------------------------------
tests/test_app.py | 25 ++++++++++++++++++
tests/test_userale.py | 41 ++++++++++++++++++++++++++++++
7 files changed, 123 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/distill/config.cfg
----------------------------------------------------------------------
diff --git a/distill/config.cfg b/distill/config.cfg
deleted file mode 100644
index 189e3ea..0000000
--- a/distill/config.cfg
+++ /dev/null
@@ -1,57 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Statement for enabling the development environment
-DEBUG = True
-
-# Host
-HOST = '0.0.0.0'
-
-# Port
-PORT = 8090
-
-# Enable STOUT integration into Distill
-ENABLE_STOUT = False
-SQLITEDB = '../path/to/stout/stout.db'
-MASTER = '../path/to/master/master_ans.csv'
-MAPPINGS = '../path/to/mappings/MOT_Mappings.csv'
-SELECTED = '../path/to/stout/selected_vars_for_distill.csv'
-
-# Elasticsearch Configuration
-ES_HOST = 'http://elasticsearch'
-ES_PORT = 9200
-HTTP_AUTH = None
-USE_SSL = False
-VERIFY_CERTS = False
-CA_CERTS = None
-CLIENT_CERT = None
-CLIENT_KEY = None
-TIMEOUT = 3
-
-# Application threads. A common general assumption is
-# using 2 per available processor cores - to handle
-# incoming requests using one and performing background
-# operations using the other.
-THREADS_PER_PAGE = 2
-
-# Enable protection agains *Cross-site Request Forgery (CSRF)*
-# CSRF_ENABLED = True
-
-# Use a secure, unique and absolutely secret key for
-# signing the data.
-# CSRF_SESSION_KEY = "secret"
-
-# Secret key for signing cookies
-# SECRET_KEY = "secret"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/distill/config/config.cfg
----------------------------------------------------------------------
diff --git a/distill/config/config.cfg b/distill/config/config.cfg
new file mode 100644
index 0000000..189e3ea
--- /dev/null
+++ b/distill/config/config.cfg
@@ -0,0 +1,57 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Statement for enabling the development environment
+DEBUG = True
+
+# Host
+HOST = '0.0.0.0'
+
+# Port
+PORT = 8090
+
+# Enable STOUT integration into Distill
+ENABLE_STOUT = False
+SQLITEDB = '../path/to/stout/stout.db'
+MASTER = '../path/to/master/master_ans.csv'
+MAPPINGS = '../path/to/mappings/MOT_Mappings.csv'
+SELECTED = '../path/to/stout/selected_vars_for_distill.csv'
+
+# Elasticsearch Configuration
+ES_HOST = 'http://elasticsearch'
+ES_PORT = 9200
+HTTP_AUTH = None
+USE_SSL = False
+VERIFY_CERTS = False
+CA_CERTS = None
+CLIENT_CERT = None
+CLIENT_KEY = None
+TIMEOUT = 3
+
+# Application threads. A common general assumption is
+# using 2 per available processor cores - to handle
+# incoming requests using one and performing background
+# operations using the other.
+THREADS_PER_PAGE = 2
+
+# Enable protection agains *Cross-site Request Forgery (CSRF)*
+# CSRF_ENABLED = True
+
+# Use a secure, unique and absolutely secret key for
+# signing the data.
+# CSRF_SESSION_KEY = "secret"
+
+# Secret key for signing cookies
+# SECRET_KEY = "secret"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/tests/__init__.py
----------------------------------------------------------------------
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index 09c5e2f..0000000
--- a/tests/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-'''
-distill: tests module.
-
-Meant for use with py.test.
-Organize tests into files, each named xxx_test.py
-Read more here: http://pytest.org/
-'''
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/tests/basic_test.py
----------------------------------------------------------------------
diff --git a/tests/basic_test.py b/tests/basic_test.py
deleted file mode 100644
index 3f44294..0000000
--- a/tests/basic_test.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-'''
-distill: Test module.
-
-Meant for use with py.test.
-Write each test as a function named test_<something>.
-Read more here: http://pytest.org/
-'''
-
-
-def test_example():
- assert True
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/tests/distill_test.py
----------------------------------------------------------------------
diff --git a/tests/distill_test.py b/tests/distill_test.py
deleted file mode 100644
index dc64027..0000000
--- a/tests/distill_test.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-def test_example():
- assert True
- # with test_app.test_client () as c:
- # rv = c.get ('/?tequila=42')
- # assert request.args ['tequila'] == '42'
-
-# import os
-# import flaskr
-# import unittest
-# import tempfile
-
-# class FlaskrTestCase(unittest.TestCase):
-
-# def setUp(self):
-# self.db_fd, flaskr.app.config['DATABASE'] = tempfile.mkstemp()
-# flaskr.app.config['TESTING'] = True
-# self.app = flaskr.app.test_client()
-# flaskr.init_db()
-
-# def tearDown(self):
-# os.close(self.db_fd)
-# os.unlink(flaskr.app.config['DATABASE'])
-
-# if __name__ == '__main__':
-# unittest.main()
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/tests/test_app.py
----------------------------------------------------------------------
diff --git a/tests/test_app.py b/tests/test_app.py
new file mode 100644
index 0000000..3f44294
--- /dev/null
+++ b/tests/test_app.py
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+'''
+distill: Test module.
+
+Meant for use with py.test.
+Write each test as a function named test_<something>.
+Read more here: http://pytest.org/
+'''
+
+
+def test_example():
+ assert True
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/tests/test_userale.py
----------------------------------------------------------------------
diff --git a/tests/test_userale.py b/tests/test_userale.py
new file mode 100644
index 0000000..dc64027
--- /dev/null
+++ b/tests/test_userale.py
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+def test_example():
+ assert True
+ # with test_app.test_client () as c:
+ # rv = c.get ('/?tequila=42')
+ # assert request.args ['tequila'] == '42'
+
+# import os
+# import flaskr
+# import unittest
+# import tempfile
+
+# class FlaskrTestCase(unittest.TestCase):
+
+# def setUp(self):
+# self.db_fd, flaskr.app.config['DATABASE'] = tempfile.mkstemp()
+# flaskr.app.config['TESTING'] = True
+# self.app = flaskr.app.test_client()
+# flaskr.init_db()
+
+# def tearDown(self):
+# os.close(self.db_fd)
+# os.unlink(flaskr.app.config['DATABASE'])
+
+# if __name__ == '__main__':
+# unittest.main()
[2/6] incubator-senssoft-distill git commit: #SENSSOFT-193: Cleanup
tests
Posted by ms...@apache.org.
#SENSSOFT-193: Cleanup tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/commit/713c7401
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/tree/713c7401
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/diff/713c7401
Branch: refs/heads/elk5.4-upgrade
Commit: 713c7401e66549e840e3e6146b732f86ed63a093
Parents: 2a8d3e7
Author: msbeard <ms...@apache.org>
Authored: Thu Jun 22 11:27:10 2017 -0400
Committer: msbeard <ms...@apache.org>
Committed: Thu Jun 22 11:27:10 2017 -0400
----------------------------------------------------------------------
distill/algorithms/graphs/tests/__init__.py | 22 -------------
distill/algorithms/stats/tests/__init__.py | 22 -------------
distill/algorithms/tests/__init__.py | 14 --------
distill/models/tests/__init__.py | 22 -------------
distill/tests/__init__.py | 21 ------------
distill/tests/basic_test.py | 25 ---------------
distill/tests/distill_test.py | 41 ------------------------
distill/utils/tests/__init__.py | 21 ------------
tests/__init__.py | 21 ++++++++++++
tests/basic_test.py | 25 +++++++++++++++
tests/distill_test.py | 41 ++++++++++++++++++++++++
11 files changed, 87 insertions(+), 188 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/713c7401/distill/algorithms/graphs/tests/__init__.py
----------------------------------------------------------------------
diff --git a/distill/algorithms/graphs/tests/__init__.py b/distill/algorithms/graphs/tests/__init__.py
deleted file mode 100644
index 329a18d..0000000
--- a/distill/algorithms/graphs/tests/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-'''
-distill: tests module.
-
-Meant for use with py.test.
-Organize tests into files, each named xxx_test.py
-Read more here: http://pytest.org/
-'''
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/713c7401/distill/algorithms/stats/tests/__init__.py
----------------------------------------------------------------------
diff --git a/distill/algorithms/stats/tests/__init__.py b/distill/algorithms/stats/tests/__init__.py
deleted file mode 100644
index 329a18d..0000000
--- a/distill/algorithms/stats/tests/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-'''
-distill: tests module.
-
-Meant for use with py.test.
-Organize tests into files, each named xxx_test.py
-Read more here: http://pytest.org/
-'''
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/713c7401/distill/algorithms/tests/__init__.py
----------------------------------------------------------------------
diff --git a/distill/algorithms/tests/__init__.py b/distill/algorithms/tests/__init__.py
deleted file mode 100644
index 6acb5d1..0000000
--- a/distill/algorithms/tests/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/713c7401/distill/models/tests/__init__.py
----------------------------------------------------------------------
diff --git a/distill/models/tests/__init__.py b/distill/models/tests/__init__.py
deleted file mode 100644
index 329a18d..0000000
--- a/distill/models/tests/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-'''
-distill: tests module.
-
-Meant for use with py.test.
-Organize tests into files, each named xxx_test.py
-Read more here: http://pytest.org/
-'''
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/713c7401/distill/tests/__init__.py
----------------------------------------------------------------------
diff --git a/distill/tests/__init__.py b/distill/tests/__init__.py
deleted file mode 100644
index 09c5e2f..0000000
--- a/distill/tests/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-'''
-distill: tests module.
-
-Meant for use with py.test.
-Organize tests into files, each named xxx_test.py
-Read more here: http://pytest.org/
-'''
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/713c7401/distill/tests/basic_test.py
----------------------------------------------------------------------
diff --git a/distill/tests/basic_test.py b/distill/tests/basic_test.py
deleted file mode 100644
index 3f44294..0000000
--- a/distill/tests/basic_test.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-'''
-distill: Test module.
-
-Meant for use with py.test.
-Write each test as a function named test_<something>.
-Read more here: http://pytest.org/
-'''
-
-
-def test_example():
- assert True
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/713c7401/distill/tests/distill_test.py
----------------------------------------------------------------------
diff --git a/distill/tests/distill_test.py b/distill/tests/distill_test.py
deleted file mode 100644
index dc64027..0000000
--- a/distill/tests/distill_test.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-def test_example():
- assert True
- # with test_app.test_client () as c:
- # rv = c.get ('/?tequila=42')
- # assert request.args ['tequila'] == '42'
-
-# import os
-# import flaskr
-# import unittest
-# import tempfile
-
-# class FlaskrTestCase(unittest.TestCase):
-
-# def setUp(self):
-# self.db_fd, flaskr.app.config['DATABASE'] = tempfile.mkstemp()
-# flaskr.app.config['TESTING'] = True
-# self.app = flaskr.app.test_client()
-# flaskr.init_db()
-
-# def tearDown(self):
-# os.close(self.db_fd)
-# os.unlink(flaskr.app.config['DATABASE'])
-
-# if __name__ == '__main__':
-# unittest.main()
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/713c7401/distill/utils/tests/__init__.py
----------------------------------------------------------------------
diff --git a/distill/utils/tests/__init__.py b/distill/utils/tests/__init__.py
deleted file mode 100644
index 29767a2..0000000
--- a/distill/utils/tests/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-'''
-distill: tests module.
-
-Meant for use with py.test.
-Organize tests into files, each named xxx_test.py
-Read more here: http://pytest.org/
-'''
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/713c7401/tests/__init__.py
----------------------------------------------------------------------
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..09c5e2f
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+'''
+distill: tests module.
+
+Meant for use with py.test.
+Organize tests into files, each named xxx_test.py
+Read more here: http://pytest.org/
+'''
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/713c7401/tests/basic_test.py
----------------------------------------------------------------------
diff --git a/tests/basic_test.py b/tests/basic_test.py
new file mode 100644
index 0000000..3f44294
--- /dev/null
+++ b/tests/basic_test.py
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+'''
+distill: Test module.
+
+Meant for use with py.test.
+Write each test as a function named test_<something>.
+Read more here: http://pytest.org/
+'''
+
+
+def test_example():
+ assert True
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/713c7401/tests/distill_test.py
----------------------------------------------------------------------
diff --git a/tests/distill_test.py b/tests/distill_test.py
new file mode 100644
index 0000000..dc64027
--- /dev/null
+++ b/tests/distill_test.py
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+def test_example():
+ assert True
+ # with test_app.test_client () as c:
+ # rv = c.get ('/?tequila=42')
+ # assert request.args ['tequila'] == '42'
+
+# import os
+# import flaskr
+# import unittest
+# import tempfile
+
+# class FlaskrTestCase(unittest.TestCase):
+
+# def setUp(self):
+# self.db_fd, flaskr.app.config['DATABASE'] = tempfile.mkstemp()
+# flaskr.app.config['TESTING'] = True
+# self.app = flaskr.app.test_client()
+# flaskr.init_db()
+
+# def tearDown(self):
+# os.close(self.db_fd)
+# os.unlink(flaskr.app.config['DATABASE'])
+
+# if __name__ == '__main__':
+# unittest.main()
[6/6] incubator-senssoft-distill git commit: #SENSSOFT-195: Updated
dependencies
Posted by ms...@apache.org.
#SENSSOFT-195: Updated dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/commit/9f745a79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/tree/9f745a79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/diff/9f745a79
Branch: refs/heads/elk5.4-upgrade
Commit: 9f745a79aade70942ee3971315238c7697e7dfd4
Parents: 55ae246
Author: msbeard <ms...@apache.org>
Authored: Thu Jun 22 12:15:58 2017 -0400
Committer: msbeard <ms...@apache.org>
Committed: Thu Jun 22 12:15:58 2017 -0400
----------------------------------------------------------------------
requirements.txt | 77 +++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 62 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/9f745a79/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 8afd240..27e241e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,62 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
+alabaster==0.7.10
+amqp==2.1.4
+astroid==1.5.3
+Babel==2.4.0
+backports-abc==0.5
+backports.functools-lru-cache==1.4
+backports.ssl-match-hostname==3.5.0.1
+billiard==3.5.0.2
+cached-property==1.3.0
+celery==4.0.2
+certifi==2017.4.17
+chardet==3.0.4
+click==6.7
+colorama==0.3.9
+configparser==3.5.0
+coverage==4.4.1
+docker==2.3.0
+docker-compose==1.12.0
+docker-pycreds==0.2.1
+dockerpty==0.4.1
+docopt==0.6.2
+docutils==0.13.1
+elasticsearch==5.4.0
+elasticsearch-dsl==5.3.0
+enum34==1.1.6
+Flask==0.12.2
+flower==0.9.2
+functools32==3.2.3.post2
+futures==3.1.1
+idna==2.5
+imagesize==0.7.1
+ipaddress==1.0.18
+isort==4.2.15
+itsdangerous==0.24
+Jinja2==2.9.6
+jsonschema==2.6.0
+kombu==4.0.2
+lazy-object-proxy==1.3.1
+MarkupSafe==1.0
+mccabe==0.6.1
+numpy==1.13.0
+pandas==0.20.2
+Pygments==2.2.0
+pylint==1.7.1
+python-dateutil==2.6.0
+pytz==2017.2
+PyYAML==3.12
+requests==2.11.1
+singledispatch==3.4.0.3
+six==1.10.0
+snowballstemmer==1.2.1
+Sphinx==1.6.2
+sphinx-rtd-theme==0.2.4
+sphinxcontrib-websupport==1.0.1
+texttable==0.8.8
+tornado==4.5.1
+typing==3.6.1
+urllib3==1.21.1
+vine==1.1.3
+websocket-client==0.43.0
+Werkzeug==0.12.2
+wrapt==1.10.10
[5/6] incubator-senssoft-distill git commit: #SENSSOFT-193: Updated
documentation and test runners
Posted by ms...@apache.org.
#SENSSOFT-193: Updated documentation and test runners
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/commit/55ae2464
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/tree/55ae2464
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/diff/55ae2464
Branch: refs/heads/elk5.4-upgrade
Commit: 55ae2464416739a703522aaf3964dee56b41edde
Parents: cf3a795
Author: msbeard <ms...@apache.org>
Authored: Thu Jun 22 12:13:01 2017 -0400
Committer: msbeard <ms...@apache.org>
Committed: Thu Jun 22 12:13:01 2017 -0400
----------------------------------------------------------------------
.coveragerc | 28 ++++++++++++++++++++++++++++
AUTHORS.rst | 2 +-
CHANGELOG.rst | 4 +---
CONTRIBUTING.rst | 12 ++++++------
DISCLAIMER.txt | 2 +-
README.rst | 11 +++++------
distill/__init__.py | 2 +-
pytest.ini | 12 ++++++++++++
setup.cfg | 4 +---
setup.py | 9 +++++----
10 files changed, 61 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/55ae2464/.coveragerc
----------------------------------------------------------------------
diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..607377a
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,28 @@
+# .coveragerc to control coverage.py
+[run]
+# Measure branch coverage in addition to statement coverage
+branch = True
+source = distill
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+ # Have to re-enable the standard pragma
+ pragma: no cover
+
+ # Don't complain about missing debug-only code:
+ def __repr__
+ if self\.debug
+
+ # Don't complain if tests don't hit defensive assertion code:
+ raise AssertionError
+ raise NotImplementedError
+
+ # Don't complain if non-runnable code isn't run:
+ if 0:
+ if __name__ == .__main__.:
+
+ignore_errors = True
+
+[xml]
+output = coverage.xml
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/55ae2464/AUTHORS.rst
----------------------------------------------------------------------
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 692b03a..fc846b0 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -31,4 +31,4 @@ Additional Staff
- Laura Mariano <lm...@apache.org>
- Dr. Joshua Poore <jp...@apache.org>
- Clay Gimenez <cg...@dapache.org>
-- Steven York <sy...@draper.com>
\ No newline at end of file
+- Arthi Vezhavendan <av...@apache.org>
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/55ae2464/CHANGELOG.rst
----------------------------------------------------------------------
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 310115f..fd615c1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -42,7 +42,6 @@ Changelog
0.0.2 (2016-06-14)
------------------
-
* Completed index route for status endpoint which lists all applications registered and their document count segmented by type.
* Updated setup.py to reference deploy scripts
* Example configuration to deploy Distill with Gunicorn and Nginx for Linux/Mac users
@@ -51,5 +50,4 @@ Changelog
0.0.1 (2016-04-01)
------------------
-
-Initial alpha release.
\ No newline at end of file
+* Initial alpha release.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/55ae2464/CONTRIBUTING.rst
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 2b08027..e6a9f2e 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -18,10 +18,10 @@
.. _contributing:
-Contributing to Apache Distill
-------------------------------
+Contributing to Apache SensSoft
+-------------------------------
-Thank you for contributing to the Apache Distill project!
+Thank you for contributing to the Distill project!
There are certain procedures that must be followed for all contributions. These
procedures are necessary to allow us to allocate resources for reviewing and
@@ -30,7 +30,7 @@ the review process.
1) Create an issue in JIRA
- All changes to Apache Distill must have a corresponding issue in JIRA so the
+ All changes to Distill must have a corresponding issue in JIRA so the
change can be properly tracked:
https://issues.apache.org/jira/browse/senssoft
@@ -40,7 +40,7 @@ the review process.
2) Make and test your changes locally
- The Apache Distill source is maintained in a git repository hosted on Apache:
+ The Distill source is maintained in a git repository hosted on Apache:
https://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill.git
@@ -64,5 +64,5 @@ the review process.
the corresponding topic branch you created when you began working on your
changes.
- The Apache Distill team will then review your changes and, if they pass review,
+ The Apache SensSoft team will then review your changes and, if they pass review,
your changes will be merged.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/55ae2464/DISCLAIMER.txt
----------------------------------------------------------------------
diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt
index 22afb45..fffac59 100644
--- a/DISCLAIMER.txt
+++ b/DISCLAIMER.txt
@@ -1,4 +1,4 @@
-Apache SensSoft Distill is an effort undergoing incubation at The Apache Software Foundation (ASF),
+Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF),
sponsored by the Apache Incubator project. Incubation is required of all newly accepted
projects until a further review indicates that the infrastructure, communications, and
decision making process have stabilized in a manner consistent with other successful
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/55ae2464/README.rst
----------------------------------------------------------------------
diff --git a/README.rst b/README.rst
index 9262457..a76a72b 100644
--- a/README.rst
+++ b/README.rst
@@ -19,11 +19,10 @@
Apache SensSoft Distill
=======================
-Apache Distill is part of the `SensSoft <http://sensssoft.incubator.apache.org>`_ software stack.
-It comprises an analytical engine for `SensSoft UserALE.js <https://github.com/apache/incubator-senssoft-user-ale>`_
-and `SensSoft UserALE.PyQt5 <https://github.com/apache/incubator-senssoft-userale-pyqt5>`_
-to interact with user activity logs and apply basic analtical operations to the data.
+Distill is part of the `Apache SensSoft <http://sensssoft.incubator.apache.org>`_ project.
+It comprises an analytical engine for `UserALE <http://senssoft.incubator.apache.org/userale/>`_
+to interact with user activity logs and apply basic analytical operations to the data.
-Install instructions can be found `here <https://draperlaboratory.github.io/distill/installation.html>`_.
+Install instructions can be found `here <http://senssoft.incubator.apache.org/docs/distill/>`_.
-A contribution guide has been provided `here <https://draperlaboratory.github.io/distill/contributing.html>`_.
\ No newline at end of file
+A contribution guide has been provided `here <http://senssoft.incubator.apache.org/docs/contributing.html>`_.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/55ae2464/distill/__init__.py
----------------------------------------------------------------------
diff --git a/distill/__init__.py b/distill/__init__.py
index 009d341..405850a 100644
--- a/distill/__init__.py
+++ b/distill/__init__.py
@@ -20,7 +20,7 @@ from elasticsearch_dsl.connections import connections
app = Flask(__name__)
# Load Configurations
-app.config.from_pyfile('config.cfg')
+app.config.from_pyfile('config/config.cfg')
# Unpack Elasticsearch configuration and create elasticsearch connection
host = app.config['ES_HOST']
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/55ae2464/pytest.ini
----------------------------------------------------------------------
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..eaaf884
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,12 @@
+[pytest]
+addopts = -s --strict --pylint --pylint-rcfile=.pylintrc --ignore=build --ignore=dist --ignore=docs --junitxml=test-report.xml
+norecursedirs = docs docker example build *.eggs *env* .git
+testpaths = tests distill
+markers =
+ unit: Unit tests are fast and only test a single module.
+ pylint: Run linter
+ integration: Integration tests integrate several modules or integrate with the OS.
+ interactive: Interactive tests require interaction with the user to complete.
+ requires_user_action: Test cannot run without user interaction.
+ requires_user_validation: Test cannot validate without user interaction, but can run for sanity.
+ only_interactive: This test can only be run in interactive mode.
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/55ae2464/setup.cfg
----------------------------------------------------------------------
diff --git a/setup.cfg b/setup.cfg
index b854127..e804958 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,11 +24,9 @@ daily = egg_info --tag-date sdist
release = egg_info --tag-build=".rc" sdist bdist_wheel bdist_egg
[tool:pytest]
-addopts = --verbose --ignore=build --ignore=setup.py --ignore=dist --junitxml=test-report.xml --cov-report xml --cov=distill distill/.
-norecursedirs = *.eggs *env* .git
[build_sphinx]
-source-dir = docs
+source-dir = docs/source
build-dir = docs/_build
all_files = 1
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/55ae2464/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index e8814db..c64db18 100644
--- a/setup.py
+++ b/setup.py
@@ -57,8 +57,8 @@ class CleanCommand(setuptools.Command):
Execute Clean Command
"""
assert os.getcwd() == self.cwd, 'Must be in package root: %s' % self.cwd
- os.system('rm -rf ./docs/build ./build ./dist ./*.egg-info')
- os.system('rm -rf ./*.log html_cov .coverage *.html')
+ os.system('rm -rf ./docs/_build ./build ./dist ./*.egg-info')
+ os.system('rm -rf ./*.log *.xml .coverage *.html')
def read(*filenames, **kwargs):
encoding = kwargs.get('encoding', 'utf-8')
@@ -88,9 +88,9 @@ setup_requires = [
install_requires = [
'elasticsearch-dsl >= 5.0.0',
+ 'pandas >= 0.20.2',
'Flask >= 0.12.2',
- 'celery',
- 'pandas',
+ 'celery >= 4.0.2',
]
tests_require = [
@@ -152,6 +152,7 @@ setuptools.setup(
setup_requires=setup_requires,
tests_require=tests_require,
install_requires=install_requires,
+ extras_require=extras_require,
entry_points={
'console_scripts': [
'dev = distill.server:dev_server'
[4/6] incubator-senssoft-distill git commit: #SENSSOFT-195: Removed
ELK references from docker-compose.yml
Posted by ms...@apache.org.
#SENSSOFT-195: Removed ELK references from docker-compose.yml
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/commit/cf3a7952
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/tree/cf3a7952
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/diff/cf3a7952
Branch: refs/heads/elk5.4-upgrade
Commit: cf3a7952b3dcd425437e12e61b260c6673d0dde9
Parents: 81f2414
Author: msbeard <ms...@apache.org>
Authored: Thu Jun 22 11:34:10 2017 -0400
Committer: msbeard <ms...@apache.org>
Committed: Thu Jun 22 11:34:10 2017 -0400
----------------------------------------------------------------------
docker-compose.yml | 51 ++++++++-----------------------------------------
1 file changed, 8 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/cf3a7952/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index df75cc9..4870fd7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,51 +17,16 @@
version: "2"
services:
+ # SensSoft Distill Application
distill:
- build:
- context: .
- dockerfile: ./docker/distill/Dockerfile
- container_name: distill
+ build: ./docker/distill
+ container_name: senssoft-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
- command: logstash -f /etc/logstash/conf.d/logstash.conf
- volumes:
- - ./userale:/var/log/senssoft
- depends_on:
- - elasticsearch
+ webserver:
+ build: ./docker/webserver
+ container_name: senssoft-distill-webserver
links:
- - elasticsearch
+ - distill