From dfcab4a47f79b62bd65278ac20d372fe5334633a Mon Sep 17 00:00:00 2001 From: Andrii Chubatiuk Date: Sun, 29 Sep 2024 10:54:45 +0300 Subject: [PATCH] deployment/victorialogs: rename not executable compose files (#7124) ### Describe Your Changes Renamed base compose files to prevent envs to be created from them ### Checklist The following checks are **mandatory**: - [ ] My change adheres [VictoriaMetrics contributing guidelines](https://docs.victoriametrics.com/contributing/). --- .../docker/victorialogs/{compose.yml => compose-base.yml} | 0 .../victorialogs/filebeat/{compose.yml => compose-base.yml} | 2 +- .../docker/victorialogs/filebeat/elasticsearch/compose.yml | 2 +- deployment/docker/victorialogs/filebeat/syslog/compose.yml | 2 +- .../victorialogs/fluentbit/{compose.yml => compose-base.yml} | 2 +- .../docker/victorialogs/fluentbit/jsonline-ha/compose.yml | 2 +- deployment/docker/victorialogs/fluentbit/jsonline/compose.yml | 2 +- deployment/docker/victorialogs/fluentbit/loki/compose.yml | 2 +- .../victorialogs/fluentd/{compose.yml => compose-base.yml} | 2 +- .../docker/victorialogs/fluentd/elasticsearch/compose.yml | 2 +- deployment/docker/victorialogs/fluentd/jsonline/compose.yml | 2 +- deployment/docker/victorialogs/fluentd/loki/compose.yml | 2 +- deployment/docker/victorialogs/fluentd/syslog/compose.yml | 2 +- .../victorialogs/logstash/{compose.yml => compose-base.yml} | 2 +- .../docker/victorialogs/logstash/elasticsearch/compose.yml | 2 +- deployment/docker/victorialogs/logstash/jsonline-ha/compose.yml | 2 +- deployment/docker/victorialogs/logstash/jsonline/compose.yml | 2 +- deployment/docker/victorialogs/logstash/loki/compose.yml | 2 +- .../opentelemetry-collector/{compose.yml => compose-base.yml} | 2 +- .../opentelemetry-collector/elasticsearch-ha/compose.yml | 2 +- .../opentelemetry-collector/elasticsearch/compose.yml | 2 +- .../victorialogs/opentelemetry-collector/loki/compose.yml | 2 +- .../victorialogs/opentelemetry-collector/otlp/compose.yml | 2 +- .../victorialogs/opentelemetry-collector/syslog/compose.yml | 2 +- .../victorialogs/promtail/{compose.yml => compose-base.yml} | 2 +- deployment/docker/victorialogs/promtail/loki/compose.yml | 2 +- .../victorialogs/telegraf/{compose.yml => compose-base.yml} | 2 +- .../docker/victorialogs/telegraf/elasticsearch/compose.yml | 2 +- deployment/docker/victorialogs/telegraf/jsonline/compose.yml | 2 +- deployment/docker/victorialogs/telegraf/loki/compose.yml | 2 +- deployment/docker/victorialogs/telegraf/syslog/compose.yml | 2 +- .../victorialogs/vector/{compose.yml => compose-base.yml} | 2 +- .../docker/victorialogs/vector/elasticsearch/compose.yaml | 2 +- deployment/docker/victorialogs/vector/jsonline-ha/compose.yml | 2 +- deployment/docker/victorialogs/vector/jsonline/compose.yml | 2 +- deployment/docker/victorialogs/vector/loki/compose.yml | 2 +- 36 files changed, 35 insertions(+), 35 deletions(-) rename deployment/docker/victorialogs/{compose.yml => compose-base.yml} (100%) rename deployment/docker/victorialogs/filebeat/{compose.yml => compose-base.yml} (95%) rename deployment/docker/victorialogs/fluentbit/{compose.yml => compose-base.yml} (92%) rename deployment/docker/victorialogs/fluentd/{compose.yml => compose-base.yml} (96%) rename deployment/docker/victorialogs/logstash/{compose.yml => compose-base.yml} (94%) rename deployment/docker/victorialogs/opentelemetry-collector/{compose.yml => compose-base.yml} (94%) rename deployment/docker/victorialogs/promtail/{compose.yml => compose-base.yml} (93%) rename deployment/docker/victorialogs/telegraf/{compose.yml => compose-base.yml} (95%) rename deployment/docker/victorialogs/vector/{compose.yml => compose-base.yml} (95%) diff --git a/deployment/docker/victorialogs/compose.yml b/deployment/docker/victorialogs/compose-base.yml similarity index 100% rename from deployment/docker/victorialogs/compose.yml rename to deployment/docker/victorialogs/compose-base.yml diff --git a/deployment/docker/victorialogs/filebeat/compose.yml b/deployment/docker/victorialogs/filebeat/compose-base.yml similarity index 95% rename from deployment/docker/victorialogs/filebeat/compose.yml rename to deployment/docker/victorialogs/filebeat/compose-base.yml index 0b3b38359..4da2cccc0 100644 --- a/deployment/docker/victorialogs/filebeat/compose.yml +++ b/deployment/docker/victorialogs/filebeat/compose-base.yml @@ -1,5 +1,5 @@ include: - - ../compose.yml + - ../compose-base.yml services: filebeat: image: docker.elastic.co/beats/filebeat:8.15.1 diff --git a/deployment/docker/victorialogs/filebeat/elasticsearch/compose.yml b/deployment/docker/victorialogs/filebeat/elasticsearch/compose.yml index f15e3b2f5..23e245b02 100644 --- a/deployment/docker/victorialogs/filebeat/elasticsearch/compose.yml +++ b/deployment/docker/victorialogs/filebeat/elasticsearch/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: filebeat-elasticsearch diff --git a/deployment/docker/victorialogs/filebeat/syslog/compose.yml b/deployment/docker/victorialogs/filebeat/syslog/compose.yml index eb908fd0c..5d38d1a17 100644 --- a/deployment/docker/victorialogs/filebeat/syslog/compose.yml +++ b/deployment/docker/victorialogs/filebeat/syslog/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: filebeat-syslog diff --git a/deployment/docker/victorialogs/fluentbit/compose.yml b/deployment/docker/victorialogs/fluentbit/compose-base.yml similarity index 92% rename from deployment/docker/victorialogs/fluentbit/compose.yml rename to deployment/docker/victorialogs/fluentbit/compose-base.yml index 2f38c9f20..c9580679f 100644 --- a/deployment/docker/victorialogs/fluentbit/compose.yml +++ b/deployment/docker/victorialogs/fluentbit/compose-base.yml @@ -1,5 +1,5 @@ include: - - ../compose.yml + - ../compose-base.yml services: fluentbit: image: cr.fluentbit.io/fluent/fluent-bit:3.1.7 diff --git a/deployment/docker/victorialogs/fluentbit/jsonline-ha/compose.yml b/deployment/docker/victorialogs/fluentbit/jsonline-ha/compose.yml index ffe557c61..3a9ccc9a9 100644 --- a/deployment/docker/victorialogs/fluentbit/jsonline-ha/compose.yml +++ b/deployment/docker/victorialogs/fluentbit/jsonline-ha/compose.yml @@ -1,5 +1,5 @@ include: - path: - - ../compose.yml + - ../compose-base.yml - ../../compose-ha.yml name: fluentbit-jsonline-ha diff --git a/deployment/docker/victorialogs/fluentbit/jsonline/compose.yml b/deployment/docker/victorialogs/fluentbit/jsonline/compose.yml index 4edd0c18b..fcdecd21b 100644 --- a/deployment/docker/victorialogs/fluentbit/jsonline/compose.yml +++ b/deployment/docker/victorialogs/fluentbit/jsonline/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: fluentbit-jsonline diff --git a/deployment/docker/victorialogs/fluentbit/loki/compose.yml b/deployment/docker/victorialogs/fluentbit/loki/compose.yml index 1627ba043..9cf140127 100644 --- a/deployment/docker/victorialogs/fluentbit/loki/compose.yml +++ b/deployment/docker/victorialogs/fluentbit/loki/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: fluentbit-loki diff --git a/deployment/docker/victorialogs/fluentd/compose.yml b/deployment/docker/victorialogs/fluentd/compose-base.yml similarity index 96% rename from deployment/docker/victorialogs/fluentd/compose.yml rename to deployment/docker/victorialogs/fluentd/compose-base.yml index e189f506e..0d35bfd8e 100644 --- a/deployment/docker/victorialogs/fluentd/compose.yml +++ b/deployment/docker/victorialogs/fluentd/compose-base.yml @@ -1,5 +1,5 @@ include: - - ../compose.yml + - ../compose-base.yml services: fluentd: build: . diff --git a/deployment/docker/victorialogs/fluentd/elasticsearch/compose.yml b/deployment/docker/victorialogs/fluentd/elasticsearch/compose.yml index 9c65b063e..9ec3ada9d 100644 --- a/deployment/docker/victorialogs/fluentd/elasticsearch/compose.yml +++ b/deployment/docker/victorialogs/fluentd/elasticsearch/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: fluentd-elasticsearch diff --git a/deployment/docker/victorialogs/fluentd/jsonline/compose.yml b/deployment/docker/victorialogs/fluentd/jsonline/compose.yml index efe3cb825..f99e29462 100644 --- a/deployment/docker/victorialogs/fluentd/jsonline/compose.yml +++ b/deployment/docker/victorialogs/fluentd/jsonline/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: fluentd-jsonline diff --git a/deployment/docker/victorialogs/fluentd/loki/compose.yml b/deployment/docker/victorialogs/fluentd/loki/compose.yml index 1627ba043..9cf140127 100644 --- a/deployment/docker/victorialogs/fluentd/loki/compose.yml +++ b/deployment/docker/victorialogs/fluentd/loki/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: fluentbit-loki diff --git a/deployment/docker/victorialogs/fluentd/syslog/compose.yml b/deployment/docker/victorialogs/fluentd/syslog/compose.yml index e9e4e82da..d6b2c9656 100644 --- a/deployment/docker/victorialogs/fluentd/syslog/compose.yml +++ b/deployment/docker/victorialogs/fluentd/syslog/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: fluentbit-syslog diff --git a/deployment/docker/victorialogs/logstash/compose.yml b/deployment/docker/victorialogs/logstash/compose-base.yml similarity index 94% rename from deployment/docker/victorialogs/logstash/compose.yml rename to deployment/docker/victorialogs/logstash/compose-base.yml index 4263a392c..8f0ac156d 100644 --- a/deployment/docker/victorialogs/logstash/compose.yml +++ b/deployment/docker/victorialogs/logstash/compose-base.yml @@ -1,5 +1,5 @@ include: - - ../compose.yml + - ../compose-base.yml services: logstash: build: diff --git a/deployment/docker/victorialogs/logstash/elasticsearch/compose.yml b/deployment/docker/victorialogs/logstash/elasticsearch/compose.yml index 79399ecc2..2de18276b 100644 --- a/deployment/docker/victorialogs/logstash/elasticsearch/compose.yml +++ b/deployment/docker/victorialogs/logstash/elasticsearch/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: logstash-elasticsearch diff --git a/deployment/docker/victorialogs/logstash/jsonline-ha/compose.yml b/deployment/docker/victorialogs/logstash/jsonline-ha/compose.yml index d63fa78c0..80a9dae0d 100644 --- a/deployment/docker/victorialogs/logstash/jsonline-ha/compose.yml +++ b/deployment/docker/victorialogs/logstash/jsonline-ha/compose.yml @@ -1,5 +1,5 @@ include: - path: - - ../compose.yml + - ../compose-base.yml - ../../compose-ha.yml name: logstash-jsonline-ha diff --git a/deployment/docker/victorialogs/logstash/jsonline/compose.yml b/deployment/docker/victorialogs/logstash/jsonline/compose.yml index 11d4a0548..b0a1849b1 100644 --- a/deployment/docker/victorialogs/logstash/jsonline/compose.yml +++ b/deployment/docker/victorialogs/logstash/jsonline/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: logstash-jsonline diff --git a/deployment/docker/victorialogs/logstash/loki/compose.yml b/deployment/docker/victorialogs/logstash/loki/compose.yml index 9e3249883..e312b61ac 100644 --- a/deployment/docker/victorialogs/logstash/loki/compose.yml +++ b/deployment/docker/victorialogs/logstash/loki/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: logstash-loki diff --git a/deployment/docker/victorialogs/opentelemetry-collector/compose.yml b/deployment/docker/victorialogs/opentelemetry-collector/compose-base.yml similarity index 94% rename from deployment/docker/victorialogs/opentelemetry-collector/compose.yml rename to deployment/docker/victorialogs/opentelemetry-collector/compose-base.yml index 794f2382b..16e43eef8 100644 --- a/deployment/docker/victorialogs/opentelemetry-collector/compose.yml +++ b/deployment/docker/victorialogs/opentelemetry-collector/compose-base.yml @@ -1,5 +1,5 @@ include: - - ../compose.yml + - ../compose-base.yml services: collector: image: docker.io/otel/opentelemetry-collector-contrib:0.108.0 diff --git a/deployment/docker/victorialogs/opentelemetry-collector/elasticsearch-ha/compose.yml b/deployment/docker/victorialogs/opentelemetry-collector/elasticsearch-ha/compose.yml index 6fc7eafd6..e8c3de276 100644 --- a/deployment/docker/victorialogs/opentelemetry-collector/elasticsearch-ha/compose.yml +++ b/deployment/docker/victorialogs/opentelemetry-collector/elasticsearch-ha/compose.yml @@ -1,5 +1,5 @@ include: - path: - - ../compose.yml + - ../compose-base.yml - ../../compose-ha.yml name: collector-elasticsearch-ha diff --git a/deployment/docker/victorialogs/opentelemetry-collector/elasticsearch/compose.yml b/deployment/docker/victorialogs/opentelemetry-collector/elasticsearch/compose.yml index 6d8c4be2d..400e6ef82 100644 --- a/deployment/docker/victorialogs/opentelemetry-collector/elasticsearch/compose.yml +++ b/deployment/docker/victorialogs/opentelemetry-collector/elasticsearch/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: collector-elasticsearch diff --git a/deployment/docker/victorialogs/opentelemetry-collector/loki/compose.yml b/deployment/docker/victorialogs/opentelemetry-collector/loki/compose.yml index 865979e9b..51d822b84 100644 --- a/deployment/docker/victorialogs/opentelemetry-collector/loki/compose.yml +++ b/deployment/docker/victorialogs/opentelemetry-collector/loki/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: collector-loki diff --git a/deployment/docker/victorialogs/opentelemetry-collector/otlp/compose.yml b/deployment/docker/victorialogs/opentelemetry-collector/otlp/compose.yml index 9dcaed9be..2a2fde05e 100644 --- a/deployment/docker/victorialogs/opentelemetry-collector/otlp/compose.yml +++ b/deployment/docker/victorialogs/opentelemetry-collector/otlp/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: collector-otlp diff --git a/deployment/docker/victorialogs/opentelemetry-collector/syslog/compose.yml b/deployment/docker/victorialogs/opentelemetry-collector/syslog/compose.yml index b87ea641e..f5e58d293 100644 --- a/deployment/docker/victorialogs/opentelemetry-collector/syslog/compose.yml +++ b/deployment/docker/victorialogs/opentelemetry-collector/syslog/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: collector-syslog diff --git a/deployment/docker/victorialogs/promtail/compose.yml b/deployment/docker/victorialogs/promtail/compose-base.yml similarity index 93% rename from deployment/docker/victorialogs/promtail/compose.yml rename to deployment/docker/victorialogs/promtail/compose-base.yml index 01d8e01d4..da25f0f1e 100644 --- a/deployment/docker/victorialogs/promtail/compose.yml +++ b/deployment/docker/victorialogs/promtail/compose-base.yml @@ -1,5 +1,5 @@ include: - - ../compose.yml + - ../compose-base.yml services: promtail: image: grafana/promtail:3.0.1 diff --git a/deployment/docker/victorialogs/promtail/loki/compose.yml b/deployment/docker/victorialogs/promtail/loki/compose.yml index 5ee00fa08..a229023a9 100644 --- a/deployment/docker/victorialogs/promtail/loki/compose.yml +++ b/deployment/docker/victorialogs/promtail/loki/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: promtail-elasticsearch diff --git a/deployment/docker/victorialogs/telegraf/compose.yml b/deployment/docker/victorialogs/telegraf/compose-base.yml similarity index 95% rename from deployment/docker/victorialogs/telegraf/compose.yml rename to deployment/docker/victorialogs/telegraf/compose-base.yml index 3132712ed..2851c274a 100644 --- a/deployment/docker/victorialogs/telegraf/compose.yml +++ b/deployment/docker/victorialogs/telegraf/compose-base.yml @@ -1,5 +1,5 @@ include: - - ../compose.yml + - ../compose-base.yml services: telegraf: image: bitnami/telegraf:1.31.3 diff --git a/deployment/docker/victorialogs/telegraf/elasticsearch/compose.yml b/deployment/docker/victorialogs/telegraf/elasticsearch/compose.yml index e9285fa03..3c9d9d863 100644 --- a/deployment/docker/victorialogs/telegraf/elasticsearch/compose.yml +++ b/deployment/docker/victorialogs/telegraf/elasticsearch/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: telegraf-elasticsearch diff --git a/deployment/docker/victorialogs/telegraf/jsonline/compose.yml b/deployment/docker/victorialogs/telegraf/jsonline/compose.yml index 68d7844a0..bb8bf05cc 100644 --- a/deployment/docker/victorialogs/telegraf/jsonline/compose.yml +++ b/deployment/docker/victorialogs/telegraf/jsonline/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: telegraf-jsonline diff --git a/deployment/docker/victorialogs/telegraf/loki/compose.yml b/deployment/docker/victorialogs/telegraf/loki/compose.yml index 470a80a0a..1f99a2501 100644 --- a/deployment/docker/victorialogs/telegraf/loki/compose.yml +++ b/deployment/docker/victorialogs/telegraf/loki/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: telegraf-loki diff --git a/deployment/docker/victorialogs/telegraf/syslog/compose.yml b/deployment/docker/victorialogs/telegraf/syslog/compose.yml index 698adb2a9..2ee27c969 100644 --- a/deployment/docker/victorialogs/telegraf/syslog/compose.yml +++ b/deployment/docker/victorialogs/telegraf/syslog/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: telegraf-syslog diff --git a/deployment/docker/victorialogs/vector/compose.yml b/deployment/docker/victorialogs/vector/compose-base.yml similarity index 95% rename from deployment/docker/victorialogs/vector/compose.yml rename to deployment/docker/victorialogs/vector/compose-base.yml index 9c9c117d7..bc035bef7 100644 --- a/deployment/docker/victorialogs/vector/compose.yml +++ b/deployment/docker/victorialogs/vector/compose-base.yml @@ -1,5 +1,5 @@ include: - - ../compose.yml + - ../compose-base.yml services: vector: image: docker.io/timberio/vector:0.40.0-distroless-static diff --git a/deployment/docker/victorialogs/vector/elasticsearch/compose.yaml b/deployment/docker/victorialogs/vector/elasticsearch/compose.yaml index bbb51e727..3e284ce3b 100644 --- a/deployment/docker/victorialogs/vector/elasticsearch/compose.yaml +++ b/deployment/docker/victorialogs/vector/elasticsearch/compose.yaml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: vector-elasticsearch diff --git a/deployment/docker/victorialogs/vector/jsonline-ha/compose.yml b/deployment/docker/victorialogs/vector/jsonline-ha/compose.yml index 7d873452b..cb5d3dc41 100644 --- a/deployment/docker/victorialogs/vector/jsonline-ha/compose.yml +++ b/deployment/docker/victorialogs/vector/jsonline-ha/compose.yml @@ -1,5 +1,5 @@ include: - path: - - ../compose.yml + - ../compose-base.yml - ../../compose-ha.yml name: vector-jsonline-ha diff --git a/deployment/docker/victorialogs/vector/jsonline/compose.yml b/deployment/docker/victorialogs/vector/jsonline/compose.yml index 10a44b140..ac6778e4f 100644 --- a/deployment/docker/victorialogs/vector/jsonline/compose.yml +++ b/deployment/docker/victorialogs/vector/jsonline/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: vector-jsonline diff --git a/deployment/docker/victorialogs/vector/loki/compose.yml b/deployment/docker/victorialogs/vector/loki/compose.yml index 433c2bf9a..708e61097 100644 --- a/deployment/docker/victorialogs/vector/loki/compose.yml +++ b/deployment/docker/victorialogs/vector/loki/compose.yml @@ -1,3 +1,3 @@ include: - - ../compose.yml + - ../compose-base.yml name: vector-loki