update alloy-mixin to 1.2.0

Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Jul 3, 2024 · a03e810 · a03e810
1 parent 9dfce61
commit a03e810
Show file tree

Hide file tree

Showing 33 changed files with 9,873 additions and 2,594 deletions.
diff --git a/go.mod b/go.mod
@@ -7,44 +7,63 @@ 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.55.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/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // 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.15.1 // 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-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
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect
-	go.opentelemetry.io/otel/log v0.3.0 // indirect
-	go.opentelemetry.io/otel/metric v1.27.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.27.0 // indirect
-	go.opentelemetry.io/otel/sdk/log v0.3.0 // indirect
-	go.opentelemetry.io/otel/trace v1.27.0 // indirect
+	go.opentelemetry.io/otel v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240703093455-b394515def56 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect
+	go.opentelemetry.io/otel/log v0.4.0 // indirect
+	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.28.0 // indirect
+	go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect
+	go.opentelemetry.io/otel/trace v1.28.0 // indirect
 	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-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/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/grpc v1.65.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/kubernetes/common/alloy/manifests/k8s-all-in-one.yaml b/kubernetes/common/alloy/manifests/k8s-all-in-one.yaml
@@ -7,8 +7,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.1
-    helm.sh/chart: alloy-0.3.2
+    app.kubernetes.io/version: v1.2.0
+    helm.sh/chart: alloy-0.4.0
   name: alloy
   namespace: monitoring-system
 ---
@@ -21,8 +21,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.1
-    helm.sh/chart: alloy-0.3.2
+    app.kubernetes.io/version: v1.2.0
+    helm.sh/chart: alloy-0.4.0
   name: alloy
 rules:
 - apiGroups:
@@ -125,8 +125,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.1
-    helm.sh/chart: alloy-0.3.2
+    app.kubernetes.io/version: v1.2.0
+    helm.sh/chart: alloy-0.4.0
   name: alloy
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -4300,8 +4300,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.1
-    helm.sh/chart: alloy-0.3.2
+    app.kubernetes.io/version: v1.2.0
+    helm.sh/chart: alloy-0.4.0
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4341,8 +4341,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.1
-    helm.sh/chart: alloy-0.3.2
+    app.kubernetes.io/version: v1.2.0
+    helm.sh/chart: alloy-0.4.0
   name: alloy-cluster
   namespace: monitoring-system
 spec:
@@ -4381,8 +4381,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.1
-    helm.sh/chart: alloy-0.3.2
+    app.kubernetes.io/version: v1.2.0
+    helm.sh/chart: alloy-0.4.0
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4435,7 +4435,7 @@ spec:
         - secretRef:
             name: alloy-env
             optional: true
-        image: docker.io/grafana/alloy:v1.1.1
+        image: docker.io/grafana/alloy:v1.2.0
         imagePullPolicy: IfNotPresent
         name: alloy
         ports:
@@ -4590,8 +4590,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.1
-    helm.sh/chart: alloy-0.3.2
+    app.kubernetes.io/version: v1.2.0
+    helm.sh/chart: alloy-0.4.0
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4613,8 +4613,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.1
-    helm.sh/chart: alloy-0.3.2
+    app.kubernetes.io/version: v1.2.0
+    helm.sh/chart: alloy-0.4.0
   name: alloy
   namespace: monitoring-system
 spec:

diff --git a/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml b/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml
@@ -11,8 +11,8 @@ metadata:
     app.kubernetes.io/instance: grafana
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.0.0
-    helm.sh/chart: grafana-8.0.2
+    app.kubernetes.io/version: 11.1.0
+    helm.sh/chart: grafana-8.3.1
   name: grafana
   namespace: monitoring-system
 ---
@@ -23,8 +23,8 @@ metadata:
     app.kubernetes.io/instance: grafana
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.0.0
-    helm.sh/chart: grafana-8.0.2
+    app.kubernetes.io/version: 11.1.0
+    helm.sh/chart: grafana-8.3.1
   name: grafana
   namespace: monitoring-system
 rules: []
@@ -36,8 +36,8 @@ metadata:
     app.kubernetes.io/instance: grafana
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.0.0
-    helm.sh/chart: grafana-8.0.2
+    app.kubernetes.io/version: 11.1.0
+    helm.sh/chart: grafana-8.3.1
   name: grafana-clusterrole
 rules:
 - apiGroups:
@@ -57,8 +57,8 @@ metadata:
     app.kubernetes.io/instance: grafana
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.0.0
-    helm.sh/chart: grafana-8.0.2
+    app.kubernetes.io/version: 11.1.0
+    helm.sh/chart: grafana-8.3.1
   name: grafana
   namespace: monitoring-system
 roleRef:
@@ -77,8 +77,8 @@ metadata:
     app.kubernetes.io/instance: grafana
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.0.0
-    helm.sh/chart: grafana-8.0.2
+    app.kubernetes.io/version: 11.1.0
+    helm.sh/chart: grafana-8.3.1
   name: grafana-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -156,8 +156,8 @@ metadata:
     app.kubernetes.io/instance: grafana
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.0.0
-    helm.sh/chart: grafana-8.0.2
+    app.kubernetes.io/version: 11.1.0
+    helm.sh/chart: grafana-8.3.1
   name: grafana-config-dashboards
   namespace: monitoring-system
 ---
@@ -4225,8 +4225,8 @@ metadata:
     app.kubernetes.io/instance: grafana
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.0.0
-    helm.sh/chart: grafana-8.0.2
+    app.kubernetes.io/version: 11.1.0
+    helm.sh/chart: grafana-8.3.1
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4247,8 +4247,8 @@ metadata:
     app.kubernetes.io/instance: grafana
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.0.0
-    helm.sh/chart: grafana-8.0.2
+    app.kubernetes.io/version: 11.1.0
+    helm.sh/chart: grafana-8.3.1
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4455,8 +4455,8 @@ metadata:
     app.kubernetes.io/instance: grafana
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.0.0
-    helm.sh/chart: grafana-8.0.2
+    app.kubernetes.io/version: 11.1.0
+    helm.sh/chart: grafana-8.3.1
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4483,8 +4483,8 @@ metadata:
     app.kubernetes.io/instance: grafana
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.0.0
-    helm.sh/chart: grafana-8.0.2
+    app.kubernetes.io/version: 11.1.0
+    helm.sh/chart: grafana-8.3.1
   name: grafana
   namespace: monitoring-system
 spec: