diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index c63be569..3c5a980f 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -53,17 +53,17 @@ $(GORELEASER): $(BINGO_DIR)/goreleaser.mod @echo "(re)installing $(GOBIN)/goreleaser-v1.26.2" @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goreleaser.mod -o=$(GOBIN)/goreleaser-v1.26.2 "github.com/goreleaser/goreleaser" -GRR := $(GOBIN)/grr-v0.4.4 +GRR := $(GOBIN)/grr-v0.4.7 $(GRR): $(BINGO_DIR)/grr.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/grr-v0.4.4" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=grr.mod -o=$(GOBIN)/grr-v0.4.4 "github.com/grafana/grizzly/cmd/grr" + @echo "(re)installing $(GOBIN)/grr-v0.4.7" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=grr.mod -o=$(GOBIN)/grr-v0.4.7 "github.com/grafana/grizzly/cmd/grr" -JB := $(GOBIN)/jb-v0.5.1 +JB := $(GOBIN)/jb-v0.6.0 $(JB): $(BINGO_DIR)/jb.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/jb-v0.5.1" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jb.mod -o=$(GOBIN)/jb-v0.5.1 "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb" + @echo "(re)installing $(GOBIN)/jb-v0.6.0" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jb.mod -o=$(GOBIN)/jb-v0.6.0 "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb" JSONNETFMT := $(GOBIN)/jsonnetfmt-v0.20.0 $(JSONNETFMT): $(BINGO_DIR)/jsonnetfmt.mod @@ -83,15 +83,15 @@ $(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod @echo "(re)installing $(GOBIN)/kustomize-v5.4.3" @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kustomize.mod -o=$(GOBIN)/kustomize-v5.4.3 "sigs.k8s.io/kustomize/kustomize/v5" -MIXTOOL := $(GOBIN)/mixtool-v0.0.0-20240806195600-448a81c91e51 +MIXTOOL := $(GOBIN)/mixtool-v0.0.0-20240823152051-1aace356d017 $(MIXTOOL): $(BINGO_DIR)/mixtool.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/mixtool-v0.0.0-20240806195600-448a81c91e51" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=mixtool.mod -o=$(GOBIN)/mixtool-v0.0.0-20240806195600-448a81c91e51 "github.com/monitoring-mixins/mixtool/cmd/mixtool" + @echo "(re)installing $(GOBIN)/mixtool-v0.0.0-20240823152051-1aace356d017" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=mixtool.mod -o=$(GOBIN)/mixtool-v0.0.0-20240823152051-1aace356d017 "github.com/monitoring-mixins/mixtool/cmd/mixtool" -UPDATECLI := $(GOBIN)/updatecli-v0.82.3 +UPDATECLI := $(GOBIN)/updatecli-v0.84.0 $(UPDATECLI): $(BINGO_DIR)/updatecli.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/updatecli-v0.82.3" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=updatecli.mod -o=$(GOBIN)/updatecli-v0.82.3 "github.com/updatecli/updatecli" + @echo "(re)installing $(GOBIN)/updatecli-v0.84.0" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=updatecli.mod -o=$(GOBIN)/updatecli-v0.84.0 "github.com/updatecli/updatecli" diff --git a/.bingo/grr.mod b/.bingo/grr.mod index 3b5bc594..89b1582d 100644 --- a/.bingo/grr.mod +++ b/.bingo/grr.mod @@ -1,5 +1,7 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.22.5 +go 1.23 -require github.com/grafana/grizzly v0.4.4 // cmd/grr +toolchain go1.23.0 + +require github.com/grafana/grizzly v0.4.7 // cmd/grr diff --git a/.bingo/grr.sum b/.bingo/grr.sum index dac9fe35..f09e0020 100644 --- a/.bingo/grr.sum +++ b/.bingo/grr.sum @@ -65,6 +65,8 @@ github.com/grafana/grafana-openapi-client-go v0.0.0-20240325012504-4958bdd139e7 github.com/grafana/grafana-openapi-client-go v0.0.0-20240325012504-4958bdd139e7/go.mod h1:hiZnMmXc9KXNUlvkV2BKFsiWuIFF/fF4wGgYWEjBitI= github.com/grafana/grizzly v0.4.4 h1:mRB91XucUK6wcxsznlXFN4JfN2A/7wq3R07Ar8xgU4Y= github.com/grafana/grizzly v0.4.4/go.mod h1:0LpwI+cKlIjq4adLbwA8oxOl4BjZ303fh8cexi37rKU= +github.com/grafana/grizzly v0.4.7 h1:FpojfPm3hKgoBbYXopo1A3vJU1ie0xexs+dqteKa3iY= +github.com/grafana/grizzly v0.4.7/go.mod h1:dtpZeDQjJOFJ589dvqo9NbHCXsd7y6eDcP7zw+qqnk8= github.com/grafana/synthetic-monitoring-agent v0.23.1 h1:otz9813Oc4s783Km3gVDbcttaFQO0HNU2RmVeS0Rmn8= github.com/grafana/synthetic-monitoring-agent v0.23.1/go.mod h1:TiHZavRfF0kqekz5RFpn0XC9KpInKXQ3zDBq1/8pvKk= github.com/grafana/synthetic-monitoring-api-go-client v0.8.0 h1:Tm4MtwwYmPNInGfnj66l6j6KOshMkNV4emIVKJdlXMg= diff --git a/.bingo/jb.mod b/.bingo/jb.mod index 8f3a29d8..0c26c8f6 100644 --- a/.bingo/jb.mod +++ b/.bingo/jb.mod @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.20 -require github.com/jsonnet-bundler/jsonnet-bundler v0.5.1 // cmd/jb +require github.com/jsonnet-bundler/jsonnet-bundler v0.6.0 // cmd/jb diff --git a/.bingo/jb.sum b/.bingo/jb.sum index 59c58ef4..dbc52952 100644 --- a/.bingo/jb.sum +++ b/.bingo/jb.sum @@ -6,10 +6,14 @@ github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/elliotchance/orderedmap/v2 v2.2.0 h1:7/2iwO98kYT4XkOjA9mBEIwvi4KpGB4cyHeOFOnj4Vk= +github.com/elliotchance/orderedmap/v2 v2.2.0/go.mod h1:85lZyVbpGaGvHvnKa7Qhx7zncAdBIBq6u56Hb1PRU5Q= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/jsonnet-bundler/jsonnet-bundler v0.5.1 h1:eUd6EA1Qzz73Q4NLNLOrNkMb96+6NTTERbX9lqaxVwk= github.com/jsonnet-bundler/jsonnet-bundler v0.5.1/go.mod h1:Qrdw/7mOFS2SKCOALKFfEH8gdvXJi8XZjw9g5ilpf4I= +github.com/jsonnet-bundler/jsonnet-bundler v0.6.0 h1:DBnynmjyWBVQ9gUBmTh49x3Dw5/u4CvGO3k2k1CsYNo= +github.com/jsonnet-bundler/jsonnet-bundler v0.6.0/go.mod h1:5esRxD59TyScj6qxT3o7GH0sryBKvVmx2zaEYDXtQkg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= diff --git a/.bingo/mixtool.mod b/.bingo/mixtool.mod index 51860326..5630c081 100644 --- a/.bingo/mixtool.mod +++ b/.bingo/mixtool.mod @@ -4,4 +4,4 @@ go 1.22.4 toolchain go1.23.0 -require github.com/monitoring-mixins/mixtool v0.0.0-20240806195600-448a81c91e51 // cmd/mixtool +require github.com/monitoring-mixins/mixtool v0.0.0-20240823152051-1aace356d017 // cmd/mixtool diff --git a/.bingo/mixtool.sum b/.bingo/mixtool.sum index 9d351fcf..f2815650 100644 --- a/.bingo/mixtool.sum +++ b/.bingo/mixtool.sum @@ -118,6 +118,8 @@ github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA= github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ= github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= +github.com/elliotchance/orderedmap/v2 v2.2.0 h1:7/2iwO98kYT4XkOjA9mBEIwvi4KpGB4cyHeOFOnj4Vk= +github.com/elliotchance/orderedmap/v2 v2.2.0/go.mod h1:85lZyVbpGaGvHvnKa7Qhx7zncAdBIBq6u56Hb1PRU5Q= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -280,6 +282,8 @@ github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jsonnet-bundler/jsonnet-bundler v0.5.1 h1:eUd6EA1Qzz73Q4NLNLOrNkMb96+6NTTERbX9lqaxVwk= github.com/jsonnet-bundler/jsonnet-bundler v0.5.1/go.mod h1:Qrdw/7mOFS2SKCOALKFfEH8gdvXJi8XZjw9g5ilpf4I= +github.com/jsonnet-bundler/jsonnet-bundler v0.6.0 h1:DBnynmjyWBVQ9gUBmTh49x3Dw5/u4CvGO3k2k1CsYNo= +github.com/jsonnet-bundler/jsonnet-bundler v0.6.0/go.mod h1:5esRxD59TyScj6qxT3o7GH0sryBKvVmx2zaEYDXtQkg= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= @@ -350,6 +354,8 @@ github.com/monitoring-mixins/mixtool v0.0.0-20240620133837-b97ae11b7bf3 h1:kASYX github.com/monitoring-mixins/mixtool v0.0.0-20240620133837-b97ae11b7bf3/go.mod h1:mIJ2b6+DEs3nDUanIklr6Gtm6hLNcH0dSZsdyO0wDyk= github.com/monitoring-mixins/mixtool v0.0.0-20240806195600-448a81c91e51 h1:9Ffkjb9gefOiJG+WTkNlNWpBOtbRZBKNG7W9siI/eH8= github.com/monitoring-mixins/mixtool v0.0.0-20240806195600-448a81c91e51/go.mod h1:EDaehy1rNIOPDwMOjJoV/fnG9up7B8yTHI3OhRNZLuM= +github.com/monitoring-mixins/mixtool v0.0.0-20240823152051-1aace356d017 h1:6O7RAftuVHBA9ZgnoQHPUfg1L8Nku4p2Z8YeeriQZZo= +github.com/monitoring-mixins/mixtool v0.0.0-20240823152051-1aace356d017/go.mod h1:ilD/JVEWxuSI11ZAFtEwUIrujkTq4iN//4qMlKdSlZA= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= diff --git a/.bingo/updatecli.mod b/.bingo/updatecli.mod index 96c308bd..4d29e000 100644 --- a/.bingo/updatecli.mod +++ b/.bingo/updatecli.mod @@ -1,7 +1,7 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.22.6 +go 1.23.0 -toolchain go1.23.0 +replace github.com/drone/go-scm => github.com/olblak/go-scm v1.26.1-0.20240829085250-adc387402cba -require github.com/updatecli/updatecli v0.82.3 +require github.com/updatecli/updatecli v0.84.0 diff --git a/.bingo/updatecli.sum b/.bingo/updatecli.sum index 7c2e9b76..55a86fdd 100644 --- a/.bingo/updatecli.sum +++ b/.bingo/updatecli.sum @@ -13,6 +13,8 @@ cuelang.org/go v0.10.0 h1:Y1Pu4wwga5HkXfLFK1sWAYaSWIBdcsr5Cb5AWj2pOuE= cuelang.org/go v0.10.0/go.mod h1:HzlaqqqInHNiqE6slTP6+UtxT9hN6DAzgJgdbNxXvX8= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= +dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= filippo.io/age v1.1.1 h1:pIpO7l151hCnQ4BdyBujnGP2YlUo0uj6sAVNHGBvXHg= filippo.io/age v1.1.1/go.mod h1:l03SrzDUrBkdBx8+IILdnn2KZysqQdbEBUQ4p3sqEQE= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= @@ -53,8 +55,12 @@ github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy86 github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= +github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= +github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs= +github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0= github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM= github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= @@ -381,6 +387,8 @@ github.com/hashicorp/hcl/v2 v2.20.0 h1:l++cRs/5jQOiKVvqXZm/P1ZEfVXJmvLS9WSVxkaeT github.com/hashicorp/hcl/v2 v2.20.0/go.mod h1:WmcD/Ym72MDOOx5F62Ly+leloeu6H7m0pG7VBiU6pQk= github.com/hashicorp/hcl/v2 v2.21.0 h1:lve4q/o/2rqwYOgUg3y3V2YPyD1/zkCLGjIV74Jit14= github.com/hashicorp/hcl/v2 v2.21.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= +github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M= +github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= github.com/hashicorp/terraform-config-inspect v0.0.0-20230614215431-f32df32a01cd h1:1uPcotqoL4TjcGKlgIe7OFSRplf7BMVtUjekwmCrvuM= github.com/hashicorp/terraform-config-inspect v0.0.0-20230614215431-f32df32a01cd/go.mod h1:l8HcFPm9cQh6Q0KSWoYPiePqMvRFenybP1CH2MjKdlg= github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI= @@ -399,6 +407,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI= +github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= @@ -519,6 +529,8 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+ github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20220510032225-4f9f17eaec4c h1:4RYnE0ISVwRxm9Dfo7utw1dh0kdRDEmVYq2MFVLy5zI= github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20220510032225-4f9f17eaec4c/go.mod h1:DvuJJ/w1Y59rG8UTDxsMk5U+UJXJwuvUgbiJSm9yhX8= +github.com/olblak/go-scm v1.26.1-0.20240829085250-adc387402cba h1:O7NLqxoRk1jWANerm9sdYCxzr3bvCFUbawtiY8MFuiQ= +github.com/olblak/go-scm v1.26.1-0.20240829085250-adc387402cba/go.mod h1:DFIJJjhMj0TSXPz+0ni4nyZ9gtTtC40Vh/TGRugtyWw= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -581,6 +593,8 @@ github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= +github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/shurcooL/githubv4 v0.0.0-20230215024106-420ad0987b9b h1:i0X9yN+P00PrKM2VZ4pc7K9m4bAQWpYnQDCk+VH4BA0= github.com/shurcooL/githubv4 v0.0.0-20230215024106-420ad0987b9b/go.mod h1:hAF0iLZy4td2EX+/8Tw+4nodhlMrwN3HupfaXj3zkGo= github.com/shurcooL/graphql v0.0.0-20220606043923-3cf50f8a0a29 h1:B1PEwpArrNp4dkQrfxh/abbBAOZBVp0ds+fBEOUOqOc= @@ -600,6 +614,8 @@ github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNo github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w= +github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= @@ -626,6 +642,8 @@ github.com/updatecli/updatecli v0.75.0 h1:gQlvqRc8B3XbWP5Xs1tA87MTWPrGY/3WIsXXDl github.com/updatecli/updatecli v0.75.0/go.mod h1:E6hItS+3fJldPGTw/Cvtf1sR2LYtc6dI554swpDNjmA= github.com/updatecli/updatecli v0.82.3 h1:c8bdBYwMrTiJ76uRGsIsl4WE1kYELgrUvpnb65q2qjo= github.com/updatecli/updatecli v0.82.3/go.mod h1:hPp+LeI8qLC8CEDsFBPxN1X4pPIi/3Lj7h4I67CnU14= +github.com/updatecli/updatecli v0.84.0 h1:sXxonPMrf/mBF6hlE3I5sk6hdQOp8JLOIyC6cf8AcxI= +github.com/updatecli/updatecli v0.84.0/go.mod h1:vLC48ZGwkVq4gQ+2uRnAoqCAE4UzjQhjyAtGVDDUjsA= github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk= github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA= github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts= diff --git a/.bingo/variables.env b/.bingo/variables.env index d31ec396..b0894291 100644 --- a/.bingo/variables.env +++ b/.bingo/variables.env @@ -20,9 +20,9 @@ GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.60.3" GORELEASER="${GOBIN}/goreleaser-v1.26.2" -GRR="${GOBIN}/grr-v0.4.4" +GRR="${GOBIN}/grr-v0.4.7" -JB="${GOBIN}/jb-v0.5.1" +JB="${GOBIN}/jb-v0.6.0" JSONNETFMT="${GOBIN}/jsonnetfmt-v0.20.0" @@ -30,7 +30,7 @@ K3D="${GOBIN}/k3d-v5.7.3" KUSTOMIZE="${GOBIN}/kustomize-v5.4.3" -MIXTOOL="${GOBIN}/mixtool-v0.0.0-20240806195600-448a81c91e51" +MIXTOOL="${GOBIN}/mixtool-v0.0.0-20240823152051-1aace356d017" -UPDATECLI="${GOBIN}/updatecli-v0.82.3" +UPDATECLI="${GOBIN}/updatecli-v0.84.0" diff --git a/go.mod b/go.mod index 9c9a81a2..51bbba53 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/qclaogui/codelab-monitoring go 1.23 require ( - dagger.io/dagger v0.12.7 + dagger.io/dagger v0.11.6 github.com/MakeNowJust/heredoc v1.0.0 github.com/blang/semver v3.5.1+incompatible github.com/dave/jennifer v1.7.0 @@ -20,7 +20,6 @@ require ( github.com/Khan/genqlient v0.7.0 // indirect github.com/adrg/xdg v0.5.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 @@ -28,10 +27,10 @@ require ( 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.22.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/kr/text v0.2.0 // 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 @@ -40,30 +39,19 @@ require ( 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/rogpeppe/go-internal v1.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.29.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.5.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.5.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 // indirect - go.opentelemetry.io/otel/log v0.5.0 // indirect go.opentelemetry.io/otel/metric v1.29.0 // indirect - go.opentelemetry.io/otel/sdk v1.29.0 // indirect - go.opentelemetry.io/otel/sdk/log v0.5.0 // indirect go.opentelemetry.io/otel/trace v1.29.0 // indirect - go.opentelemetry.io/proto/otlp v1.3.1 // indirect - golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect + golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/oauth2 v0.22.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/text v0.17.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect - google.golang.org/grpc v1.66.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.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 index b86af0e0..c667f102 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -dagger.io/dagger v0.12.7 h1:xMwRc/szSsEkixkmSAnWoRMfejBKipxoVuHiNGOWXpE= -dagger.io/dagger v0.12.7/go.mod h1:Qxqy5hz1MLMdmVOaByAKpTa/c7K0R0NuxPZX5ZzEneM= +dagger.io/dagger v0.11.6 h1:aGmMpPETphE091FQ4U4LRxYLxbvLZd5Icm/V1Vv8IOQ= +dagger.io/dagger v0.11.6/go.mod h1:7JewnFDOKZdJNQbQsPvjemONAn6v3ihuTL1bxBSQG8g= github.com/99designs/gqlgen v0.17.49 h1:b3hNGexHd33fBSAd4NDT/c3NCcQzcAVkknhN9ym36YQ= github.com/99designs/gqlgen v0.17.49/go.mod h1:tC8YFVZMed81x7UJ7ORUwXF4Kn6SXuucFqQBhN8+BU0= github.com/Khan/genqlient v0.7.0 h1:GZ1meyRnzcDTK48EjqB8t3bcfYvHArCUUvgOwpz1D4w= @@ -14,11 +14,10 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= -github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/dave/jennifer v1.7.0 h1:uRbSBH9UTS64yXbh4FrMHfgfY762RD+C7bUPKODpSJE= github.com/dave/jennifer v1.7.0/go.mod h1:nXbxhEmQfOZhWml3D1cDK5M1FLnMSozpbFN/m3RmGZc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -43,8 +42,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248= github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= @@ -86,8 +83,8 @@ github.com/prometheus/prometheus v0.54.1/go.mod h1:xlLByHhk2g3ycakQGrMaU8K7OySZx github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= -github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/sosodev/duration v1.3.1 h1:qtHBDMQ6lvMQsL15g4aopM4HEfOaYuhWBw3NPTtlqq4= github.com/sosodev/duration v1.3.1/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= @@ -104,28 +101,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.5.0 h1:iWyFL+atC9S1e6MFDLNUZieyKTmsrvsDzuozUDbFg8E= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.5.0/go.mod h1:0Ur7rPCJmkHksYcBywsFXnKBG3pqGl4TGltZ+T3qhSA= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.5.0 h1:4d++HQ+Ihdl+53zSjtsCUFDmNMju2FC9qFkUlTxPLqo= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.5.0/go.mod h1:mQX5dTO3Mh5ZF7bPKDkt5c/7C41u/SiDr9XgTpzXXn8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 h1:dIIDULZJpgdiHz5tXrTgKIMLkus6jEFa7x5SOKcyR7E= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0/go.mod h1:jlRVBe7+Z1wyxFSUs48L6OBQZ5JwH2Hg/Vbl+t9rAgI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 h1:nSiV3s7wiCam610XcLbYOmMfJxB9gO4uK3Xgv5gmTgg= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0/go.mod h1:hKn/e/Nmd19/x1gvIHwtOwVWM+VhuITSWip3JUDghj0= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 h1:JAv0Jwtl01UFiyWZEMiJZBiTlv5A50zNs8lsthXqIio= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0/go.mod h1:QNKLmUEAq2QUbPQUfvw4fmv0bgbK7UlOSFCnXyfvSNc= -go.opentelemetry.io/otel/log v0.5.0 h1:x1Pr6Y3gnXgl1iFBwtGy1W/mnzENoK0w0ZoaeOI3i30= -go.opentelemetry.io/otel/log v0.5.0/go.mod h1:NU/ozXeGuOR5/mjCRXYbTC00NFJ3NYuraV/7O78F0rE= go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= -go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHyryo= -go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok= -go.opentelemetry.io/otel/sdk/log v0.5.0 h1:A+9lSjlZGxkQOr7QSBJcuyyYBw79CufQ69saiJLey7o= -go.opentelemetry.io/otel/sdk/log v0.5.0/go.mod h1:zjxIW7sw1IHolZL2KlSAtrUi8JHttoeiQy43Yl3WuVQ= go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= -go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= -go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -133,8 +112,8 @@ go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= -golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -153,12 +132,12 @@ golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -167,12 +146,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed h1:3RgNmBoI9MZhsj3QxC+AP/qQhNwpCLOvYDYYsFrhFt0= -google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed h1:J6izYgfBXAI3xTKLgxzTmUltdYaLsuBxFCgDHWJ/eXg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= -google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/kubernetes/common/grafana/kustomization.yaml b/kubernetes/common/grafana/kustomization.yaml index 466d04ca..af0c9df0 100644 --- a/kubernetes/common/grafana/kustomization.yaml +++ b/kubernetes/common/grafana/kustomization.yaml @@ -4,7 +4,7 @@ namespace: monitoring-system helmCharts: - name: grafana repo: https://grafana.github.io/helm-charts - version: 8.5.0 + version: 8.5.1 releaseName: grafana namespace: monitoring-system includeCRDs: false diff --git a/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml b/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml index bb55325a..ec37e589 100644 --- 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.1.5 - helm.sh/chart: grafana-8.5.0 + app.kubernetes.io/version: 11.2.0 + helm.sh/chart: grafana-8.5.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.1.5 - helm.sh/chart: grafana-8.5.0 + app.kubernetes.io/version: 11.2.0 + helm.sh/chart: grafana-8.5.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.1.5 - helm.sh/chart: grafana-8.5.0 + app.kubernetes.io/version: 11.2.0 + helm.sh/chart: grafana-8.5.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.1.5 - helm.sh/chart: grafana-8.5.0 + app.kubernetes.io/version: 11.2.0 + helm.sh/chart: grafana-8.5.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.1.5 - helm.sh/chart: grafana-8.5.0 + app.kubernetes.io/version: 11.2.0 + helm.sh/chart: grafana-8.5.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.1.5 - helm.sh/chart: grafana-8.5.0 + app.kubernetes.io/version: 11.2.0 + helm.sh/chart: grafana-8.5.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.1.5 - helm.sh/chart: grafana-8.5.0 + app.kubernetes.io/version: 11.2.0 + helm.sh/chart: grafana-8.5.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.1.5 - helm.sh/chart: grafana-8.5.0 + app.kubernetes.io/version: 11.2.0 + helm.sh/chart: grafana-8.5.1 name: grafana namespace: monitoring-system spec: @@ -4383,7 +4383,7 @@ spec: - secretRef: name: grafana-env optional: true - image: docker.io/grafana/grafana:11.1.5 + image: docker.io/grafana/grafana:11.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -4462,8 +4462,8 @@ metadata: app.kubernetes.io/instance: grafana app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: grafana - app.kubernetes.io/version: 11.1.5 - helm.sh/chart: grafana-8.5.0 + app.kubernetes.io/version: 11.2.0 + helm.sh/chart: grafana-8.5.1 name: grafana namespace: monitoring-system spec: @@ -4490,8 +4490,8 @@ metadata: app.kubernetes.io/instance: grafana app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: grafana - app.kubernetes.io/version: 11.1.5 - helm.sh/chart: grafana-8.5.0 + app.kubernetes.io/version: 11.2.0 + helm.sh/chart: grafana-8.5.1 name: grafana namespace: monitoring-system spec: diff --git a/kubernetes/common/grafana/values.yaml b/kubernetes/common/grafana/values.yaml index f1ffc9d9..51e94e01 100644 --- a/kubernetes/common/grafana/values.yaml +++ b/kubernetes/common/grafana/values.yaml @@ -367,7 +367,7 @@ extraContainerVolumes: [] # emptyDir: {} ## Enable persistence using Persistent Volume Claims -## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ +## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/ ## persistence: type: pvc @@ -1160,6 +1160,10 @@ imageRenderer: targetCPU: "60" targetMemory: "" behavior: {} + # The url of remote image renderer if it is not in the same namespace with the grafana instance + serverURL: "" + # The callback url of grafana instances if it is not in the same namespace with the remote image renderer + renderingCallbackURL: "" image: # -- The Docker registry registry: docker.io diff --git a/kubernetes/common/kube-prometheus-stack/kustomization.yaml b/kubernetes/common/kube-prometheus-stack/kustomization.yaml index 7a9bdc99..36f7d362 100644 --- a/kubernetes/common/kube-prometheus-stack/kustomization.yaml +++ b/kubernetes/common/kube-prometheus-stack/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization helmCharts: - name: kube-prometheus-stack repo: https://prometheus-community.github.io/helm-charts - version: 62.3.1 + version: 62.4.0 releaseName: kube-prometheus-stack namespace: monitoring-system includeCRDs: false diff --git a/kubernetes/common/kube-prometheus-stack/manifests/k8s-all-in-one.yaml b/kubernetes/common/kube-prometheus-stack/manifests/k8s-all-in-one.yaml index 1776ddb6..7f0dd143 100644 --- a/kubernetes/common/kube-prometheus-stack/manifests/k8s-all-in-one.yaml +++ b/kubernetes/common/kube-prometheus-stack/manifests/k8s-all-in-one.yaml @@ -308,8 +308,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -393,8 +393,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -492,8 +492,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -551,8 +551,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -618,8 +618,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -660,8 +660,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -751,8 +751,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -926,8 +926,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1000,8 +1000,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1177,8 +1177,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1240,8 +1240,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1404,8 +1404,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1582,8 +1582,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1767,8 +1767,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1883,8 +1883,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1948,8 +1948,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2062,8 +2062,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2125,8 +2125,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2176,8 +2176,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2260,8 +2260,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2316,8 +2316,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2365,8 +2365,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2451,8 +2451,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2512,8 +2512,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2582,8 +2582,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2658,8 +2658,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2933,8 +2933,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-alertmanager.rules @@ -3092,8 +3092,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-config-reloaders @@ -3123,8 +3123,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-etcd @@ -3324,8 +3324,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-general.rules @@ -3384,8 +3384,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-cpu-usage-seconds-tot @@ -3410,8 +3410,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-memory-cache @@ -3435,8 +3435,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-memory-rss @@ -3460,8 +3460,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-memory-swap @@ -3485,8 +3485,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-memory-working-set-by @@ -3510,8 +3510,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-resource @@ -3597,8 +3597,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.pod-owner @@ -3663,8 +3663,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-apiserver-availability.rules @@ -3794,8 +3794,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-apiserver-burnrate.rules @@ -4114,8 +4114,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-apiserver-histogram.rules @@ -4145,8 +4145,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-apiserver-slos @@ -4220,8 +4220,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-prometheus-general.rules @@ -4243,8 +4243,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-prometheus-node-recording.rules @@ -4278,8 +4278,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-scheduler.rules @@ -4342,8 +4342,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-state-metrics @@ -4417,8 +4417,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubelet.rules @@ -4454,8 +4454,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-apps @@ -4733,8 +4733,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-resources @@ -4864,8 +4864,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-storage @@ -4990,8 +4990,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system @@ -5034,8 +5034,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system-apiserver @@ -5121,8 +5121,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system-controller-manager @@ -5150,8 +5150,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system-kube-proxy @@ -5178,8 +5178,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system-kubelet @@ -5337,8 +5337,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system-scheduler @@ -5365,8 +5365,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-node-exporter @@ -5721,8 +5721,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-node-exporter.rules @@ -5802,8 +5802,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-node-network @@ -5831,8 +5831,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-node.rules @@ -5886,8 +5886,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-prometheus @@ -6229,8 +6229,8 @@ metadata: app.kubernetes.io/instance: kube-prometheus-stack app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: kube-prometheus-stack - app.kubernetes.io/version: 62.3.1 - chart: kube-prometheus-stack-62.3.1 + app.kubernetes.io/version: 62.4.0 + chart: kube-prometheus-stack-62.4.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-prometheus-operator diff --git a/kubernetes/common/kube-prometheus-stack/values.yaml b/kubernetes/common/kube-prometheus-stack/values.yaml index d89713c8..77c57d2a 100644 --- a/kubernetes/common/kube-prometheus-stack/values.yaml +++ b/kubernetes/common/kube-prometheus-stack/values.yaml @@ -2136,6 +2136,9 @@ prometheus-node-exporter: enabled: false ipFamilies: ["IPv6", "IPv4"] ipFamilyPolicy: "PreferDualStack" + labels: + jobLabel: node-exporter + prometheus: monitor: enabled: true @@ -3493,7 +3496,7 @@ prometheus: image: registry: quay.io repository: prometheus/prometheus - tag: v2.54.0 + tag: v2.54.1 sha: "" ## Tolerations for use with node taints diff --git a/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml b/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml index 5d8ff42f..7305f111 100644 --- a/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml +++ b/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki namespace: logging-system --- @@ -332,7 +332,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-runtime namespace: logging-system --- @@ -4779,6 +4779,74 @@ type: Opaque --- apiVersion: v1 kind: Service +metadata: + labels: + app.kubernetes.io/component: bloom-builder + app.kubernetes.io/instance: loki-distributed + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.1.1 + helm.sh/chart: loki-6.12.0 + name: loki-distributed-bloom-builder + namespace: logging-system +spec: + ports: + - name: http-metrics + port: 3100 + protocol: TCP + targetPort: http-metrics + - name: grpc + port: 9095 + protocol: TCP + targetPort: grpc + - name: grpclb + port: 9096 + protocol: TCP + targetPort: grpc + publishNotReadyAddresses: true + selector: + app.kubernetes.io/component: bloom-builder + app.kubernetes.io/instance: loki-distributed + app.kubernetes.io/name: loki + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app.kubernetes.io/component: bloom-builder + app.kubernetes.io/instance: loki-distributed + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.1.1 + helm.sh/chart: loki-6.12.0 + prometheus.io/service-monitor: "false" + name: loki-distributed-bloom-builder-headless + namespace: logging-system +spec: + clusterIP: None + ports: + - name: http-metrics + port: 3100 + protocol: TCP + targetPort: http-metrics + - name: grpc + port: 9095 + protocol: TCP + targetPort: grpc + - name: grpclb + port: 9096 + protocol: TCP + targetPort: grpc + publishNotReadyAddresses: true + selector: + app.kubernetes.io/component: bloom-builder + app.kubernetes.io/instance: loki-distributed + app.kubernetes.io/name: loki + type: ClusterIP +--- +apiVersion: v1 +kind: Service metadata: labels: app.kubernetes.io/component: bloom-gateway @@ -4805,6 +4873,32 @@ spec: --- apiVersion: v1 kind: Service +metadata: + labels: + app.kubernetes.io/component: bloom-planner + app.kubernetes.io/instance: loki-distributed + app.kubernetes.io/name: loki + name: loki-distributed-bloom-planner-headless + namespace: logging-system +spec: + clusterIP: None + ports: + - name: http-metrics + port: 3100 + protocol: TCP + targetPort: http-metrics + - name: grpc + port: 9095 + protocol: TCP + targetPort: grpc + selector: + app.kubernetes.io/component: bloom-planner + app.kubernetes.io/instance: loki-distributed + app.kubernetes.io/name: loki + type: ClusterIP +--- +apiVersion: v1 +kind: Service metadata: labels: app.kubernetes.io/component: compactor @@ -4812,7 +4906,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-compactor namespace: logging-system spec: @@ -4840,7 +4934,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-distributor namespace: logging-system spec: @@ -4896,7 +4990,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-index-gateway namespace: logging-system spec: @@ -4951,7 +5045,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-ingester namespace: logging-system spec: @@ -5006,7 +5100,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-querier namespace: logging-system spec: @@ -5034,7 +5128,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-query-frontend namespace: logging-system spec: @@ -5067,7 +5161,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 prometheus.io/service-monitor: "false" name: loki-distributed-query-frontend-headless namespace: logging-system @@ -5102,7 +5196,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-query-scheduler namespace: logging-system spec: @@ -5157,7 +5251,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-memberlist namespace: logging-system spec: @@ -5307,6 +5401,104 @@ spec: --- apiVersion: apps/v1 kind: Deployment +metadata: + labels: + app.kubernetes.io/component: bloom-builder + app.kubernetes.io/instance: loki-distributed + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.1.1 + helm.sh/chart: loki-6.12.0 + name: loki-distributed-bloom-builder + namespace: logging-system +spec: + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: + app.kubernetes.io/component: bloom-builder + app.kubernetes.io/instance: loki-distributed + app.kubernetes.io/name: loki + strategy: + rollingUpdate: + maxSurge: 0 + maxUnavailable: 1 + template: + metadata: + annotations: + checksum/config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b + labels: + app.kubernetes.io/component: bloom-builder + app.kubernetes.io/instance: loki-distributed + app.kubernetes.io/name: loki + app.kubernetes.io/part-of: memberlist + spec: + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchLabels: + app.kubernetes.io/component: bloom-builder + topologyKey: kubernetes.io/hostname + containers: + - args: + - -config.file=/etc/loki/config/config.yaml + - -target=bloom-builder + - -config.expand-env=true + envFrom: + - secretRef: + name: loki-env-58m52b99kc + image: docker.io/grafana/loki:3.1.1 + imagePullPolicy: IfNotPresent + name: bloom-builder + ports: + - containerPort: 3100 + name: http-metrics + protocol: TCP + - containerPort: 9095 + name: grpc + protocol: TCP + - containerPort: 7946 + name: http-memberlist + protocol: TCP + readinessProbe: + httpGet: + path: /ready + port: http-metrics + initialDelaySeconds: 10 + timeoutSeconds: 1 + resources: {} + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + volumeMounts: + - mountPath: /etc/loki/config + name: config + - mountPath: /etc/loki/runtime-config + name: runtime-config + securityContext: + fsGroup: 10001 + runAsGroup: 10001 + runAsNonRoot: true + runAsUser: 10001 + serviceAccountName: loki + terminationGracePeriodSeconds: 30 + volumes: + - configMap: + items: + - key: config.yaml + path: config.yaml + name: loki-config-b7m6ch6f6t + name: config + - configMap: + name: loki-runtime + name: runtime-config +--- +apiVersion: apps/v1 +kind: Deployment metadata: labels: app.kubernetes.io/component: distributor @@ -5315,7 +5507,7 @@ metadata: app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-distributor namespace: logging-system spec: @@ -5415,7 +5607,7 @@ metadata: app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-querier namespace: logging-system spec: @@ -5525,7 +5717,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-query-frontend namespace: logging-system spec: @@ -5623,7 +5815,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-query-scheduler namespace: logging-system spec: @@ -5801,13 +5993,13 @@ apiVersion: apps/v1 kind: StatefulSet metadata: labels: - app.kubernetes.io/component: bloom-compactor + app.kubernetes.io/component: bloom-gateway app.kubernetes.io/instance: loki-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 - name: loki-distributed-bloom-compactor + helm.sh/chart: loki-6.12.0 + name: loki-distributed-bloom-gateway namespace: logging-system spec: podManagementPolicy: Parallel @@ -5815,16 +6007,16 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - app.kubernetes.io/component: bloom-compactor + app.kubernetes.io/component: bloom-gateway app.kubernetes.io/instance: loki-distributed app.kubernetes.io/name: loki - serviceName: loki-distributed-bloom-compactor-headless + serviceName: loki-distributed-bloom-gateway-headless template: metadata: annotations: checksum/config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b labels: - app.kubernetes.io/component: bloom-compactor + app.kubernetes.io/component: bloom-gateway app.kubernetes.io/instance: loki-distributed app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist @@ -5834,19 +6026,19 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchLabels: - app.kubernetes.io/component: bloom-compactor + app.kubernetes.io/component: bloom-gateway topologyKey: kubernetes.io/hostname containers: - args: - -config.file=/etc/loki/config/config.yaml - - -target=bloom-compactor + - -target=bloom-gateway - -config.expand-env=true envFrom: - secretRef: name: loki-env-58m52b99kc image: docker.io/grafana/loki:3.1.1 imagePullPolicy: IfNotPresent - name: bloom-compactor + name: bloom-gateway ports: - containerPort: 3100 name: http-metrics @@ -5909,13 +6101,13 @@ apiVersion: apps/v1 kind: StatefulSet metadata: labels: - app.kubernetes.io/component: bloom-gateway + app.kubernetes.io/component: bloom-planner app.kubernetes.io/instance: loki-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 - name: loki-distributed-bloom-gateway + helm.sh/chart: loki-6.12.0 + name: loki-distributed-bloom-planner namespace: logging-system spec: podManagementPolicy: Parallel @@ -5923,16 +6115,16 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - app.kubernetes.io/component: bloom-gateway + app.kubernetes.io/component: bloom-planner app.kubernetes.io/instance: loki-distributed app.kubernetes.io/name: loki - serviceName: loki-distributed-bloom-gateway-headless + serviceName: loki-distributed-bloom-planner-headless template: metadata: annotations: checksum/config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b labels: - app.kubernetes.io/component: bloom-gateway + app.kubernetes.io/component: bloom-planner app.kubernetes.io/instance: loki-distributed app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist @@ -5942,19 +6134,19 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchLabels: - app.kubernetes.io/component: bloom-gateway + app.kubernetes.io/component: bloom-planner topologyKey: kubernetes.io/hostname containers: - args: - -config.file=/etc/loki/config/config.yaml - - -target=bloom-gateway + - -target=bloom-planner - -config.expand-env=true envFrom: - secretRef: name: loki-env-58m52b99kc image: docker.io/grafana/loki:3.1.1 imagePullPolicy: IfNotPresent - name: bloom-gateway + name: bloom-planner ports: - containerPort: 3100 name: http-metrics @@ -5986,8 +6178,6 @@ spec: name: runtime-config - mountPath: /var/loki name: data - - mountPath: /data - name: temp securityContext: fsGroup: 10001 runAsGroup: 10001 @@ -6023,7 +6213,7 @@ metadata: app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-compactor namespace: logging-system spec: @@ -6129,7 +6319,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-index-gateway namespace: logging-system spec: @@ -6233,7 +6423,7 @@ metadata: app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-ingester namespace: logging-system spec: @@ -6342,7 +6532,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-pattern-ingester namespace: logging-system spec: @@ -6449,7 +6639,7 @@ metadata: app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-ruler namespace: logging-system spec: @@ -6685,7 +6875,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-distributor namespace: logging-system spec: @@ -6705,7 +6895,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-ingester namespace: logging-system spec: @@ -6730,7 +6920,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-distributed-querier namespace: logging-system spec: diff --git a/kubernetes/microservices-mode/logs/loki/kustomization.yaml b/kubernetes/microservices-mode/logs/loki/kustomization.yaml index 0617f7a7..9fc4c14e 100644 --- a/kubernetes/microservices-mode/logs/loki/kustomization.yaml +++ b/kubernetes/microservices-mode/logs/loki/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization namespace: logging-system helmCharts: - name: loki - version: 6.11.0 + version: 6.12.0 repo: https://grafana.github.io/helm-charts releaseName: loki-distributed namespace: logging-system diff --git a/kubernetes/microservices-mode/logs/loki/values-k3d-k3s.yaml b/kubernetes/microservices-mode/logs/loki/values-k3d-k3s.yaml index 6e737bd7..1376bf7f 100644 --- a/kubernetes/microservices-mode/logs/loki/values-k3d-k3s.yaml +++ b/kubernetes/microservices-mode/logs/loki/values-k3d-k3s.yaml @@ -113,16 +113,21 @@ bloomGateway: - mountPath: /data name: temp -bloomCompactor: +bloomPlanner: + replicas: 1 + extraArgs: + - -config.expand-env=true + extraEnvFrom: + - secretRef: + name: loki-env + +bloomBuilder: replicas: 1 extraArgs: - -config.expand-env=true extraEnvFrom: - secretRef: name: loki-env - extraVolumeMounts: - - mountPath: /data - name: temp patternIngester: replicas: 1 diff --git a/kubernetes/microservices-mode/logs/loki/values.yaml b/kubernetes/microservices-mode/logs/loki/values.yaml index 4f27bd13..ed65339c 100644 --- a/kubernetes/microservices-mode/logs/loki/values.yaml +++ b/kubernetes/microservices-mode/logs/loki/values.yaml @@ -329,6 +329,7 @@ loki: http_config: {} # -- Check https://grafana.com/docs/loki/latest/configure/#s3_storage_config for more info on how to provide a backoff_config backoff_config: {} + disable_dualstack: false gcs: chunkBufferSize: 0 requestTimeout: "0s" @@ -439,6 +440,10 @@ loki: # -- Enable tracing tracing: enabled: false + bloom_build: + enabled: false + bloom_gateway: + enabled: false ###################################################################################################################### # # Enterprise Loki Configs @@ -450,7 +455,7 @@ enterprise: # Enable enterprise features, license must be provided enabled: false # Default verion of GEL to deploy - version: 3.1.0 + version: 3.1.1 # -- Optional name of the GEL cluster, otherwise will use .Release.Name # The cluster name must match what is in your GEL license cluster_name: null @@ -897,7 +902,7 @@ gateway: # -- The gateway image repository repository: nginxinc/nginx-unprivileged # -- The gateway image tag - tag: 1.24-alpine + tag: 1.27-alpine # -- Overrides the gateway image tag with an image digest digest: null # -- The gateway image pull policy @@ -1012,9 +1017,11 @@ gateway: htpasswd: >- {{ if .Values.loki.tenants }} + {{- range $t := .Values.loki.tenants }} {{ htpasswd (required "All tenants must have a 'name' set" $t.name) (required "All tenants must have a 'password' set" $t.password) }} + {{- end }} {{ else }} {{ htpasswd (required "'gateway.basicAuth.username' is required" .Values.gateway.basicAuth.username) (required "'gateway.basicAuth.password' is required" .Values.gateway.basicAuth.password) }} {{ end }} # -- Existing basic auth secret to use. Must contain '.htpasswd' @@ -1589,7 +1596,7 @@ backend: annotations: {} # -- Additional labels for backend Service labels: {} - # -- Comma-separated list of Loki modules to load for the read + # -- Comma-separated list of Loki modules to load for the backend targetModule: "backend" # -- Additional CLI args for the backend extraArgs: [] @@ -2373,9 +2380,9 @@ compactor: annotations: {} # -- Set this toggle to false to opt out of automounting API credentials for the service account automountServiceAccountToken: true -# -- Configuration for the bloom gateway +# -- Configuration for the bloom-gateway bloomGateway: - # -- Number of replicas for the bloom gateway + # -- Number of replicas for the bloom-gateway replicas: 0 # -- hostAliases to add hostAliases: [] @@ -2383,21 +2390,21 @@ bloomGateway: # hostnames: # - domain.tld image: - # -- The Docker registry for the bloom gateway image. Overrides `loki.image.registry` + # -- The Docker registry for the bloom-gateway image. Overrides `loki.image.registry` registry: null - # -- Docker image repository for the bloom gateway image. Overrides `loki.image.repository` + # -- Docker image repository for the bloom-gateway image. Overrides `loki.image.repository` repository: null - # -- Docker image tag for the bloom gateway image. Overrides `loki.image.tag` + # -- Docker image tag for the bloom-gateway image. Overrides `loki.image.tag` tag: null # -- Command to execute instead of defined in Docker image command: null - # -- The name of the PriorityClass for bloom gateway pods + # -- The name of the PriorityClass for bloom-gateway pods priorityClassName: null - # -- Labels for bloom gateway pods + # -- Labels for bloom-gateway pods podLabels: {} - # -- Annotations for bloom gateway pods + # -- Annotations for bloom-gateway pods podAnnotations: {} - # -- Affinity for bloom gateway pods. + # -- Affinity for bloom-gateway pods. # @default -- Hard node anti-affinity affinity: podAntiAffinity: @@ -2406,39 +2413,39 @@ bloomGateway: matchLabels: app.kubernetes.io/component: bloom-gateway topologyKey: kubernetes.io/hostname - # -- Labels for bloom gateway service + # -- Labels for bloom-gateway service serviceLabels: {} - # -- Additional CLI args for the bloom gateway + # -- Additional CLI args for the bloom-gateway extraArgs: [] - # -- Environment variables to add to the bloom gateway pods + # -- Environment variables to add to the bloom-gateway pods extraEnv: [] - # -- Environment variables from secrets or configmaps to add to the bloom gateway pods + # -- Environment variables from secrets or configmaps to add to the bloom-gateway pods extraEnvFrom: [] - # -- Volume mounts to add to the bloom gateway pods + # -- Volume mounts to add to the bloom-gateway pods extraVolumeMounts: [] - # -- Volumes to add to the bloom gateway pods + # -- Volumes to add to the bloom-gateway pods extraVolumes: [] # -- readiness probe settings for ingester pods. If empty, use `loki.readinessProbe` readinessProbe: {} # -- liveness probe settings for ingester pods. If empty use `loki.livenessProbe` livenessProbe: {} - # -- Resource requests and limits for the bloom gateway + # -- Resource requests and limits for the bloom-gateway resources: {} - # -- Containers to add to the bloom gateway pods + # -- Containers to add to the bloom-gateway pods extraContainers: [] - # -- Init containers to add to the bloom gateway pods + # -- Init containers to add to the bloom-gateway pods initContainers: [] - # -- Grace period to allow the bloom gateway to shutdown before it is killed + # -- Grace period to allow the bloom-gateway to shutdown before it is killed terminationGracePeriodSeconds: 30 - # -- Node selector for bloom gateway pods + # -- Node selector for bloom-gateway pods nodeSelector: {} - # -- Tolerations for bloom gateway pods + # -- Tolerations for bloom-gateway pods tolerations: [] # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" appProtocol: grpc: "" persistence: - # -- Enable creating PVCs for the bloom gateway + # -- Enable creating PVCs for the bloom-gateway enabled: false # -- Size of persistent disk size: 10Gi @@ -2448,9 +2455,9 @@ bloomGateway: # If empty or set to null, no storageClassName spec is # set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). storageClass: null - # -- Annotations for bloom gateway PVCs + # -- Annotations for bloom-gateway PVCs annotations: {} - # -- List of the bloom gateway PVCs + # -- List of the bloom-gateway PVCs # @notationType -- list claims: - name: data @@ -2469,19 +2476,19 @@ bloomGateway: whenScaled: Retain serviceAccount: create: false - # -- The name of the ServiceAccount to use for the bloom gateway. + # -- The name of the ServiceAccount to use for the bloom-gateway. # If not set and create is true, a name is generated by appending # "-bloom-gateway" to the common ServiceAccount. name: null - # -- Image pull secrets for the bloom gateway service account + # -- Image pull secrets for the bloom-gateway service account imagePullSecrets: [] - # -- Annotations for the bloom gateway service account + # -- Annotations for the bloom-gateway service account annotations: {} # -- Set this toggle to false to opt out of automounting API credentials for the service account automountServiceAccountToken: true -# -- Configuration for the bloom compactor -bloomCompactor: - # -- Number of replicas for the bloom compactor +# -- Configuration for the bloom-planner +bloomPlanner: + # -- Number of replicas for the bloom-planner replicas: 0 # -- hostAliases to add hostAliases: [] @@ -2489,62 +2496,62 @@ bloomCompactor: # hostnames: # - domain.tld image: - # -- The Docker registry for the bloom compactor image. Overrides `loki.image.registry` + # -- The Docker registry for the bloom-planner image. Overrides `loki.image.registry` registry: null - # -- Docker image repository for the bloom compactor image. Overrides `loki.image.repository` + # -- Docker image repository for the bloom-planner image. Overrides `loki.image.repository` repository: null - # -- Docker image tag for the bloom compactor image. Overrides `loki.image.tag` + # -- Docker image tag for the bloom-planner image. Overrides `loki.image.tag` tag: null # -- Command to execute instead of defined in Docker image command: null - # -- The name of the PriorityClass for bloom compactor pods + # -- The name of the PriorityClass for bloom-planner pods priorityClassName: null - # -- Labels for bloom compactor pods + # -- Labels for bloom-planner pods podLabels: {} - # -- Annotations for bloom compactor pods + # -- Annotations for bloom-planner pods podAnnotations: {} - # -- Affinity for bloom compactor pods. + # -- Affinity for bloom-planner pods. # @default -- Hard node anti-affinity affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchLabels: - app.kubernetes.io/component: bloom-compactor + app.kubernetes.io/component: bloom-planner topologyKey: kubernetes.io/hostname - # -- Labels for bloom compactor service + # -- Labels for bloom-planner service serviceLabels: {} - # -- Additional CLI args for the bloom compactor + # -- Additional CLI args for the bloom-planner extraArgs: [] - # -- Environment variables to add to the bloom compactor pods + # -- Environment variables to add to the bloom-planner pods extraEnv: [] - # -- Environment variables from secrets or configmaps to add to the bloom compactor pods + # -- Environment variables from secrets or configmaps to add to the bloom-planner pods extraEnvFrom: [] - # -- Volume mounts to add to the bloom compactor pods + # -- Volume mounts to add to the bloom-planner pods extraVolumeMounts: [] - # -- Volumes to add to the bloom compactor pods + # -- Volumes to add to the bloom-planner pods extraVolumes: [] # -- readiness probe settings for ingester pods. If empty, use `loki.readinessProbe` readinessProbe: {} # -- liveness probe settings for ingester pods. If empty use `loki.livenessProbe` livenessProbe: {} - # -- Resource requests and limits for the bloom compactor + # -- Resource requests and limits for the bloom-planner resources: {} - # -- Containers to add to the bloom compactor pods + # -- Containers to add to the bloom-planner pods extraContainers: [] - # -- Init containers to add to the bloom compactor pods + # -- Init containers to add to the bloom-planner pods initContainers: [] - # -- Grace period to allow the bloom compactor to shutdown before it is killed + # -- Grace period to allow the bloom-planner to shutdown before it is killed terminationGracePeriodSeconds: 30 - # -- Node selector for bloom compactor pods + # -- Node selector for bloom-planner pods nodeSelector: {} - # -- Tolerations for bloom compactor pods + # -- Tolerations for bloom-planner pods tolerations: [] # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" appProtocol: grpc: "" persistence: - # -- Enable creating PVCs for the bloom compactor + # -- Enable creating PVCs for the bloom-planner enabled: false # -- Size of persistent disk size: 10Gi @@ -2554,37 +2561,115 @@ bloomCompactor: # If empty or set to null, no storageClassName spec is # set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). storageClass: null - # -- Annotations for bloom compactor PVCs + # -- Annotations for bloom-planner PVCs annotations: {} - # -- List of the bloom compactor PVCs + # -- List of the bloom-planner PVCs # @notationType -- list - claims: - - name: data - size: 10Gi - # -- Storage class to be used. - # If defined, storageClassName: . - # If set to "-", storageClassName: "", which disables dynamic provisioning. - # If empty or set to null, no storageClassName spec is - # set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). - storageClass: null - # - name: wal - # size: 150Gi + claims: [] # -- Enable StatefulSetAutoDeletePVC feature enableStatefulSetAutoDeletePVC: false whenDeleted: Retain whenScaled: Retain serviceAccount: create: false - # -- The name of the ServiceAccount to use for the bloom compactor. + # -- The name of the ServiceAccount to use for the bloom-planner. # If not set and create is true, a name is generated by appending - # "-bloom-compactor" to the common ServiceAccount. + # "-bloom-planner" to the common ServiceAccount. name: null - # -- Image pull secrets for the bloom compactor service account + # -- Image pull secrets for the bloom-planner service account imagePullSecrets: [] - # -- Annotations for the bloom compactor service account + # -- Annotations for the bloom-planner service account annotations: {} # -- Set this toggle to false to opt out of automounting API credentials for the service account automountServiceAccountToken: true +# -- Configuration for the bloom-builder +bloomBuilder: + # -- Number of replicas for the bloom-builder + replicas: 0 + # -- hostAliases to add + hostAliases: [] + # - ip: 1.2.3.4 + # hostnames: + # - domain.tld + autoscaling: + # -- Enable autoscaling for the bloom-builder + enabled: false + # -- Minimum autoscaling replicas for the bloom-builder + minReplicas: 1 + # -- Maximum autoscaling replicas for the bloom-builder + maxReplicas: 3 + # -- Target CPU utilisation percentage for the bloom-builder + targetCPUUtilizationPercentage: 60 + # -- Target memory utilisation percentage for the bloom-builder + targetMemoryUtilizationPercentage: null + # -- Allows one to define custom metrics using the HPA/v2 schema (for example, Pods, Object or External metrics) + customMetrics: [] + # - type: Pods + # pods: + # metric: + # name: loki_query_rate + # target: + # type: AverageValue + # averageValue: 100 + behavior: + # -- Enable autoscaling behaviours + enabled: false + # -- define scale down policies, must conform to HPAScalingRules + scaleDown: {} + # -- define scale up policies, must conform to HPAScalingRules + scaleUp: {} + image: + # -- The Docker registry for the bloom-builder image. Overrides `loki.image.registry` + registry: null + # -- Docker image repository for the bloom-builder image. Overrides `loki.image.repository` + repository: null + # -- Docker image tag for the bloom-builder image. Overrides `loki.image.tag` + tag: null + # -- Command to execute instead of defined in Docker image + command: null + # -- The name of the PriorityClass for bloom-builder pods + priorityClassName: null + # -- Labels for bloom-builder pods + podLabels: {} + # -- Annotations for bloom-builder pods + podAnnotations: {} + # -- Labels for bloom-builder service + serviceLabels: {} + # -- Additional CLI args for the bloom-builder + extraArgs: [] + # -- Environment variables to add to the bloom-builder pods + extraEnv: [] + # -- Environment variables from secrets or configmaps to add to the bloom-builder pods + extraEnvFrom: [] + # -- Volume mounts to add to the bloom-builder pods + extraVolumeMounts: [] + # -- Volumes to add to the bloom-builder pods + extraVolumes: [] + # -- Resource requests and limits for the bloom-builder + resources: {} + # -- Containers to add to the bloom-builder pods + extraContainers: [] + # -- Grace period to allow the bloom-builder to shutdown before it is killed + terminationGracePeriodSeconds: 30 + # -- Affinity for bloom-builder pods. + # @default -- Hard node anti-affinity + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchLabels: + app.kubernetes.io/component: bloom-builder + topologyKey: kubernetes.io/hostname + # -- Pod Disruption Budget maxUnavailable + maxUnavailable: null + # -- Node selector for bloom-builder pods + nodeSelector: {} + # -- Tolerations for bloom-builder pods + tolerations: [] + # -- Adds the appProtocol field to the queryFrontend service. This allows bloomBuilder to work with istio protocol selection. + appProtocol: + # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" + grpc: "" # -- Configuration for the pattern ingester patternIngester: # -- Number of replicas for the pattern ingester @@ -2964,6 +3049,20 @@ resultsCache: service: annotations: {} labels: {} + # -- Persistence settings for the results-cache + persistence: + # -- Enable creating PVCs for the results-cache + enabled: false + # -- Size of persistent disk + storageSize: 10G + # -- Storage class to be used. + # If defined, storageClassName: . + # If set to "-", storageClassName: "", which disables dynamic provisioning. + # If empty or set to null, no storageClassName spec is + # set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). + storageClass: null + # -- Volume mount path + mountPath: /data chunksCache: # -- Specifies whether memcached based chunks-cache should be enabled enabled: true @@ -3052,6 +3151,20 @@ chunksCache: service: annotations: {} labels: {} + # -- Persistence settings for the chunks-cache + persistence: + # -- Enable creating PVCs for the chunks-cache + enabled: false + # -- Size of persistent disk + storageSize: 10G + # -- Storage class to be used. + # If defined, storageClassName: . + # If set to "-", storageClassName: "", which disables dynamic provisioning. + # If empty or set to null, no storageClassName spec is + # set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). + storageClass: null + # -- Volume mount path + mountPath: /data ###################################################################################################################### # # Subchart configurations @@ -3147,7 +3260,7 @@ sidecar: # -- The Docker registry and image for the k8s sidecar repository: kiwigrid/k8s-sidecar # -- Docker image tag - tag: 1.24.3 + tag: 1.27.5 # -- Docker image sha. If empty, no sha will be used sha: "" # -- Docker image pull policy diff --git a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml index 8440c109..abf68acd 100644 --- a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml +++ b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: logging-system --- apiVersion: v1 @@ -23,7 +23,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system --- @@ -178,7 +178,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-clusterrole rules: - apiGroups: @@ -220,7 +220,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io @@ -525,7 +525,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-config-2mt25bhccf namespace: logging-system --- @@ -549,7 +549,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-runtime-9599m5k6h2 namespace: logging-system --- @@ -5103,7 +5103,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-env-58m52b99kc namespace: logging-system type: Opaque @@ -5179,7 +5179,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: @@ -5202,7 +5202,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 prometheus.io/service-monitor: "false" name: loki-headless namespace: logging-system @@ -5224,7 +5224,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 prometheus.io/service-monitor: "false" name: loki-memberlist namespace: logging-system @@ -6422,7 +6422,7 @@ metadata: app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: @@ -6922,7 +6922,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: diff --git a/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml index df43d312..17f5ee51 100644 --- a/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml +++ b/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: logging-system --- apiVersion: v1 @@ -28,7 +28,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system --- @@ -465,7 +465,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-clusterrole rules: - apiGroups: @@ -548,7 +548,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io @@ -857,7 +857,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-config-2mt25bhccf namespace: logging-system --- @@ -881,7 +881,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-runtime-9599m5k6h2 namespace: logging-system --- @@ -5486,7 +5486,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-env-58m52b99kc namespace: logging-system type: Opaque @@ -5571,7 +5571,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: @@ -5594,7 +5594,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 prometheus.io/service-monitor: "false" name: loki-headless namespace: logging-system @@ -5616,7 +5616,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 prometheus.io/service-monitor: "false" name: loki-memberlist namespace: logging-system @@ -6129,7 +6129,7 @@ metadata: app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: @@ -6805,7 +6805,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: diff --git a/kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml index afae46cd..946c63a3 100644 --- a/kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml +++ b/kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: logging-system --- apiVersion: v1 @@ -18,7 +18,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system --- @@ -160,7 +160,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-clusterrole rules: - apiGroups: @@ -202,7 +202,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io @@ -334,7 +334,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-config-2mt25bhccf namespace: logging-system --- @@ -358,7 +358,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-runtime-9599m5k6h2 namespace: logging-system --- @@ -4755,7 +4755,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-env-58m52b99kc namespace: logging-system type: Opaque @@ -4817,7 +4817,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: @@ -4840,7 +4840,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 prometheus.io/service-monitor: "false" name: loki-headless namespace: logging-system @@ -4862,7 +4862,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 prometheus.io/service-monitor: "false" name: loki-memberlist namespace: logging-system @@ -5104,7 +5104,7 @@ metadata: app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: @@ -5446,7 +5446,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: diff --git a/kubernetes/monolithic-mode/logs/loki/kustomization.yaml b/kubernetes/monolithic-mode/logs/loki/kustomization.yaml index c09978ee..a004f24c 100644 --- a/kubernetes/monolithic-mode/logs/loki/kustomization.yaml +++ b/kubernetes/monolithic-mode/logs/loki/kustomization.yaml @@ -12,11 +12,11 @@ labels: - includeSelectors: false pairs: app.kubernetes.io/managed-by: Kustomize - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 images: - name: docker.io/grafana/loki - newTag: 3.1.0 + newTag: 3.1.1 resources: - namespace.yaml diff --git a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml index e4ba6a86..4f04f63a 100644 --- a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml +++ b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: logging-system --- apiVersion: v1 @@ -23,7 +23,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system --- @@ -178,7 +178,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-clusterrole rules: - apiGroups: @@ -220,7 +220,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io @@ -514,7 +514,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-config-2mt25bhccf namespace: logging-system --- @@ -538,7 +538,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-runtime-9599m5k6h2 namespace: logging-system --- @@ -5091,7 +5091,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki-env-58m52b99kc namespace: logging-system type: Opaque @@ -5176,7 +5176,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: @@ -5199,7 +5199,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 prometheus.io/service-monitor: "false" name: loki-headless namespace: logging-system @@ -5221,7 +5221,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 prometheus.io/service-monitor: "false" name: loki-memberlist namespace: logging-system @@ -5527,7 +5527,7 @@ metadata: app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: @@ -5970,7 +5970,7 @@ metadata: app.kubernetes.io/instance: loki-monolithic-mode app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.1.0 + app.kubernetes.io/version: 3.1.1 name: loki namespace: logging-system spec: diff --git a/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml b/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml index 3b77cf74..0e1f1224 100644 --- a/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml +++ b/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki namespace: logging-system --- @@ -154,7 +154,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-clusterrole rules: - apiGroups: @@ -196,7 +196,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io @@ -365,7 +365,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-runtime namespace: logging-system --- @@ -4819,7 +4819,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-backend namespace: logging-system spec: @@ -4874,7 +4874,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-memberlist namespace: logging-system spec: @@ -4927,7 +4927,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-read namespace: logging-system spec: @@ -4984,7 +4984,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-write namespace: logging-system spec: @@ -5174,7 +5174,7 @@ metadata: app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-read namespace: logging-system spec: @@ -5369,7 +5369,7 @@ metadata: app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-backend namespace: logging-system spec: @@ -5504,7 +5504,7 @@ metadata: app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-write namespace: logging-system spec: @@ -5742,7 +5742,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-backend namespace: logging-system spec: @@ -5762,7 +5762,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-read namespace: logging-system spec: @@ -5782,7 +5782,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: loki app.kubernetes.io/version: 3.1.1 - helm.sh/chart: loki-6.11.0 + helm.sh/chart: loki-6.12.0 name: loki-write namespace: logging-system spec: diff --git a/kubernetes/read-write-mode/logs/loki/kustomization.yaml b/kubernetes/read-write-mode/logs/loki/kustomization.yaml index 40670dfe..302ce7b3 100644 --- a/kubernetes/read-write-mode/logs/loki/kustomization.yaml +++ b/kubernetes/read-write-mode/logs/loki/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization namespace: logging-system helmCharts: - name: loki - version: 6.11.0 + version: 6.12.0 repo: https://grafana.github.io/helm-charts releaseName: loki namespace: logging-system diff --git a/kubernetes/read-write-mode/logs/loki/values-k3d-k3s.yaml b/kubernetes/read-write-mode/logs/loki/values-k3d-k3s.yaml index 0f6e2ebb..c11260a4 100644 --- a/kubernetes/read-write-mode/logs/loki/values-k3d-k3s.yaml +++ b/kubernetes/read-write-mode/logs/loki/values-k3d-k3s.yaml @@ -19,10 +19,10 @@ gateway: enabled: false verboseLogging: false -chunksCache: - enabled: false resultsCache: enabled: false +chunksCache: + enabled: false ###################################################################################################################### # diff --git a/kubernetes/read-write-mode/logs/loki/values.yaml b/kubernetes/read-write-mode/logs/loki/values.yaml index 4f27bd13..ed65339c 100644 --- a/kubernetes/read-write-mode/logs/loki/values.yaml +++ b/kubernetes/read-write-mode/logs/loki/values.yaml @@ -329,6 +329,7 @@ loki: http_config: {} # -- Check https://grafana.com/docs/loki/latest/configure/#s3_storage_config for more info on how to provide a backoff_config backoff_config: {} + disable_dualstack: false gcs: chunkBufferSize: 0 requestTimeout: "0s" @@ -439,6 +440,10 @@ loki: # -- Enable tracing tracing: enabled: false + bloom_build: + enabled: false + bloom_gateway: + enabled: false ###################################################################################################################### # # Enterprise Loki Configs @@ -450,7 +455,7 @@ enterprise: # Enable enterprise features, license must be provided enabled: false # Default verion of GEL to deploy - version: 3.1.0 + version: 3.1.1 # -- Optional name of the GEL cluster, otherwise will use .Release.Name # The cluster name must match what is in your GEL license cluster_name: null @@ -897,7 +902,7 @@ gateway: # -- The gateway image repository repository: nginxinc/nginx-unprivileged # -- The gateway image tag - tag: 1.24-alpine + tag: 1.27-alpine # -- Overrides the gateway image tag with an image digest digest: null # -- The gateway image pull policy @@ -1012,9 +1017,11 @@ gateway: htpasswd: >- {{ if .Values.loki.tenants }} + {{- range $t := .Values.loki.tenants }} {{ htpasswd (required "All tenants must have a 'name' set" $t.name) (required "All tenants must have a 'password' set" $t.password) }} + {{- end }} {{ else }} {{ htpasswd (required "'gateway.basicAuth.username' is required" .Values.gateway.basicAuth.username) (required "'gateway.basicAuth.password' is required" .Values.gateway.basicAuth.password) }} {{ end }} # -- Existing basic auth secret to use. Must contain '.htpasswd' @@ -1589,7 +1596,7 @@ backend: annotations: {} # -- Additional labels for backend Service labels: {} - # -- Comma-separated list of Loki modules to load for the read + # -- Comma-separated list of Loki modules to load for the backend targetModule: "backend" # -- Additional CLI args for the backend extraArgs: [] @@ -2373,9 +2380,9 @@ compactor: annotations: {} # -- Set this toggle to false to opt out of automounting API credentials for the service account automountServiceAccountToken: true -# -- Configuration for the bloom gateway +# -- Configuration for the bloom-gateway bloomGateway: - # -- Number of replicas for the bloom gateway + # -- Number of replicas for the bloom-gateway replicas: 0 # -- hostAliases to add hostAliases: [] @@ -2383,21 +2390,21 @@ bloomGateway: # hostnames: # - domain.tld image: - # -- The Docker registry for the bloom gateway image. Overrides `loki.image.registry` + # -- The Docker registry for the bloom-gateway image. Overrides `loki.image.registry` registry: null - # -- Docker image repository for the bloom gateway image. Overrides `loki.image.repository` + # -- Docker image repository for the bloom-gateway image. Overrides `loki.image.repository` repository: null - # -- Docker image tag for the bloom gateway image. Overrides `loki.image.tag` + # -- Docker image tag for the bloom-gateway image. Overrides `loki.image.tag` tag: null # -- Command to execute instead of defined in Docker image command: null - # -- The name of the PriorityClass for bloom gateway pods + # -- The name of the PriorityClass for bloom-gateway pods priorityClassName: null - # -- Labels for bloom gateway pods + # -- Labels for bloom-gateway pods podLabels: {} - # -- Annotations for bloom gateway pods + # -- Annotations for bloom-gateway pods podAnnotations: {} - # -- Affinity for bloom gateway pods. + # -- Affinity for bloom-gateway pods. # @default -- Hard node anti-affinity affinity: podAntiAffinity: @@ -2406,39 +2413,39 @@ bloomGateway: matchLabels: app.kubernetes.io/component: bloom-gateway topologyKey: kubernetes.io/hostname - # -- Labels for bloom gateway service + # -- Labels for bloom-gateway service serviceLabels: {} - # -- Additional CLI args for the bloom gateway + # -- Additional CLI args for the bloom-gateway extraArgs: [] - # -- Environment variables to add to the bloom gateway pods + # -- Environment variables to add to the bloom-gateway pods extraEnv: [] - # -- Environment variables from secrets or configmaps to add to the bloom gateway pods + # -- Environment variables from secrets or configmaps to add to the bloom-gateway pods extraEnvFrom: [] - # -- Volume mounts to add to the bloom gateway pods + # -- Volume mounts to add to the bloom-gateway pods extraVolumeMounts: [] - # -- Volumes to add to the bloom gateway pods + # -- Volumes to add to the bloom-gateway pods extraVolumes: [] # -- readiness probe settings for ingester pods. If empty, use `loki.readinessProbe` readinessProbe: {} # -- liveness probe settings for ingester pods. If empty use `loki.livenessProbe` livenessProbe: {} - # -- Resource requests and limits for the bloom gateway + # -- Resource requests and limits for the bloom-gateway resources: {} - # -- Containers to add to the bloom gateway pods + # -- Containers to add to the bloom-gateway pods extraContainers: [] - # -- Init containers to add to the bloom gateway pods + # -- Init containers to add to the bloom-gateway pods initContainers: [] - # -- Grace period to allow the bloom gateway to shutdown before it is killed + # -- Grace period to allow the bloom-gateway to shutdown before it is killed terminationGracePeriodSeconds: 30 - # -- Node selector for bloom gateway pods + # -- Node selector for bloom-gateway pods nodeSelector: {} - # -- Tolerations for bloom gateway pods + # -- Tolerations for bloom-gateway pods tolerations: [] # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" appProtocol: grpc: "" persistence: - # -- Enable creating PVCs for the bloom gateway + # -- Enable creating PVCs for the bloom-gateway enabled: false # -- Size of persistent disk size: 10Gi @@ -2448,9 +2455,9 @@ bloomGateway: # If empty or set to null, no storageClassName spec is # set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). storageClass: null - # -- Annotations for bloom gateway PVCs + # -- Annotations for bloom-gateway PVCs annotations: {} - # -- List of the bloom gateway PVCs + # -- List of the bloom-gateway PVCs # @notationType -- list claims: - name: data @@ -2469,19 +2476,19 @@ bloomGateway: whenScaled: Retain serviceAccount: create: false - # -- The name of the ServiceAccount to use for the bloom gateway. + # -- The name of the ServiceAccount to use for the bloom-gateway. # If not set and create is true, a name is generated by appending # "-bloom-gateway" to the common ServiceAccount. name: null - # -- Image pull secrets for the bloom gateway service account + # -- Image pull secrets for the bloom-gateway service account imagePullSecrets: [] - # -- Annotations for the bloom gateway service account + # -- Annotations for the bloom-gateway service account annotations: {} # -- Set this toggle to false to opt out of automounting API credentials for the service account automountServiceAccountToken: true -# -- Configuration for the bloom compactor -bloomCompactor: - # -- Number of replicas for the bloom compactor +# -- Configuration for the bloom-planner +bloomPlanner: + # -- Number of replicas for the bloom-planner replicas: 0 # -- hostAliases to add hostAliases: [] @@ -2489,62 +2496,62 @@ bloomCompactor: # hostnames: # - domain.tld image: - # -- The Docker registry for the bloom compactor image. Overrides `loki.image.registry` + # -- The Docker registry for the bloom-planner image. Overrides `loki.image.registry` registry: null - # -- Docker image repository for the bloom compactor image. Overrides `loki.image.repository` + # -- Docker image repository for the bloom-planner image. Overrides `loki.image.repository` repository: null - # -- Docker image tag for the bloom compactor image. Overrides `loki.image.tag` + # -- Docker image tag for the bloom-planner image. Overrides `loki.image.tag` tag: null # -- Command to execute instead of defined in Docker image command: null - # -- The name of the PriorityClass for bloom compactor pods + # -- The name of the PriorityClass for bloom-planner pods priorityClassName: null - # -- Labels for bloom compactor pods + # -- Labels for bloom-planner pods podLabels: {} - # -- Annotations for bloom compactor pods + # -- Annotations for bloom-planner pods podAnnotations: {} - # -- Affinity for bloom compactor pods. + # -- Affinity for bloom-planner pods. # @default -- Hard node anti-affinity affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchLabels: - app.kubernetes.io/component: bloom-compactor + app.kubernetes.io/component: bloom-planner topologyKey: kubernetes.io/hostname - # -- Labels for bloom compactor service + # -- Labels for bloom-planner service serviceLabels: {} - # -- Additional CLI args for the bloom compactor + # -- Additional CLI args for the bloom-planner extraArgs: [] - # -- Environment variables to add to the bloom compactor pods + # -- Environment variables to add to the bloom-planner pods extraEnv: [] - # -- Environment variables from secrets or configmaps to add to the bloom compactor pods + # -- Environment variables from secrets or configmaps to add to the bloom-planner pods extraEnvFrom: [] - # -- Volume mounts to add to the bloom compactor pods + # -- Volume mounts to add to the bloom-planner pods extraVolumeMounts: [] - # -- Volumes to add to the bloom compactor pods + # -- Volumes to add to the bloom-planner pods extraVolumes: [] # -- readiness probe settings for ingester pods. If empty, use `loki.readinessProbe` readinessProbe: {} # -- liveness probe settings for ingester pods. If empty use `loki.livenessProbe` livenessProbe: {} - # -- Resource requests and limits for the bloom compactor + # -- Resource requests and limits for the bloom-planner resources: {} - # -- Containers to add to the bloom compactor pods + # -- Containers to add to the bloom-planner pods extraContainers: [] - # -- Init containers to add to the bloom compactor pods + # -- Init containers to add to the bloom-planner pods initContainers: [] - # -- Grace period to allow the bloom compactor to shutdown before it is killed + # -- Grace period to allow the bloom-planner to shutdown before it is killed terminationGracePeriodSeconds: 30 - # -- Node selector for bloom compactor pods + # -- Node selector for bloom-planner pods nodeSelector: {} - # -- Tolerations for bloom compactor pods + # -- Tolerations for bloom-planner pods tolerations: [] # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" appProtocol: grpc: "" persistence: - # -- Enable creating PVCs for the bloom compactor + # -- Enable creating PVCs for the bloom-planner enabled: false # -- Size of persistent disk size: 10Gi @@ -2554,37 +2561,115 @@ bloomCompactor: # If empty or set to null, no storageClassName spec is # set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). storageClass: null - # -- Annotations for bloom compactor PVCs + # -- Annotations for bloom-planner PVCs annotations: {} - # -- List of the bloom compactor PVCs + # -- List of the bloom-planner PVCs # @notationType -- list - claims: - - name: data - size: 10Gi - # -- Storage class to be used. - # If defined, storageClassName: . - # If set to "-", storageClassName: "", which disables dynamic provisioning. - # If empty or set to null, no storageClassName spec is - # set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). - storageClass: null - # - name: wal - # size: 150Gi + claims: [] # -- Enable StatefulSetAutoDeletePVC feature enableStatefulSetAutoDeletePVC: false whenDeleted: Retain whenScaled: Retain serviceAccount: create: false - # -- The name of the ServiceAccount to use for the bloom compactor. + # -- The name of the ServiceAccount to use for the bloom-planner. # If not set and create is true, a name is generated by appending - # "-bloom-compactor" to the common ServiceAccount. + # "-bloom-planner" to the common ServiceAccount. name: null - # -- Image pull secrets for the bloom compactor service account + # -- Image pull secrets for the bloom-planner service account imagePullSecrets: [] - # -- Annotations for the bloom compactor service account + # -- Annotations for the bloom-planner service account annotations: {} # -- Set this toggle to false to opt out of automounting API credentials for the service account automountServiceAccountToken: true +# -- Configuration for the bloom-builder +bloomBuilder: + # -- Number of replicas for the bloom-builder + replicas: 0 + # -- hostAliases to add + hostAliases: [] + # - ip: 1.2.3.4 + # hostnames: + # - domain.tld + autoscaling: + # -- Enable autoscaling for the bloom-builder + enabled: false + # -- Minimum autoscaling replicas for the bloom-builder + minReplicas: 1 + # -- Maximum autoscaling replicas for the bloom-builder + maxReplicas: 3 + # -- Target CPU utilisation percentage for the bloom-builder + targetCPUUtilizationPercentage: 60 + # -- Target memory utilisation percentage for the bloom-builder + targetMemoryUtilizationPercentage: null + # -- Allows one to define custom metrics using the HPA/v2 schema (for example, Pods, Object or External metrics) + customMetrics: [] + # - type: Pods + # pods: + # metric: + # name: loki_query_rate + # target: + # type: AverageValue + # averageValue: 100 + behavior: + # -- Enable autoscaling behaviours + enabled: false + # -- define scale down policies, must conform to HPAScalingRules + scaleDown: {} + # -- define scale up policies, must conform to HPAScalingRules + scaleUp: {} + image: + # -- The Docker registry for the bloom-builder image. Overrides `loki.image.registry` + registry: null + # -- Docker image repository for the bloom-builder image. Overrides `loki.image.repository` + repository: null + # -- Docker image tag for the bloom-builder image. Overrides `loki.image.tag` + tag: null + # -- Command to execute instead of defined in Docker image + command: null + # -- The name of the PriorityClass for bloom-builder pods + priorityClassName: null + # -- Labels for bloom-builder pods + podLabels: {} + # -- Annotations for bloom-builder pods + podAnnotations: {} + # -- Labels for bloom-builder service + serviceLabels: {} + # -- Additional CLI args for the bloom-builder + extraArgs: [] + # -- Environment variables to add to the bloom-builder pods + extraEnv: [] + # -- Environment variables from secrets or configmaps to add to the bloom-builder pods + extraEnvFrom: [] + # -- Volume mounts to add to the bloom-builder pods + extraVolumeMounts: [] + # -- Volumes to add to the bloom-builder pods + extraVolumes: [] + # -- Resource requests and limits for the bloom-builder + resources: {} + # -- Containers to add to the bloom-builder pods + extraContainers: [] + # -- Grace period to allow the bloom-builder to shutdown before it is killed + terminationGracePeriodSeconds: 30 + # -- Affinity for bloom-builder pods. + # @default -- Hard node anti-affinity + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchLabels: + app.kubernetes.io/component: bloom-builder + topologyKey: kubernetes.io/hostname + # -- Pod Disruption Budget maxUnavailable + maxUnavailable: null + # -- Node selector for bloom-builder pods + nodeSelector: {} + # -- Tolerations for bloom-builder pods + tolerations: [] + # -- Adds the appProtocol field to the queryFrontend service. This allows bloomBuilder to work with istio protocol selection. + appProtocol: + # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" + grpc: "" # -- Configuration for the pattern ingester patternIngester: # -- Number of replicas for the pattern ingester @@ -2964,6 +3049,20 @@ resultsCache: service: annotations: {} labels: {} + # -- Persistence settings for the results-cache + persistence: + # -- Enable creating PVCs for the results-cache + enabled: false + # -- Size of persistent disk + storageSize: 10G + # -- Storage class to be used. + # If defined, storageClassName: . + # If set to "-", storageClassName: "", which disables dynamic provisioning. + # If empty or set to null, no storageClassName spec is + # set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). + storageClass: null + # -- Volume mount path + mountPath: /data chunksCache: # -- Specifies whether memcached based chunks-cache should be enabled enabled: true @@ -3052,6 +3151,20 @@ chunksCache: service: annotations: {} labels: {} + # -- Persistence settings for the chunks-cache + persistence: + # -- Enable creating PVCs for the chunks-cache + enabled: false + # -- Size of persistent disk + storageSize: 10G + # -- Storage class to be used. + # If defined, storageClassName: . + # If set to "-", storageClassName: "", which disables dynamic provisioning. + # If empty or set to null, no storageClassName spec is + # set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). + storageClass: null + # -- Volume mount path + mountPath: /data ###################################################################################################################### # # Subchart configurations @@ -3147,7 +3260,7 @@ sidecar: # -- The Docker registry and image for the k8s sidecar repository: kiwigrid/k8s-sidecar # -- Docker image tag - tag: 1.24.3 + tag: 1.27.5 # -- Docker image sha. If empty, no sha will be used sha: "" # -- Docker image pull policy