use dockerhub image

bird-house · Nov 4, 2024 · d4e8402 · d4e8402
1 parent 1d8d160
commit d4e8402
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 114 deletions.
diff --git a/birdhouse/optional-components/prometheus-log-parser/config/thredds/docker-compose-extra.yml b/birdhouse/optional-components/prometheus-log-parser/config/thredds/docker-compose-extra.yml
@@ -2,4 +2,4 @@ version: "3.4"
 services:
   prometheus-log-parser:
     volumes:
-      - ./optional-components/prometheus-log-parser/config/thredds/prometheus-log-exporter.py:${PROMETHEUS_LOG_PARSER_EXPORTERS_DIR}/thredds-prometheus-log-exporter.py:ro
+      - ./optional-components/prometheus-log-parser/config/thredds/prometheus-log-exporter.py:${PROMETHEUS_LOG_PARSER_PARSERS_DIR}/thredds-prometheus-log-exporter.py:ro
diff --git a/birdhouse/optional-components/prometheus-log-parser/default.env b/birdhouse/optional-components/prometheus-log-parser/default.env
@@ -1,8 +1,8 @@
-export PROMETHEUS_LOG_PARSER_DOCKER=python
-export PROMETHEUS_LOG_PARSER_VERSION=3.13-alpine
+export PROMETHEUS_LOG_PARSER_DOCKER=marbleclimate/log-parser
+export PROMETHEUS_LOG_PARSER_VERSION=v1.0.1
 export PROMETHEUS_LOG_PARSER_IMAGE='${PROMETHEUS_LOG_PARSER_DOCKER}:${PROMETHEUS_LOG_PARSER_VERSION}'
 export PROMETHEUS_LOG_PARSER_CLIENT_PORT=8000
-export PROMETHEUS_LOG_PARSER_EXPORTERS_DIR=/exporters.d
+export PROMETHEUS_LOG_PARSER_PARSERS_DIR=/parsers.d
 export PROMETHEUS_LOG_PARSER_POLL_DELAY=1 # time in seconds
 export PROMETHEUS_LOG_PARSER_TAIL=t
 

diff --git a/birdhouse/optional-components/prometheus-log-parser/docker-compose-extra.yml b/birdhouse/optional-components/prometheus-log-parser/docker-compose-extra.yml
@@ -10,15 +10,10 @@ services:
   prometheus-log-parser:
     image: ${PROMETHEUS_LOG_PARSER_IMAGE}
     container_name: prometheus-log-parser
-    entrypoint: ["sh", "/entrypoint.sh"]
-    command: ["python", "/prometheus-log-exporter.py"]
-    volumes:
-      - ./optional-components/prometheus-log-parser/requirements.txt:/requirements.txt:ro
-      - ./optional-components/prometheus-log-parser/entrypoint.sh:/entrypoint.sh:ro
-      - ./optional-components/prometheus-log-parser/prometheus-log-exporter.py:/prometheus-log-exporter.py:ro
+    entrypoint: ["log-parser-prometheus"]
     environment:
       - PROMETHEUS_LOG_PARSER_CLIENT_PORT=${PROMETHEUS_LOG_PARSER_CLIENT_PORT}
-      - LOG_PARSER_EXPORTERS_DIR=${PROMETHEUS_LOG_PARSER_EXPORTERS_DIR}
+      - LOG_PARSER_PARSERS=${PROMETHEUS_LOG_PARSER_PARSERS_DIR}
       - LOG_PARSER_POLL_DELAY=${PROMETHEUS_LOG_PARSER_POLL_DELAY}
       - LOG_PARSER_TAIL=${PROMETHEUS_LOG_PARSER_TAIL}
     restart: always

diff --git a/birdhouse/optional-components/prometheus-log-parser/entrypoint.sh b/birdhouse/optional-components/prometheus-log-parser/entrypoint.sh
diff --git a/birdhouse/optional-components/prometheus-log-parser/prometheus-log-exporter.py b/birdhouse/optional-components/prometheus-log-parser/prometheus-log-exporter.py
diff --git a/birdhouse/optional-components/prometheus-log-parser/requirements.txt b/birdhouse/optional-components/prometheus-log-parser/requirements.txt