Repository: incubator-senssoft-distill Updated Branches: refs/heads/elk5.0-upgrade 923a3052e -> f784d8014
Cleaned up branch 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/f784d801 Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/tree/f784d801 Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/diff/f784d801 Branch: refs/heads/elk5.0-upgrade Commit: f784d8014096ddca082de6fb999360a9c22696ef Parents: 923a305 Author: msb3399 <mbe...@draper.com> Authored: Tue Apr 4 11:40:06 2017 -0400 Committer: msb3399 <mbe...@draper.com> Committed: Tue Apr 4 11:40:06 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.rst | 6 ++++++ docker/distill/Dockerfile | 35 +++++++++++++++++++++++++++++++++++ docker/es/Dockerfile | 2 +- docker/logstash/Dockerfile | 8 -------- setup.py | 24 ++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/f784d801/CHANGELOG.rst ---------------------------------------------------------------------- diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4f3281c..06b6678 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -21,6 +21,12 @@ Changelog ========= +0.1.4 (2017-04-30) +------------------ +* Upgraded ELK stack to 5.0 +* Incorporated Production deployment of Distill using gunicorn, supervisord, and nginx +* + 0.1.3 (2016-09-19) ------------------ * Moved to Apache. http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/f784d801/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/f784d801/docker/es/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/es/Dockerfile b/docker/es/Dockerfile index 8acde7c..153dfa2 100644 --- a/docker/es/Dockerfile +++ b/docker/es/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. FROM elasticsearch:5 -MAINTAINER Michelle Beard <msbe...@apache.org> +MAINTAINER Michelle Beard <mbe...@apache.org> # Install XPack # RUN elasticsearch-plugin install --batch x-pack \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/f784d801/docker/logstash/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/logstash/Dockerfile b/docker/logstash/Dockerfile index c38251b..8028a44 100644 --- a/docker/logstash/Dockerfile +++ b/docker/logstash/Dockerfile @@ -16,14 +16,6 @@ FROM logstash:5 MAINTAINER Michelle Beard <msbe...@apache.org> - -# 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 - # Setup Logstash COPY logstash.conf /etc/logstash/conf.d/logstash.conf COPY userale.json /etc/logstash/conf.d/userale.json http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/f784d801/setup.py ---------------------------------------------------------------------- diff --git a/setup.py b/setup.py index dc7f9f3..e330939 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,8 @@ from __future__ import absolute_import from setuptools import setup, find_packages +from distutils.cmd import Command + import io import os import sys @@ -38,6 +40,25 @@ def read(*filenames, **kwargs): return sep.join(buf) +class CleanCommand(Command): + """ + A command class to clean up build artifacts + + python setup.py clean + """ + description = "clean dist/build/*.egg directories" + user_options = [] + + def initialize_options(self): + self.cwd = None + + def finalize_options(self): + self.cwd = os.getcwd() + + def run(self): + assert os.getcwd() == self.cwd, 'Must be in package root: %s' % self.cwd + os.system('rm -rf ./build ./dist .eggs ./*.egg-info *.log *.xml .coverage') + # Get the version string def get_version(): basedir = os.path.dirname(__file__) @@ -73,6 +94,9 @@ setup( 'Topic :: Internet :: Log Analysis' ], keywords="stout userale tap distill", + cmdclass={ + 'clean': CleanCommand + }, packages=find_packages(exclude=['examples', 'tests']), include_package_data=True, zip_safe=False,
