diff --git a/ci/main.go b/ci/main.go index 089004ee..e76aa289 100644 --- a/ci/main.go +++ b/ci/main.go @@ -11,8 +11,8 @@ import ( "dagger.io/dagger" ) -// use golang:1.21.0 container as builder -const goImage = "golang:1.21.0" +// use golang:1.21.1 container as builder +const goImage = "golang:1.21.1" func main() { println("Dagger is a programmable CI/CD engine that runs your pipelines in containers.") diff --git a/docker-compose/common/compose-include/agent-collect-logs.yaml b/docker-compose/common/compose-include/agent-collect-logs.yaml index a0093f0d..cf94702f 100644 --- a/docker-compose/common/compose-include/agent-collect-logs.yaml +++ b/docker-compose/common/compose-include/agent-collect-logs.yaml @@ -4,7 +4,7 @@ services: depends_on: gateway: condition: service_healthy - image: grafana/agent:v0.36.1 + image: grafana/agent:v0.36.2 volumes: - ../config/agent-flow:/etc/agent-config - /var/run/docker.sock:/var/run/docker.sock diff --git a/docker-compose/common/compose-include/agent-collect-metrics.yaml b/docker-compose/common/compose-include/agent-collect-metrics.yaml index 17a98930..92eb2245 100644 --- a/docker-compose/common/compose-include/agent-collect-metrics.yaml +++ b/docker-compose/common/compose-include/agent-collect-metrics.yaml @@ -4,7 +4,7 @@ services: depends_on: gateway: condition: service_healthy - image: grafana/agent:v0.36.1 + image: grafana/agent:v0.36.2 volumes: - ../config/agent-flow:/etc/agent-config - /var/run/docker.sock:/var/run/docker.sock diff --git a/docker-compose/common/compose-include/agent-collect-profiles.yaml b/docker-compose/common/compose-include/agent-collect-profiles.yaml index 4f8b594f..62e2734b 100644 --- a/docker-compose/common/compose-include/agent-collect-profiles.yaml +++ b/docker-compose/common/compose-include/agent-collect-profiles.yaml @@ -4,7 +4,7 @@ services: depends_on: pyroscope: condition: service_started - image: grafana/agent:v0.36.1 + image: grafana/agent:v0.36.2 volumes: - ../config/agent-flow:/etc/agent-config - /var/run/docker.sock:/var/run/docker.sock diff --git a/docker-compose/common/compose-include/agent-collect-traces.yaml b/docker-compose/common/compose-include/agent-collect-traces.yaml index 81b0baa4..6609e85e 100644 --- a/docker-compose/common/compose-include/agent-collect-traces.yaml +++ b/docker-compose/common/compose-include/agent-collect-traces.yaml @@ -4,7 +4,7 @@ services: depends_on: gateway: condition: service_healthy - image: grafana/agent:v0.36.1 + image: grafana/agent:v0.36.2 volumes: - ../config/agent-flow:/etc/agent-config - /var/run/docker.sock:/var/run/docker.sock diff --git a/docker-compose/common/compose-include/load-mimir-rule.yaml b/docker-compose/common/compose-include/load-mimir-rule.yaml index 515fab8e..4335606a 100644 --- a/docker-compose/common/compose-include/load-mimir-rule.yaml +++ b/docker-compose/common/compose-include/load-mimir-rule.yaml @@ -3,7 +3,7 @@ services: depends_on: gateway: condition: service_started - image: grafana/mimirtool:2.9.0 + image: grafana/mimirtool:2.10.0 volumes: - ../../../monitoring-mixins/mimir-mixin/deploy/rules.yaml:/mimir-mixin/rules.yaml - ../../../monitoring-mixins/mimir-mixin/deploy/alerts.yaml:/mimir-mixin/alerts.yaml diff --git a/docker-compose/microservices-mode/logs/docker-compose.yaml b/docker-compose/microservices-mode/logs/docker-compose.yaml index ef983fe0..b810baa9 100644 --- a/docker-compose/microservices-mode/logs/docker-compose.yaml +++ b/docker-compose/microservices-mode/logs/docker-compose.yaml @@ -37,7 +37,7 @@ services: depends_on: ingester: condition: service_started - image: &lokiImage grafana/loki:2.9.0 + image: &lokiImage grafana/loki:2.9.1 volumes: - ../../common/config/loki/microservices-mode-logs.yaml:/etc/loki.yaml # Note: Loki use microservices-mode-logs.yaml command: @@ -139,7 +139,7 @@ services: - loki-memberlist grafana: - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 command: - --config=/etc/grafana-config/grafana.ini volumes: diff --git a/docker-compose/microservices-mode/metrics/docker-compose.yaml b/docker-compose/microservices-mode/metrics/docker-compose.yaml index 44bbc0aa..d2cbbf35 100644 --- a/docker-compose/microservices-mode/metrics/docker-compose.yaml +++ b/docker-compose/microservices-mode/metrics/docker-compose.yaml @@ -38,7 +38,7 @@ services: depends_on: ingester: condition: service_started - image: &mimirImage grafana/mimir:2.9.0 + image: &mimirImage grafana/mimir:2.10.0 volumes: - ../../common/config/mimir/microservices-mode-metrics.yaml:/etc/mimir.yaml # Note: Mimir use microservices-mode-metrics.yaml - ./config/mimir:/etc/mimir @@ -205,7 +205,7 @@ services: - mimir-memberlist grafana: - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 command: - --config=/etc/grafana-config/grafana.ini volumes: diff --git a/docker-compose/microservices-mode/profiles/docker-compose.yaml b/docker-compose/microservices-mode/profiles/docker-compose.yaml index 844c9f14..c9322ae5 100644 --- a/docker-compose/microservices-mode/profiles/docker-compose.yaml +++ b/docker-compose/microservices-mode/profiles/docker-compose.yaml @@ -152,7 +152,7 @@ services: - pyroscope-memberlist grafana: - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 command: - --config=/etc/grafana-config/grafana.ini volumes: diff --git a/docker-compose/microservices-mode/traces/docker-compose.yaml b/docker-compose/microservices-mode/traces/docker-compose.yaml index 5a3d3870..78a4986f 100644 --- a/docker-compose/microservices-mode/traces/docker-compose.yaml +++ b/docker-compose/microservices-mode/traces/docker-compose.yaml @@ -36,7 +36,7 @@ services: depends_on: ingester: condition: service_started - image: &tempoImage grafana/tempo:2.2.2 + image: &tempoImage grafana/tempo:2.2.3 volumes: - ../../common/config/tempo/microservices-mode-traces.yaml:/etc/tempo.yaml # Note: Tempo use microservices-mode-traces.yaml command: @@ -111,7 +111,7 @@ services: depends_on: agent: condition: service_started - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 command: - --config=/etc/grafana-config/grafana.ini volumes: diff --git a/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml b/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml index 36cf5cdf..c4c48ced 100644 --- a/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml +++ b/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml @@ -15,7 +15,7 @@ services: condition: service_healthy loki: condition: service_healthy - image: grafana/agent:v0.36.1 + image: grafana/agent:v0.36.2 volumes: - ../../common/config/agent-flow:/etc/agent-config - /var/run/docker.sock:/var/run/docker.sock @@ -73,7 +73,7 @@ services: depends_on: minio: condition: service_healthy - image: grafana/loki:2.9.0 + image: grafana/loki:2.9.1 volumes: - ../../common/config/loki/monolithic-mode-logs.yaml:/etc/config.yaml command: @@ -112,7 +112,7 @@ services: condition: service_healthy mimir: condition: service_healthy - image: grafana/tempo:2.2.2 + image: grafana/tempo:2.2.3 volumes: - ../../common/config/tempo/monolithic-mode-traces.yaml:/etc/config.yaml command: @@ -152,7 +152,7 @@ services: # - "4040:4040" grafana: - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 command: - --config=/etc/grafana-config/grafana.ini volumes: diff --git a/docker-compose/monolithic-mode/logs/docker-compose.yaml b/docker-compose/monolithic-mode/logs/docker-compose.yaml index c5f56761..238a8fc2 100644 --- a/docker-compose/monolithic-mode/logs/docker-compose.yaml +++ b/docker-compose/monolithic-mode/logs/docker-compose.yaml @@ -37,7 +37,7 @@ services: depends_on: minio: condition: service_healthy - image: &lokiImage grafana/loki:2.9.0 + image: &lokiImage grafana/loki:2.9.1 command: - -config.file=/etc/loki.yaml - -target=all @@ -61,7 +61,7 @@ services: - loki-memberlist grafana: - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 command: - --config=/etc/grafana-config/grafana.ini volumes: diff --git a/docker-compose/monolithic-mode/metrics/docker-compose.yaml b/docker-compose/monolithic-mode/metrics/docker-compose.yaml index 592fb30a..78da2e4a 100644 --- a/docker-compose/monolithic-mode/metrics/docker-compose.yaml +++ b/docker-compose/monolithic-mode/metrics/docker-compose.yaml @@ -40,7 +40,7 @@ services: depends_on: minio: condition: service_healthy - image: &mimirImage grafana/mimir:2.10.0-rc.1 + image: grafana/mimir:2.10.0 command: - -config.file=/etc/mimir.yaml - -target=all @@ -64,7 +64,7 @@ services: - mimir-memberlist grafana: - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 command: - --config=/etc/grafana-config/grafana.ini volumes: diff --git a/docker-compose/monolithic-mode/profiles/docker-compose.yaml b/docker-compose/monolithic-mode/profiles/docker-compose.yaml index a0572b2f..8ef26578 100644 --- a/docker-compose/monolithic-mode/profiles/docker-compose.yaml +++ b/docker-compose/monolithic-mode/profiles/docker-compose.yaml @@ -30,7 +30,7 @@ services: - gateway grafana: - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 hostname: grafana command: - --config=/etc/grafana-config/grafana.ini diff --git a/docker-compose/monolithic-mode/traces/docker-compose.yaml b/docker-compose/monolithic-mode/traces/docker-compose.yaml index e360e324..1098ce37 100644 --- a/docker-compose/monolithic-mode/traces/docker-compose.yaml +++ b/docker-compose/monolithic-mode/traces/docker-compose.yaml @@ -36,7 +36,7 @@ services: depends_on: minio: condition: service_healthy - image: &tempoImage grafana/tempo:2.2.2 + image: &tempoImage grafana/tempo:2.2.3 restart: always volumes: - ./config/tempo/scalable-single-binary.yaml:/etc/tempo.yaml # Note: Tempo use scalable-single-binary.yaml @@ -64,7 +64,7 @@ services: depends_on: minio: condition: service_started - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 command: - --config=/etc/grafana-config/grafana.ini volumes: diff --git a/docker-compose/read-write-mode/logs/docker-compose.yaml b/docker-compose/read-write-mode/logs/docker-compose.yaml index f8ba1d1a..818674c7 100644 --- a/docker-compose/read-write-mode/logs/docker-compose.yaml +++ b/docker-compose/read-write-mode/logs/docker-compose.yaml @@ -37,7 +37,7 @@ services: depends_on: minio: condition: service_healthy - image: &lokiImage grafana/loki:2.9.0 + image: &lokiImage grafana/loki:2.9.1 command: - -config.file=/etc/loki.yaml - -target=read @@ -101,7 +101,7 @@ services: retries: 5 grafana: - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 command: - --config=/etc/grafana-config/grafana.ini volumes: diff --git a/docker-compose/read-write-mode/metrics/docker-compose.yaml b/docker-compose/read-write-mode/metrics/docker-compose.yaml index 6e19c0ba..669a03b9 100644 --- a/docker-compose/read-write-mode/metrics/docker-compose.yaml +++ b/docker-compose/read-write-mode/metrics/docker-compose.yaml @@ -38,7 +38,7 @@ services: depends_on: minio: condition: service_healthy - image: &mimirImage grafana/mimir:2.9.0 + image: &mimirImage grafana/mimir:2.10.0 command: - -config.file=/etc/mimir.yaml - -target=backend @@ -94,7 +94,7 @@ services: - mimir-memberlist grafana: - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 hostname: grafana command: - --config=/etc/grafana-config/grafana.ini diff --git a/kubernetes/microservices-mode/metrics/k8s-all-in-one.yaml b/kubernetes/microservices-mode/metrics/k8s-all-in-one.yaml index b62772fb..762b0ebd 100644 --- a/kubernetes/microservices-mode/metrics/k8s-all-in-one.yaml +++ b/kubernetes/microservices-mode/metrics/k8s-all-in-one.yaml @@ -5097,7 +5097,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: grafana/mimir:2.9.0 + image: grafana/mimir:2.10.0 imagePullPolicy: IfNotPresent name: distributor ports: @@ -5217,7 +5217,7 @@ spec: - configMapRef: name: grafana-env-dkmb477tfh optional: true - image: grafana/grafana:10.1.1 + image: grafana/grafana:10.1.2 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -5392,7 +5392,7 @@ spec: - -target=overrides-exporter - -config.file=/etc/mimir/mimir.yaml - -config.expand-env=true - image: grafana/mimir:2.9.0 + image: grafana/mimir:2.10.0 imagePullPolicy: IfNotPresent name: overrides-exporter ports: @@ -5499,7 +5499,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: grafana/mimir:2.9.0 + image: grafana/mimir:2.10.0 imagePullPolicy: IfNotPresent name: querier ports: @@ -5554,7 +5554,7 @@ spec: - -target=query-frontend - -config.file=/etc/mimir/mimir.yaml - -config.expand-env=true - image: grafana/mimir:2.9.0 + image: grafana/mimir:2.10.0 imagePullPolicy: IfNotPresent name: query-frontend ports: @@ -5609,7 +5609,7 @@ spec: - -config.expand-env=true - -server.grpc.keepalive.max-connection-age=2562047h - -server.grpc.keepalive.max-connection-age-grace=2562047h - image: grafana/mimir:2.9.0 + image: grafana/mimir:2.10.0 imagePullPolicy: IfNotPresent name: query-scheduler ports: @@ -5669,7 +5669,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: grafana/mimir:2.9.0 + image: grafana/mimir:2.10.0 imagePullPolicy: IfNotPresent name: ruler ports: @@ -5736,7 +5736,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: grafana/mimir:2.9.0 + image: grafana/mimir:2.10.0 imagePullPolicy: IfNotPresent name: alertmanager ports: @@ -5807,7 +5807,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: grafana/mimir:2.9.0 + image: grafana/mimir:2.10.0 imagePullPolicy: IfNotPresent name: compactor ports: @@ -5872,7 +5872,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: grafana/mimir:2.9.0 + image: grafana/mimir:2.10.0 imagePullPolicy: IfNotPresent name: ingester ports: @@ -5936,7 +5936,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: grafana/mimir:2.9.0 + image: grafana/mimir:2.10.0 imagePullPolicy: IfNotPresent name: store-gateway ports: diff --git a/kubernetes/microservices-mode/metrics/kustomization.yaml b/kubernetes/microservices-mode/metrics/kustomization.yaml index 6b3a1b69..14754e8a 100644 --- a/kubernetes/microservices-mode/metrics/kustomization.yaml +++ b/kubernetes/microservices-mode/metrics/kustomization.yaml @@ -30,11 +30,11 @@ resources: images: - name: grafana/mimir - newTag: 2.9.0 + newTag: 2.10.0 - name: prom/prometheus newTag: v2.46.0 - name: grafana/grafana - newTag: 10.1.1 + newTag: 10.1.2 - name: quay.io/kiwigrid/k8s-sidecar newTag: 1.24.6