From cb30197c107d6b21fcaafa7d35f15e2c63e802e6 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Thu, 11 Jul 2024 06:39:53 +0300 Subject: [PATCH 1/2] run alpine3.19 to avoid upgrading fping to 5.2 and breaking output --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 722a925..53a9af7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG vaping_extras=all ARG poetry_pin=">=1,<=2" -FROM python:3.11-alpine as base +FROM python:3.11-alpine3.19 as base ARG runtime_packages ARG virtual_env=/venv From 1a0fcfc35498f202c30294c6718d530a7a9a3e14 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Thu, 11 Jul 2024 08:35:56 +0300 Subject: [PATCH 2/2] fix standalone_dns config and use unreleased vodka from github to mitigate #173 --- Dockerfile | 1 + examples/standalone_dns/config.yml | 4 ++-- pyproject.toml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 53a9af7..38ed55d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ ARG build_packages="\ rust \ cargo \ rrdtool-dev \ + git \ " ARG runtime_packages="\ diff --git a/examples/standalone_dns/config.yml b/examples/standalone_dns/config.yml index ee8c385..13e89ae 100644 --- a/examples/standalone_dns/config.yml +++ b/examples/standalone_dns/config.yml @@ -1,6 +1,6 @@ probes: - name: latency - type: std_fping + type: fping output: - vodka @@ -22,7 +22,7 @@ plugins: type: fping count: 10 interval: 3s - period: 200 + period: 200 output: - vodka diff --git a/pyproject.toml b/pyproject.toml index 7fbfe0c..36d90c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,8 @@ prometheus_client = { version = ">=0.11.0", optional = true } # standalone graphsrv = { version = "^2", optional = true } -vodka = { version = "^3.1", optional = true } +vodka = { git = "https://github.com/20c/vodka", branch = "master" } +#vodka = { version = "^3.1", optional = true } # FIXME: wekzeug >2.1.0 breaks static file serving Werkzeug = { version = ">2,<2.1.0", optional = true } Flask = { version = ">2,<2.2", optional = true }