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

Rds ingestor cleanup #174

Merged
merged 9 commits into from
Dec 20, 2024
Merged

Rds ingestor cleanup #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f39de78
gotta catch then all
JasonTheMain Dec 19, 2024
8017629
gsub out brackets
JasonTheMain Dec 19, 2024
7bb8324
gsub out brackets
JasonTheMain Dec 19, 2024
5ac667f
gsub out brackets
JasonTheMain Dec 19, 2024
9883774
replacing these values
JasonTheMain Dec 19, 2024
ff5e228
replacing these values
JasonTheMain Dec 20, 2024
174ebb4
better organization
JasonTheMain Dec 20, 2024
8cfeb72
more cleanup
JasonTheMain Dec 20, 2024
2a76660
more cleanup
JasonTheMain Dec 20, 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
8 changes: 0 additions & 8 deletions jobs/ingestor_cloudwatch/templates/bin/ingestor_cloudwatch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ export LOGSTASH_WORKERS=`grep -c ^processor /proc/cpuinfo`
<% else %>
export LOGSTASH_WORKERS=<%= p('logstash_parser.workers') %>
<% end %>
export TIMECOP_REJECT_GREATER_THAN_HOURS=<%= p('logstash_parser.timecop.reject_greater_than_hours') %>
export TIMECOP_REJECT_LESS_THAN_HOURS=<%= p('logstash_parser.timecop.reject_less_than_hours') %>
export HEAP_SIZE=$((( $( cat /proc/meminfo | grep MemTotal | awk '{ print $2 }' ) * <%= p("logstash.heap_percentage") %> ) / 100 ))K
<% if_p('logstash.heap_size') do |heap_size| %>
HEAP_SIZE=<%= heap_size %>
Expand All @@ -56,12 +54,6 @@ HEAP_SIZE=<%= heap_size %>
export <%= env.keys[0] %>="<%= env.values[0] %>"
<% end %>


# These are what changes between ingestors
<% p("logstash_parser.wait_for_templates").each do |template| %>
wait_for_template "<%= template %>"
<% end %>

export LS_JAVA_OPTS="-Xms$HEAP_SIZE -Xmx$HEAP_SIZE -DPID=$$"

# construct a complete config file from all the fragments
Expand Down
12 changes: 4 additions & 8 deletions jobs/ingestor_cloudwatch/templates/config/input_and_output.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,25 @@ filter

rename => {"[cloudwatch_logs][tags][OrganizationGUID]"=>"[@cf][org_id]"}
rename => {"[cloudwatch_logs][tags][Organization GUID]"=>"[@cf][org_id]"}
rename => {"[cloudwatch_logs][tags][Organizationname]"=>"[@cf][org]"}
rename => {"[cloudwatch_logs][tags][Organization name]"=>"[@cf][org]"}

rename => {"[cloudwatch_logs][tags][SpaceGUID]"=>"[@cf][space_id]"}
rename => {"[cloudwatch_logs][tags][Space GUID]"=>"[@cf][space_id]"}

rename => {"[cloudwatch_logs][tags][Spacename]"=>"[@cf][space]"}
rename => {"[cloudwatch_logs][tags][Space name]"=>"[@cf][space]"}

rename => {"[cloudwatch_logs][tags][Organizationname]"=>"[@cf][org]"}
rename => {"[cloudwatch_logs][tags][Organization name]"=>"[@cf][org]"}

rename => {"[cloudwatch_logs][tags][InstanceGUID]"=>"[@cf][service_instance_id]"}
rename => {"[cloudwatch_logs][tags][Instance GUID]"=>"[@cf][service_instance_id]"}

rename => {"[cloudwatch_logs][tags][Instance name]"=>"[@cf][service]"}

rename => {"[cloudwatch_logs][tags][Serviceofferingname]"=>"[@cf][service_offering]"}
rename => {"[cloudwatch_logs][tags][Service offering name]"=>"[@cf][service_offering]"}

rename => {"[cloudwatch_logs][tags][Service plan name]"=>"[@cf][service_plan]"}

rename => {"[cloudwatch_logs][tags][service]"=>"broker"}

rename => {"[cloudwatch_logs][tags][broker]"=>"broker"}
rename => {"message" => "@message" }

remove_field => ["[cloudwatch_logs][tags][Createdat]"]
remove_field => ["[cloudwatch_logs][tags][Created at]"]
Expand All @@ -54,7 +51,6 @@ filter
remove_field => ["[cloudwatch_logs][tags][ServiceGUID]"]
remove_field => ["[cloudwatch_logs][tags][Service GUID]"]

rename => [ "message" => "@message" ]
}
truncate {
fields => ["@message"]
Expand Down
Loading