Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OSCTRL_VERSION=0.5.0
OSQUERY_VERSION=5.21.0
OSQUERY_VERSION=5.22.1
NGINX_VERSION=1.21.6-alpine
POSTGRES_VERSION=13.5-alpine
POSTGRES_DB_NAME=osctrl
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test_main_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:

env:
GOLANG_VERSION: 1.25.4
OSQUERY_VERSION: 5.21.0
OSQUERY_VERSION: 5.22.1

jobs:
build_and_test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on: [push, pull_request]

env:
GOLANG_VERSION: 1.25.4
OSQUERY_VERSION: 5.21.0
OSQUERY_VERSION: 5.22.1

jobs:
build_and_test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_tagged_releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:

env:
GOLANG_VERSION: 1.25.4
OSQUERY_VERSION: 5.21.0
OSQUERY_VERSION: 5.22.1

jobs:
build_and_test:
Expand Down
2 changes: 1 addition & 1 deletion deploy/cicd/deb/generate-deb-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
OSCTRL_USER="${VARIABLE:-osctrl}"
OSCTRL_GROUP="${VARIABLE:-osctrl}"
WORKING_DIR="${VARIABLE:-/opt/osctrl}"
OSQUERY_VERSION="${VARIABLE:-5.21.0}"
OSQUERY_VERSION="${VARIABLE:-5.22.1}"
OSCTRL_VERSION="${VARIABLE:-0.0.0}"
Comment on lines 5 to 9
Copy link

Copilot AI Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the DEB packaging flow, the installed osquery tables file name doesn't match the default/configured tablesFile path. deploy/config/*.yml (and pkg/config/flags.go default) point to ./data/<version>.json, but this script later copies the schema to /opt/osctrl/data/osquery-<version>.json. This will cause osctrl-admin to fail at startup when it tries to open the tables file. Align the filename (either copy to <version>.json or update the packaged config to reference osquery-<version>.json).

Copilot uses AI. Check for mistakes.

# Init DEB contents
Expand Down
4 changes: 2 additions & 2 deletions deploy/config/admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ redis:

# Osquery nodes configuration
osquery:
version: 5.21.0
tablesFile: ./data/5.21.0.json
version: 5.22.1
tablesFile: ./data/5.22.1.json
logger: true
config: true
query: true
Expand Down
4 changes: 2 additions & 2 deletions deploy/config/api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ redis:

# Osquery nodes configuration
osquery:
version: 5.21.0
tablesFile: ./data/5.21.0.json
version: 5.22.1
tablesFile: ./data/5.22.1.json
logger: true
config: true
query: true
Expand Down
4 changes: 2 additions & 2 deletions deploy/config/tls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ redis:

# Osquery nodes configuration
osquery:
version: 5.21.0
tablesFile: ./data/5.21.0.json
version: 5.22.1
tablesFile: ./data/5.22.1.json
logger: true
config: true
query: true
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/dockerfiles/Dockerfile-osquery
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG OSCTRL_VERSION
FROM jmpsec/osctrl-cli:v${OSCTRL_VERSION}

ARG OSQUERY_VERSION=5.21.0
ARG OSQUERY_VERSION=5.22.1

USER root

Expand Down
Loading
Loading