diff --git a/__swarm/grafana/grafana-swarm.yml b/__swarm/grafana/grafana-swarm.yml index e742eda..886a70d 100644 --- a/__swarm/grafana/grafana-swarm.yml +++ b/__swarm/grafana/grafana-swarm.yml @@ -1,5 +1,9 @@ networks: loki: null +volumes: + grafana-data: + grafana-certs: + services: grafana: entrypoint: @@ -31,11 +35,11 @@ services: networks: - loki ports: - - 3000:3007 + - 3007:3000 user: 0:0 volumes: - - /share/docker_data/grafana/data:/var/lib/grafana - - /share/docker_data/grafana/certs:/certs + - grafana-data:/var/lib/grafana + - grafana-certs:/certs deploy: labels: com.centurylinklabs.watchtower.enable: 'true' @@ -45,7 +49,7 @@ services: homepage.href: https://g.sectorq.eu homepage.icon: grafana.png homepage.name: Grafana - homepage.server: my-docker + homepage.server: my-docker-swarm homepage.weight: '1' wud.watch: 'true' wud.watch.digest: 'true' @@ -76,7 +80,6 @@ services: volumes: - /var/log:/var/log - /share/docker_data/grafana/promtail/config.yml:/etc/promtail/config.yml - - /share/Data/__GITLAB/omv_backup/:/share/Data/__GITLAB/omv_backup/ deploy: labels: wud.watch: 'true' diff --git a/yaml_convert2.py b/yaml_convert2.py index 30109c6..454e174 100644 --- a/yaml_convert2.py +++ b/yaml_convert2.py @@ -47,7 +47,7 @@ def ensure_labels_as_string(labels): def convert_compose_to_swarm(data): services = data.get("services", {}) - input(services) + #input(services) for name, svc in services.items(): print(f"Converting service: {name} , svc: {svc}") if name in ["container_name", "restart", "depends_on"]: @@ -85,7 +85,7 @@ def convert_compose_to_swarm(data): # 6) Convert ports to long format if "ports" in svc: - input(svc) + #input(svc) svc["ports"] = convert_ports(svc["ports"]) # 7) Remove container_name (not allowed in Swarm) @@ -96,7 +96,7 @@ def convert_compose_to_swarm(data): def main(): with open(INPUT_FILE, "r") as f: compose = yaml.safe_load(f) - input(compose) + #input(compose) swarm = convert_compose_to_swarm(compose) with open(OUTPUT_FILE, "w") as f: