Skip to content

Commit

Permalink
v3.2.0 fixes (v3.1.1 had a few regressions, otherwise this is the sam…
Browse files Browse the repository at this point in the history 
…e release as that)

fix idaholab#51, kibana offline maps server not started
fix idaholab#50, zeek_template index template not created if index management not configured
  • Loading branch information
@mmguero
mmguero committed Jul 13, 2021
1 parent 3a35306 commit d8b4f0b
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 73 deletions.
62 changes: 31 additions & 31 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,21 +139,21 @@ You can then observe that the images have been retrieved by running `docker imag
```
$ docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
malcolmnetsec/arkime 3.1.1 xxxxxxxxxxxx 39 hours ago 683MB
malcolmnetsec/elasticsearch-od 3.1.1 xxxxxxxxxxxx 40 hours ago 690MB
malcolmnetsec/file-monitor 3.1.1 xxxxxxxxxxxx 39 hours ago 470MB
malcolmnetsec/file-upload 3.1.1 xxxxxxxxxxxx 39 hours ago 199MB
malcolmnetsec/filebeat-oss 3.1.1 xxxxxxxxxxxx 39 hours ago 555MB
malcolmnetsec/freq 3.1.1 xxxxxxxxxxxx 39 hours ago 390MB
malcolmnetsec/htadmin 3.1.1 xxxxxxxxxxxx 39 hours ago 180MB
malcolmnetsec/kibana-helper 3.1.1 xxxxxxxxxxxx 40 hours ago 141MB
malcolmnetsec/kibana-od 3.1.1 xxxxxxxxxxxx 40 hours ago 1.16GB
malcolmnetsec/logstash-oss 3.1.1 xxxxxxxxxxxx 39 hours ago 1.41GB
malcolmnetsec/name-map-ui 3.1.1 xxxxxxxxxxxx 39 hours ago 137MB
malcolmnetsec/nginx-proxy 3.1.1 xxxxxxxxxxxx 39 hours ago 120MB
malcolmnetsec/pcap-capture 3.1.1 xxxxxxxxxxxx 39 hours ago 111MB
malcolmnetsec/pcap-monitor 3.1.1 xxxxxxxxxxxx 39 hours ago 157MB
malcolmnetsec/zeek 3.1.1 xxxxxxxxxxxx 39 hours ago 887MB
malcolmnetsec/arkime 3.2.0 xxxxxxxxxxxx 39 hours ago 683MB
malcolmnetsec/elasticsearch-od 3.2.0 xxxxxxxxxxxx 40 hours ago 690MB
malcolmnetsec/file-monitor 3.2.0 xxxxxxxxxxxx 39 hours ago 470MB
malcolmnetsec/file-upload 3.2.0 xxxxxxxxxxxx 39 hours ago 199MB
malcolmnetsec/filebeat-oss 3.2.0 xxxxxxxxxxxx 39 hours ago 555MB
malcolmnetsec/freq 3.2.0 xxxxxxxxxxxx 39 hours ago 390MB
malcolmnetsec/htadmin 3.2.0 xxxxxxxxxxxx 39 hours ago 180MB
malcolmnetsec/kibana-helper 3.2.0 xxxxxxxxxxxx 40 hours ago 141MB
malcolmnetsec/kibana-od 3.2.0 xxxxxxxxxxxx 40 hours ago 1.16GB
malcolmnetsec/logstash-oss 3.2.0 xxxxxxxxxxxx 39 hours ago 1.41GB
malcolmnetsec/name-map-ui 3.2.0 xxxxxxxxxxxx 39 hours ago 137MB
malcolmnetsec/nginx-proxy 3.2.0 xxxxxxxxxxxx 39 hours ago 120MB
malcolmnetsec/pcap-capture 3.2.0 xxxxxxxxxxxx 39 hours ago 111MB
malcolmnetsec/pcap-monitor 3.2.0 xxxxxxxxxxxx 39 hours ago 157MB
malcolmnetsec/zeek 3.2.0 xxxxxxxxxxxx 39 hours ago 887MB
```

#### Import from pre-packaged tarballs
Expand Down Expand Up @@ -1440,7 +1440,7 @@ Building the ISO may take 30 minutes or more depending on your system. As the bu

```
…
Finished, created "/malcolm-build/malcolm-iso/malcolm-3.1.1.iso"
Finished, created "/malcolm-build/malcolm-iso/malcolm-3.2.0.iso"
…
```

Expand Down Expand Up @@ -1823,21 +1823,21 @@ Pulling zeek ... done
user@host:~/Malcolm$ docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
malcolmnetsec/arkime 3.1.1 xxxxxxxxxxxx 39 hours ago 683MB
malcolmnetsec/elasticsearch-od 3.1.1 xxxxxxxxxxxx 40 hours ago 690MB
malcolmnetsec/file-monitor 3.1.1 xxxxxxxxxxxx 39 hours ago 470MB
malcolmnetsec/file-upload 3.1.1 xxxxxxxxxxxx 39 hours ago 199MB
malcolmnetsec/filebeat-oss 3.1.1 xxxxxxxxxxxx 39 hours ago 555MB
malcolmnetsec/freq 3.1.1 xxxxxxxxxxxx 39 hours ago 390MB
malcolmnetsec/htadmin 3.1.1 xxxxxxxxxxxx 39 hours ago 180MB
malcolmnetsec/kibana-helper 3.1.1 xxxxxxxxxxxx 40 hours ago 141MB
malcolmnetsec/kibana-od 3.1.1 xxxxxxxxxxxx 40 hours ago 1.16GB
malcolmnetsec/logstash-oss 3.1.1 xxxxxxxxxxxx 39 hours ago 1.41GB
malcolmnetsec/name-map-ui 3.1.1 xxxxxxxxxxxx 39 hours ago 137MB
malcolmnetsec/nginx-proxy 3.1.1 xxxxxxxxxxxx 39 hours ago 120MB
malcolmnetsec/pcap-capture 3.1.1 xxxxxxxxxxxx 39 hours ago 111MB
malcolmnetsec/pcap-monitor 3.1.1 xxxxxxxxxxxx 39 hours ago 157MB
malcolmnetsec/zeek 3.1.1 xxxxxxxxxxxx 39 hours ago 887MB
malcolmnetsec/arkime 3.2.0 xxxxxxxxxxxx 39 hours ago 683MB
malcolmnetsec/elasticsearch-od 3.2.0 xxxxxxxxxxxx 40 hours ago 690MB
malcolmnetsec/file-monitor 3.2.0 xxxxxxxxxxxx 39 hours ago 470MB
malcolmnetsec/file-upload 3.2.0 xxxxxxxxxxxx 39 hours ago 199MB
malcolmnetsec/filebeat-oss 3.2.0 xxxxxxxxxxxx 39 hours ago 555MB
malcolmnetsec/freq 3.2.0 xxxxxxxxxxxx 39 hours ago 390MB
malcolmnetsec/htadmin 3.2.0 xxxxxxxxxxxx 39 hours ago 180MB
malcolmnetsec/kibana-helper 3.2.0 xxxxxxxxxxxx 40 hours ago 141MB
malcolmnetsec/kibana-od 3.2.0 xxxxxxxxxxxx 40 hours ago 1.16GB
malcolmnetsec/logstash-oss 3.2.0 xxxxxxxxxxxx 39 hours ago 1.41GB
malcolmnetsec/name-map-ui 3.2.0 xxxxxxxxxxxx 39 hours ago 137MB
malcolmnetsec/nginx-proxy 3.2.0 xxxxxxxxxxxx 39 hours ago 120MB
malcolmnetsec/pcap-capture 3.2.0 xxxxxxxxxxxx 39 hours ago 111MB
malcolmnetsec/pcap-monitor 3.2.0 xxxxxxxxxxxx 39 hours ago 157MB
malcolmnetsec/zeek 3.2.0 xxxxxxxxxxxx 39 hours ago 887MB
```

Finally, we can start Malcolm. When Malcolm starts it will stream informational and debug messages to the console. If you wish, you can safely close the console or use `Ctrl+C` to stop these messages; Malcolm will continue running in the background.
Expand Down
30 changes: 15 additions & 15 deletions docker-compose-standalone.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ x-pcap-capture-variables: &pcap-capture-variables

services:
elasticsearch:
image: malcolmnetsec/elasticsearch-od:3.1.1
image: malcolmnetsec/elasticsearch-od:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -156,7 +156,7 @@ services:
retries: 3
start_period: 180s
kibana-helper:
image: malcolmnetsec/kibana-helper:3.1.1
image: malcolmnetsec/kibana-helper:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -184,7 +184,7 @@ services:
retries: 3
start_period: 30s
kibana:
image: malcolmnetsec/kibana-od:3.1.1
image: malcolmnetsec/kibana-od:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -205,7 +205,7 @@ services:
retries: 3
start_period: 210s
logstash:
image: malcolmnetsec/logstash-oss:3.1.1
image: malcolmnetsec/logstash-oss:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -239,7 +239,7 @@ services:
retries: 3
start_period: 600s
filebeat:
image: malcolmnetsec/filebeat-oss:3.1.1
image: malcolmnetsec/filebeat-oss:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -276,7 +276,7 @@ services:
retries: 3
start_period: 60s
arkime:
image: malcolmnetsec/arkime:3.1.1
image: malcolmnetsec/arkime:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -315,7 +315,7 @@ services:
retries: 3
start_period: 210s
zeek:
image: malcolmnetsec/zeek:3.1.1
image: malcolmnetsec/zeek:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -341,7 +341,7 @@ services:
retries: 3
start_period: 60s
file-monitor:
image: malcolmnetsec/file-monitor:3.1.1
image: malcolmnetsec/file-monitor:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -364,7 +364,7 @@ services:
retries: 3
start_period: 60s
pcap-capture:
image: malcolmnetsec/pcap-capture:3.1.1
image: malcolmnetsec/pcap-capture:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -390,7 +390,7 @@ services:
retries: 3
start_period: 60s
pcap-monitor:
image: malcolmnetsec/pcap-monitor:3.1.1
image: malcolmnetsec/pcap-monitor:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -413,7 +413,7 @@ services:
retries: 3
start_period: 90s
upload:
image: malcolmnetsec/file-upload:3.1.1
image: malcolmnetsec/file-upload:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -439,7 +439,7 @@ services:
retries: 3
start_period: 60s
htadmin:
image: malcolmnetsec/htadmin:3.1.1
image: malcolmnetsec/htadmin:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -461,7 +461,7 @@ services:
retries: 3
start_period: 60s
freq:
image: malcolmnetsec/freq:3.1.1
image: malcolmnetsec/freq:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -479,7 +479,7 @@ services:
retries: 3
start_period: 60s
name-map-ui:
image: malcolmnetsec/name-map-ui:3.1.1
image: malcolmnetsec/name-map-ui:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -500,7 +500,7 @@ services:
retries: 3
start_period: 60s
nginx-proxy:
image: malcolmnetsec/nginx-proxy:3.1.1
image: malcolmnetsec/nginx-proxy:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down
30 changes: 15 additions & 15 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/elasticsearch.Dockerfile
image: malcolmnetsec/elasticsearch-od:3.1.1
image: malcolmnetsec/elasticsearch-od:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -162,7 +162,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/kibana-helper.Dockerfile
image: malcolmnetsec/kibana-helper:3.1.1
image: malcolmnetsec/kibana-helper:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -193,7 +193,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/kibana.Dockerfile
image: malcolmnetsec/kibana-od:3.1.1
image: malcolmnetsec/kibana-od:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -217,7 +217,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/logstash.Dockerfile
image: malcolmnetsec/logstash-oss:3.1.1
image: malcolmnetsec/logstash-oss:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -256,7 +256,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/filebeat.Dockerfile
image: malcolmnetsec/filebeat-oss:3.1.1
image: malcolmnetsec/filebeat-oss:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -297,7 +297,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/arkime.Dockerfile
image: malcolmnetsec/arkime:3.1.1
image: malcolmnetsec/arkime:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -342,7 +342,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/zeek.Dockerfile
image: malcolmnetsec/zeek:3.1.1
image: malcolmnetsec/zeek:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -372,7 +372,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/file-monitor.Dockerfile
image: malcolmnetsec/file-monitor:3.1.1
image: malcolmnetsec/file-monitor:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -398,7 +398,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/pcap-capture.Dockerfile
image: malcolmnetsec/pcap-capture:3.1.1
image: malcolmnetsec/pcap-capture:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -427,7 +427,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/pcap-monitor.Dockerfile
image: malcolmnetsec/pcap-monitor:3.1.1
image: malcolmnetsec/pcap-monitor:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -453,7 +453,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/file-upload.Dockerfile
image: malcolmnetsec/file-upload:3.1.1
image: malcolmnetsec/file-upload:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand All @@ -479,7 +479,7 @@ services:
retries: 3
start_period: 60s
htadmin:
image: malcolmnetsec/htadmin:3.1.1
image: malcolmnetsec/htadmin:3.2.0
build:
context: .
dockerfile: Dockerfiles/htadmin.Dockerfile
Expand All @@ -504,7 +504,7 @@ services:
retries: 3
start_period: 60s
freq:
image: malcolmnetsec/freq:3.1.1
image: malcolmnetsec/freq:3.2.0
build:
context: .
dockerfile: Dockerfiles/freq.Dockerfile
Expand All @@ -525,7 +525,7 @@ services:
retries: 3
start_period: 60s
name-map-ui:
image: malcolmnetsec/name-map-ui:3.1.1
image: malcolmnetsec/name-map-ui:3.2.0
build:
context: .
dockerfile: Dockerfiles/name-map-ui.Dockerfile
Expand All @@ -552,7 +552,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/nginx.Dockerfile
image: malcolmnetsec/nginx-proxy:3.1.1
image: malcolmnetsec/nginx-proxy:3.2.0
restart: "no"
stdin_open: false
tty: true
Expand Down
Loading

0 comments on commit d8b4f0b

Please sign in to comment.