Index: pom.xml
===================================================================
diff -u -r3e2c8b7634389a7bc0ddee58812b44d1e711aecc -r1e186118efb1dc91159fccd5c3aca7478ca78712
--- pom.xml (.../pom.xml) (revision 3e2c8b7634389a7bc0ddee58812b44d1e711aecc)
+++ pom.xml (.../pom.xml) (revision 1e186118efb1dc91159fccd5c3aca7478ca78712)
@@ -10,7 +10,7 @@
4.0.0
313devgrp
standard-project
- 20.09.12
+ 20.09.15
pom
standard-project
Index: web-module/pom.xml
===================================================================
diff -u -r3e2c8b7634389a7bc0ddee58812b44d1e711aecc -r1e186118efb1dc91159fccd5c3aca7478ca78712
--- web-module/pom.xml (.../pom.xml) (revision 3e2c8b7634389a7bc0ddee58812b44d1e711aecc)
+++ web-module/pom.xml (.../pom.xml) (revision 1e186118efb1dc91159fccd5c3aca7478ca78712)
@@ -7,7 +7,7 @@
313devgrp
standard-project
- 20.09.12
+ 20.09.15
../pom.xml
Index: web-module/script/yml/monitoring/allinone.yml
===================================================================
diff -u -r3e2c8b7634389a7bc0ddee58812b44d1e711aecc -r1e186118efb1dc91159fccd5c3aca7478ca78712
--- web-module/script/yml/monitoring/allinone.yml (.../allinone.yml) (revision 3e2c8b7634389a7bc0ddee58812b44d1e711aecc)
+++ web-module/script/yml/monitoring/allinone.yml (.../allinone.yml) (revision 1e186118efb1dc91159fccd5c3aca7478ca78712)
@@ -341,6 +341,9 @@
user: "$UID:$GID"
ports:
- 3000:3000
+ environment:
+ - GF_AUTH_ANONYMOUS_ENABLED=true
+ - GF_SECURITY_ALLOW_EMBEDDING=true
depends_on:
- chronograf
volumes:
Index: web-module/script/yml/monitoring/allinone/logstash.conf
===================================================================
diff -u -r3e2c8b7634389a7bc0ddee58812b44d1e711aecc -r1e186118efb1dc91159fccd5c3aca7478ca78712
--- web-module/script/yml/monitoring/allinone/logstash.conf (.../logstash.conf) (revision 3e2c8b7634389a7bc0ddee58812b44d1e711aecc)
+++ web-module/script/yml/monitoring/allinone/logstash.conf (.../logstash.conf) (revision 1e186118efb1dc91159fccd5c3aca7478ca78712)
@@ -1,37 +1,39 @@
input {
+
beats {
port => 5044
- }
+ }
- kafka {
- bootstrap_servers => "kafka1:9092,kafka2:9092,kafka3:9092"
- topics => ["msgTopic"]
- consumer_threads => 1
- decorate_events => true
+ kafka {
+ bootstrap_servers => "kafka1:9092,kafka2:9092,kafka3:9092"
+ topics => ["msgTopic"]
+ consumer_threads => 1
+ decorate_events => true
group_id => "logstash"
- add_field => {
- "[@metadata][beat]" => "apm-%{+YYYY.MM.dd}"
- "[@metadata][type]" => "logs"
- }
- }
+ codec => json {
+ charset => "UTF-8"
+ }
+ }
}
+
filter {
- if [type] == "catalinalog" {
- grok {
- match => { "message" => "%{COMBINEDAPACHELOG}" }
- }
- date {
- match => [ "timestamp" , "dd/MMM/yyyy:HH:mm:ss Z" ]
- }
+ if [type] == "catalinalog" {
+ grok {
+ match => { "message" => "%{COMBINEDAPACHELOG}" }
+ }
+ date {
+ match => [ "timestamp" , "dd/MMM/yyyy:HH:mm:ss Z" ]
+ }
}
-
+
}
+
output {
- stdout {
- codec => rubydebug
- }
+ stdout {
+ codec => rubydebug
+ }
elasticsearch {
hosts => ["es-coordinating:9200"]