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 v25.01.0 #558

Merged
merged 56 commits into from
Jan 17, 2025
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
6e157fb
Bump development for v25.01.0, also update copyright year
mmguero Dec 19, 2024
433aa57
bump netbox to v4.1.10, osd_transform to v2.18.0, and fluent-bit to v…
mmguero Jan 6, 2025
02cf852
for cisagov/Malcolm#354, work in progress for Malcolm directly accept…
mmguero Jan 6, 2025
76606c9
for cisagov/Malcolm#354, work in progress for Malcolm directly accept…
mmguero Jan 6, 2025
a5eb005
cisagov/Malcolm#543, add naviation pane to non-network dashboards
mmguero Jan 7, 2025
9256719
bump jinja to 3.1.5
mmguero Jan 7, 2025
d021eaa
Documentation for cisagov/Malcolm#354, syslog
mmguero Jan 7, 2025
f8217e0
replace old filebeat input for syslog with tcp/udp input and syslog p…
mmguero Jan 7, 2025
6461221
Documentation for cisagov/Malcolm#354, syslog
mmguero Jan 7, 2025
83d7485
install.py tweak for cisagov/Malcolm#354
mmguero Jan 7, 2025
0f69adb
minor fix for for cisagov/Malcolm#354, set host.name correctly
mmguero Jan 7, 2025
329de6f
bump netbox to v4.11.1 and elasticsearch-dsl to v8.17.1
mmguero Jan 8, 2025
fa6807b
start of cisagov/Malcolm#356, normalize winlogbeats
mmguero Jan 8, 2025
413eca5
WIP of cisagov/Malcolm#356, normalize winlogbeats
mmguero Jan 8, 2025
9ce0289
WIP of cisagov/Malcolm#356, normalize winlogbeats
mmguero Jan 8, 2025
e0e8af5
WIP of cisagov/Malcolm#356, fix for a dashboard
mmguero Jan 8, 2025
8cb4348
WIP of cisagov/Malcolm#356, normalize winlogbeats
mmguero Jan 8, 2025
de41177
Work in progress for cisagov/Malcolm#541, making sure conn.log and kn…
mmguero Jan 9, 2025
98d7d17
Work in progress for cisagov/Malcolm#541
mmguero Jan 9, 2025
3866959
standardize ICS protocols in network.protocol field, so they all get …
mmguero Jan 9, 2025
0844647
fix cisagov/Malcolm#533, allow keystores to be created on startup eve…
mmguero Jan 9, 2025
eae26a7
forgot to add file for cisagov/Malcolm#356
mmguero Jan 9, 2025
dea3ce7
For cisagov/Malcolm#524, handle filenames with spaces in extracted_fi…
mmguero Jan 9, 2025
35da64f
work for cisagov/Malcolm#542, preserve custom field formatting for in…
mmguero Jan 13, 2025
a884675
work for cisagov/Malcolm#542, preserve custom field formatting for in…
mmguero Jan 13, 2025
d2827a3
bump yq to v4.45.1
mmguero Jan 13, 2025
3c94d7f
for cisagov/Malcolm#551, URL pivot links from dashboards to arkime
mmguero Jan 13, 2025
ae3c7f0
for cisagov/Malcolm#551, URL pivot links from dashboards to arkime
mmguero Jan 13, 2025
4bd8362
fix pivot from arkime to dashboards and vice-versa when using a traef…
mmguero Jan 14, 2025
4dd9ef9
for cisagov/Malcolm#551, URL pivot links from dashboards to netbox
mmguero Jan 14, 2025
db8bde4
for cisagov/Malcolm#551, URL pivot links from dashboards to netbox
mmguero Jan 14, 2025
bdac4f4
for cisagov/Malcolm#551, URL pivot links from netbox to arkime/dashbo…
mmguero Jan 14, 2025
c005ec2
start of cisagov/Malcolm#553, update zeek to v7.1.0
mmguero Jan 14, 2025
f3231e9
cisagov/Malcolm#553, handle conn.log for zeek v7.1.0 and documentatio…
mmguero Jan 14, 2025
d6c48f1
cisagov/Malcolm#553, handle postgresql.log
mmguero Jan 14, 2025
c400649
cisagov/Malcolm#553, handle postgresql.log
mmguero Jan 14, 2025
f29ff50
cisagov/Malcolm#553, added PostgreSQL dashboard
mmguero Jan 14, 2025
77d6996
for cisagov/Malcolm#551, URL pivot links in dashboards (ignore date/t…
mmguero Jan 14, 2025
33c05c7
start of omron fins integration, cisagov/Malcolm#554
mmguero Jan 15, 2025
260a7f0
wip omron fins integration, , cisagov/Malcolm#554
mmguero Jan 15, 2025
4949221
arkime to v5.6.0
mmguero Jan 15, 2025
e4408f6
bump logstash and filebeat to v8.17.0
mmguero Jan 15, 2025
2c1571b
Fix nginx filebeat
mmguero Jan 15, 2025
d0fe1e0
WIP omron fins integration, cisagov/Malcolm#554
mmguero Jan 15, 2025
0ca98c0
WIP omron fins integration, cisagov/Malcolm#554
mmguero Jan 15, 2025
2f5a022
WIP omron fins integration, cisagov/Malcolm#554
mmguero Jan 15, 2025
9503a4d
WIP omron fins integration, cisagov/Malcolm#554
mmguero Jan 15, 2025
5d8fed7
WIP omron fins integration, cisagov/Malcolm#554
mmguero Jan 15, 2025
401da78
dashboards tweaks
mmguero Jan 16, 2025
61eab8b
fix links for hh redirect download
mmguero Jan 16, 2025
a950f6c
fix issue with nginx proxy
mmguero Jan 16, 2025
1fd94c7
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Jan 16, 2025
8115771
html formatting
mmguero Jan 16, 2025
d61e5ab
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Jan 16, 2025
b92528b
documentation for workaround for UFW software firewall for Malcolm IS…
mmguero Jan 17, 2025
f964a63
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Jan 17, 2025
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
Prev Previous commit
Next Next commit
fix issue with nginx proxy
mmguero committed Jan 16, 2025
commit a950f6ca5013ee4a353f0b388a5af98283424754
4 changes: 2 additions & 2 deletions nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -202,8 +202,8 @@ http {
rewrite ^/(dashboards/app/)?hh-extracted-files/([a-zA-Z0-9-\.]+)(.*)$ $filereq break;
proxy_pass https://$upstream;
proxy_ssl_verify off;
proxy_set_header Host $1;
proxy_set_header X-Malcolm-Forward "/hh-extracted-files/$1";
proxy_set_header Host $2;
proxy_set_header X-Malcolm-Forward "/hh-extracted-files/$2";
}

# Arkime -> Dashboards shortcut
4 changes: 2 additions & 2 deletions nginx/nginx_readonly.conf
Original file line number Diff line number Diff line change
@@ -163,8 +163,8 @@ http {
rewrite ^/(dashboards/app/)?hh-extracted-files/([a-zA-Z0-9-\.]+)(.*)$ $filereq break;
proxy_pass https://$upstream;
proxy_ssl_verify off;
proxy_set_header Host $1;
proxy_set_header X-Malcolm-Forward "/hh-extracted-files/$1";
proxy_set_header Host $2;
proxy_set_header X-Malcolm-Forward "/hh-extracted-files/$2";
}

# Dashboards -> Arkime shortcut