Fix delete timeline stored in Opensearch (#46)

IR-723

Author: Zawadidone

.github/workflows/e2e-tests.yml

@@ -6,43 +6,6 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
-  # OpenSearch version 1.x.x
-  PyPi-plaso-stable-opensearch-v1:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [ubuntu-22.04]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up infrastructure with docker compose
-        run: docker compose -f docker/e2e/docker-compose.yml up -d
-        env:
-          OPENSEARCH_VERSION: 1.3.10
-          PLASO_PPA_TRACK: stable
-      - name: Run e2e tests
-        run: docker compose -f docker/e2e/docker-compose.yml exec -T timesketch python3 /usr/local/src/timesketch/end_to_end_tests/tools/run_in_container.py
-      - name: Dump docker logs on failure
-        if: failure()
-        uses: jwalton/gh-docker-logs@v2
-  PyPi-plaso-staging-opensearch-v1:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [ubuntu-22.04]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up infrastructure with docker compose
-        run: docker compose -f docker/e2e/docker-compose.yml up -d
-        env:
-          OPENSEARCH_VERSION: 1.3.10
-          PLASO_PPA_TRACK: staging
-      - name: Run e2e tests
-        run: docker compose -f docker/e2e/docker-compose.yml exec -T timesketch python3 /usr/local/src/timesketch/end_to_end_tests/tools/run_in_container.py
-      - name: Dump docker logs on failure
-        if: failure()
-        uses: jwalton/gh-docker-logs@v2
-
-  # OpenSearch version 2.x.x
   PyPi-plaso-stable-opensearch-v2:
     runs-on: ubuntu-latest
     strategy:
@@ -60,21 +23,3 @@ jobs:
       - name: Dump docker logs on failure
         if: failure()
         uses: jwalton/gh-docker-logs@v2
-  PyPi-plaso-staging-opensearch-v2:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [ubuntu-22.04]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up infrastructure with docker compose
-        run: docker compose -f docker/e2e/docker-compose.yml up -d
-        env:
-          OPENSEARCH_VERSION: 2.9.0
-          PLASO_PPA_TRACK: staging
-      - name: Run e2e tests
-        run: docker compose -f docker/e2e/docker-compose.yml exec -T timesketch python3 /usr/local/src/timesketch/end_to_end_tests/tools/run_in_container.py
-      - name: Dump docker logs on failure
-        if: failure()
-        uses: jwalton/gh-docker-logs@v2
-

contrib/tsdev.sh

@@ -43,7 +43,7 @@ else
 fi
 
 # Set variables required to execute commands
-CONTAINER_ID="$($s docker container list --filter name='timesketch-dev' --quiet)"
+CONTAINER_ID="$($s docker container list --filter name='timesketch' --quiet)"
 frontend="frontend-ng"
 
 # Run the provided command

docker/dev/README.md

@@ -18,23 +18,29 @@ If you see the following message you can continue
 ```
 Timesketch development server is ready!
 ```
+
 ### Find out container ID for the timesketch container
 
 ```
-CONTAINER_ID="$(docker container list -f name=timesketch-dev -q)"
+CONTAINER_ID="$(docker container list -f name=timesketch -q)"
 ```
+
 In the output look for CONTAINER ID for the timesketch container
 
 To write the ID to a variable, use:
+
 ```
-export CONTAINER_ID="$(docker container list -f name=timesketch-dev -q)"
+export CONTAINER_ID="$(docker container list -f name=timesketch -q)"
 ```
+
 and test with
+
 ```
 echo $CONTAINER_ID
 ```
 
 ### Start a celery container shell
+
 ```
 docker exec -it $CONTAINER_ID celery -A timesketch.lib.tasks worker --loglevel info
 ```
@@ -45,17 +51,18 @@ docker exec -it $CONTAINER_ID celery -A timesketch.lib.tasks worker --loglevel i
 docker exec -it $CONTAINER_ID gunicorn --reload -b 0.0.0.0:5000 --log-file - --timeout 600 -c /usr/local/src/timesketch/data/gunicorn_config.py timesketch.wsgi:application
 ```
 
-You now can access your development version at http://127.0.0.1:5000/
+You now can access your development version at <http://127.0.0.1:5000/>
 
 Log in with user: dev password: dev
 
-You can also access a metrics dashboard at http://127.0.0.1:3000/
+You can also access a metrics dashboard at <http://127.0.0.1:3000/>
 
 ### Non-interactive
 
 Running the following as a script after `docker compose up -d` will bring up the development environment in the background for you.
+
 ```
-export CONTAINER_ID="$(docker container list -f name=timesketch-dev -q)"
+export CONTAINER_ID="$(docker container list -f name=timesketch -q)"
 docker exec $CONTAINER_ID celery -A timesketch.lib.tasks worker --loglevel info
 docker exec $CONTAINER_ID gunicorn --reload -b 0.0.0.0:5000 --log-file - --timeout 120 timesketch.wsgi:application
 ```
@@ -71,7 +78,7 @@ That will run all tests in your docker container. It is recommended to run all t
 ### Jupyter Notebook
 
 To access a Jupyter notebook that has access to the Timesketch development
-environment start a browser and visit http://localhost:8844/ . The password to
+environment start a browser and visit <http://localhost:8844/> . The password to
 gain access is "timesketch".
 
 By default the /tmp directory is mapped as the data directory to store all
@@ -110,5 +117,5 @@ active.
 To update the docker image run:
 
 ```shell
-$ sudo docker image pull us-docker.pkg.dev/osdfir-registry/timesketch/notebook:latest
+sudo docker image pull us-docker.pkg.dev/osdfir-registry/timesketch/notebook:latest
 ```

docker/dev/docker-compose.yml

@@ -1,13 +1,12 @@
 version: "3"
 services:
   timesketch:
-    container_name: timesketch-dev
+    container_name: timesketch
     image: us-docker.pkg.dev/osdfir-registry/timesketch/dev:latest
     command: timesketch
     ports:
       - 127.0.0.1:5000:5000
       - 127.0.0.1:5001:5001
-      - 127.0.0.1:8080:8080
     links:
       - opensearch
       - postgres

docker/dev/restart.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
-export CONTAINER_ID="$(docker container list -f name=timesketch-dev -q)"
+export CONTAINER_ID="$(docker container list -f name=timesketch -q)"
 docker exec -d $CONTAINER_ID celery -A timesketch.lib.tasks worker --loglevel info
 docker exec -d $CONTAINER_ID gunicorn --reload -b 0.0.0.0:5000 --log-file - --timeout 600 -c /usr/local/src/timesketch/data/gunicorn_config.py timesketch.wsgi:application

docker/dev/start_frontend.sh

@@ -4,7 +4,7 @@ echo "[i] Script (NOT TESTED) to run the frontend in dev mode"
 echo "[i] Run this script in timesketch/docker/dev"
 echo "[i] Remember to run 'docker compose up -d' to start the containers"
 
-CONTAINER_ID="$(docker container list -f name=timesketch-dev -q)"
+CONTAINER_ID="$(docker container list -f name=timesketch -q)"
 docker exec -d $CONTAINER_ID celery -A timesketch.lib.tasks worker --loglevel info
 docker compose exec timesketch yarn install --cwd=/usr/local/src/timesketch/timesketch/frontend
 docker compose exec -d timesketch yarn run --cwd=/usr/local/src/timesketch/timesketch/frontend build --mode development --watch

docs/developers/frontend-development.md

@@ -49,14 +49,14 @@ You need two shells:
 1. Start the main webserver (for serving the API etc) in the first shell:
 
 ```bash
-CONTAINER_ID="$(docker container list -f name=timesketch-dev -q)"
+CONTAINER_ID="$(docker container list -f name=timesketch -q)"
 docker exec -it $CONTAINER_ID gunicorn --reload -b 0.0.0.0:5000 --log-file - --timeout 600 -c /usr/local/src/timesketch/data/gunicorn_config.py timesketch.wsgi:application
 ```
 
 2. Start the development webserver in the second shell:
 
 ```bash
-CONTAINER_ID="$(docker container list -f name=timesketch-dev -q)"
+CONTAINER_ID="$(docker container list -f name=timesketch -q)"
 docker compose exec timesketch yarn run --cwd=/usr/local/src/timesketch/timesketch/frontend serve
 ```
 
@@ -102,14 +102,14 @@ You need two shells:
 1. Start the main webserver (for serving the API etc) in the first shell:
 
 ```bash
-CONTAINER_ID="$(docker container list -f name=timesketch-dev -q)"
+CONTAINER_ID="$(docker container list -f name=timesketch -q)"
 docker exec -it $CONTAINER_ID gunicorn --reload -b 0.0.0.0:5000 --log-file - --timeout 600 -c /usr/local/src/timesketch/data/gunicorn_config.py timesketch.wsgi:application
 ```
 
 2. Start the development webserver in the second shell:
 
 ```bash
-CONTAINER_ID="$(docker container list -f name=timesketch-dev -q)"
+CONTAINER_ID="$(docker container list -f name=timesketch -q)"
 docker compose exec timesketch yarn run --cwd=/usr/local/src/timesketch/timesketch/frontend-ng serve
 ```
 
@@ -124,7 +124,7 @@ If you already have a yarn process running with the "old" frontend, it might not
 Generate UI builds:
 
 ```bash
-CONTAINER_ID="$(docker container list -f name=timesketch-dev -q)"
+CONTAINER_ID="$(docker container list -f name=timesketch -q)"
 docker exec -it $CONTAINER_ID timesketch bash
 cd /usr/local/src/timesketch/timesketch/frontend-ng
 yarn build

docs/guides/admin/troubleshooting.md

@@ -115,7 +115,7 @@ If you started the webserver with docker, look in the console where you started:
 docker exec -it $CONTAINER_ID gunicorn --reload -b 0.0.0.0:5000 --log-file --timeout 600 timesketch.wsgi:application
 ```
 
-Or run the following where `$CONTAINER_ID` is the ID from your `timesketch-dev` or `timesketch` Docker container.
+Or run the following where `$CONTAINER_ID` is the ID from your `timesketch` Docker container.
 
 ```shell
 docker logs $CONTAINER_ID

timesketch/api/v1/resources/timeline.py

@@ -408,15 +408,6 @@ def delete(self, sketch_id, timeline_id):
                     close_index = False
                     break
 
-        if close_index:
-            try:
-                self.datastore.client.indices.close(index=searchindex.index_name)
-            except opensearchpy.NotFoundError:
-                logger.error(
-                    "Unable to close index: {0:s} - index not "
-                    "found".format(searchindex.index_name)
-                )
-
             searchindex.set_status(status="archived")
             timeline.set_status(status="archived")