Skip to content

Commit

Permalink
reverted for staging still use maangement shipper for drain logs
Browse files Browse the repository at this point in the history
  • Loading branch information
Jin-Sun-tts committed Dec 28, 2023
1 parent e2e8c76 commit a8ea8a5
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 3 deletions.
Binary file modified .DS_Store
Binary file not shown.
5 changes: 3 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ jobs:
runs-on: ubuntu-latest
needs:
- create-cloudgov-services-management
- deploy-management-staging
steps:
- name: checkout
uses: actions/checkout@v2
Expand All @@ -94,10 +95,10 @@ jobs:
drain-apps-in-staging:
name: drain everything in staging space
environment: management-staging
environment: management
runs-on: ubuntu-latest
needs:
- deploy-management-staging
- deploy-management
steps:
- name: checkout
uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
logstash/logstash-oss-*-linux-x86_64.tar.gz
logstash/plugins.zip
logstash/awscliv2.zip
test/.DS_Store
1 change: 0 additions & 1 deletion create-space-drain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ cf t -s "$space" > /dev/null 2>&1

# Assemble the URL for the drain
drain_url=https://${drain_user}:${drain_password}@${drain_route}
echo $drain_url

# Push out the app that auto-binds apps to the drain
cd "$(mktemp -d)"
Expand Down
Binary file added logstash/.DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions logstash/logstash.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ filter{
mutate {
remove_field => ["headers"]
}

# grok {
# match => { "message" => "%{SYSLOG5424PRI}%{NONNEGINT:syslog5424_ver} +(?:%{TIMESTAMP_ISO8601:syslog5424_ts}|-) +(?:%{DATA:syslog5424_host}|-) +(?:%{NOTSPACE:syslog5424_app}|-) +(?:%{NOTSPACE:syslog5424_proc}|-) +(?:%{WORD:syslog5424_msgid}|-) +(?:%{SYSLOG5424SD:syslog5424_sd}|-|)%{SPACE}%{GREEDYDATA:message}" }
# tag_on_failure => []
Expand Down

0 comments on commit a8ea8a5

Please sign in to comment.