diff --git a/blackbox/blackbox.yml b/blackbox/blackbox.yml index ad94a31..4f09e06 100644 --- a/blackbox/blackbox.yml +++ b/blackbox/blackbox.yml @@ -3,7 +3,7 @@ modules: prober: http timeout: 5s http: - valid_status_codes: [] + valid_status_codes: [200] method: GET preferred_ip_protocol: "ip4" tls_config: diff --git a/docker-compose.core.yml b/docker-compose.core.yml index 2860ae0..330f802 100644 --- a/docker-compose.core.yml +++ b/docker-compose.core.yml @@ -20,7 +20,7 @@ services: - prometheus_network woodpecker_server: - image: woodpeckerci/woodpecker-server:v3.16-alpine + image: woodpeckerci/woodpecker-server:v3.17-alpine volumes: - woodpeckerdata:/var/lib/woodpecker/ entrypoint: /bin/sh -c "export WOODPECKER_GITEA_CLIENT=$$(cat /run/secrets/woodpecker_gitea_client) && export WOODPECKER_GITEA_SECRET=$$(cat /run/secrets/woodpecker_gitea_secret) && export WOODPECKER_AGENT_SECRET=$$(cat /run/secrets/woodpecker_agent_secret) && /bin/woodpecker-server" @@ -37,7 +37,7 @@ services: - woodpecker_gitea_secret woodpecker_agent: - image: woodpeckerci/woodpecker-agent:v3.16-alpine + image: woodpeckerci/woodpecker-agent:v3.17-alpine volumes: - /var/run/docker.sock:/var/run/docker.sock entrypoint: /bin/sh -c "export WOODPECKER_AGENT_SECRET=$$(cat /run/secrets/woodpecker_agent_secret) && /bin/woodpecker-agent" @@ -51,7 +51,7 @@ services: - woodpecker_agent_secret gitea: - image: docker.gitea.com/gitea:1.27.0 + image: docker.gitea.com/gitea:1.27.1 environment: - USER_UID=1000 - USER_GID=1000 diff --git a/docker-compose.observability.yml b/docker-compose.observability.yml index 2028543..e586468 100644 --- a/docker-compose.observability.yml +++ b/docker-compose.observability.yml @@ -57,10 +57,16 @@ services: configs: - source: otel_collector_config target: /etc/otelcol-contrib/config.yaml + volumes: + - /:/hostfs:ro + - /proc:/hostfs/proc:ro + - /sys:/hostfs/sys:ro + - /dev:/hostfs/dev:ro + - /run:/hostfs/run:ro deploy: resources: limits: - memory: 256M + memory: 512M networks: - prometheus_network diff --git a/otel-collector/config.yaml b/otel-collector/config.yaml index 84c3feb..2b76ef4 100644 --- a/otel-collector/config.yaml +++ b/otel-collector/config.yaml @@ -3,6 +3,17 @@ receivers: protocols: http: endpoint: 0.0.0.0:4318 + hostmetrics: + root_path: /hostfs + collection_interval: 10s + scrapers: + cpu: + memory: + disk: + filesystem: + network: + load: + processes: prometheus: config: scrape_configs: @@ -18,11 +29,32 @@ receivers: scrape_interval: 10s static_configs: - targets: ['herald:9100'] + - job_name: alertmanager + scrape_interval: 10s + static_configs: + - targets: ['alertmanager:9093'] + - job_name: blackbox_http + scrape_interval: 10s + metrics_path: /probe + params: + module: [http_2xx] + static_configs: + - targets: + - https://www.qpismont.fr + - https://gitea.qpismont.fr + - https://woodpecker.qpismont.fr + relabel_configs: + - source_labels: [__address__] + target_label: __param_target + - source_labels: [__param_target] + target_label: instance + - target_label: __address__ + replacement: blackbox_exporter:9115 processors: memory_limiter: check_interval: 5s - limit_mib: 200 + limit_mib: 400 spike_limit_mib: 50 batch: timeout: 10s @@ -35,12 +67,20 @@ exporters: endpoint: http://tempo:4318 service: + telemetry: + metrics: + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 pipelines: metrics: - receivers: [otlp, prometheus] + receivers: [otlp, prometheus, hostmetrics] processors: [memory_limiter, batch] exporters: [prometheusremotewrite] traces: receivers: [otlp] processors: [memory_limiter, batch] - exporters: [otlphttp/tempo] \ No newline at end of file + exporters: [otlphttp/tempo] diff --git a/portfolio/index.html b/portfolio/index.html index f72d7d6..47f7091 100644 --- a/portfolio/index.html +++ b/portfolio/index.html @@ -3,11 +3,11 @@ - -Portfolio — Platform Engineer + +Quentin Pismont — Senior/Lead Platform Engineer - +