Skip to content

Commit 44b7e4c

Browse files
mmguerommguero
committed
Merge branch 'staging' of https://github.com/idaholab/Malcolm 
2 parents f3590a7 + bab8780 commit 44b7e4c

File tree

150 files changed

+8266
-5354
lines changed

Some content is hidden

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

150 files changed

+8266
-5354
lines changed

‎.envrc.example‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ export NETBOX_TOKEN=
124124
export ARKIME_AUTO_ANALYZE_PCAP_THREADS=2
125125
export ARKIME_ROTATE_INDEX=daily
126126
export ARKIME_SPI_DATA_MAX_INDICES=7
127+
export ARKIME_EXPOSE_WISE_GUI=true
128+
export ARKIME_ALLOW_WISE_GUI_CONFIG=true
127129
export CAPA_MAX_REQUESTS=2
128130
export CLAMD_MAX_REQUESTS=4
129131
export CSRF_TRUSTED_ORIGINS=https://*

‎.github/workflows/api-build-and-push-ghcr.yml‎

Lines changed: 4 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -26,107 +26,7 @@ on:
2626

2727
jobs:
2828
docker:
29-
runs-on: ${{ matrix.os }}
30-
permissions:
31-
actions: write
32-
packages: write
33-
contents: read
34-
security-events: write
35-
strategy:
36-
fail-fast: false
37-
matrix:
38-
include:
39-
- os: ubuntu-24.04
40-
arch: amd64
41-
platform: linux/amd64
42-
- os: ubuntu-24.04-arm
43-
arch: arm64
44-
platform: linux/arm64
45-
steps:
46-
-
47-
name: Cancel previous run in progress
48-
uses: styfle/cancel-workflow-action@0.12.1
49-
with:
50-
ignore_sha: true
51-
all_but_latest: true
52-
access_token: ${{ secrets.GITHUB_TOKEN }}
53-
-
54-
name: Checkout
55-
uses: actions/checkout@v4
56-
-
57-
name: Generate build timestamp
58-
shell: bash
59-
run: echo "btimestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
60-
id: generate_build_timestamp
61-
-
62-
name: Extract branch name
63-
shell: bash
64-
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
65-
id: extract_branch
66-
-
67-
name: Generate arch tag suffix
68-
shell: bash
69-
run: echo "archtag=$([[ "${{ matrix.platform }}" == 'linux/amd64' ]] && echo '' || ( echo -n '-' ; echo "${{ matrix.platform }}" | cut -d '/' -f 2) )" >> $GITHUB_OUTPUT
70-
id: arch_tag_suffix
71-
-
72-
name: Extract commit SHA
73-
shell: bash
74-
run: echo "sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
75-
id: extract_commit_sha
76-
-
77-
name: Extract Malcolm version
78-
shell: bash
79-
run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT
80-
id: extract_malcolm_version
81-
-
82-
name: Set up Docker Buildx
83-
uses: docker/setup-buildx-action@v3
84-
with:
85-
driver-opts: |
86-
image=moby/buildkit:master
87-
-
88-
name: Log in to registry
89-
uses: docker/login-action@v3
90-
with:
91-
registry: ghcr.io
92-
username: ${{ github.repository_owner }}
93-
password: ${{ secrets.GITHUB_TOKEN }}
94-
-
95-
name: Build and push
96-
uses: docker/build-push-action@v6
97-
with:
98-
context: .
99-
file: ./Dockerfiles/api.Dockerfile
100-
build-args: |
101-
TARGETPLATFORM=${{ matrix.platform }}
102-
MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
103-
BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
104-
VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
105-
push: true
106-
provenance: false
107-
platforms: ${{ matrix.platform }}
108-
tags: ghcr.io/${{ github.repository_owner }}/malcolm/api:${{ steps.extract_branch.outputs.branch }}${{ steps.arch_tag_suffix.outputs.archtag }}
109-
-
110-
name: Run Trivy vulnerability scanner
111-
if: ${{ matrix.platform == 'linux/amd64' }}
112-
id: trivy-scan
113-
uses: aquasecurity/trivy-action@0.29.0
114-
env:
115-
TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
116-
with:
117-
scan-type: 'image'
118-
scanners: 'vuln'
119-
image-ref: ghcr.io/${{ github.repository_owner }}/malcolm/api:${{ steps.extract_branch.outputs.branch }}${{ steps.arch_tag_suffix.outputs.archtag }}
120-
format: 'sarif'
121-
output: 'trivy-results.sarif'
122-
severity: 'HIGH,CRITICAL'
123-
vuln-type: 'os,library'
124-
hide-progress: true
125-
ignore-unfixed: true
126-
exit-code: '0'
127-
-
128-
name: Upload Trivy scan results to GitHub Security tab
129-
if: ${{ matrix.platform == 'linux/amd64' }}
130-
uses: github/codeql-action/upload-sarif@v3
131-
with:
132-
sarif_file: 'trivy-results.sarif'
29+
uses: ./.github/workflows/docker-build-push-scan.yml
30+
with:
31+
service: api
32+
dockerfile: ./Dockerfiles/api.Dockerfile

‎.github/workflows/arkime-build-and-push-ghcr.yml‎

Lines changed: 7 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -25,109 +25,10 @@ on:
2525

2626
jobs:
2727
docker:
28-
runs-on: ${{ matrix.os }}
29-
permissions:
30-
actions: write
31-
packages: write
32-
contents: read
33-
security-events: write
34-
strategy:
35-
fail-fast: false
36-
matrix:
37-
include:
38-
- os: ubuntu-24.04
39-
arch: amd64
40-
platform: linux/amd64
41-
- os: ubuntu-24.04-arm
42-
arch: arm64
43-
platform: linux/arm64
44-
steps:
45-
-
46-
name: Cancel previous run in progress
47-
uses: styfle/cancel-workflow-action@0.12.1
48-
with:
49-
ignore_sha: true
50-
all_but_latest: true
51-
access_token: ${{ secrets.GITHUB_TOKEN }}
52-
-
53-
name: Checkout
54-
uses: actions/checkout@v4
55-
-
56-
name: Generate build timestamp
57-
shell: bash
58-
run: echo "btimestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
59-
id: generate_build_timestamp
60-
-
61-
name: Extract branch name
62-
shell: bash
63-
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
64-
id: extract_branch
65-
-
66-
name: Generate arch tag suffix
67-
shell: bash
68-
run: echo "archtag=$([[ "${{ matrix.platform }}" == 'linux/amd64' ]] && echo '' || ( echo -n '-' ; echo "${{ matrix.platform }}" | cut -d '/' -f 2) )" >> $GITHUB_OUTPUT
69-
id: arch_tag_suffix
70-
-
71-
name: Extract commit SHA
72-
shell: bash
73-
run: echo "sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
74-
id: extract_commit_sha
75-
-
76-
name: Extract Malcolm version
77-
shell: bash
78-
run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT
79-
id: extract_malcolm_version
80-
-
81-
name: Set up Docker Buildx
82-
uses: docker/setup-buildx-action@v3
83-
with:
84-
driver-opts: |
85-
image=moby/buildkit:master
86-
-
87-
name: Log in to registry
88-
uses: docker/login-action@v3
89-
with:
90-
registry: ghcr.io
91-
username: ${{ github.repository_owner }}
92-
password: ${{ secrets.GITHUB_TOKEN }}
93-
-
94-
name: Build and push
95-
uses: docker/build-push-action@v6
96-
with:
97-
context: .
98-
file: ./Dockerfiles/arkime.Dockerfile
99-
build-args: |
100-
TARGETPLATFORM=${{ matrix.platform }}
101-
MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
102-
BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
103-
VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
104-
MAXMIND_GEOIP_DB_LICENSE_KEY=${{ secrets.MAXMIND_GEOIP_DB_LICENSE_KEY }}
105-
MAXMIND_GEOIP_DB_ALTERNATE_DOWNLOAD_URL=${{ secrets.MAXMIND_GEOIP_DB_ALTERNATE_DOWNLOAD_URL }}
106-
push: true
107-
provenance: false
108-
platforms: ${{ matrix.platform }}
109-
tags: ghcr.io/${{ github.repository_owner }}/malcolm/arkime:${{ steps.extract_branch.outputs.branch }}${{ steps.arch_tag_suffix.outputs.archtag }}
110-
-
111-
name: Run Trivy vulnerability scanner
112-
if: ${{ matrix.platform == 'linux/amd64' }}
113-
id: trivy-scan
114-
uses: aquasecurity/trivy-action@0.29.0
115-
env:
116-
TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
117-
with:
118-
scan-type: 'image'
119-
scanners: 'vuln'
120-
image-ref: ghcr.io/${{ github.repository_owner }}/malcolm/arkime:${{ steps.extract_branch.outputs.branch }}${{ steps.arch_tag_suffix.outputs.archtag }}
121-
format: 'sarif'
122-
output: 'trivy-results.sarif'
123-
severity: 'HIGH,CRITICAL'
124-
vuln-type: 'os,library'
125-
hide-progress: true
126-
ignore-unfixed: true
127-
exit-code: '0'
128-
-
129-
name: Upload Trivy scan results to GitHub Security tab
130-
if: ${{ matrix.platform == 'linux/amd64' }}
131-
uses: github/codeql-action/upload-sarif@v3
132-
with:
133-
sarif_file: 'trivy-results.sarif'
28+
uses: ./.github/workflows/docker-build-push-scan.yml
29+
with:
30+
service: arkime
31+
dockerfile: ./Dockerfiles/arkime.Dockerfile
32+
secrets:
33+
maxmind_license_key: ${{ secrets.MAXMIND_GEOIP_DB_LICENSE_KEY }}
34+
maxmind_alternate_url: ${{ secrets.MAXMIND_GEOIP_DB_ALTERNATE_DOWNLOAD_URL }}

‎.github/workflows/dashboards-build-and-push-ghcr.yml‎

Lines changed: 4 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -26,107 +26,7 @@ on:
2626

2727
jobs:
2828
docker:
29-
runs-on: ${{ matrix.os }}
30-
permissions:
31-
actions: write
32-
packages: write
33-
contents: read
34-
security-events: write
35-
strategy:
36-
fail-fast: false
37-
matrix:
38-
include:
39-
- os: ubuntu-24.04
40-
arch: amd64
41-
platform: linux/amd64
42-
- os: ubuntu-24.04-arm
43-
arch: arm64
44-
platform: linux/arm64
45-
steps:
46-
-
47-
name: Cancel previous run in progress
48-
uses: styfle/cancel-workflow-action@0.12.1
49-
with:
50-
ignore_sha: true
51-
all_but_latest: true
52-
access_token: ${{ secrets.GITHUB_TOKEN }}
53-
-
54-
name: Checkout
55-
uses: actions/checkout@v4
56-
-
57-
name: Generate build timestamp
58-
shell: bash
59-
run: echo "btimestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
60-
id: generate_build_timestamp
61-
-
62-
name: Extract branch name
63-
shell: bash
64-
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
65-
id: extract_branch
66-
-
67-
name: Generate arch tag suffix
68-
shell: bash
69-
run: echo "archtag=$([[ "${{ matrix.platform }}" == 'linux/amd64' ]] && echo '' || ( echo -n '-' ; echo "${{ matrix.platform }}" | cut -d '/' -f 2) )" >> $GITHUB_OUTPUT
70-
id: arch_tag_suffix
71-
-
72-
name: Extract commit SHA
73-
shell: bash
74-
run: echo "sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
75-
id: extract_commit_sha
76-
-
77-
name: Extract Malcolm version
78-
shell: bash
79-
run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT
80-
id: extract_malcolm_version
81-
-
82-
name: Set up Docker Buildx
83-
uses: docker/setup-buildx-action@v3
84-
with:
85-
driver-opts: |
86-
image=moby/buildkit:master
87-
-
88-
name: Log in to registry
89-
uses: docker/login-action@v3
90-
with:
91-
registry: ghcr.io
92-
username: ${{ github.repository_owner }}
93-
password: ${{ secrets.GITHUB_TOKEN }}
94-
-
95-
name: Build and push
96-
uses: docker/build-push-action@v6
97-
with:
98-
context: .
99-
file: ./Dockerfiles/dashboards.Dockerfile
100-
build-args: |
101-
TARGETPLATFORM=${{ matrix.platform }}
102-
MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
103-
BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
104-
VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
105-
push: true
106-
provenance: false
107-
platforms: ${{ matrix.platform }}
108-
tags: ghcr.io/${{ github.repository_owner }}/malcolm/dashboards:${{ steps.extract_branch.outputs.branch }}${{ steps.arch_tag_suffix.outputs.archtag }}
109-
-
110-
name: Run Trivy vulnerability scanner
111-
if: ${{ matrix.platform == 'linux/amd64' }}
112-
id: trivy-scan
113-
uses: aquasecurity/trivy-action@0.29.0
114-
env:
115-
TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
116-
with:
117-
scan-type: 'image'
118-
scanners: 'vuln'
119-
image-ref: ghcr.io/${{ github.repository_owner }}/malcolm/dashboards:${{ steps.extract_branch.outputs.branch }}${{ steps.arch_tag_suffix.outputs.archtag }}
120-
format: 'sarif'
121-
output: 'trivy-results.sarif'
122-
severity: 'HIGH,CRITICAL'
123-
vuln-type: 'os,library'
124-
hide-progress: true
125-
ignore-unfixed: true
126-
exit-code: '0'
127-
-
128-
name: Upload Trivy scan results to GitHub Security tab
129-
if: ${{ matrix.platform == 'linux/amd64' }}
130-
uses: github/codeql-action/upload-sarif@v3
131-
with:
132-
sarif_file: 'trivy-results.sarif'
29+
uses: ./.github/workflows/docker-build-push-scan.yml
30+
with:
31+
service: dashboards
32+
dockerfile: ./Dockerfiles/dashboards.Dockerfile

0 commit comments

Comments
 (0)