Skip to content

Commit

Permalink
adding catchall
Browse files Browse the repository at this point in the history
  • Loading branch information
ivukotic committed Sep 19, 2023
1 parent d525f21 commit 796f85d
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 16 deletions.
1 change: 1 addition & 0 deletions Dockerfile.ps_collector
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ COPY logstash.yml /usr/share/logstash/config/logstash.yml

# COPY configs/ps-collector.conf /usr/share/logstash/configs/ps-collector.conf
COPY configs/ps-status.conf /usr/share/logstash/configs/ps-status.conf
COPY configs/ps-extra.conf /usr/share/logstash/configs/ps-extra.conf
COPY configs/ps-meta.conf /usr/share/logstash/configs/ps-meta.conf
COPY configs/ps-latencybg.conf /usr/share/logstash/configs/ps-latencybg.conf
COPY configs/ps-throughput.conf /usr/share/logstash/configs/ps-throughput.conf
Expand Down
1 change: 0 additions & 1 deletion ToDo.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@

* make logstash parser for "meta", "status".

* add more sites for stress testing.
* add scripted variables.
* add trace hash calculation.
32 changes: 17 additions & 15 deletions configs/es-output.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,27 @@ output {
path => "/var/log/logstash/ruby_exception.json"
}
}
# else if "_bad_document" in [tags] {
# file {
# path => "/var/log/logstash/bad_document.json"
# }
# }
# else {
else if "_extra" in [tags] {
file {
path => "/var/log/logstash/extra.json"
}
}
else {

# file{
# path => "/var/log/logstash/correct_%{[@metadata][type]}.json"
# }
# }

elasticsearch {
hosts => "atlas-kibana.mwt2.org"
data_stream => false
ssl => true
index => "%{[@metadata][type]}"
user => "uc_logstash_indexer"
password => "${LOGSTASH_PWD}"
document_id => "%{[@metadata][id]}"
elasticsearch {
hosts => "atlas-kibana.mwt2.org"
data_stream => false
ssl => true
index => "%{[@metadata][type]}"
user => "uc_logstash_indexer"
password => "${LOGSTASH_PWD}"
document_id => "%{[@metadata][id]}"
}

}

}
13 changes: 13 additions & 0 deletions configs/ps-extra.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
input { pipeline { address => "ps-extra" } }

filter {

mutate{
add_field => { "tags" => "_extra" }
}

}

output {
pipeline { send_to => ["es-output"] }
}
3 changes: 3 additions & 0 deletions configs/ps-intake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,8 @@ output {
}
else if [type]=="meta" {
pipeline { send_to => ["ps-meta"] }
}
else {
pipeline { send_to => ["ps-extra"] }
}
}
3 changes: 3 additions & 0 deletions pipelines/ps-collector.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
- pipeline.id: ps-extra
path.config: "/usr/share/logstash/configs/ps-extra.conf"
pipeline.workers: 1
- pipeline.id: ps-trace
path.config: "/usr/share/logstash/configs/ps-trace.conf"
pipeline.workers: 1
Expand Down

0 comments on commit 796f85d

Please sign in to comment.