From c19d8625f261704a4bd9c872b91c9df10767978f Mon Sep 17 00:00:00 2001 From: Ben Hays Date: Fri, 16 Feb 2024 17:58:12 -0500 Subject: [PATCH] Add Prelim Elasticsearch Support --- .gitmodules | 3 +++ Ansible/elasticsearch.yml | 0 Ansible/grafana-docker.yml | 2 +- Ansible/inventory.ini | 5 ++++- Bash/grafana-docker.sh | 18 ++++++++++++++++-- Configs/elk-stack/docker-elk | 1 + 6 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 .gitmodules create mode 100644 Ansible/elasticsearch.yml create mode 160000 Configs/elk-stack/docker-elk diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f501478 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Configs/elk-stack/docker-elk"] + path = Configs/elk-stack/docker-elk + url = https://github.com/deviantony/docker-elk.git diff --git a/Ansible/elasticsearch.yml b/Ansible/elasticsearch.yml new file mode 100644 index 0000000..e69de29 diff --git a/Ansible/grafana-docker.yml b/Ansible/grafana-docker.yml index 31dea3a..80598cd 100644 --- a/Ansible/grafana-docker.yml +++ b/Ansible/grafana-docker.yml @@ -9,7 +9,7 @@ tags: docker - name: Install Docker apt: - name: docker + name: docker-compose state: latest tags: docker - name: Ensure Docker service is enabled and started diff --git a/Ansible/inventory.ini b/Ansible/inventory.ini index 19635d9..6181be3 100644 --- a/Ansible/inventory.ini +++ b/Ansible/inventory.ini @@ -3,6 +3,7 @@ [linux] 10.0.1.2 +10.0.1.3 10.0.1.12 10.0.1.13 10.0.1.14 @@ -13,5 +14,7 @@ 10.0.1.2 [grafana] -10.0.1.2 +10.0.1.3 +[elasticsearch] +10.0.1.3 diff --git a/Bash/grafana-docker.sh b/Bash/grafana-docker.sh index c6cb36e..ff53394 100644 --- a/Bash/grafana-docker.sh +++ b/Bash/grafana-docker.sh @@ -1,15 +1,29 @@ #!/bin/bash +# run Grafana/InfluxDB for metric collection and observation + # Check if port 3000 is open if lsof -Pi :3000 -sTCP:LISTEN -t >/dev/null ; then echo "Port 3000 is already in use. Stopping existing Grafana instance..." docker stop grafana + docker stop influxdb + docker rm grafana + docker rm influxdb else - # Create a Docker volume for Grafana storage + # Create Docker volumes docker volume create grafana-storage + docker volume create influxdb-storage fi # Run Grafana container docker run -d -p 3000:3000 --name=grafana \ --volume grafana-storage:/var/lib/grafana \ - grafana/grafana-enterprise \ No newline at end of file + grafana/grafana-enterprise + +# Run InfluxDB container +docker run -d \ + --name influxdb \ + -p 8086:8086 \ + -p 8089:8089/udp \ + --volume influxdb-storage:/var/lib/influxdb2 \ + influxdb:latest \ No newline at end of file diff --git a/Configs/elk-stack/docker-elk b/Configs/elk-stack/docker-elk new file mode 160000 index 0000000..5da1bad --- /dev/null +++ b/Configs/elk-stack/docker-elk @@ -0,0 +1 @@ +Subproject commit 5da1badcf9e835047d07d7c34eb0e38583867cc5