Skip to content

Commit

Permalink
Merge pull request #355 from jmpsec/osquery-5.8.2
Browse files Browse the repository at this point in the history
Support for osquery 5.8.2
  • Loading branch information
javuto authored Nov 3, 2023
2 parents 0bbda2e + a3326df commit e3f0e21
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
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.3.1
OSQUERY_VERSION=5.6.0
OSQUERY_VERSION=5.8.2
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 @@ -7,7 +7,7 @@ on:

env:
GOLANG_VERSION: 1.19.2
OSQUERY_VERSION: 5.6.0
OSQUERY_VERSION: 5.8.2

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 @@ -4,7 +4,7 @@ on: [push, pull_request]

env:
GOLANG_VERSION: 1.19.2
OSQUERY_VERSION: 5.6.0
OSQUERY_VERSION: 5.8.2

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 @@ -8,7 +8,7 @@ on:

env:
GOLANG_VERSION: 1.19.2
OSQUERY_VERSION: 5.6.0
OSQUERY_VERSION: 5.8.2

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:-/etc/osctrl}"
OSQUERY_VESION="${VARIABLE:-5.6.0}"
OSQUERY_VESION="${VARIABLE:-5.8.2}"
OSCTRL_VERSION="${VARIABLE:-0.0.0}"

###################################### Init DEB contents ######################################
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/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.6.0
ARG OSQUERY_VERSION=5.8.2

USER root

Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OSCTRL_VERSION=0.3.1
OSQUERY_VERSION=5.6.0
OSQUERY_VERSION=5.8.2
NGINX_VERSION=1.21.1-alpine
POSTGRES_VERSION=10-alpine
POSTGRES_DB_NAME=osctrl
Expand Down
2 changes: 1 addition & 1 deletion deploy/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ BRANCH="main"
SOURCE_PATH=/vagrant
DEST_PATH=/opt/osctrl
ALL_HOST="127.0.0.1"
OSQUERY_VERSION="5.6.0"
OSQUERY_VERSION="5.8.2"

# Backend values
_DB_HOST="localhost"
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ const (
// OsctrlVersion to have the version for all components
OsctrlVersion = "0.3.1"
// OsqueryVersion to have the version for osquery defined
OsqueryVersion = "5.6.0"
OsqueryVersion = "5.8.2"
)
2 changes: 1 addition & 1 deletion version/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
)

func TestOsqueryVersion(t *testing.T) {
assert.Equal(t, "5.6.0", OsqueryVersion)
assert.Equal(t, "5.8.2", OsqueryVersion)
}

func TestOsctrlVersion(t *testing.T) {
Expand Down

0 comments on commit e3f0e21

Please sign in to comment.