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.

Sign up for GitHub

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

Opensearch ingestor now supports s3 #111

Merged
merged 18 commits into from
Nov 19, 2024
Merged

Opensearch ingestor now supports s3 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
71dae52
attempt at fixing filter ability
JasonTheMain Nov 18, 2024
77d59c2
second end
JasonTheMain Nov 18, 2024
b6090fe
second end
JasonTheMain Nov 18, 2024
32f9db9
second end
JasonTheMain Nov 18, 2024
6ac5117
adding in different formatting
JasonTheMain Nov 19, 2024
57e5095
adding in s3 access
JasonTheMain Nov 19, 2024
6ca6873
can't be none
JasonTheMain Nov 19, 2024
287b796
can't be none
JasonTheMain Nov 19, 2024
6cd3533
removing because it errors
JasonTheMain Nov 19, 2024
3a2b299
removing because it errors
JasonTheMain Nov 19, 2024
ba6ad1d
fixing cf_enabled
JasonTheMain Nov 19, 2024
08536d9
fixing cf_enabled
JasonTheMain Nov 19, 2024
89f8f9a
trying to remove old values
JasonTheMain Nov 19, 2024
5e09187
trying to remove old values
JasonTheMain Nov 19, 2024
6d7bb87
trying to remove old values
JasonTheMain Nov 19, 2024
cd9617e
replacing message
JasonTheMain Nov 19, 2024
cb1a3f6
updated and working ingestion
JasonTheMain Nov 19, 2024
18ddaee
Merge pull request #110 from cloud-gov/main
JasonTheMain Nov 19, 2024
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
4 changes: 4 additions & 0 deletions jobs/ingestor_syslog/templates/bin/ingestor_syslog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ cat ${JOB_DIR}/config/filters_post.conf >> ${JOB_DIR}/config/logstash.conf
<% if p('logstash_parser.enable_json_filter') %>
cat /var/vcap/packages/base-logstash-filters/if_it_looks_like_json.conf >> ${JOB_DIR}/config/logstash.conf
<% end %>

<% if p('logstash_ingestor.ingest_syslog_enabled') %>
cat /var/vcap/packages/base-logstash-filters/timecop.conf >> ${JOB_DIR}/config/logstash.conf
<% end %>

cat /var/vcap/packages/base-logstash-filters/deployment.conf >> ${JOB_DIR}/config/logstash.conf

echo "} #close filters" >> ${JOB_DIR}/config/logstash.conf
Expand Down
12 changes: 11 additions & 1 deletion jobs/ingestor_syslog/templates/config/filters_pre.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,19 @@
#
# Injected custom filters below from logstash_inject.filters manifest property
#
<%= p('logstash_ingestor.filters') %>


<% if !p('logstash_ingestor.ingest_syslog_enabled') %>
grok {
match => { "message" => "^%{TIMESTAMP_ISO8601:timestamp}%{SPACE}%{SYSLOGPROG:program}%{SPACE}%{GREEDYDATA:newmessage}$" }
tag_on_failure => ["fail/s3-start/_grokparsefailure"]
}
mutate {
remove_field => ["timestamp","program"]
replace => {"message" => "%{newmessage}" }
}
<% end %>

<% if 'DEBUG' == p('logstash.metadata_level') %>
mutate {
add_field => [ "@parser[job]", "<%= name %>/<%= index %>" ]
Expand Down