Skip to content

Commit

Permalink
Merge pull request #91 from jmpsec/osquery-4-5-1
Browse files Browse the repository at this point in the history
Support for osquery 4.5.1
  • Loading branch information
javuto authored Nov 6, 2020
2 parents 8210c33 + 4a18f2f commit cbff3b9
Show file tree
Hide file tree
Showing 13 changed files with 548 additions and 33 deletions.
2 changes: 1 addition & 1 deletion admin/handlers/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
// osquery
const (
// osquery version to display tables
osqueryTablesVersion string = "4.4.0"
osqueryTablesVersion string = "4.5.1"
// JSON file with osquery tables data
osqueryTablesFile string = "data/" + osqueryTablesVersion + ".json"
// Carved files folder
Expand Down
2 changes: 1 addition & 1 deletion admin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const (
// osquery
const (
// osquery version to display tables
osqueryTablesVersion string = "4.4.0"
osqueryTablesVersion string = "4.5.1"
// JSON file with osquery tables data
osqueryTablesFile string = "data/" + osqueryTablesVersion + ".json"
)
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/admin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPY admin/templates/components/page-head-online.html tmpl_admin/components/page
COPY admin/templates/components/page-js-online.html tmpl_admin/components/page-js.html
COPY admin/static/ static

COPY deploy/osquery/data/4.4.0.json data/
COPY deploy/osquery/data/4.5.1.json data/
COPY deploy/osquery/osquery-cfg.json data/

RUN mkdir -p carved_files
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/nodes/centos6/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM centos:6
LABEL maintainer="javuto"

RUN curl -# "https://osquery-packages.s3.amazonaws.com/rpm/osquery-4.4.0-1.linux.x86_64.rpm" -o "/tmp/osquery.rpm"
RUN curl -# "https://osquery-packages.s3.amazonaws.com/rpm/osquery-4.5.1-1.linux.x86_64.rpm" -o "/tmp/osquery.rpm"
RUN rpm -ivh "/tmp/osquery.rpm"

COPY deploy/docker/nodes/centos6/wait.sh .
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/nodes/centos7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM centos:7
LABEL maintainer="javuto"

RUN curl -# "https://osquery-packages.s3.amazonaws.com/rpm/osquery-4.4.0-1.linux.x86_64.rpm" -o "/tmp/osquery.rpm"
RUN curl -# "https://osquery-packages.s3.amazonaws.com/rpm/osquery-4.5.1-1.linux.x86_64.rpm" -o "/tmp/osquery.rpm"
RUN rpm -ivh "/tmp/osquery.rpm"

COPY deploy/docker/nodes/centos7/wait.sh .
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/nodes/debian8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LABEL maintainer="javuto"

RUN apt update && apt install -y curl

RUN curl -# "https://osquery-packages.s3.amazonaws.com/deb/osquery_4.4.0_1.linux.amd64.deb" -o "/tmp/osquery.deb"
RUN curl -# "https://osquery-packages.s3.amazonaws.com/deb/osquery_4.5.1_1.linux.amd64.deb" -o "/tmp/osquery.deb"
RUN dpkg -i "/tmp/osquery.deb"

COPY deploy/docker/nodes/debian8/wait.sh .
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/nodes/debian9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LABEL maintainer="javuto"

RUN apt update && apt install -y curl

RUN curl -# "https://osquery-packages.s3.amazonaws.com/deb/osquery_4.4.0_1.linux.amd64.deb" -o "/tmp/osquery.deb"
RUN curl -# "https://osquery-packages.s3.amazonaws.com/deb/osquery_4.5.1_1.linux.amd64.deb" -o "/tmp/osquery.deb"
RUN dpkg -i "/tmp/osquery.deb"

COPY deploy/docker/nodes/debian9/wait.sh .
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/nodes/ubuntu16/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LABEL maintainer="javuto"

RUN apt update && apt install -y curl

RUN curl -# "https://osquery-packages.s3.amazonaws.com/deb/osquery_4.4.0_1.linux.amd64.deb" -o "/tmp/osquery.deb"
RUN curl -# "https://osquery-packages.s3.amazonaws.com/deb/osquery_4.5.1_1.linux.amd64.deb" -o "/tmp/osquery.deb"
RUN dpkg -i "/tmp/osquery.deb"

COPY deploy/docker/nodes/ubuntu16/wait.sh .
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/nodes/ubuntu18/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LABEL maintainer="javuto"

RUN apt update && apt install -y curl

RUN curl -# "https://osquery-packages.s3.amazonaws.com/deb/osquery_4.4.0_1.linux.amd64.deb" -o "/tmp/osquery.deb"
RUN curl -# "https://osquery-packages.s3.amazonaws.com/deb/osquery_4.5.1_1.linux.amd64.deb" -o "/tmp/osquery.deb"
RUN dpkg -i "/tmp/osquery.deb"

COPY deploy/docker/nodes/ubuntu18/wait.sh .
Expand Down
Loading

0 comments on commit cbff3b9

Please sign in to comment.