From 8521dcd90d6055b0a1f6fa4e0544a3ef4ed50482 Mon Sep 17 00:00:00 2001 From: Nicholas Dille Date: Wed, 31 Jul 2024 23:05:09 +0200 Subject: [PATCH 1/2] Added config and host network --- grafana.yaml | 10 ++++ prometheus.yaml | 16 +++++ prometheus.yml | 7 +++ tools/alertmanager/compose.yaml.go-template | 5 +- tools/blackbox-exporter/Dockerfile.template | 2 +- .../compose.yaml.go-template | 5 +- tools/cadvisor/compose.yaml.go-template | 3 +- .../Dockerfile.template | 1 + .../compose.yaml.go-template | 4 +- .../gitlab-ci-pipelines-exporter.yaml | 24 ++++++++ tools/gitlab-runner/compose.yaml.go-template | 2 + tools/grafana-agent/Dockerfile.template | 2 +- tools/grafana-agent/compose.yaml.go-template | 7 +-- tools/grafana/compose.yaml.go-template | 12 +--- tools/json-exporter/compose.yaml.go-template | 3 +- tools/loki/Dockerfile.template | 2 +- tools/loki/compose.yaml.go-template | 5 +- tools/mimir/Dockerfile.template | 4 +- tools/mimir/compose.yaml.go-template | 25 +++----- tools/mitmproxy/compose.yaml.go-template | 4 +- tools/node-exporter/compose.yaml.go-template | 5 +- tools/portainer/compose.yaml.go-template | 8 +-- tools/prometheus/Dockerfile.template | 3 +- tools/prometheus/compose.yaml.go-template | 10 ++-- tools/prometheus/prometheus.yaml | 7 +++ tools/promtail/compose.yaml.go-template | 1 + tools/pushgateway/compose.yaml.go-template | 3 +- tools/tempo/Dockerfile.template | 1 + tools/tempo/compose.yaml.go-template | 14 ++--- tools/tempo/tempo.yaml | 60 +++++++++++++++++++ tools/traefik/compose.yaml.go-template | 4 +- tools/trivy/compose.yaml.go-template | 3 +- 32 files changed, 177 insertions(+), 85 deletions(-) create mode 100644 grafana.yaml create mode 100644 prometheus.yaml create mode 100644 prometheus.yml create mode 100644 tools/gitlab-ci-pipelines-exporter/gitlab-ci-pipelines-exporter.yaml create mode 100644 tools/prometheus/prometheus.yaml create mode 100644 tools/tempo/tempo.yaml diff --git a/grafana.yaml b/grafana.yaml new file mode 100644 index 0000000000..0b31c0763c --- /dev/null +++ b/grafana.yaml @@ -0,0 +1,10 @@ +services: + grafana: + image: grafana/grafana-oss:11.1.3 + restart: always + volumes: + - grafana-storage:/var/lib/grafana + network_mode: host + +volumes: + grafana-storage: diff --git a/prometheus.yaml b/prometheus.yaml new file mode 100644 index 0000000000..cc981bd211 --- /dev/null +++ b/prometheus.yaml @@ -0,0 +1,16 @@ +services: + prometheus: + image: prom/prometheus:v2.53.1 + command: + - '--config.file=/etc/prometheus/prometheus.yml' + - '--storage.tsdb.path=/prometheus' + - '--web.console.libraries=/usr/share/prometheus/console_libraries' + - '--web.console.templates=/usr/share/prometheus/consoles' + restart: always + volumes: + - ./prometheus.yml:/etc/prometheus/prometheus.yml + - prometheus_data:/prometheus + network_mode: host + +volumes: + prometheus_data: diff --git a/prometheus.yml b/prometheus.yml new file mode 100644 index 0000000000..5659ccabf3 --- /dev/null +++ b/prometheus.yml @@ -0,0 +1,7 @@ +global: + scrape_interval: 15s + evaluation_interval: 15s + +rule_files: + +scrape_configs: diff --git a/tools/alertmanager/compose.yaml.go-template b/tools/alertmanager/compose.yaml.go-template index ef3ab2b17a..8f1925c878 100644 --- a/tools/alertmanager/compose.yaml.go-template +++ b/tools/alertmanager/compose.yaml.go-template @@ -4,5 +4,6 @@ services: command: - '--storage.path=/alertmanager' restart: always - ports: - - 9093:9093 + volumes: + - /var/lib/alertmanager:/alertmanager + network_mode: host diff --git a/tools/blackbox-exporter/Dockerfile.template b/tools/blackbox-exporter/Dockerfile.template index dac0974264..116a3e3990 100644 --- a/tools/blackbox-exporter/Dockerfile.template +++ b/tools/blackbox-exporter/Dockerfile.template @@ -14,4 +14,4 @@ curl --silent --show-error --location --fail "https://github.com/prometheus/blac "blackbox_exporter-${version}.linux-${alt_arch}/blackbox_exporter" EOF COPY compose.yaml.go-template /uniget_bootstrap/etc/docker-compose/blackbox-exporter/ -COPY blackbox.yaml /uniget_bootstrap/etc/docker-compose/blackbox-exporter/config/ +COPY blackbox.yaml /uniget_bootstrap/etc/blackbox/ diff --git a/tools/blackbox-exporter/compose.yaml.go-template b/tools/blackbox-exporter/compose.yaml.go-template index 287d10b402..27f8233157 100644 --- a/tools/blackbox-exporter/compose.yaml.go-template +++ b/tools/blackbox-exporter/compose.yaml.go-template @@ -4,6 +4,5 @@ services: command: - --config.file=/etc/blackbox/blackbox.yaml volumes: - - ./config/blackbox.yaml:/etc/blackbox/blackbox.yaml - ports: - - "127.0.0.1:9115:9115" + - /etc/blackbox/:/etc/blackbox/ + network_mode: host diff --git a/tools/cadvisor/compose.yaml.go-template b/tools/cadvisor/compose.yaml.go-template index 768e9530af..3ca1cbd078 100644 --- a/tools/cadvisor/compose.yaml.go-template +++ b/tools/cadvisor/compose.yaml.go-template @@ -7,5 +7,4 @@ services: - /var/run:/var/run:rw - /sys:/sys:ro - /var/lib/docker/:/var/lib/docker:ro - ports: - - 8080:8080 + network_mode: host diff --git a/tools/gitlab-ci-pipelines-exporter/Dockerfile.template b/tools/gitlab-ci-pipelines-exporter/Dockerfile.template index b096c2bbb7..0578bf7805 100644 --- a/tools/gitlab-ci-pipelines-exporter/Dockerfile.template +++ b/tools/gitlab-ci-pipelines-exporter/Dockerfile.template @@ -20,3 +20,4 @@ mv "${prefix}/bin/helpers/manpages/gitlab-ci-pipelines-exporter.1.gz" "${prefix} rm -rf "${prefix}/bin/helpers" EOF COPY compose.yaml.go-template /uniget_bootstrap/etc/docker-compose/gitlab-ci-pipelines-exporter/ +COPY gitlab-ci-pipelines-exporter.yaml /uniget_bootstrap/etc/gitlab-ci-pipelines-exporter/ diff --git a/tools/gitlab-ci-pipelines-exporter/compose.yaml.go-template b/tools/gitlab-ci-pipelines-exporter/compose.yaml.go-template index d4d45e67ff..db1efa4b28 100644 --- a/tools/gitlab-ci-pipelines-exporter/compose.yaml.go-template +++ b/tools/gitlab-ci-pipelines-exporter/compose.yaml.go-template @@ -2,6 +2,6 @@ services: gcpe: image: quay.io/mvisonneau/gitlab-ci-pipelines-exporter:v{{ .Version }} environment: + GCPE_CONFIG: /etc/gitlab-ci-pipelines-exporter.yml GCPE_INTERNAL_MONITORING_LISTENER_ADDRESS: tcp://127.0.0.1:8082 - ports: - - 8080:8080 \ No newline at end of file + network_mode: host \ No newline at end of file diff --git a/tools/gitlab-ci-pipelines-exporter/gitlab-ci-pipelines-exporter.yaml b/tools/gitlab-ci-pipelines-exporter/gitlab-ci-pipelines-exporter.yaml new file mode 100644 index 0000000000..b669870cf9 --- /dev/null +++ b/tools/gitlab-ci-pipelines-exporter/gitlab-ci-pipelines-exporter.yaml @@ -0,0 +1,24 @@ +log: + level: debug + +gitlab: + url: https://gitlab.com + token: + +# Pull jobs related metrics on all projects +project_defaults: + pull: + pipeline: + jobs: + enabled: true + +# Example public projects to monitor +projects: + - name: gitlab-org/gitlab-runner + # Pull environments related metrics prefixed with 'stable' for this project + pull: + environments: + enabled: true + name_regexp: '^stable.*' + + - name: gitlab-org/charts/auto-deploy-app \ No newline at end of file diff --git a/tools/gitlab-runner/compose.yaml.go-template b/tools/gitlab-runner/compose.yaml.go-template index 3934a433e4..cfa54e9117 100644 --- a/tools/gitlab-runner/compose.yaml.go-template +++ b/tools/gitlab-runner/compose.yaml.go-template @@ -6,6 +6,7 @@ services: image: registry.gitlab.com/gitlab-org/gitlab-runner:v{{ .Version }} volumes: - /etc/gitlab-runner:/etc/gitlab-runner:z + network_mode: host register-runner: restart: 'no' @@ -23,3 +24,4 @@ services: REGISTRATION_TOKEN: ${REGISTRATION_TOKEN} volumes: - ./config:/etc/gitlab-runner:z + network_mode: host diff --git a/tools/grafana-agent/Dockerfile.template b/tools/grafana-agent/Dockerfile.template index c724071626..2044494e80 100644 --- a/tools/grafana-agent/Dockerfile.template +++ b/tools/grafana-agent/Dockerfile.template @@ -27,4 +27,4 @@ mv "${prefix}/bin/grafana-agentctl-linux-${alt_arch}" "${prefix}/bin/grafana-age "${prefix}/bin/grafana-agentctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_grafana-agentctl" EOF COPY compose.yaml.go-template /uniget_bootstrap/etc/docker-compose/grafana-agent/ -COPY agent.yaml /uniget_bootstrap/etc/docker-compose/grafana-agent/config/ \ No newline at end of file +COPY agent.yaml /uniget_bootstrap/etc/grafana-agent/ \ No newline at end of file diff --git a/tools/grafana-agent/compose.yaml.go-template b/tools/grafana-agent/compose.yaml.go-template index 19be5b97f0..8b2b1326a8 100644 --- a/tools/grafana-agent/compose.yaml.go-template +++ b/tools/grafana-agent/compose.yaml.go-template @@ -4,7 +4,7 @@ services: entrypoint: - /bin/grafana-agent - -server.http.address=0.0.0.0:12345 - - -config.file=/etc/agent-config/agent.yaml + - -config.file=/etc/grafana-agent/agent.yaml - -metrics.wal-directory=/tmp/agent/wal - -enable-features=integrations-next - -config.expand-env @@ -15,6 +15,5 @@ services: LOKI_HOST: loki:3100 TEMPO_HOST: tempo:4317 volumes: - - ./config:/etc/agent-config - ports: - - "127.0.0.1:12345:12345" + - /etc/grafana-agent/:/etc/grafana-agent/ + network_mode: host diff --git a/tools/grafana/compose.yaml.go-template b/tools/grafana/compose.yaml.go-template index 6e46f81691..ba439acd26 100644 --- a/tools/grafana/compose.yaml.go-template +++ b/tools/grafana/compose.yaml.go-template @@ -1,13 +1,7 @@ services: grafana: image: grafana/grafana-oss:{{ .Version }} - command: -H unix:///var/run/docker.sock - restart: always - ports: - - "127.0.0.1:3000:3000" + restart: always volumes: - - "/var/run/docker.sock:/var/run/docker.sock" - - grafana-storage:/var/lib/grafana - -volumes: - grafana-storage: \ No newline at end of file + - /var/lib/grafana:/var/lib/grafana + network_mode: host \ No newline at end of file diff --git a/tools/json-exporter/compose.yaml.go-template b/tools/json-exporter/compose.yaml.go-template index 15d389a6a5..22d8693f40 100644 --- a/tools/json-exporter/compose.yaml.go-template +++ b/tools/json-exporter/compose.yaml.go-template @@ -1,5 +1,4 @@ services: json_exporter: image: quay.io/prometheuscommunity/json-exporter:v{{ .Version }} - ports: - - "127.0.0.1:7979:7979" + network_mode: host diff --git a/tools/loki/Dockerfile.template b/tools/loki/Dockerfile.template index 1bc0268d74..9f53d1442d 100644 --- a/tools/loki/Dockerfile.template +++ b/tools/loki/Dockerfile.template @@ -16,4 +16,4 @@ unzip -q -o -d "${prefix}/bin" "${filename}" mv "${prefix}/bin/loki-linux-${alt_arch}" "${prefix}/bin/loki" EOF COPY compose.yaml.go-template /uniget_bootstrap/etc/docker-compose/loki/ -COPY loki.yaml /uniget_bootstrap/etc/docker-compose/loki/config/ \ No newline at end of file +COPY loki.yaml /uniget_bootstrap/etc/loki/config.yaml \ No newline at end of file diff --git a/tools/loki/compose.yaml.go-template b/tools/loki/compose.yaml.go-template index 7d0d9583ae..a071aba587 100644 --- a/tools/loki/compose.yaml.go-template +++ b/tools/loki/compose.yaml.go-template @@ -16,6 +16,5 @@ services: image: grafana/loki:{{ .Version }} command: -config.file=/etc/loki/local-config.yaml volumes: - - ./config/loki.yaml:/etc/loki/config.yaml - ports: - - "127.0.0.1:3100:3100" + - /etc/loki/config.yaml:/etc/loki/config.yaml + network_mode: host diff --git a/tools/mimir/Dockerfile.template b/tools/mimir/Dockerfile.template index 7337c498a6..0d612f8d2f 100644 --- a/tools/mimir/Dockerfile.template +++ b/tools/mimir/Dockerfile.template @@ -14,5 +14,5 @@ curl --silent --show-error --location --fail --output "${prefix}/bin/mimir" \ chmod +x "${prefix}/bin/mimir" EOF COPY compose.yaml.go-template /uniget_bootstrap/etc/docker-compose/mimir/ -COPY mimir.yaml /uniget_bootstrap/etc/docker-compose/mimir/config/ -COPY nginx.conf /uniget_bootstrap/etc/docker-compose/mimir/config/ +COPY mimir.yaml /uniget_bootstrap/etc/mimir/ +COPY nginx.conf /uniget_bootstrap/etc/mimir/ diff --git a/tools/mimir/compose.yaml.go-template b/tools/mimir/compose.yaml.go-template index 387bffb554..dd9d2333e1 100644 --- a/tools/mimir/compose.yaml.go-template +++ b/tools/mimir/compose.yaml.go-template @@ -2,42 +2,33 @@ services: load-balancer: image: nginx:latest volumes: - - ./config/nginx.conf:/etc/nginx/nginx.conf:ro + - /etc/mimir/nginx.conf:/etc/nginx/nginx.conf:ro depends_on: - "mimir-1" - "mimir-2" - "mimir-3" - ports: - - "127.0.0.1:9009:9009" + network_mode: host mimir-1: image: grafana/mimir:{{ .Version }} command: ["-config.file=/etc/mimir.yaml"] hostname: mimir-1 volumes: - - ./config/mimir.yaml:/etc/mimir.yaml - - ./config/alertmanager-fallback-config.yaml:/etc/alertmanager-fallback-config.yaml - - mimir-1-data:/data + - /etc/mimir/mimir.yaml:/etc/mimir.yaml + - /var/lib/mimir/data1:/data mimir-2: image: grafana/mimir:{{ .Version }} command: ["-config.file=/etc/mimir.yaml"] hostname: mimir-2 volumes: - - ./config/mimir.yaml:/etc/mimir.yaml - - ./config/alertmanager-fallback-config.yaml:/etc/alertmanager-fallback-config.yaml - - mimir-2-data:/data + - /etc/mimir/mimir.yaml:/etc/mimir.yaml + - /var/lib/mimir/data2:/data mimir-3: image: grafana/mimir:{{ .Version }} command: ["-config.file=/etc/mimir.yaml"] hostname: mimir-3 volumes: - - ./config/mimir.yaml:/etc/mimir.yaml - - ./config/alertmanager-fallback-config.yaml:/etc/alertmanager-fallback-config.yaml - - mimir-3-data:/data - -volumes: - mimir-1-data: - mimir-2-data: - mimir-3-data: \ No newline at end of file + - /etc/mimir/mimir.yaml:/etc/mimir.yaml + - /var/lib/mimir/data3:/data \ No newline at end of file diff --git a/tools/mitmproxy/compose.yaml.go-template b/tools/mitmproxy/compose.yaml.go-template index 120b3f4ae3..587ce71771 100644 --- a/tools/mitmproxy/compose.yaml.go-template +++ b/tools/mitmproxy/compose.yaml.go-template @@ -2,6 +2,4 @@ services: mitmweb: image: mitmproxy/mitmproxy:{{ .Version }} command: mitmweb --web-iface 0.0.0.0 - ports: - - "127.0.0.1:8080:8080" - - "127.0.0.1"8081:8081" + network_mode: host diff --git a/tools/node-exporter/compose.yaml.go-template b/tools/node-exporter/compose.yaml.go-template index c96b503386..9b8bc6248b 100644 --- a/tools/node-exporter/compose.yaml.go-template +++ b/tools/node-exporter/compose.yaml.go-template @@ -8,10 +8,9 @@ services: - '--path.sysfs=/host/sys' - --collector.filesystem.ignored-mount-points - "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)" - ports: - - "127.0.0.1:9100:9100" volumes: - /proc:/host/proc:ro - /sys:/host/sys:ro - /:/rootfs:ro - - /:/host:ro,rslave \ No newline at end of file + - /:/host:ro,rslave + network_mode: host \ No newline at end of file diff --git a/tools/portainer/compose.yaml.go-template b/tools/portainer/compose.yaml.go-template index 961943424a..8f459e3c30 100644 --- a/tools/portainer/compose.yaml.go-template +++ b/tools/portainer/compose.yaml.go-template @@ -3,11 +3,7 @@ services: image: portainer/portainer-ce:{{ .Version }} command: -H unix:///var/run/docker.sock restart: always - ports: - - "127.0.0.1:9000:9000" volumes: - "/var/run/docker.sock:/var/run/docker.sock" - - "portainer_data:/data" - -volumes: - portainer_data: \ No newline at end of file + - /var/lib/portainer:/data" + network_mode: host \ No newline at end of file diff --git a/tools/prometheus/Dockerfile.template b/tools/prometheus/Dockerfile.template index ece3ab3bab..e7e5b2c8f6 100644 --- a/tools/prometheus/Dockerfile.template +++ b/tools/prometheus/Dockerfile.template @@ -13,4 +13,5 @@ curl --silent --show-error --location --fail "https://github.com/prometheus/prom | tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \ "prometheus-${version}.linux-${alt_arch}/prometheus" EOF -COPY compose.yaml.go-template /uniget_bootstrap/etc/docker-compose/prometheus/ \ No newline at end of file +COPY compose.yaml.go-template /uniget_bootstrap/etc/docker-compose/prometheus/ +COPY prometheus.yaml /uniget_bootstrap/etc/prometheus/ \ No newline at end of file diff --git a/tools/prometheus/compose.yaml.go-template b/tools/prometheus/compose.yaml.go-template index 2b493a75e3..901e8e8774 100644 --- a/tools/prometheus/compose.yaml.go-template +++ b/tools/prometheus/compose.yaml.go-template @@ -2,14 +2,12 @@ services: prometheus: image: prom/prometheus:v{{ .Version }} command: + - '--config.file=/etc/prometheus/prometheus.yaml' - '--storage.tsdb.path=/prometheus' - '--web.console.libraries=/usr/share/prometheus/console_libraries' - '--web.console.templates=/usr/share/prometheus/consoles' restart: always - ports: - - 9090:9090 volumes: - - prometheus_data:/prometheus - -volumes: - prometheus_data: + - /etc/prometheus/:/etc/prometheus/ + - /var/lib/prometheus:/prometheus + network_mode: host \ No newline at end of file diff --git a/tools/prometheus/prometheus.yaml b/tools/prometheus/prometheus.yaml new file mode 100644 index 0000000000..7ad170d541 --- /dev/null +++ b/tools/prometheus/prometheus.yaml @@ -0,0 +1,7 @@ +global: + scrape_interval: 15s + evaluation_interval: 15s + +rule_files: + +scrape_configs: \ No newline at end of file diff --git a/tools/promtail/compose.yaml.go-template b/tools/promtail/compose.yaml.go-template index 4a69287bff..ac414140c3 100644 --- a/tools/promtail/compose.yaml.go-template +++ b/tools/promtail/compose.yaml.go-template @@ -4,3 +4,4 @@ services: command: -config.file=/etc/promtail/config.yml volumes: - /var/log:/var/log + network_mode: host diff --git a/tools/pushgateway/compose.yaml.go-template b/tools/pushgateway/compose.yaml.go-template index b0cae099e7..564f319f29 100644 --- a/tools/pushgateway/compose.yaml.go-template +++ b/tools/pushgateway/compose.yaml.go-template @@ -2,5 +2,4 @@ services: pushgateway: image: prom/pushgateway:v{{ .Version }} restart: always - ports: - - "127.0.0.1:9091:9091" \ No newline at end of file + network_mode: host \ No newline at end of file diff --git a/tools/tempo/Dockerfile.template b/tools/tempo/Dockerfile.template index d8b029e3f4..72e048f31d 100644 --- a/tools/tempo/Dockerfile.template +++ b/tools/tempo/Dockerfile.template @@ -15,3 +15,4 @@ curl --silent --show-error --location --fail "https://github.com/grafana/tempo/r tempo-query EOF COPY compose.yaml.go-template /uniget_bootstrap/etc/docker-compose/tempo/ +COPY tempo.yaml /uniget_bootstrap/etc/tempo/ diff --git a/tools/tempo/compose.yaml.go-template b/tools/tempo/compose.yaml.go-template index 70fd893f79..60fb4c8e4d 100644 --- a/tools/tempo/compose.yaml.go-template +++ b/tools/tempo/compose.yaml.go-template @@ -14,16 +14,10 @@ services: tempo: image: grafana/tempo:{{ .Version }} - command: [ "-config.file=/etc/tempo.yaml" ] + command: [ "-config.file=/etc/tempo/tempo.yaml" ] depends_on: - init volumes: - - ../shared/tempo.yaml:/etc/tempo.yaml - - ./tempo-data:/var/tempo - ports: - - "127.0.0.1:14268:14268" # jaeger ingest - - "127.0.0.1:3200:3200" # tempo - - "127.0.0.1:9095:9095" # tempo grpc - - "127.0.0.1:4317:4317" # otlp grpc - - "127.0.0.1:4318:4318" # otlp http - - "127.0.0.1:9411:9411" # zipkin \ No newline at end of file + - /etc/tempo/:/etc/tempo/ + - /var/tempo:/var/tempo + network_mode: host \ No newline at end of file diff --git a/tools/tempo/tempo.yaml b/tools/tempo/tempo.yaml new file mode 100644 index 0000000000..61fccee0cf --- /dev/null +++ b/tools/tempo/tempo.yaml @@ -0,0 +1,60 @@ +stream_over_http_enabled: true +server: + http_listen_port: 3200 + log_level: info + +query_frontend: + search: + duration_slo: 5s + throughput_bytes_slo: 1.073741824e+09 + trace_by_id: + duration_slo: 5s + +distributor: + receivers: # this configuration will listen on all ports and protocols that tempo is capable of. + jaeger: # the receives all come from the OpenTelemetry collector. more configuration information can + protocols: # be found there: https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver + thrift_http: # + grpc: # for a production deployment you should only enable the receivers you need! + thrift_binary: + thrift_compact: + zipkin: + otlp: + protocols: + http: + grpc: + opencensus: + +ingester: + max_block_duration: 5m # cut the headblock when this much time passes. this is being set for demo purposes and should probably be left alone normally + +compactor: + compaction: + block_retention: 1h # overall Tempo trace retention. set for demo purposes + +metrics_generator: + registry: + external_labels: + source: tempo + cluster: docker-compose + storage: + path: /var/tempo/generator/wal + remote_write: + - url: http://prometheus:9090/api/v1/write + send_exemplars: true + traces_storage: + path: /var/tempo/generator/traces + +storage: + trace: + backend: local # backend configuration to use + wal: + path: /var/tempo/wal # where to store the wal locally + local: + path: /var/tempo/blocks + +overrides: + defaults: + metrics_generator: + processors: [service-graphs, span-metrics, local-blocks] # enables metrics generator + generate_native_histograms: both \ No newline at end of file diff --git a/tools/traefik/compose.yaml.go-template b/tools/traefik/compose.yaml.go-template index 0f88191697..27dfeeaf09 100644 --- a/tools/traefik/compose.yaml.go-template +++ b/tools/traefik/compose.yaml.go-template @@ -13,9 +13,7 @@ services: - --providers.file.directory=/etc/traefik/conf.d - --providers.docker=true - --providers.docker.exposedByDefault=false - ports: - - 80:80 - - 443:443 + network_mode: host volumes: - /etc/traefik:/etc/traefik/conf.d:ro - /etc/ssl:/etc/traefik/ssl:ro diff --git a/tools/trivy/compose.yaml.go-template b/tools/trivy/compose.yaml.go-template index 17b806d6b3..e815e7e307 100644 --- a/tools/trivy/compose.yaml.go-template +++ b/tools/trivy/compose.yaml.go-template @@ -2,5 +2,4 @@ services: trivy-server: image: aquasec/trivy:{{ .Version }} entrypoint: trivy server --skip-update --listen "0.0.0.0:4030" - ports: - - "127.0.0.1:4030:4030" \ No newline at end of file + network_mode: host \ No newline at end of file From c5c1c741d1602e05eae299816c039957949d0cf4 Mon Sep 17 00:00:00 2001 From: Nicholas Dille Date: Thu, 1 Aug 2024 00:06:34 +0200 Subject: [PATCH 2/2] Fixed file location --- tools/cadvisor/Dockerfile.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cadvisor/Dockerfile.template b/tools/cadvisor/Dockerfile.template index bbe8ab91fd..7a695f057f 100644 --- a/tools/cadvisor/Dockerfile.template +++ b/tools/cadvisor/Dockerfile.template @@ -13,4 +13,4 @@ curl --silent --show-error --location --fail --output "${prefix}/bin/cadvisor" \ "https://github.com/google/cadvisor/releases/download/v${version}/cadvisor-v${version}-linux-${alt_arch}" chmod +x "${prefix}/bin/cadvisor" EOF -COPY compose.yaml.go-template /etc/docker-compose/cadvisor/ +COPY compose.yaml.go-template /uniget_bootstrap/etc/docker-compose/cadvisor/