added and updated some docker files
changed elasticsearch image to the original elastic one
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
version: '2'
|
||||
version: '2.2'
|
||||
services:
|
||||
elasticsearch:
|
||||
image:
|
||||
elasticsearch
|
||||
image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
|
||||
container_name: elasticsearch
|
||||
hostname: elasticsearch
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "9200:9200"
|
||||
- "9300:9300"
|
||||
- "10.1.0.10:9200:9200"
|
||||
- "10.1.0.10:9300:9300"
|
||||
volumes:
|
||||
- elastic-data:/usr/share/elasticsearch/data
|
||||
environment:
|
||||
@@ -25,8 +25,9 @@ services:
|
||||
image:
|
||||
kibana
|
||||
hostname: kibana
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "5601:5601"
|
||||
- "10.1.0.10:5601:5601"
|
||||
networks:
|
||||
- elk
|
||||
depends_on:
|
||||
|
||||
22
dockerfiles/logstash/logstash.conf
Normal file
22
dockerfiles/logstash/logstash.conf
Normal file
@@ -0,0 +1,22 @@
|
||||
input {
|
||||
stdin {
|
||||
type => syslog
|
||||
}
|
||||
}
|
||||
|
||||
filter {
|
||||
if [type] == "syslog" {
|
||||
grok {
|
||||
match => { "message" => "%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} %{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}" }
|
||||
add_field => [ "received_at", "%{@timestamp}" ]
|
||||
add_field => [ "received_from", "%{host}" ]
|
||||
}
|
||||
date {
|
||||
match => [ "syslog_timestamp", "MMM d HH:mm:ss", "MMM dd HH:mm:ss" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
output {
|
||||
stdout { codec => rubydebug }
|
||||
}
|
||||
20
dockerfiles/openhab/docker-compose.yml
Normal file
20
dockerfiles/openhab/docker-compose.yml
Normal file
@@ -0,0 +1,20 @@
|
||||
version: '2.2'
|
||||
|
||||
services:
|
||||
openhab:
|
||||
image: "openhab/openhab:2.2.0-amd64-debian"
|
||||
restart: always
|
||||
network_mode: host
|
||||
tty: true
|
||||
volumes:
|
||||
- "/etc/localtime:/etc/localtime:ro"
|
||||
- "/etc/timezone:/etc/timezone:ro"
|
||||
- "/opt/openhab/addons:/openhab/addons"
|
||||
- "/opt/openhab/conf:/openhab/conf"
|
||||
- "/opt/openhab/userdata:/openhab/userdata"
|
||||
environment:
|
||||
OPENHAB_HTTP_PORT: "8080"
|
||||
OPENHAB_HTTPS_PORT: "8443"
|
||||
expose:
|
||||
- "8080"
|
||||
- "8443"
|
||||
Reference in New Issue
Block a user