Merge pull request #1450 from mozilla/move_demo_events

Update example demo events
mozilla · Sep 6, 2019 · 0447418 · 0447418
2 parents d098cef + c4a8c58
commit 0447418
Show file tree

Hide file tree

Showing 40 changed files with 88 additions and 2,733 deletions.
diff --git a/benchmarking/es/insert_bulk.js b/benchmarking/es/insert_bulk.js
diff --git a/benchmarking/es/insert_simple.js b/benchmarking/es/insert_simple.js
diff --git a/benchmarking/es/search_all_fulltext.js b/benchmarking/es/search_all_fulltext.js
diff --git a/benchmarking/workers/json2Mozdef.py b/benchmarking/workers/json2Mozdef.py
diff --git a/docker/compose/dev-sampledata.yml b/docker/compose/dev-sampledata.yml
@@ -6,7 +6,7 @@ services:
       context: ../../
       dockerfile: docker/compose/mozdef_sampledata/Dockerfile
     restart: always
-    command: bash -c 'while ! timeout 1 bash -c "echo > /dev/tcp/elasticsearch/9200";do sleep 1;done && /opt/mozdef/envs/mozdef/examples/demo/sampleevents.sh'
+    command: bash -c 'while ! timeout 1 bash -c "echo > /dev/tcp/elasticsearch/9200";do sleep 1;done && /opt/mozdef/envs/mozdef/scripts/demo/populate_sample_events.sh'
     links:
       - elasticsearch
     depends_on:
@@ -17,4 +17,4 @@ services:
     networks:
       - default
     volumes:
-      - ../../examples:/opt/mozdef/envs/mozdef/examples
+      - ../../scripts/demo:/opt/mozdef/envs/mozdef/scripts/demo
diff --git a/docker/compose/mozdef_sampledata/Dockerfile b/docker/compose/mozdef_sampledata/Dockerfile
@@ -2,11 +2,6 @@ FROM mozdef/mozdef_base
 
 LABEL maintainer="mozdef@mozilla.com"
 
-COPY --chown=mozdef:mozdef ./examples /opt/mozdef/envs/mozdef/examples
+COPY --chown=mozdef:mozdef scripts/demo /opt/mozdef/envs/mozdef/scripts/demo
 
-COPY --chown=mozdef:mozdef docker/compose/mozdef_sampledata/files/sampleData2MozDef.conf /opt/mozdef/envs/mozdef/examples/demo/sampleData2MozDef.conf
-RUN chmod u+rwx /opt/mozdef/envs/mozdef/examples/demo/sampleevents.sh
-
-WORKDIR /opt/mozdef/envs/mozdef/examples/demo
-
-USER root
+WORKDIR /opt/mozdef/envs/mozdef/scripts/demo
diff --git a/docker/compose/mozdef_sampledata/files/sampleData2MozDef.conf b/docker/compose/mozdef_sampledata/files/sampleData2MozDef.conf
diff --git a/docker/compose/tester/Dockerfile b/docker/compose/tester/Dockerfile
@@ -6,7 +6,7 @@ RUN pip install -r /opt/mozdef/envs/mozdef/tests/requirements_tests.txt
 COPY alerts /opt/mozdef/envs/mozdef/alerts
 COPY bot /opt/mozdef/envs/mozdef/bot
 COPY cron /opt/mozdef/envs/mozdef/cron
-COPY examples /opt/mozdef/envs/mozdef/examples
+COPY scripts /opt/mozdef/envs/mozdef/scripts
 COPY loginput /opt/mozdef/envs/mozdef/loginput
 COPY mozdef_util /opt/mozdef/envs/mozdef/mozdef_util
 COPY mq /opt/mozdef/envs/mozdef/mq