Skip to content

Commit 2c19ef0

Browse files
mmguerommguero
committed
Merge branch 'main' of https://github.com/mmguero-dev/Malcolm into v26.07.1_merge_cisagov
2 parents 551ce2d + a2caa7c commit 2c19ef0

45 files changed

Lines changed: 229 additions & 168 deletions

Some content is hidden

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

‎.github/workflows/hedgehog-raspi-build-docker-wrap-push-ghcr.yml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,23 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
rpi_model: [4, 5]
23+
include:
24+
- rpi_model: 4
25+
rpi_os: trixie
26+
- rpi_model: 4
27+
rpi_os: forky
28+
- rpi_model: 5
29+
rpi_os: forky
30+
2431
uses: ./.github/workflows/raspi-build-push.yml
32+
2533
permissions:
2634
actions: write
2735
packages: write
2836
contents: read
2937
security-events: write
38+
3039
with:
3140
profile: hedgehog
3241
rpi_model: ${{ matrix.rpi_model }}
33-
rpi_os: trixie
42+
rpi_os: ${{ matrix.rpi_os }}

‎Dockerfiles/logstash.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN microdnf -y install \
1616
python3 -m pip install --no-cache-dir -r requirements.txt && \
1717
python3 manuf-oui-parse.py -o vendor_macs.yaml
1818

19-
FROM docker.elastic.co/logstash/logstash-oss:9.4.3
19+
FROM docker.elastic.co/logstash/logstash-oss:9.4.4
2020

2121
LABEL maintainer="malcolm@inl.gov"
2222
LABEL org.opencontainers.image.authors='malcolm@inl.gov'

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ repository: cisagov/Malcolm
22
title: Malcolm
33
offline_mode: false
44
malcolm:
5-
version: 26.07.0
5+
version: 26.07.1
66
description: A powerful, easily deployable network traffic analysis tool suite for network security monitoring
77
logo: docs/images/logo/Malcolm_outline_banner_dark.png
88
remote_theme: pages-themes/minimal@v0.2.0

‎docker-compose-dev.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
build:
66
context: .
77
dockerfile: Dockerfiles/opensearch.Dockerfile
8-
image: ghcr.io/idaholab/malcolm/opensearch:26.07.0
8+
image: ghcr.io/idaholab/malcolm/opensearch:26.07.1
99
profiles: ["malcolm"]
1010
logging:
1111
driver: local
@@ -79,7 +79,7 @@ services:
7979
build:
8080
context: .
8181
dockerfile: Dockerfiles/dashboards-helper.Dockerfile
82-
image: ghcr.io/idaholab/malcolm/dashboards-helper:26.07.0
82+
image: ghcr.io/idaholab/malcolm/dashboards-helper:26.07.1
8383
profiles: ["malcolm"]
8484
logging:
8585
driver: local
@@ -133,7 +133,7 @@ services:
133133
build:
134134
context: .
135135
dockerfile: Dockerfiles/dashboards.Dockerfile
136-
image: ghcr.io/idaholab/malcolm/dashboards:26.07.0
136+
image: ghcr.io/idaholab/malcolm/dashboards:26.07.1
137137
profiles: ["malcolm"]
138138
logging:
139139
driver: local
@@ -178,7 +178,7 @@ services:
178178
build:
179179
context: .
180180
dockerfile: Dockerfiles/logstash.Dockerfile
181-
image: ghcr.io/idaholab/malcolm/logstash-oss:26.07.0
181+
image: ghcr.io/idaholab/malcolm/logstash-oss:26.07.1
182182
profiles: ["malcolm"]
183183
logging:
184184
driver: local
@@ -296,7 +296,7 @@ services:
296296
build:
297297
context: .
298298
dockerfile: Dockerfiles/filebeat.Dockerfile
299-
image: ghcr.io/idaholab/malcolm/filebeat-oss:26.07.0
299+
image: ghcr.io/idaholab/malcolm/filebeat-oss:26.07.1
300300
profiles: ["malcolm", "hedgehog"]
301301
logging:
302302
driver: local
@@ -387,7 +387,7 @@ services:
387387
build:
388388
context: .
389389
dockerfile: Dockerfiles/arkime.Dockerfile
390-
image: ghcr.io/idaholab/malcolm/arkime:26.07.0
390+
image: ghcr.io/idaholab/malcolm/arkime:26.07.1
391391
profiles: ["malcolm", "hedgehog"]
392392
logging:
393393
driver: local
@@ -475,7 +475,7 @@ services:
475475
build:
476476
context: .
477477
dockerfile: Dockerfiles/arkime.Dockerfile
478-
image: ghcr.io/idaholab/malcolm/arkime:26.07.0
478+
image: ghcr.io/idaholab/malcolm/arkime:26.07.1
479479
profiles: ["malcolm", "hedgehog"]
480480
logging:
481481
driver: local
@@ -571,7 +571,7 @@ services:
571571
build:
572572
context: .
573573
dockerfile: Dockerfiles/zeek.Dockerfile
574-
image: ghcr.io/idaholab/malcolm/zeek:26.07.0
574+
image: ghcr.io/idaholab/malcolm/zeek:26.07.1
575575
profiles: ["malcolm", "hedgehog"]
576576
logging:
577577
driver: local
@@ -641,7 +641,7 @@ services:
641641
build:
642642
context: .
643643
dockerfile: Dockerfiles/zeek.Dockerfile
644-
image: ghcr.io/idaholab/malcolm/zeek:26.07.0
644+
image: ghcr.io/idaholab/malcolm/zeek:26.07.1
645645
profiles: ["malcolm", "hedgehog"]
646646
logging:
647647
driver: local
@@ -711,7 +711,7 @@ services:
711711
build:
712712
context: .
713713
dockerfile: Dockerfiles/suricata.Dockerfile
714-
image: ghcr.io/idaholab/malcolm/suricata:26.07.0
714+
image: ghcr.io/idaholab/malcolm/suricata:26.07.1
715715
profiles: ["malcolm", "hedgehog"]
716716
logging:
717717
driver: local
@@ -774,7 +774,7 @@ services:
774774
build:
775775
context: .
776776
dockerfile: Dockerfiles/suricata.Dockerfile
777-
image: ghcr.io/idaholab/malcolm/suricata:26.07.0
777+
image: ghcr.io/idaholab/malcolm/suricata:26.07.1
778778
profiles: ["malcolm", "hedgehog"]
779779
logging:
780780
driver: local
@@ -841,7 +841,7 @@ services:
841841
build:
842842
context: .
843843
dockerfile: Dockerfiles/filescan.Dockerfile
844-
image: ghcr.io/idaholab/malcolm/filescan:26.07.0
844+
image: ghcr.io/idaholab/malcolm/filescan:26.07.1
845845
profiles: ["malcolm", "hedgehog"]
846846
logging:
847847
driver: local
@@ -900,7 +900,7 @@ services:
900900
build:
901901
context: .
902902
dockerfile: Dockerfiles/strelka-backend.Dockerfile
903-
image: ghcr.io/idaholab/malcolm/strelka-backend:26.07.0
903+
image: ghcr.io/idaholab/malcolm/strelka-backend:26.07.1
904904
profiles: ["malcolm", "hedgehog"]
905905
logging:
906906
driver: local
@@ -955,7 +955,7 @@ services:
955955
build:
956956
context: .
957957
dockerfile: Dockerfiles/strelka-frontend.Dockerfile
958-
image: ghcr.io/idaholab/malcolm/strelka-frontend:26.07.0
958+
image: ghcr.io/idaholab/malcolm/strelka-frontend:26.07.1
959959
profiles: ["malcolm", "hedgehog"]
960960
logging:
961961
driver: local
@@ -1001,7 +1001,7 @@ services:
10011001
build:
10021002
context: .
10031003
dockerfile: Dockerfiles/strelka-manager.Dockerfile
1004-
image: ghcr.io/idaholab/malcolm/strelka-manager:26.07.0
1004+
image: ghcr.io/idaholab/malcolm/strelka-manager:26.07.1
10051005
profiles: ["malcolm", "hedgehog"]
10061006
logging:
10071007
driver: local
@@ -1046,7 +1046,7 @@ services:
10461046
build:
10471047
context: .
10481048
dockerfile: Dockerfiles/pcap-capture.Dockerfile
1049-
image: ghcr.io/idaholab/malcolm/pcap-capture:26.07.0
1049+
image: ghcr.io/idaholab/malcolm/pcap-capture:26.07.1
10501050
profiles: ["malcolm", "hedgehog"]
10511051
logging:
10521052
driver: local
@@ -1100,7 +1100,7 @@ services:
11001100
build:
11011101
context: .
11021102
dockerfile: Dockerfiles/pcap-monitor.Dockerfile
1103-
image: ghcr.io/idaholab/malcolm/pcap-monitor:26.07.0
1103+
image: ghcr.io/idaholab/malcolm/pcap-monitor:26.07.1
11041104
profiles: ["malcolm", "hedgehog"]
11051105
logging:
11061106
driver: local
@@ -1153,7 +1153,7 @@ services:
11531153
build:
11541154
context: .
11551155
dockerfile: Dockerfiles/file-upload.Dockerfile
1156-
image: ghcr.io/idaholab/malcolm/file-upload:26.07.0
1156+
image: ghcr.io/idaholab/malcolm/file-upload:26.07.1
11571157
profiles: ["malcolm"]
11581158
logging:
11591159
driver: local
@@ -1194,7 +1194,7 @@ services:
11941194
start_period: 60s
11951195
stop_grace_period: 20s
11961196
htadmin:
1197-
image: ghcr.io/idaholab/malcolm/htadmin:26.07.0
1197+
image: ghcr.io/idaholab/malcolm/htadmin:26.07.1
11981198
profiles: ["malcolm"]
11991199
logging:
12001200
driver: local
@@ -1241,7 +1241,7 @@ services:
12411241
start_period: 60s
12421242
stop_grace_period: 20s
12431243
freq:
1244-
image: ghcr.io/idaholab/malcolm/freq:26.07.0
1244+
image: ghcr.io/idaholab/malcolm/freq:26.07.1
12451245
profiles: ["malcolm"]
12461246
logging:
12471247
driver: local
@@ -1277,7 +1277,7 @@ services:
12771277
start_period: 60s
12781278
stop_grace_period: 20s
12791279
netbox:
1280-
image: ghcr.io/idaholab/malcolm/netbox:26.07.0
1280+
image: ghcr.io/idaholab/malcolm/netbox:26.07.1
12811281
profiles: ["malcolm"]
12821282
logging:
12831283
driver: local
@@ -1351,7 +1351,7 @@ services:
13511351
start_period: 120s
13521352
stop_grace_period: 20s
13531353
postgres:
1354-
image: ghcr.io/idaholab/malcolm/postgresql:26.07.0
1354+
image: ghcr.io/idaholab/malcolm/postgresql:26.07.1
13551355
profiles: ["malcolm"]
13561356
logging:
13571357
driver: local
@@ -1393,7 +1393,7 @@ services:
13931393
start_period: 20m
13941394
stop_grace_period: 1m
13951395
valkey:
1396-
image: ghcr.io/idaholab/malcolm/valkey:26.07.0
1396+
image: ghcr.io/idaholab/malcolm/valkey:26.07.1
13971397
profiles: ["malcolm", "hedgehog"]
13981398
logging:
13991399
driver: local
@@ -1438,7 +1438,7 @@ services:
14381438
start_period: 45s
14391439
stop_grace_period: 20s
14401440
valkey-cache:
1441-
image: ghcr.io/idaholab/malcolm/valkey:26.07.0
1441+
image: ghcr.io/idaholab/malcolm/valkey:26.07.1
14421442
profiles: ["malcolm", "hedgehog"]
14431443
logging:
14441444
driver: local
@@ -1478,7 +1478,7 @@ services:
14781478
start_period: 45s
14791479
stop_grace_period: 20s
14801480
api:
1481-
image: ghcr.io/idaholab/malcolm/api:26.07.0
1481+
image: ghcr.io/idaholab/malcolm/api:26.07.1
14821482
profiles: ["malcolm"]
14831483
logging:
14841484
driver: local
@@ -1528,7 +1528,7 @@ services:
15281528
start_period: 60s
15291529
stop_grace_period: 20s
15301530
keycloak:
1531-
image: ghcr.io/idaholab/malcolm/keycloak:26.07.0
1531+
image: ghcr.io/idaholab/malcolm/keycloak:26.07.1
15321532
profiles: ["malcolm"]
15331533
logging:
15341534
driver: local
@@ -1572,7 +1572,7 @@ services:
15721572
build:
15731573
context: .
15741574
dockerfile: Dockerfiles/nginx.Dockerfile
1575-
image: ghcr.io/idaholab/malcolm/nginx-proxy:26.07.0
1575+
image: ghcr.io/idaholab/malcolm/nginx-proxy:26.07.1
15761576
profiles: ["malcolm"]
15771577
logging:
15781578
driver: local

0 commit comments

Comments
 (0)