From 229281a44ea24639edbe86c54bf9a1e798b694a9 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 16:15:26 -0600 Subject: [PATCH 01/24] Use env var SSD_DEVICE to pass SSD to container --- .github/workflows/github-actions-test.yml | 1 + docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-test.yml b/.github/workflows/github-actions-test.yml index ec289c2d..99472949 100644 --- a/.github/workflows/github-actions-test.yml +++ b/.github/workflows/github-actions-test.yml @@ -75,6 +75,7 @@ jobs: source ./env.template export MOCK_SIGAN=1 export MOCK_SIGAN_RANDOM=1 + export SSD_DEVICE=/dev/nvme0n1 docker-compose build --no-cache docker-compose up -d diff --git a/docker-compose.yml b/docker-compose.yml index 4987bce3..834a1a75 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -86,7 +86,7 @@ services: - SYS_ADMIN # required for ^ with NVMe drives devices: - /dev/bus/usb:/dev/bus/usb:rw - - /dev/nvme0n1:/dev/nvme0n1:ro + - ${SSD_DEVICE}:/dev/nvme0n1:ro extra_hosts: - "${MANAGER_FQDN}:${MANAGER_IP}" command: /entrypoints/api_entrypoint.sh From ee3b3111f7299fe49f2ae195c177d82c79482382 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 16:16:14 -0600 Subject: [PATCH 02/24] Add default SSD_DEVICE=/dev/nvme0n1 --- env.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/env.template b/env.template index f78e123e..96cd14a0 100644 --- a/env.template +++ b/env.template @@ -88,6 +88,8 @@ SSL_KEY_PATH=sensor01.pem USB_DEVICE=Tektronix +# Device made available to SCOS Plugins, e.g. for getting SMART data +SSD_DEVICE=/dev/nvme0n1 # Debug dependant settings if $DEBUG; then From 645b0349fdfe499d93baab9a1baa8147fba62edb Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 16:18:59 -0600 Subject: [PATCH 03/24] Configure API container shared memory size with env var --- docker-compose.yml | 7 +++---- env.template | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 834a1a75..2f9e79d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: interval: 6s timeout: 3s retries: 1 - shm_size: '16gb' + shm_size: ${API_SHM_SIZE} restart: always depends_on: db: @@ -59,8 +59,8 @@ services: - IN_DOCKER=1 - IPS - MAX_DISK_USAGE - - MOCK_SIGAN - - MOCK_SIGAN_RANDOM + - MOCK_SIGAN=1 + - MOCK_SIGAN_RANDOM=1 - PATH_TO_CLIENT_CERT - PATH_TO_VERIFY_CERT - POSTGRES_PASSWORD @@ -71,7 +71,6 @@ services: - SIGAN_POWER_SWITCH - SIGAN_POWER_CYCLE_STATES - RUNNING_MIGRATIONS - - USB_DEVICE expose: - '8000' volumes: diff --git a/env.template b/env.template index 96cd14a0..5eebc6d1 100644 --- a/env.template +++ b/env.template @@ -91,6 +91,10 @@ USB_DEVICE=Tektronix # Device made available to SCOS Plugins, e.g. for getting SMART data SSD_DEVICE=/dev/nvme0n1 +# Size of shared memory for API container (/dev/shm), used for parallel processing +# See https://docs.docker.com/compose/compose-file/compose-file-v3/#shm_size +API_SHM_SIZE='16gb' + # Debug dependant settings if $DEBUG; then GUNICORN_LOG_LEVEL=debug From 027b572e9415752f18311021e7f340fb9dc062f4 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 16:27:25 -0600 Subject: [PATCH 04/24] remove unnecessary quotes --- env.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env.template b/env.template index 5eebc6d1..9a7075a1 100644 --- a/env.template +++ b/env.template @@ -93,7 +93,7 @@ SSD_DEVICE=/dev/nvme0n1 # Size of shared memory for API container (/dev/shm), used for parallel processing # See https://docs.docker.com/compose/compose-file/compose-file-v3/#shm_size -API_SHM_SIZE='16gb' +API_SHM_SIZE=16gb # Debug dependant settings if $DEBUG; then From 48148333b90828ce00394a597817deb2c9b400e6 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 18:34:25 -0400 Subject: [PATCH 05/24] add SSD_DEVICE and API_SHM_SIZE to README --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 4bd31ab4..afd4c446 100644 --- a/README.md +++ b/README.md @@ -312,6 +312,8 @@ settings in the environment file: - ADMIN_EMAIL: Email used to generate admin user. Change in production. - ADMIN_NAME: Username for the admin user. - ADMIN_PASSWORD: Password used to generate admin user. Change in production. +- API_SHM_SIZE: Size to allocate shared memory (`/dev/shm`) in the API container. This + is currently used to allocate shared memory for parallel processing of IQ data with Ray. - AUTHENTICATION: Authentication method used for scos-sensor. Supports `TOKEN` or `CERT`. - BASE_IMAGE: Base docker image used to build the API container. These docker @@ -373,6 +375,9 @@ settings in the environment file: [WebRelay](https://github.com/NTIA/Preselector) that may be used to power cycle the signal analyzer if necessary. Note: specifics of power cycling behavior are implemented within the signal analyzer implementations or actions. +- SSD_DEVICE: The device (e.g., `/dev/sda/`) which is mapped to `/dev/nvme0n1` within + the API container. This is currently only used to retrieve SSD SMART diagnostics (in + SCOS Actions). - SSL_CA_PATH: Path to a CA certificate used to verify scos-sensor client certificate(s) when authentication is set to CERT. - SSL_CERT_PATH: Path to server SSL certificate. Replace the certificate in the From d3c541bc6bc3c6ea530c47e126a6879cba8e27d3 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 18:35:44 -0400 Subject: [PATCH 06/24] remove testing changes --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2f9e79d1..8a80f175 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,8 +59,8 @@ services: - IN_DOCKER=1 - IPS - MAX_DISK_USAGE - - MOCK_SIGAN=1 - - MOCK_SIGAN_RANDOM=1 + - MOCK_SIGAN + - MOCK_SIGAN_RANDOM - PATH_TO_CLIENT_CERT - PATH_TO_VERIFY_CERT - POSTGRES_PASSWORD From c795c983ffe1510dac0c9c0668b1a3712e4d2c4c Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 18:36:29 -0400 Subject: [PATCH 07/24] remove redundant environment variable setting --- .github/workflows/github-actions-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/github-actions-test.yml b/.github/workflows/github-actions-test.yml index 99472949..ec289c2d 100644 --- a/.github/workflows/github-actions-test.yml +++ b/.github/workflows/github-actions-test.yml @@ -75,7 +75,6 @@ jobs: source ./env.template export MOCK_SIGAN=1 export MOCK_SIGAN_RANDOM=1 - export SSD_DEVICE=/dev/nvme0n1 docker-compose build --no-cache docker-compose up -d From 340588cbdde78a5327f76951e67305e365e54ff7 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 10 May 2024 08:46:41 -0600 Subject: [PATCH 08/24] Automatically get SSD_DEVICE --- env.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/env.template b/env.template index 75a64e89..037b7b02 100644 --- a/env.template +++ b/env.template @@ -2,7 +2,6 @@ # Copy env.template to env and modify - # Mark all the following variables for export set -o allexport @@ -88,7 +87,7 @@ SSL_CERT_PATH=sensor01.pem SSL_KEY_PATH=sensor01.pem # Device made available to SCOS Plugins, e.g. for getting SMART data -SSD_DEVICE=/dev/nvme0n1 +SSD_DEVICE="$(lsblk -I 8 -npdo KNAME)" # Size of shared memory for API container (/dev/shm), used for parallel processing # See https://docs.docker.com/compose/compose-file/compose-file-v3/#shm_size From 5875313a2132c900895c8d6cd145ecfa0bea9442 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 10 May 2024 09:24:23 -0600 Subject: [PATCH 09/24] Fix SSD_DEVICE default for github actions runner --- .github/workflows/github-actions-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-test.yml b/.github/workflows/github-actions-test.yml index ec289c2d..2a426ff7 100644 --- a/.github/workflows/github-actions-test.yml +++ b/.github/workflows/github-actions-test.yml @@ -75,6 +75,7 @@ jobs: source ./env.template export MOCK_SIGAN=1 export MOCK_SIGAN_RANDOM=1 + export SSD_DEVICE=/dev/sda docker-compose build --no-cache docker-compose up -d From d804d6d1a4116f9bb37a6bdb6421c59d2eb188e1 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 16:15:26 -0600 Subject: [PATCH 10/24] Use env var SSD_DEVICE to pass SSD to container --- .github/workflows/github-actions-test.yml | 5 +++-- compose.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-test.yml b/.github/workflows/github-actions-test.yml index 6aaa7561..99472949 100644 --- a/.github/workflows/github-actions-test.yml +++ b/.github/workflows/github-actions-test.yml @@ -75,8 +75,9 @@ jobs: source ./env.template export MOCK_SIGAN=1 export MOCK_SIGAN_RANDOM=1 - docker compose build --no-cache - docker compose up -d + export SSD_DEVICE=/dev/nvme0n1 + docker-compose build --no-cache + docker-compose up -d - name: Wait for containers # wait for containers to finish starting run: sleep 45 diff --git a/compose.yaml b/compose.yaml index 6a2bec6d..2d7b185b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -95,7 +95,7 @@ services: - SYS_ADMIN # required for ^ with NVMe drives devices: - /dev/bus/usb:/dev/bus/usb:rw - - /dev/nvme0n1:/dev/nvme0n1:ro + - ${SSD_DEVICE}:/dev/nvme0n1:ro extra_hosts: - "${MANAGER_FQDN}:${MANAGER_IP}" logging: From c01814ab348efb2395ad28fa5e199b2e6116bd1c Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 16:16:14 -0600 Subject: [PATCH 11/24] Add default SSD_DEVICE=/dev/nvme0n1 --- env.template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/env.template b/env.template index cacf4bb6..671d5141 100644 --- a/env.template +++ b/env.template @@ -95,6 +95,9 @@ SSL_KEY_PATH=sensor01.pem # is available on startup. The specified action must be available. STARTUP_CALIBRATION_ACTION=SEA_CBRS_Calibrate_Baseline +# Device made available to SCOS Plugins, e.g. for getting SMART data +SSD_DEVICE=/dev/nvme0n1 + # Debug dependant settings if $DEBUG; then GUNICORN_LOG_LEVEL=debug From e4f343d399096c290532a0d56914663bafa51546 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 16:18:59 -0600 Subject: [PATCH 12/24] Configure API container shared memory size with env var --- compose.yaml | 7 +++---- env.template | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/compose.yaml b/compose.yaml index 2d7b185b..b3b7c15c 100644 --- a/compose.yaml +++ b/compose.yaml @@ -27,7 +27,7 @@ services: interval: 6s timeout: 3s retries: 1 - shm_size: '16gb' + shm_size: ${API_SHM_SIZE} restart: always depends_on: db: @@ -66,8 +66,8 @@ services: - IN_DOCKER=1 - IPS - MAX_DISK_USAGE - - MOCK_SIGAN - - MOCK_SIGAN_RANDOM + - MOCK_SIGAN=1 + - MOCK_SIGAN_RANDOM=1 - PATH_TO_CLIENT_CERT - PATH_TO_VERIFY_CERT - POSTGRES_PASSWORD @@ -80,7 +80,6 @@ services: - STARTUP_CALIBRATION_ACTION - RAY_INIT - RUNNING_MIGRATIONS - - USB_DEVICE expose: - '8000' volumes: diff --git a/env.template b/env.template index 671d5141..c0417ca6 100644 --- a/env.template +++ b/env.template @@ -98,6 +98,10 @@ STARTUP_CALIBRATION_ACTION=SEA_CBRS_Calibrate_Baseline # Device made available to SCOS Plugins, e.g. for getting SMART data SSD_DEVICE=/dev/nvme0n1 +# Size of shared memory for API container (/dev/shm), used for parallel processing +# See https://docs.docker.com/compose/compose-file/compose-file-v3/#shm_size +API_SHM_SIZE='16gb' + # Debug dependant settings if $DEBUG; then GUNICORN_LOG_LEVEL=debug From 80e4bd1ede3f7f540493595a50f0f0886e6cc67d Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 16:27:25 -0600 Subject: [PATCH 13/24] remove unnecessary quotes --- env.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env.template b/env.template index c0417ca6..19f57176 100644 --- a/env.template +++ b/env.template @@ -100,7 +100,7 @@ SSD_DEVICE=/dev/nvme0n1 # Size of shared memory for API container (/dev/shm), used for parallel processing # See https://docs.docker.com/compose/compose-file/compose-file-v3/#shm_size -API_SHM_SIZE='16gb' +API_SHM_SIZE=16gb # Debug dependant settings if $DEBUG; then From 4e55d69eef255c0421f388ad2d04cefc7662cdc8 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 10 May 2024 08:46:41 -0600 Subject: [PATCH 14/24] Automatically get SSD_DEVICE --- env.template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/env.template b/env.template index 19f57176..02f6296d 100644 --- a/env.template +++ b/env.template @@ -2,7 +2,6 @@ # Copy env.template to env and modify - # Mark all the following variables for export set -o allexport @@ -89,15 +88,19 @@ SSL_CA_PATH=scos_test_ca.crt SSL_CERT_PATH=sensor01.pem SSL_KEY_PATH=sensor01.pem +# Device made available to SCOS Plugins, e.g. for getting SMART data +SSD_DEVICE="$(lsblk -I 8 -npdo KNAME)" + +# Size of shared memory for API container (/dev/shm), used for parallel processing +# See https://docs.docker.com/compose/compose-file/compose-file-v3/#shm_size +API_SHM_SIZE=16gb + # Calibration action selection # The action specified here will be used to attempt an onboard # sensor calibration on startup, if no onboard calibration data # is available on startup. The specified action must be available. STARTUP_CALIBRATION_ACTION=SEA_CBRS_Calibrate_Baseline -# Device made available to SCOS Plugins, e.g. for getting SMART data -SSD_DEVICE=/dev/nvme0n1 - # Size of shared memory for API container (/dev/shm), used for parallel processing # See https://docs.docker.com/compose/compose-file/compose-file-v3/#shm_size API_SHM_SIZE=16gb From eb178f7cb6ca711684b80ceb4417d7d1664a7151 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 18:34:25 -0400 Subject: [PATCH 15/24] add SSD_DEVICE and API_SHM_SIZE to README --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index fafb58b9..0bbf4e2a 100644 --- a/README.md +++ b/README.md @@ -314,6 +314,8 @@ settings in the environment file: - ADMIN_EMAIL: Email used to generate admin user. Change in production. - ADMIN_NAME: Username for the admin user. - ADMIN_PASSWORD: Password used to generate admin user. Change in production. +- API_SHM_SIZE: Size to allocate shared memory (`/dev/shm`) in the API container. This + is currently used to allocate shared memory for parallel processing of IQ data with Ray. - AUTHENTICATION: Authentication method used for scos-sensor. Supports `TOKEN` or `CERT`. - BASE_IMAGE: Base docker image used to build the API container. These docker @@ -379,6 +381,9 @@ settings in the environment file: [WebRelay](https://github.com/NTIA/Preselector) that may be used to power cycle the signal analyzer if necessary. Note: specifics of power cycling behavior are implemented within the signal analyzer implementations or actions. +- SSD_DEVICE: The device (e.g., `/dev/sda/`) which is mapped to `/dev/nvme0n1` within + the API container. This is currently only used to retrieve SSD SMART diagnostics (in + SCOS Actions). - SSL_CA_PATH: Path to a CA certificate used to verify scos-sensor client certificate(s) when authentication is set to CERT. - SSL_CERT_PATH: Path to server SSL certificate. Replace the certificate in the From b9c5bf932af169c174be9beced625b516385baf3 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 18:35:44 -0400 Subject: [PATCH 16/24] remove testing changes --- compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yaml b/compose.yaml index b3b7c15c..13493349 100644 --- a/compose.yaml +++ b/compose.yaml @@ -66,8 +66,8 @@ services: - IN_DOCKER=1 - IPS - MAX_DISK_USAGE - - MOCK_SIGAN=1 - - MOCK_SIGAN_RANDOM=1 + - MOCK_SIGAN + - MOCK_SIGAN_RANDOM - PATH_TO_CLIENT_CERT - PATH_TO_VERIFY_CERT - POSTGRES_PASSWORD From e29e015136d3f14f2ff8c87add8e413474bb4929 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 22 Mar 2024 18:36:29 -0400 Subject: [PATCH 17/24] remove redundant environment variable setting --- .github/workflows/github-actions-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/github-actions-test.yml b/.github/workflows/github-actions-test.yml index 99472949..ec289c2d 100644 --- a/.github/workflows/github-actions-test.yml +++ b/.github/workflows/github-actions-test.yml @@ -75,7 +75,6 @@ jobs: source ./env.template export MOCK_SIGAN=1 export MOCK_SIGAN_RANDOM=1 - export SSD_DEVICE=/dev/nvme0n1 docker-compose build --no-cache docker-compose up -d From e6fd7153e1d6deddd0d5f31a97196f91b1190d03 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 10 May 2024 09:24:23 -0600 Subject: [PATCH 18/24] Fix SSD_DEVICE default for github actions runner --- .github/workflows/github-actions-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-test.yml b/.github/workflows/github-actions-test.yml index ec289c2d..2a426ff7 100644 --- a/.github/workflows/github-actions-test.yml +++ b/.github/workflows/github-actions-test.yml @@ -75,6 +75,7 @@ jobs: source ./env.template export MOCK_SIGAN=1 export MOCK_SIGAN_RANDOM=1 + export SSD_DEVICE=/dev/sda docker-compose build --no-cache docker-compose up -d From 82bc5ed7adc87d504828537579063bda5af8b1d7 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Thu, 25 Jul 2024 14:33:10 -0600 Subject: [PATCH 19/24] Fix github action --- .github/workflows/github-actions-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-test.yml b/.github/workflows/github-actions-test.yml index 2a426ff7..99472949 100644 --- a/.github/workflows/github-actions-test.yml +++ b/.github/workflows/github-actions-test.yml @@ -75,7 +75,7 @@ jobs: source ./env.template export MOCK_SIGAN=1 export MOCK_SIGAN_RANDOM=1 - export SSD_DEVICE=/dev/sda + export SSD_DEVICE=/dev/nvme0n1 docker-compose build --no-cache docker-compose up -d From 37cc54c82b4478dc45f9b79da64715faded36ec8 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 17 Oct 2024 12:58:13 -0400 Subject: [PATCH 20/24] Use "docker compose" in CI Updated from old "docker-compose" --- .github/workflows/github-actions-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-test.yml b/.github/workflows/github-actions-test.yml index 99472949..09353764 100644 --- a/.github/workflows/github-actions-test.yml +++ b/.github/workflows/github-actions-test.yml @@ -76,8 +76,8 @@ jobs: export MOCK_SIGAN=1 export MOCK_SIGAN_RANDOM=1 export SSD_DEVICE=/dev/nvme0n1 - docker-compose build --no-cache - docker-compose up -d + docker compose build --no-cache + docker compose up -d - name: Wait for containers # wait for containers to finish starting run: sleep 45 From dab86076583f934d93e65e5be5175423b67bd0ff Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:27:31 -0500 Subject: [PATCH 21/24] Re-add mistakenly removed env variable --- compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yaml b/compose.yaml index 13493349..43e1ba3b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -80,6 +80,7 @@ services: - STARTUP_CALIBRATION_ACTION - RAY_INIT - RUNNING_MIGRATIONS + - USB_DEVICE expose: - '8000' volumes: From cc553d0539bd90e798475860e1e7ed2f35a8229c Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:28:50 -0500 Subject: [PATCH 22/24] Update scos-tekrsa branch for testing --- src/requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/requirements.in b/src/requirements.in index e4a4f7db..05eb3f82 100644 --- a/src/requirements.in +++ b/src/requirements.in @@ -12,7 +12,7 @@ psycopg2-binary>=2.0, <3.0 tzdata # https://code.djangoproject.com/ticket/33814 requests>=2.32.0 requests-mock>=1.0, <2.0 -scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@8.0.0 +scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@scos-actions-11.1.0 # The following are sub-dependencies for which SCOS Sensor enforces a # higher minimum patch version than the dependencies which require them. From 16b12dd212a3b53ed3314af2737d3b83ca5584b8 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 13 Dec 2024 14:19:25 -0700 Subject: [PATCH 23/24] Do not dynamically generate SSD_DEVICE default --- env.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/env.template b/env.template index 2996576e..592edd9c 100644 --- a/env.template +++ b/env.template @@ -88,8 +88,8 @@ SSL_CA_PATH=scos_test_ca.crt SSL_CERT_PATH=sensor01.pem SSL_KEY_PATH=sensor01.pem -# Device made available to SCOS Plugins, e.g. for getting SMART data -SSD_DEVICE="$(lsblk -I 8 -npdo KNAME)" +# SSD Device made available to SCOS Plugins, e.g. for getting SMART data +SSD_DEVICE=/dev/nvme0n1 # Size of shared memory for API container (/dev/shm), used for parallel processing # See https://docs.docker.com/compose/compose-file/compose-file-v3/#shm_size From 1879b0401b35ced1fd709d35ab72301d8cd2c87b Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Fri, 3 Jan 2025 14:36:28 -0700 Subject: [PATCH 24/24] Update scos-tekrsa to 8.1.0 --- src/requirements-dev.txt | 8 +++++--- src/requirements.in | 2 +- src/requirements.txt | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/requirements-dev.txt b/src/requirements-dev.txt index 12add771..373268cd 100644 --- a/src/requirements-dev.txt +++ b/src/requirements-dev.txt @@ -64,7 +64,9 @@ colorama==0.4.6 colorful==0.5.5 # via ray coverage[toml]==7.6.4 - # via pytest-cov + # via + # coverage + # pytest-cov cryptography==43.0.1 # via -r requirements.txt defusedxml==0.7.1 @@ -325,11 +327,11 @@ scipy==1.13.1 # via # -r requirements.txt # scos-actions -scos-actions @ git+https://github.com/NTIA/scos-actions@11.0.0 +scos-actions @ git+https://github.com/NTIA/scos-actions@11.1.0 # via # -r requirements.txt # scos-tekrsa -scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@8.0.0 +scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@8.1.0 # via -r requirements.txt sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive # via diff --git a/src/requirements.in b/src/requirements.in index 05eb3f82..d126a1f9 100644 --- a/src/requirements.in +++ b/src/requirements.in @@ -12,7 +12,7 @@ psycopg2-binary>=2.0, <3.0 tzdata # https://code.djangoproject.com/ticket/33814 requests>=2.32.0 requests-mock>=1.0, <2.0 -scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@scos-actions-11.1.0 +scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@8.1.0 # The following are sub-dependencies for which SCOS Sensor enforces a # higher minimum patch version than the dependencies which require them. diff --git a/src/requirements.txt b/src/requirements.txt index 80b9740f..d18ee514 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -157,9 +157,9 @@ ruamel-yaml-clib==0.2.8 # via ruamel-yaml scipy==1.13.1 # via scos-actions -scos-actions @ git+https://github.com/NTIA/scos-actions@11.0.0 +scos-actions @ git+https://github.com/NTIA/scos-actions@11.1.0 # via scos-tekrsa -scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@8.0.0 +scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@8.1.0 # via -r requirements.in sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive # via scos-actions