update deps and regenerates k8s manifests

Signed-off-by: Weifeng Wang <[email protected]> go get -u ./... Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Jun 26, 2024 · f894bec · f894bec
1 parent 609953c
commit f894bec
Show file tree

Hide file tree

Showing 19 changed files with 442 additions and 343 deletions.
diff --git a/compose.override.yaml b/compose.override.yaml
@@ -31,7 +31,7 @@ services:
       metrics.grafana.com/scrape: true
       profiles.grafana.com/service_name: grafana
       profiles.grafana.com/port: 6060
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.0.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
     volumes:
       - ./monitoring-mixins/loki-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/loki-mixin
       - ./monitoring-mixins/tempo-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/tempo-mixin

diff --git a/docker-compose/common/compose-include/grafana.yaml b/docker-compose/common/compose-include/grafana.yaml
@@ -20,7 +20,7 @@ services:
   grafana:
     labels:
       metrics.grafana.com/scrape: false
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.0.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/common/compose-include/minio.yaml b/docker-compose/common/compose-include/minio.yaml
@@ -10,7 +10,7 @@ services:
       metrics.grafana.com/port: 9000
       metrics.grafana.com/interval: 15s
       metrics.grafana.com/timeout: 10s
-    image: ${MINIO_IMAGE:-docker.io/minio/minio:RELEASE.2024-05-28T17-19-04Z}
+    image: ${MINIO_IMAGE:-docker.io/minio/minio:RELEASE.2024-06-22T05-26-45Z}
     entrypoint:
       - sh
       - -euc

diff --git a/docker-compose/common/compose-include/pyroscope.yaml b/docker-compose/common/compose-include/pyroscope.yaml
@@ -3,7 +3,7 @@ services:
     labels:
       metrics.grafana.com/scrape: false
     depends_on: { minio: { condition: service_healthy } }
-    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.6.0}
+    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.6.1}
     configs:
       - source: pyroscope_config_file
         target: /etc/pyroscope/config.yaml

diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env
@@ -1,12 +1,12 @@
 ALLOY_IMAGE=grafana/alloy:v1.1.1
 LOKI_IMAGE=grafana/loki:3.0.0
-GRAFANA_IMAGE=grafana/grafana:11.0.0
+GRAFANA_IMAGE=grafana/grafana:11.1.0
 TEMPO_IMAGE=grafana/tempo:2.5.0
 MIMIR_IMAGE=grafana/mimir:2.12.0
 MIMIRTOOL_IMAGE=grafana/mimirtool:2.12.0
-PYROSCOPE_IMAGE=grafana/pyroscope:1.6.0
+PYROSCOPE_IMAGE=grafana/pyroscope:1.6.1
 NGINX_IMAGE=nginxinc/nginx-unprivileged:1.25-alpine
-MINIO_IMAGE=minio/minio:RELEASE.2024-05-28T17-19-04Z
+MINIO_IMAGE=minio/minio:RELEASE.2024-06-22T05-26-45Z
 MEMCACHED_IMAGE=memcached:1.6.27-alpine
 MEMCACHED_EXPORTER_IMAGE=prom/memcached-exporter:v0.14.3
 INBUCKET_IMAGE=inbucket/inbucket:3.0.4
diff --git a/docker-compose/microservices-mode/profiles/compose.yaml b/docker-compose/microservices-mode/profiles/compose.yaml
@@ -62,7 +62,7 @@ services:
       <<: *profiles-labels
       profiles.grafana.com/service_name: pyroscope-distributor
     depends_on: { ingester: { condition: service_healthy } }
-    image: &pyroscopeImage ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.6.0}
+    image: &pyroscopeImage ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.6.1}
     configs:
       - source: pyroscope_config_file
         target: /etc/pyroscope/config.yaml

diff --git a/docker-compose/monolithic-mode/all-in-one/compose.yaml b/docker-compose/monolithic-mode/all-in-one/compose.yaml
@@ -169,7 +169,7 @@ services:
       metrics.grafana.com/scrape: false
       profiles.grafana.com/service_name: pyroscope
     depends_on: { minio: { condition: service_healthy } }
-    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.6.0}
+    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.6.1}
     configs:
       - source: pyroscope_config_file
         target: /etc/pyroscope/config.yaml

diff --git a/examples/grafana-explore-logs/README.md b/examples/grafana-explore-logs/README.md
@@ -26,7 +26,7 @@ include:
 services:
   # override included service grafana environment
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.0.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
     volumes:
       - ./grafana/provisioning/plugins/grafana-lokiexplore-app.yaml:/etc/grafana/provisioning/plugins/grafana-lokiexplore-app.yaml
     environment:

diff --git a/examples/grafana-explore-logs/compose.override.yaml b/examples/grafana-explore-logs/compose.override.yaml
@@ -2,7 +2,7 @@
 services:
   # override included service grafana environment
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.0.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
     volumes:
       - ./grafana/provisioning/plugins/grafana-lokiexplore-app.yaml:/etc/grafana/provisioning/plugins/grafana-lokiexplore-app.yaml
     environment:

diff --git a/go.mod b/go.mod
@@ -7,27 +7,43 @@ require (
 	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/dave/jennifer v1.7.0
+	github.com/prometheus/client_golang v1.19.1
+	github.com/prometheus/common v0.54.0
+	github.com/prometheus/prometheus v0.53.0
 	github.com/spf13/cobra v1.8.1
+	github.com/stretchr/testify v1.9.0
+	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
 	github.com/99designs/gqlgen v0.17.49 // indirect
 	github.com/Khan/genqlient v0.7.0 // indirect
 	github.com/adrg/xdg v0.4.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jpillora/backoff v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/sosodev/duration v1.3.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/vektah/gqlparser/v2 v2.5.16 // indirect
 	go.opentelemetry.io/otel v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240518090000-14441aefdf88 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240625175500-6d45f283c7ab // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.3.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
@@ -40,11 +56,13 @@ require (
 	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.21.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect
 	google.golang.org/grpc v1.64.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )