Merge pull request #656 from jmpsec/osquery-5.17.0

Adding support for osquery `5.17.0`

Author: javuto

.env.example

@@ -1,5 +1,5 @@
 OSCTRL_VERSION=0.4.4
-OSQUERY_VERSION=5.16.0
+OSQUERY_VERSION=5.17.0
 NGINX_VERSION=1.21.6-alpine
 POSTGRES_VERSION=13.5-alpine
 POSTGRES_DB_NAME=osctrl

.github/actions/build/dpkg/action.yml

@@ -44,7 +44,7 @@ runs:
         GOOS: ${{ inputs.go_os }}
         GOARCH: ${{ inputs.go_arch }}
         COMMIT_SHA: ${{ inputs.commit_sha }}
-        OSQUERY_VESION: ${{ inputs.osquery_version }}
+        OSQUERY_VERSION: ${{ inputs.osquery_version }}
         OSCTRL_VERSION: ${{ inputs.commit_sha }}
 
     - name: Create DEB package contents for tagged version

.github/workflows/build_and_test_main_merge.yml

@@ -10,7 +10,7 @@ permissions:
 
 env:
   GOLANG_VERSION: 1.24.3
-  OSQUERY_VERSION: 5.16.0
+  OSQUERY_VERSION: 5.17.0
 
 jobs:
   build_and_test:

.github/workflows/build_and_test_pr.yml

@@ -6,7 +6,7 @@ on: [push, pull_request]
 
 env:
   GOLANG_VERSION: 1.24.3
-  OSQUERY_VERSION: 5.16.0
+  OSQUERY_VERSION: 5.17.0
 
 jobs:
   build_and_test:

.github/workflows/create_tagged_releases.yml

@@ -11,7 +11,7 @@ permissions:
 
 env:
   GOLANG_VERSION: 1.24.3
-  OSQUERY_VERSION: 5.16.0
+  OSQUERY_VERSION: 5.17.0
 
 jobs:
   build_and_test:

deploy/cicd/deb/generate-deb-package.sh

@@ -5,7 +5,7 @@ set -e
 OSCTRL_USER="${VARIABLE:-osctrl}"
 OSCTRL_GROUP="${VARIABLE:-osctrl}"
 WORKING_DIR="${VARIABLE:-/etc/osctrl}"
-OSQUERY_VESION="${VARIABLE:-5.16.0}"
+OSQUERY_VERSION="${VARIABLE:-5.17.0}"
 OSCTRL_VERSION="${VARIABLE:-0.0.0}"
 
 ###################################### Init DEB contents ######################################
@@ -74,7 +74,7 @@ then
     --carved /var/osctrl/carves \\
     --templates /usr/share/osctrl/tmpl_admin \\
     --static /usr/share/osctrl/static \\
-    --osquery-tables /etc/osctrl/osctrl-admin/osquery-${OSQUERY_VESION}.json"
+    --osquery-tables /etc/osctrl/osctrl-admin/osquery-${OSQUERY_VERSION}.json"
     EXECSTART+=${ADMIN_ARGS}
 fi
 
@@ -130,11 +130,11 @@ then
     cp -r cmd/admin/static "${DEB_DIR}/usr/share/osctrl/static"
 
     # Copy osquery schema
-    cp deploy/osquery/data/${OSQUERY_VESION}.json "${DEB_DIR}/etc/osctrl/osctrl-admin/osquery-${OSQUERY_VESION}.json"
+    cp deploy/osquery/data/${OSQUERY_VERSION}.json "${DEB_DIR}/etc/osctrl/osctrl-admin/osquery-${OSQUERY_VERSION}.json"
 
     # Define conffiles
     echo "/etc/osctrl/osctrl-admin/jwt.json" >> "${DEB_DIR}/DEBIAN/conffiles"
-    echo "/etc/osctrl/osctrl-admin/osquery-${OSQUERY_VESION}.json" >> "${DEB_DIR}/DEBIAN/conffiles"
+    echo "/etc/osctrl/osctrl-admin/osquery-${OSQUERY_VERSION}.json" >> "${DEB_DIR}/DEBIAN/conffiles"
 
 fi
 

deploy/docker/conf/dev/.env.example

@@ -1,5 +1,5 @@
 OSCTRL_VERSION=0.4.4
-OSQUERY_VERSION=5.16.0
+OSQUERY_VERSION=5.17.0
 NGINX_VERSION=1.21.6-alpine
 POSTGRES_VERSION=13.5-alpine
 POSTGRES_DB_NAME=osctrl

deploy/docker/dockerfiles/Dockerfile-osquery

@@ -1,7 +1,7 @@
 ARG OSCTRL_VERSION
 FROM jmpsec/osctrl-cli:v${OSCTRL_VERSION}
 
-ARG OSQUERY_VERSION=5.16.0
+ARG OSQUERY_VERSION=5.17.0
 
 USER root