update mixin

Signed-off-by: Weifeng Wang <[email protected]> update mixin Signed-off-by: Weifeng Wang <[email protected]> update mimir-mixin Signed-off-by: Weifeng Wang <[email protected]> update mimir-mixin Signed-off-by: Weifeng Wang <[email protected]> update loki-mixin Signed-off-by: Weifeng Wang <[email protected]> update loki-mixin Signed-off-by: Weifeng Wang <[email protected]> update mimir-mixin Signed-off-by: Weifeng Wang <[email protected]> update mimir-mixin Signed-off-by: Weifeng Wang <[email protected]> update mimir-mixin Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Dec 25, 2023 · 90c1c63 · 90c1c63
1 parent 88fff35
commit 90c1c63
Show file tree

Hide file tree

Showing 101 changed files with 9,568 additions and 4,598 deletions.
diff --git a/go.mod b/go.mod
@@ -4,18 +4,18 @@ go 1.21
 
 toolchain go1.21.5
 
-require dagger.io/dagger v0.9.4
+require dagger.io/dagger v0.9.5
 
 require (
 	github.com/99designs/gqlgen v0.17.41 // indirect
 	github.com/Khan/genqlient v0.6.0 // indirect
 	github.com/adrg/xdg v0.4.0 // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/sosodev/duration v1.2.0 // indirect
 	github.com/stretchr/testify v1.8.4 // indirect
 	github.com/vektah/gqlparser/v2 v2.5.10 // indirect
-	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
+	golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 // indirect
 	golang.org/x/sync v0.5.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-dagger.io/dagger v0.9.4 h1:0GNTLq1RlTOcwq6u3qMg/hLFBf2t+OlPeq9OYstLE1E=
-dagger.io/dagger v0.9.4/go.mod h1:ic2UD6gS5iBp2e6VWPxyb7h6VpAyhFN6U7/TDlriox8=
+dagger.io/dagger v0.9.5 h1:44ypKgOjKZKrzqHSoa/wIfqnrSZM87tuoAKJpo5tGV4=
+dagger.io/dagger v0.9.5/go.mod h1:ic2UD6gS5iBp2e6VWPxyb7h6VpAyhFN6U7/TDlriox8=
 github.com/99designs/gqlgen v0.17.41 h1:C1/zYMhGVP5TWNCNpmZ9Mb6CqT1Vr5SHEWoTOEJ3v3I=
 github.com/99designs/gqlgen v0.17.41/go.mod h1:GQ6SyMhwFbgHR0a8r2Wn8fYgEwPxxmndLFPhU63+cJE=
 github.com/Khan/genqlient v0.6.0 h1:Bwb1170ekuNIVIwTJEqvO8y7RxBxXu639VJOkKSrwAk=
@@ -11,8 +11,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
-github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
+github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -27,8 +27,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/vektah/gqlparser/v2 v2.5.10 h1:6zSM4azXC9u4Nxy5YmdmGu4uKamfwsdKTwp5zsEealU=
 github.com/vektah/gqlparser/v2 v2.5.10/go.mod h1:1rCcfwB2ekJofmluGWXMSEnPMZgbxzwj6FaZ/4OT8Cc=
-golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8=
-golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 h1:+iq7lrkxmFNBM7xx+Rae2W6uyPfhPeDWD+n+JgppptE=
+golang.org/x/exp v0.0.0-20231219180239-dc181d75b848/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

diff --git a/kubernetes/common/grafana/k8s-all-in-one.yaml b/kubernetes/common/grafana/k8s-all-in-one.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.2.2
-    helm.sh/chart: grafana-7.0.15
+    helm.sh/chart: grafana-7.0.19
   name: grafana
   namespace: monitoring-system
 ---
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.2.2
-    helm.sh/chart: grafana-7.0.15
+    helm.sh/chart: grafana-7.0.19
   name: grafana
   namespace: monitoring-system
 rules: []
@@ -36,7 +36,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.2.2
-    helm.sh/chart: grafana-7.0.15
+    helm.sh/chart: grafana-7.0.19
   name: grafana-clusterrole
 rules:
 - apiGroups:
@@ -57,7 +57,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.2.2
-    helm.sh/chart: grafana-7.0.15
+    helm.sh/chart: grafana-7.0.19
   name: grafana
   namespace: monitoring-system
 roleRef:
@@ -77,7 +77,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.2.2
-    helm.sh/chart: grafana-7.0.15
+    helm.sh/chart: grafana-7.0.19
   name: grafana-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -156,7 +156,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.2.2
-    helm.sh/chart: grafana-7.0.15
+    helm.sh/chart: grafana-7.0.19
   name: grafana-config-dashboards
   namespace: monitoring-system
 ---
@@ -3465,7 +3465,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.2.2
-    helm.sh/chart: grafana-7.0.15
+    helm.sh/chart: grafana-7.0.19
   name: grafana
   namespace: monitoring-system
 spec:
@@ -3487,7 +3487,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.2.2
-    helm.sh/chart: grafana-7.0.15
+    helm.sh/chart: grafana-7.0.19
   name: grafana
   namespace: monitoring-system
 spec:
@@ -3502,9 +3502,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
-        checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
-        checksum/sc-dashboard-provider-config: bdf4f72457c27d90339e495afe35c93f33240b1ab1ae0206f6f20cf91dd89563
+        checksum/config: 1120aef9f995c07acee41c7a4606678ccfc19213f1be038c204f23a193a59ee2
+        checksum/sc-dashboard-provider-config: a0c14ec48c732bce9563a691da03becdcb64b4ad0056b890bee49de38ae261d2
         kubectl.kubernetes.io/default-container: grafana
         logs.agent.grafana.com/scrape: "true"
         logs.agent.grafana.com/scrub-level: debug
@@ -3696,7 +3695,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.2.2
-    helm.sh/chart: grafana-7.0.15
+    helm.sh/chart: grafana-7.0.19
   name: grafana
   namespace: monitoring-system
 spec:
@@ -3724,7 +3723,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.2.2
-    helm.sh/chart: grafana-7.0.15
+    helm.sh/chart: grafana-7.0.19
   name: grafana
   namespace: monitoring-system
 spec:

diff --git a/kubernetes/common/grafana/kustomization.yaml b/kubernetes/common/grafana/kustomization.yaml
@@ -5,7 +5,6 @@ namespace: monitoring-system
 
 helmCharts:
 - name: grafana
-  version: 7.0.15
   repo: https://grafana.github.io/helm-charts
   releaseName: grafana
   namespace: monitoring-system
@@ -16,10 +15,6 @@ helmCharts:
 resources:
 - namespace.yaml
 
-images:
-- name: docker.io/grafana/grafana
-  newTag: 10.2.2
-
 configMapGenerator:
 - name: grafana
   files:

diff --git a/monitoring-mixins/agent-flow-mixin/jsonnetfile.lock.json b/monitoring-mixins/agent-flow-mixin/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
           "subdir": "operations/agent-flow-mixin"
         }
       },
-      "version": "5c0fa9bf270beafcabfe46f9966f5b2c2dc84fff",
+      "version": "5e9df54372c6d1115abb5bb0a7e6b3fb86e6b03e",
       "sum": "TyMxO1sQ2p21MKAYqufOO5HVp/UtTyMBMLmBK4kM6Pw="
     }
   ],