Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Malcolm v23.12.1 #315

Merged
merged 89 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
bb9cd0f
Work in progress of idaholab/Malcolm#281, arkime-live container; done…
mmguero Nov 28, 2023
05516fd
Work in progress of idaholab/Malcolm#281, arkime-live container; done…
mmguero Nov 28, 2023
a74ad8b
Work in progress of idaholab/Malcolm#281, arkime-live container; done…
mmguero Nov 28, 2023
3fdfd98
Work in progress of idaholab/Malcolm#281, arkime-live container; done…
mmguero Nov 28, 2023
e4bd70f
Work in progress of idaholab/Malcolm#281, arkime-live container; done…
mmguero Nov 28, 2023
3b503d3
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Nov 28, 2023
7f061e6
Work in progress of idaholab/Malcolm#281, arkime-live container; done…
mmguero Nov 28, 2023
24a19ae
Work in progress of idaholab/Malcolm#281, arkime-live container; done…
mmguero Nov 28, 2023
66d0af1
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Nov 30, 2023
4a24fed
bump for v23.12.1 development
mmguero Dec 5, 2023
ac58ba3
copyright year update
mmguero Dec 5, 2023
1329815
update workflows
mmguero Dec 5, 2023
b0f39c3
change URL for downloading manuf list to new wireshark.org URL, idaho…
mmguero Dec 5, 2023
78861db
surface .env variable for zeek intel refresh threads
mmguero Dec 5, 2023
9284881
for idaholab/Malcolm#282, reviewing capabilities for containers
mmguero Dec 6, 2023
3b437b9
for idaholab/Malcolm#282, reviewing capabilities for containers
mmguero Dec 6, 2023
23e7ea4
for idaholab/Malcolm#282, reviewing capabilities for containers
mmguero Dec 6, 2023
0d1ae89
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Dec 7, 2023
e4a4387
beats to v8.11.2 (https://www.elastic.co/guide/en/beats/libbeat/curre…
mmguero Dec 7, 2023
f345c7b
comments for idaholab/Malcolm#282
mmguero Dec 7, 2023
47d038f
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Dec 7, 2023
7c67665
goStatic -vhost ''
mmguero Dec 7, 2023
32fc9a1
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Dec 7, 2023
ce2b7b8
added python3-dotenv as an install script dependency
mmguero Dec 7, 2023
dead776
Revert "added python3-dotenv as an install script dependency"
mmguero Dec 7, 2023
7591fbc
some tweaks to installer
mmguero Dec 7, 2023
c60ae37
idaholab/Malcolm#310, have install.py offer to pull the docker images
mmguero Dec 7, 2023
d544339
idaholab/Malcolm#310, have install.py offer to pull the docker images
mmguero Dec 7, 2023
1c66692
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Dec 7, 2023
0bf719d
idaholab/Malcolm#310, have install.py offer to pull the docker images
mmguero Dec 7, 2023
8652234
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Dec 7, 2023
47f770f
work in progress for idaholab/Malcolm#281, clean up env. variable nam…
mmguero Dec 7, 2023
d4175c6
idaholab/Malcolm#281
mmguero Dec 7, 2023
66e1525
idaholab/Malcolm#281
mmguero Dec 7, 2023
1c13f59
idaholab/Malcolm#281
mmguero Dec 7, 2023
0c9874a
for idaholab/Malcolm#282, reviewing capabilities for containers
mmguero Dec 7, 2023
86cbe70
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Dec 7, 2023
2d77b8f
for idaholab/Malcolm#282, reviewing capabilities for containers
mmguero Dec 7, 2023
f0f3217
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Dec 7, 2023
692f658
work in progress for idaholab/Malcolm#281, clean up env. variable nam…
mmguero Dec 7, 2023
8c0975f
idaholab/Malcolm#281
mmguero Dec 7, 2023
676400f
idaholab/Malcolm#281
mmguero Dec 7, 2023
5399cef
bump elasticsearch-py to v8.11.1
mmguero Dec 8, 2023
a5e734e
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Dec 8, 2023
5ba889e
idaholab/Malcolm#281, don't try to surface opensearch port unless pri…
mmguero Dec 8, 2023
bf64861
idaholab/Malcolm#281, arkime capture work in progress
mmguero Dec 8, 2023
dd9794e
idaholab/Malcolm#281, arkime capture work in progress
mmguero Dec 8, 2023
0f129fe
work in progress for idaholab/Malcolm#281 (arkime capture) and idahol…
mmguero Dec 8, 2023
c207871
work in progress for idaholab/Malcolm#281: arkime capture tuning para…
mmguero Dec 8, 2023
2bc1c43
work in progress for idaholab/Malcolm#281: arkime capture rules
mmguero Dec 8, 2023
87ef4ed
documentation updates
mmguero Dec 8, 2023
89b904d
for idaholab/Malcolm#282 (container capabilities), netsniff-ng needs …
mmguero Dec 8, 2023
08a76ad
for idaholab/Malcolm#282 (container capabilities), netsniff-ng needs …
mmguero Dec 8, 2023
cc53ae6
idaholab/Malcolm#309, rsyslog no longer in bookworm
mmguero Dec 11, 2023
ad74561
set defaults for ZEEK_INTEL_PATH and ZEEK_CUSTOM_PATH
mmguero Dec 11, 2023
e0b9287
beats and logstash to to v8.11.3
mmguero Dec 12, 2023
53eefa6
work on idaholab/Malcolm#309, rsyslog no longer in bookworm
mmguero Dec 12, 2023
82021da
work on idaholab/Malcolm#309, rsyslog no longer in bookworm
mmguero Dec 12, 2023
8715faf
work on idaholab/Malcolm#309, rsyslog no longer in bookworm
mmguero Dec 12, 2023
a8f1bed
work on idaholab/Malcolm#309, rsyslog no longer in bookworm
mmguero Dec 12, 2023
bea5499
work on idaholab/Malcolm#309, rsyslog no longer in bookworm
mmguero Dec 12, 2023
8c7e04d
work on idaholab/Malcolm#309, rsyslog no longer in bookworm
mmguero Dec 12, 2023
7f06a8b
work on idaholab/Malcolm#309, rsyslog no longer in bookworm
mmguero Dec 12, 2023
5d7503b
only overwrite Arkime's config.ini with config.orig.ini config.ini do…
mmguero Dec 13, 2023
517c2b4
work on idaholab/Malcolm#309, rsyslog no longer in bookworm
mmguero Dec 13, 2023
e5f63bf
idaholab/Malcolm#251; include CVE-2023-28771 rule based on Zyxel Sekt…
mmguero Dec 13, 2023
ca41a4e
improvements to suricata custom rule handling, and added SURICATA_DIS…
mmguero Dec 13, 2023
b50b7dd
disable ICS based on variables
mmguero Dec 13, 2023
ab59023
passthrough opensearch, netbox and logstash APIs vi malcolm API
mmguero Dec 14, 2023
6163aae
fix config location in docker-compose.yml
mmguero Dec 14, 2023
89dd9b0
fixes that shouldn't have been merged in
mmguero Dec 14, 2023
60a8619
fix arkime deploy
mmguero Dec 14, 2023
391ab26
systemd dashboard
mmguero Dec 14, 2023
835dd2c
gitignore
mmguero Dec 18, 2023
6737389
bump supercronic to v0.2.29 and netbox to v3.6.7
mmguero Dec 18, 2023
8b69bf8
Reduce verbosity
mmguero Dec 18, 2023
7f457af
in docker container startup, allow files with _MALDIR_ in the name to…
mmguero Dec 18, 2023
4a3842e
Adjust kubernetes mountPaths for a few configMaps
mmguero Dec 18, 2023
a111b20
don't fail if we can't create expanded dirs, leave the error up to th…
mmguero Dec 18, 2023
5845087
fix kubernetes typo
mmguero Dec 18, 2023
1d106e4
idaholab/Malcolm#308, create configmaps with flattened path names for…
mmguero Dec 18, 2023
0398bef
rename kubernetes image references prior to a v23.12.1 release
mmguero Dec 18, 2023
b7ab36b
for idaholab/Malcolm#281, make sure PCAP_TWEAK_IFACE gets set correct…
mmguero Dec 19, 2023
1d5b57e
for idaholab/Malcolm#281, make sure PCAP_TWEAK_IFACE gets set correct…
mmguero Dec 19, 2023
65046c6
allow ufw_allow_viewer.sh by %netdev group
mmguero Dec 19, 2023
92c8f78
Revert "allow ufw_allow_viewer.sh by %netdev group"
mmguero Dec 19, 2023
a4479ba
for idaholab/Malcolm#281, allow docker to talk to host for retrieving…
mmguero Dec 19, 2023
d5e2cef
update documents for v23.12.1 release
mmguero Dec 20, 2023
ad82892
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Dec 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/api-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@ jobs:
steps:
-
name: Cancel previous run in progress
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
ignore_sha: true
all_but_latest: true
access_token: ${{ secrets.GITHUB_TOKEN }}
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Extract branch name
shell: bash
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
id: extract_branch
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
driver-opts: |
image=moby/buildkit:master
-
name: Log in to registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfiles/api.Dockerfile
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/arkime-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@ jobs:
steps:
-
name: Cancel previous run in progress
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
ignore_sha: true
all_but_latest: true
access_token: ${{ secrets.GITHUB_TOKEN }}
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Extract branch name
shell: bash
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
id: extract_branch
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
driver-opts: |
image=moby/buildkit:master
-
name: Log in to registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfiles/arkime.Dockerfile
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/dashboards-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@ jobs:
steps:
-
name: Cancel previous run in progress
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
ignore_sha: true
all_but_latest: true
access_token: ${{ secrets.GITHUB_TOKEN }}
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Extract branch name
shell: bash
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
id: extract_branch
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
driver-opts: |
image=moby/buildkit:master
-
name: Log in to registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfiles/dashboards.Dockerfile
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/dashboards-helper-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@ jobs:
steps:
-
name: Cancel previous run in progress
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
ignore_sha: true
all_but_latest: true
access_token: ${{ secrets.GITHUB_TOKEN }}
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Extract branch name
shell: bash
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
id: extract_branch
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
driver-opts: |
image=moby/buildkit:master
-
name: Log in to registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfiles/dashboards-helper.Dockerfile
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/dirinit-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,38 +23,38 @@ jobs:
steps:
-
name: Cancel previous run in progress
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
ignore_sha: true
all_but_latest: true
access_token: ${{ secrets.GITHUB_TOKEN }}
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Extract branch name
shell: bash
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
id: extract_branch
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
driver-opts: |
image=moby/buildkit:master
-
name: Log in to registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfiles/dirinit.Dockerfile
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/file-monitor-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@ jobs:
steps:
-
name: Cancel previous run in progress
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
ignore_sha: true
all_but_latest: true
access_token: ${{ secrets.GITHUB_TOKEN }}
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Extract branch name
shell: bash
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
id: extract_branch
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
driver-opts: |
image=moby/buildkit:master
-
name: Log in to registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfiles/file-monitor.Dockerfile
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/file-upload-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@ jobs:
steps:
-
name: Cancel previous run in progress
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
ignore_sha: true
all_but_latest: true
access_token: ${{ secrets.GITHUB_TOKEN }}
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Extract branch name
shell: bash
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
id: extract_branch
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
driver-opts: |
image=moby/buildkit:master
-
name: Log in to registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfiles/file-upload.Dockerfile
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/filebeat-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@ jobs:
steps:
-
name: Cancel previous run in progress
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
ignore_sha: true
all_but_latest: true
access_token: ${{ secrets.GITHUB_TOKEN }}
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Extract branch name
shell: bash
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
id: extract_branch
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
driver-opts: |
image=moby/buildkit:master
-
name: Log in to registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfiles/filebeat.Dockerfile
Expand Down
Loading