Skip to content

Commit fb4216d

Browse files
committed
API documentation and partial update to 0.3.7
1 parent 9f5ae06 commit fb4216d

File tree

137 files changed

+3356
-23576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+3356
-23576
lines changed

config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ unsafe= true
1313
home = [ "HTML", "RSS", "JSON"]
1414

1515
[params]
16-
author = "Javier Marcos de Prado, JMPSec"
16+
author = "Javier Marcos, JMP Sec"
1717
description = "Documentation for osctrl: Fast and efficient osquery management"
1818
themeVariant = "osctrl"
1919
editURL = "https://github.com/jmpsec/osctrl-docs/edit/master/content/"

content/components/osctrl-api/_index.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,4 @@ pre = ""
1515

1616
The osctrl-api component of **osctrl** provides an API interface to interact with its enrolled nodes and with **osctrl** itself.
1717

18-
The API is documented with Swagger:
19-
20-
[https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/)
18+
You can find the updated [API documentation](/openapi/doc.html) for **osctrl**, generated using [stoplight.io](https://docs.stoplight.io/).

content/deployment/docker/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ date = 2019-08-09T19:23:53+02:00
44
weight = 2
55
+++
66

7-
You can use docker to run **osctrl**. Each component has a separate `Dockerfile` to run independently. There is also a [docker-compose.yml](https://github.com/jmpsec/osctrl/blob/master/docker/docker-compose.yml) that ties all the components together to serve a functional deployment.
7+
You can use docker to run **osctrl** and all the components are defined in the `docker-compose-dev.yml` that ties all the components together, to serve a functional deployment.
88

9-
In the [Makefile](https://github.com/jmpsec/osctrl/blob/master/Makefile) there are docker specific commands to deploy **osctrl**, which are utilizing the [dockerize.sh](/usage/dockerize.sh/) command
9+
Ultimately you can just execute `make docker_dev` and it will automagically build and run **osctrl** locally in docker, for development purposes.

content/deployment/natively/_index.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ date = 2019-08-09T19:24:35+02:00
44
weight = 3
55
+++
66

7-
If you want to deploy **osctrl** in your own environment, you can use the [provision.sh](https://github.com/jmpsec/osctrl/blob/master/deploy/provision.sh) to install all necessary dependencies and to configure all components.
7+
If you want to deploy **osctrl** in your own environment, you can use the [provision.sh](https://github.com/jmpsec/osctrl/blob/master/deploy/provision.sh) script to install all necessary dependencies and to configure all components.
88

9-
It is a good idea to take a look at the [usage](/usage/provision.sh/) of the provisioning script to understand all the options and all the parameters. Check out also how the same script is used with [vagrant](/deployment/vagrant/) to deploy **osctrl** in a local virtual machine, with all components installed and configured.
9+
It is a good idea to take a look at the [usage](/usage/provision.sh/) of the provisioning script to understand all the options and all the parameters.
1010

1111
### Examples
1212

13-
The most common use case for provisioning **osctrl** is very similar to how it gets provisioned for [vagrant](/deployment/vagrant/), which means in dev mode and using self-signed certificates.
13+
A very common use case for provisioning **osctrl** , would run in dev mode and using self-signed certificates. This is would be the preferred choice for development purposes:
14+
15+
```properties
16+
./deploy/provision.sh -m dev -s /path/to/code --nginx --postgres --redis -p all --all-hostname "dev.osctrl.net" -E
17+
```

content/deployment/vagrant/_index.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

content/usage/dockerize.sh/_index.md

Lines changed: 0 additions & 39 deletions
This file was deleted.

content/usage/osctrl-admin/_index.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ USAGE:
1818
osctrl-admin [global options] command [command options] [arguments...]
1919

2020
VERSION:
21-
0.3.4
21+
0.3.7
2222

2323
DESCRIPTION:
2424
Admin service for osctrl, a fast and efficient osquery management
@@ -65,9 +65,10 @@ GLOBAL OPTIONS:
6565
--jwt-file FILE Load JWT configuration from FILE (default: "config/jwt.json") [$JWT_CONFIG_FILE]
6666
--jwt-secret value Password to be used for the backend [$JWT_SECRET]
6767
--jwt-expire value Maximum amount of hours for the tokens to expire (default: 3) [$JWT_EXPIRE]
68-
--osquery-version value Set osquery version as default to be used (default: "5.10.2") [$OSQUERY_VERSION]
69-
--osquery-tables FILE Load osquery tables schema from FILE (default: "data/5.10.2.json") [$OSQUERY_TABLES]
68+
--osquery-version value Set osquery version as default to be used (default: "5.12.1") [$OSQUERY_VERSION]
69+
--osquery-tables FILE Load osquery tables schema from FILE (default: "data/5.12.1.json") [$OSQUERY_TABLES]
7070
--logger-file value, -F value Logger configuration to handle status/results logs from nodes (default: "config/logger.json") [$LOGGER_FILE]
71+
--logger-db-same Use the same DB configuration for the logger (default: false) [$LOGGER_DB_SAME]
7172
--static value, -s value Directory with all the static files needed for the osctrl-admin UI (default: "./static") [$STATIC_FILES]
7273
--static-offline, -S Use offline static files (js and css). Default is online files. (default: false) [$STATIC_ONLINE]
7374
--templates value Directory with all the templates needed for the osctrl-admin UI (default: "./tmpl_admin") [$STATIC_FILES]

content/usage/osctrl-api/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ USAGE:
1818
osctrl-api [global options] command [command options] [arguments...]
1919

2020
VERSION:
21-
0.3.4
21+
0.3.7
2222

2323
DESCRIPTION:
2424
API service for osctrl, a fast and efficient osquery management

content/usage/osctrl-cli/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ USAGE:
1818
osctrl-cli [global options] command [command options] [arguments...]
1919

2020
VERSION:
21-
0.3.4
21+
0.3.7
2222

2323
DESCRIPTION:
2424
CLI for osctrl, a fast and efficient osquery management

content/usage/osctrl-tls/_index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ USAGE:
1818
osctrl-tls [global options] command [command options] [arguments...]
1919

2020
VERSION:
21-
0.3.4
21+
0.3.7
2222

2323
DESCRIPTION:
2424
TLS service for osctrl, a fast and efficient osquery management
@@ -60,6 +60,7 @@ GLOBAL OPTIONS:
6060
--cert FILE, -T FILE TLS termination certificate from FILE (default: "config/tls.crt") [$TLS_CERTIFICATE]
6161
--key FILE, -K FILE TLS termination private key from FILE (default: "config/tls.key") [$TLS_KEY]
6262
--logger-file value, -F value Logger configuration to handle status/results logs from nodes (default: "config/logger.json") [$LOGGER_FILE]
63+
--logger-db-same Use the same DB configuration for the logger (default: false) [$LOGGER_DB_SAME]
6364
--always-log, -a, --always Always log status and on-demand query logs from nodes in database (default: false) [$ALWAYS_LOG]
6465
--carver-type value Carver to be used to receive files extracted from nodes (default: "db") [$CARVER_TYPE]
6566
--carver-file value Carver configuration file to receive files extracted from nodes (default: "config/carver.json") [$CARVER_FILE]

0 commit comments

Comments
 (0)