moving /opt/datsets to /opt/antinex/datasets

jay-johnson · Jun 4, 2018 · 841125f · 841125f
1 parent 59bcb28
commit 841125f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/README.rst b/README.rst
@@ -635,10 +635,11 @@ Please export the path to the datasets repository on your host:
 
     export DS_DIR=<path_to_datasets_base_directory>
 
-Or clone the repository to the default value for the environment variable (``DS_DIR=/opt/datasets``) with:
+Or clone the repository to the default value for the environment variable (``DS_DIR=/opt/antinex/datasets``) with:
 
 ::
 
+    mkdir -p -m 777 /opt/antinex
     git clone https://github.com/jay-johnson/network-pipeline-datasets.git /opt/antinex/datasets
 
 Build Dataset
@@ -650,13 +651,13 @@ This will take a few moments to prepare the csv files.
 
     prepare_dataset.py
     2018-01-31 23:38:04,298 - builder - INFO - start - builder
-    2018-01-31 23:38:04,298 - builder - INFO - finding pipeline csvs in dir=/opt/datasets/*/*.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/react-redux/netdata-2018-01-29-13-36-35.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/spring/netdata-2018-01-29-15-00-12.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/vue/netdata-2018-01-29-14-12-44.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/django/netdata-2018-01-28-23-12-13.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/django/netdata-2018-01-28-23-06-05.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/flask-restplus/netdata-2018-01-29-11-30-02.csv
+    2018-01-31 23:38:04,298 - builder - INFO - finding pipeline csvs in dir=/opt/antinex/datasets/*/*.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/react-redux/netdata-2018-01-29-13-36-35.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/spring/netdata-2018-01-29-15-00-12.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/vue/netdata-2018-01-29-14-12-44.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/django/netdata-2018-01-28-23-12-13.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/django/netdata-2018-01-28-23-06-05.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/flask-restplus/netdata-2018-01-29-11-30-02.csv
 
 Verify Dataset and Tracking Files
 ---------------------------------

diff --git a/network_pipeline/scripts/builders/README.rst b/network_pipeline/scripts/builders/README.rst
@@ -30,11 +30,12 @@ Please export the path to the datasets repository on your host:
 
     export DS_DIR=<path_to_datasets_base_directory>
 
-Or clone the repository to the default value for the environment variable (``DS_DIR=/opt/datasets``) with:
+Or clone the repository to the default value for the environment variable (``DS_DIR=/opt/antinex/datasets``) with:
 
 ::
 
-    git clone https://github.com/jay-johnson/network-pipeline-datasets.git /opt/datasets
+    mkdir -p -m 777 /opt/antinex
+    git clone https://github.com/jay-johnson/network-pipeline-datasets.git /opt/antinex/datasets
 
 Build Dataset
 =============
@@ -45,13 +46,13 @@ This will take a few moments to prepare the csv files.
 
     prepare_dataset.py
     2018-01-31 23:38:04,298 - builder - INFO - start - builder
-    2018-01-31 23:38:04,298 - builder - INFO - finding pipeline csvs in dir=/opt/datasets/*/*.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/react-redux/netdata-2018-01-29-13-36-35.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/spring/netdata-2018-01-29-15-00-12.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/vue/netdata-2018-01-29-14-12-44.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/django/netdata-2018-01-28-23-12-13.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/django/netdata-2018-01-28-23-06-05.csv
-    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/datasets/flask-restplus/netdata-2018-01-29-11-30-02.csv
+    2018-01-31 23:38:04,298 - builder - INFO - finding pipeline csvs in dir=/opt/antinex/datasets/*/*.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/react-redux/netdata-2018-01-29-13-36-35.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/spring/netdata-2018-01-29-15-00-12.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/vue/netdata-2018-01-29-14-12-44.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/django/netdata-2018-01-28-23-12-13.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/django/netdata-2018-01-28-23-06-05.csv
+    2018-01-31 23:38:04,299 - builder - INFO - adding file=/opt/antinex/datasets/flask-restplus/netdata-2018-01-29-11-30-02.csv
 
 Verify Dataset and Tracking Files
 =================================

diff --git a/network_pipeline/scripts/builders/prepare_dataset.py b/network_pipeline/scripts/builders/prepare_dataset.py
@@ -426,7 +426,7 @@ def build_csv(
 
 
 def find_all_pipeline_csvs(
-        csv_glob_path="/opt/datasets/**/*.csv"):
+        csv_glob_path="/opt/antinex/datasets/**/*.csv"):
     """find_all_pipeline_csvs
 
     :param csv_glob_path: path to csvs
@@ -465,7 +465,7 @@ def prepare_new_dataset():
             clean_dir))
     dataset_dir = ev(
         "DS_DIR",
-        "/opt/datasets")
+        "/opt/antinex/datasets")
     csv_glob_path = ev(
         "DS_GLOB_PATH",
         "{}/*/*.csv".format(

diff --git a/setup.py b/setup.py
@@ -60,7 +60,7 @@ def networkpipeline_test_suite():
 setup(
     name="network-pipeline",
     cmdclass={"build_py": build_py},
-    version="1.0.20",
+    version="1.0.21",
     description="Distributed Network Packet Analysis Pipeline " +
     "for Layer 2, 3 and 4 Frames",
     long_description="" +