From b074b251222adbcb82324c106e484fce191778c1 Mon Sep 17 00:00:00 2001 From: Weifeng Wang Date: Thu, 5 Sep 2024 22:05:18 +0800 Subject: [PATCH] update tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Weifeng Wang update deps Signed-off-by: Weifeng Wang fix loki start error Signed-off-by: Weifeng Wang Update common dependency helm charts Signed-off-by: 🤖QC Owl App[bot] <165384878+qc-owl-app[bot]@users.noreply.github.com> Update common dependency helm charts Signed-off-by: 🤖QC Owl App[bot] <165384878+qc-owl-app[bot]@users.noreply.github.com> Update common dependency helm charts Signed-off-by: 🤖QC Owl App[bot] <165384878+qc-owl-app[bot]@users.noreply.github.com> Update LGTMP stack dependency Helm charts Signed-off-by: 🤖QC Owl App[bot] <165384878+qc-owl-app[bot]@users.noreply.github.com> fix loki start error Signed-off-by: Weifeng Wang fix loki start error Signed-off-by: Weifeng Wang --- .bingo/Variables.mk | 24 +- .bingo/cmctl.mod | 2 +- .bingo/cmctl.sum | 91 ++++ .bingo/goimports.mod | 2 +- .bingo/goimports.sum | 4 + .bingo/golangci-lint.mod | 2 +- .bingo/golangci-lint.sum | 32 ++ .bingo/k3d.mod | 2 +- .bingo/k3d.sum | 2 + .bingo/variables.env | 8 +- .../config/loki/microservices-mode-logs.yaml | 43 +- .../config/loki/monolithic-mode-logs.yaml | 1 - .../config/loki/read-write-mode-logs.yaml | 1 - .../microservices-mode/logs/compose.yaml | 42 ++ .../kube-prometheus-stack/kustomization.yaml | 2 +- .../manifests/k8s-all-in-one.yaml | 483 ++++++++++-------- .../common/kube-prometheus-stack/values.yaml | 5 +- .../logs/k8s-all-in-one.yaml | 37 +- .../logs/loki/configs/loki.yaml | 5 +- .../logs/loki/values-k3d-k3s.yaml | 9 +- .../traces/k8s-all-in-one.yaml | 132 ++--- .../tempo-distributed/kustomization.yaml | 2 +- .../read-write-mode/logs/k8s-all-in-one.yaml | 18 +- .../logs/loki/configs/loki.yaml | 10 +- 24 files changed, 614 insertions(+), 345 deletions(-) diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index 3c5a980f..12623769 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -17,11 +17,11 @@ GO ?= $(shell which go) # @echo "Running cmctl" # @$(CMCTL) # -CMCTL := $(GOBIN)/cmctl-v2.1.0 +CMCTL := $(GOBIN)/cmctl-v2.1.1 $(CMCTL): $(BINGO_DIR)/cmctl.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)/cmctl-v2.1.0" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=cmctl.mod -o=$(GOBIN)/cmctl-v2.1.0 "github.com/cert-manager/cmctl/v2" + @echo "(re)installing $(GOBIN)/cmctl-v2.1.1" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=cmctl.mod -o=$(GOBIN)/cmctl-v2.1.1 "github.com/cert-manager/cmctl/v2" COPYRIGHT := $(GOBIN)/copyright-v0.0.0-20230505153745-6b7392939a60 $(COPYRIGHT): $(BINGO_DIR)/copyright.mod @@ -35,17 +35,17 @@ $(GOFUMPT): $(BINGO_DIR)/gofumpt.mod @echo "(re)installing $(GOBIN)/gofumpt-v0.7.0" @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gofumpt.mod -o=$(GOBIN)/gofumpt-v0.7.0 "mvdan.cc/gofumpt" -GOIMPORTS := $(GOBIN)/goimports-v0.24.0 +GOIMPORTS := $(GOBIN)/goimports-v0.25.0 $(GOIMPORTS): $(BINGO_DIR)/goimports.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)/goimports-v0.24.0" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goimports.mod -o=$(GOBIN)/goimports-v0.24.0 "golang.org/x/tools/cmd/goimports" + @echo "(re)installing $(GOBIN)/goimports-v0.25.0" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goimports.mod -o=$(GOBIN)/goimports-v0.25.0 "golang.org/x/tools/cmd/goimports" -GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.60.3 +GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.61.0 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.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)/golangci-lint-v1.60.3" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.60.3 "github.com/golangci/golangci-lint/cmd/golangci-lint" + @echo "(re)installing $(GOBIN)/golangci-lint-v1.61.0" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.61.0 "github.com/golangci/golangci-lint/cmd/golangci-lint" GORELEASER := $(GOBIN)/goreleaser-v1.26.2 $(GORELEASER): $(BINGO_DIR)/goreleaser.mod @@ -71,11 +71,11 @@ $(JSONNETFMT): $(BINGO_DIR)/jsonnetfmt.mod @echo "(re)installing $(GOBIN)/jsonnetfmt-v0.20.0" @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.20.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt" -K3D := $(GOBIN)/k3d-v5.7.3 +K3D := $(GOBIN)/k3d-v5.7.4 $(K3D): $(BINGO_DIR)/k3d.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)/k3d-v5.7.3" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=k3d.mod -o=$(GOBIN)/k3d-v5.7.3 "github.com/k3d-io/k3d/v5" + @echo "(re)installing $(GOBIN)/k3d-v5.7.4" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=k3d.mod -o=$(GOBIN)/k3d-v5.7.4 "github.com/k3d-io/k3d/v5" KUSTOMIZE := $(GOBIN)/kustomize-v5.4.3 $(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod diff --git a/.bingo/cmctl.mod b/.bingo/cmctl.mod index 6cd98401..10d06a53 100644 --- a/.bingo/cmctl.mod +++ b/.bingo/cmctl.mod @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.22.5 -require github.com/cert-manager/cmctl/v2 v2.1.0 +require github.com/cert-manager/cmctl/v2 v2.1.1 diff --git a/.bingo/cmctl.sum b/.bingo/cmctl.sum index aa76e4cc..954346ec 100644 --- a/.bingo/cmctl.sum +++ b/.bingo/cmctl.sum @@ -35,8 +35,12 @@ github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2y github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cert-manager/cert-manager v1.15.0 h1:xVL8tzdQECMypoYQa9rv4DLjkn2pJXJLTqH4JUsxfko= github.com/cert-manager/cert-manager v1.15.0/go.mod h1:Vxq6yNKAbgQeMtzu5gqU8n0vXDiZcGTa5LDyCJRbmXE= +github.com/cert-manager/cert-manager v1.15.3 h1:/u9T0griwd5MegPfWbB7v0KcVcT9OJrEvPNhc9tl7xQ= +github.com/cert-manager/cert-manager v1.15.3/go.mod h1:stBge/DTvrhfQMB/93+Y62s+gQgZBsfL1o0C/4AL/mI= github.com/cert-manager/cmctl/v2 v2.1.0 h1:qfREHhoHtKQUXfYFWLhsRmHEbMriSb354okyHaB5/Us= github.com/cert-manager/cmctl/v2 v2.1.0/go.mod h1:PFs45yfpvkcAkk2PWI0Ojr49gU8VQ2chvZ/s5lMOI00= +github.com/cert-manager/cmctl/v2 v2.1.1 h1:9wX3pSUiLCcWt+pIuGKPxoG+mVo/hXGd9C7engM0sy0= +github.com/cert-manager/cmctl/v2 v2.1.1/go.mod h1:6QqbzBxVvP71C+R7bilOvGjc3lsYzaF59U4hMsfAWLo= 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/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= @@ -50,22 +54,33 @@ github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= 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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= +github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg= github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v25.0.1+incompatible h1:mFpqnrS6Hsm3v1k7Wa/BO23oz0k121MTbTO1lpcGSkU= +github.com/docker/cli v25.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= +github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.6+incompatible h1:5cPwbwriIcsua2REJe8HqQV+6WlWc1byg2QSXzBxBGg= +github.com/docker/docker v25.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -88,6 +103,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= github.com/go-asn1-ber/asn1-ber v1.5.6 h1:CYsqysemXfEaQbyrLJmdsCRuufHoLa3P/gGWGl5TDrM= github.com/go-asn1-ber/asn1-ber v1.5.6/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= @@ -235,6 +252,8 @@ github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8= +github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -257,6 +276,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= +github.com/opencontainers/image-spec v1.1.0-rc6 h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU= +github.com/opencontainers/image-spec v1.1.0-rc6/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -268,6 +289,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -277,11 +300,15 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y= github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rubenv/sql-migrate v1.5.2 h1:bMDqOnrJVV/6JQgQ/MxOpU+AdO8uzYYA/TxFUBzFtS0= @@ -299,6 +326,8 @@ github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= 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= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -313,6 +342,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -327,12 +358,20 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 h1:Xs2Ncz0gNihqu9iosIZ5SkBbWo5T8JhhLJFMQL1qmLI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0/go.mod h1:vy+2G/6NvVMpwGX/NyLqcC41fxepnuKHk16E6IZUcJc= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs= go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30= go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA= go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY= go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -350,6 +389,8 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= @@ -381,9 +422,13 @@ golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo= golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= +golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -394,6 +439,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -416,6 +463,8 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.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/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -426,6 +475,8 @@ golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= 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.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -435,6 +486,8 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -460,11 +513,15 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 h1:AgADTJarZTBqgjiUzRgfaBchgYB3/WFTC80GPwsMcRI= google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -475,8 +532,12 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -490,42 +551,72 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= helm.sh/helm/v3 v3.15.1 h1:22ztacHz4gMqhXNqCQ9NAg6BFWoRUryNLvnkz6OVyw0= helm.sh/helm/v3 v3.15.1/go.mod h1:fvfoRcB8UKRUV5jrIfOTaN/pG1TPhuqSb56fjYdTKXg= +helm.sh/helm/v3 v3.15.4 h1:UFHd6oZ1IN3FsUZ7XNhOQDyQ2QYknBNWRHH57e9cbHY= +helm.sh/helm/v3 v3.15.4/go.mod h1:phOwlxqGSgppCY/ysWBNRhG3MtnpsttOzxaTK+Mt40E= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY= k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM= +k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo= +k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE= k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws= k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4= +k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= +k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U= k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= +k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/apiserver v0.30.1 h1:BEWEe8bzS12nMtDKXzCF5Q5ovp6LjjYkSp8qOPk8LZ8= k8s.io/apiserver v0.30.1/go.mod h1:i87ZnQ+/PGAmSbD/iEKM68bm1D5reX8fO4Ito4B01mo= +k8s.io/apiserver v0.31.0 h1:p+2dgJjy+bk+B1Csz+mc2wl5gHwvNkC9QJV+w55LVrY= +k8s.io/apiserver v0.31.0/go.mod h1:KI9ox5Yu902iBnnyMmy7ajonhKnkeZYJhTZ/YI+WEMk= k8s.io/cli-runtime v0.30.1 h1:kSBBpfrJGS6lllc24KeniI9JN7ckOOJKnmFYH1RpTOw= k8s.io/cli-runtime v0.30.1/go.mod h1:zhHgbqI4J00pxb6gM3gJPVf2ysDjhQmQtnTxnMScab8= +k8s.io/cli-runtime v0.31.0 h1:V2Q1gj1u3/WfhD475HBQrIYsoryg/LrhhK4RwpN+DhA= +k8s.io/cli-runtime v0.31.0/go.mod h1:vg3H94wsubuvWfSmStDbekvbla5vFGC+zLWqcf+bGDw= k8s.io/client-go v0.30.1 h1:uC/Ir6A3R46wdkgCV3vbLyNOYyCJ8oZnjtJGKfytl/Q= k8s.io/client-go v0.30.1/go.mod h1:wrAqLNs2trwiCH/wxxmT/x3hKVH9PuV0GGW0oDoHVqc= +k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= +k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= k8s.io/component-base v0.30.1 h1:bvAtlPh1UrdaZL20D9+sWxsJljMi0QZ3Lmw+kmZAaxQ= k8s.io/component-base v0.30.1/go.mod h1:e/X9kDiOebwlI41AvBHuWdqFriSRrX50CdwA9TFaHLI= +k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs= +k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f h1:0LQagt0gDpKqvIkAMPaRGcXawNMouPECM1+F9BVxEaM= k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f/go.mod h1:S9tOR0FxgyusSNR+MboCuiDpVWkAifZvaYI1Q2ubgro= k8s.io/kubectl v0.30.1 h1:sHFIRI3oP0FFZmBAVEE8ErjnTyXDPkBcvO88mH9RjuY= k8s.io/kubectl v0.30.1/go.mod h1:7j+L0Cc38RYEcx+WH3y44jRBe1Q1jxdGPKkX0h4iDq0= +k8s.io/kubectl v0.31.0 h1:kANwAAPVY02r4U4jARP/C+Q1sssCcN/1p9Nk+7BQKVg= +k8s.io/kubectl v0.31.0/go.mod h1:pB47hhFypGsaHAPjlwrNbvhXgmuAr01ZBvAIIUaI8d4= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY= oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324= +oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo= +oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo= sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= +sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= +sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM= sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 h1:XX3Ajgzov2RKUdc5jW3t5jwY7Bo7dcRm+tFxT+NfgY0= sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3/go.mod h1:9n16EZKMhXBNSiUC5kSdFQJkdH3zbxS/JoO619G1VAY= +sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g= +sigs.k8s.io/kustomize/api v0.17.2/go.mod h1:UWTz9Ct+MvoeQsHcJ5e+vziRRkwimm3HytpZgIYqye0= sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 h1:W6cLQc5pnqM7vh3b7HvGNfXrJ/xL6BDMS0v1V/HHg5U= sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3/go.mod h1:JWP1Fj0VWGHyw3YUPjXSQnRnrwezrZSrApfX5S0nIag= +sigs.k8s.io/kustomize/kyaml v0.17.1 h1:TnxYQxFXzbmNG6gOINgGWQt09GghzgTP6mIurOgrLCQ= +sigs.k8s.io/kustomize/kyaml v0.17.1/go.mod h1:9V0mCjIEYjlXuCdYsSXvyoy2BTsLESH7TlGV81S282U= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= diff --git a/.bingo/goimports.mod b/.bingo/goimports.mod index 49fc60d8..fd568db0 100644 --- a/.bingo/goimports.mod +++ b/.bingo/goimports.mod @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.23.0 -require golang.org/x/tools v0.24.0 // cmd/goimports +require golang.org/x/tools v0.25.0 // cmd/goimports diff --git a/.bingo/goimports.sum b/.bingo/goimports.sum index c4895982..6a89ff3f 100644 --- a/.bingo/goimports.sum +++ b/.bingo/goimports.sum @@ -1,6 +1,10 @@ golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= +golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod index 25a1e1c4..9ee83091 100644 --- a/.bingo/golangci-lint.mod +++ b/.bingo/golangci-lint.mod @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.23.0 -require github.com/golangci/golangci-lint v1.60.3 // cmd/golangci-lint +require github.com/golangci/golangci-lint v1.61.0 // cmd/golangci-lint diff --git a/.bingo/golangci-lint.sum b/.bingo/golangci-lint.sum index 288b79d2..11918388 100644 --- a/.bingo/golangci-lint.sum +++ b/.bingo/golangci-lint.sum @@ -39,6 +39,8 @@ github.com/4meepo/tagalign v1.3.4 h1:P51VcvBnf04YkHzjfclN6BbsopfJR5rxs1n+5zHt+w8 github.com/4meepo/tagalign v1.3.4/go.mod h1:M+pnkHH2vG8+qhE5bVc/zeP7HS/j910Fwa9TUSyZVI0= github.com/Abirdcfly/dupword v0.0.14 h1:3U4ulkc8EUo+CaT105/GJ1BQwtgyj6+VaBVbAX11Ba8= github.com/Abirdcfly/dupword v0.0.14/go.mod h1:VKDAbxdY8YbKUByLGg8EETzYSuC4crm9WwI6Y3S0cLI= +github.com/Abirdcfly/dupword v0.1.1 h1:Bsxe0fIw6OwBtXMIncaTxCLHYO5BB+3mcsR5E8VXloY= +github.com/Abirdcfly/dupword v0.1.1/go.mod h1:B49AcJdTYYkpd4HjgAcutNGG9HZ2JWwKunH9Y2BA6sM= github.com/Antonboom/errname v0.1.13 h1:JHICqsewj/fNckzrfVSe+T33svwQxmjC+1ntDsHOVvM= github.com/Antonboom/errname v0.1.13/go.mod h1:uWyefRYRN54lBg6HseYCFhs6Qjcy41Y3Jl/dVhA87Ns= github.com/Antonboom/nilnil v0.1.9 h1:eKFMejSxPSA9eLSensFmjW2XTgTwJMjZ8hUHtV4s/SQ= @@ -51,12 +53,16 @@ github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Crocmagnon/fatcontext v0.4.0 h1:4ykozu23YHA0JB6+thiuEv7iT6xq995qS1vcuWZq0tg= github.com/Crocmagnon/fatcontext v0.4.0/go.mod h1:ZtWrXkgyfsYPzS6K3O88va6t2GEglG93vnII/F94WC0= +github.com/Crocmagnon/fatcontext v0.5.2 h1:vhSEg8Gqng8awhPju2w7MKHqMlg4/NI+gSDHtR3xgwA= +github.com/Crocmagnon/fatcontext v0.5.2/go.mod h1:87XhRMaInHP44Q7Tlc7jkgKKB7kZAOPiDkFMdKCC+74= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 h1:/fTUt5vmbkAcMBt4YQiuC23cV0kEsN1MVMNqeOW43cU= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0/go.mod h1:ONJg5sxcbsdQQ4pOW8TGdTidT2TMAUy/2Xhr8mrYaao= 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/OpenPeeDeeP/depguard/v2 v2.2.0 h1:vDfG60vDtIuf0MEOhmLlLLSzqaRM8EMcgJPdp74zmpA= github.com/OpenPeeDeeP/depguard/v2 v2.2.0/go.mod h1:CIzddKRvLBC4Au5aYP/i3nyaWQ+ClszLIuVocRiCYFQ= github.com/alecthomas/go-check-sumtype v0.1.4 h1:WCvlB3l5Vq5dZQTFmodqL2g68uHiSwwlWcT5a2FGK0c= @@ -111,6 +117,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/ckaznocha/intrange v0.1.2 h1:3Y4JAxcMntgb/wABQ6e8Q8leMd26JbX2790lIss9MTI= github.com/ckaznocha/intrange v0.1.2/go.mod h1:RWffCw/vKBwHeOEwWdCikAtY0q4gGt8VhJZEEA5n+RE= +github.com/ckaznocha/intrange v0.2.0 h1:FykcZuJ8BD7oX93YbO1UY9oZtkRbp+1/kJcDjkefYLs= +github.com/ckaznocha/intrange v0.2.0/go.mod h1:r5I7nUlAAG56xmkOpw4XVr16BXhwYTUdcuRFeevn1oE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -118,6 +126,8 @@ github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDU github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= github.com/daixiang0/gci v0.13.4 h1:61UGkmpoAcxHM2hhNkZEf5SzwQtWJXTSws7jaPyqwlw= github.com/daixiang0/gci v0.13.4/go.mod h1:12etP2OniiIdP4q+kjUGrC/rUagga7ODbqsom5Eo5Yk= +github.com/daixiang0/gci v0.13.5 h1:kThgmH1yBmZSBCh1EJVxQ7JsHpm5Oms0AMed/0LaH4c= +github.com/daixiang0/gci v0.13.5/go.mod h1:12etP2OniiIdP4q+kjUGrC/rUagga7ODbqsom5Eo5Yk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -172,6 +182,8 @@ github.com/go-toolsmith/typep v1.1.0 h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUN github.com/go-toolsmith/typep v1.1.0/go.mod h1:fVIw+7zjdsMxDA3ITWnH1yOiw1rnTQKCsF/sk2H/qig= github.com/go-viper/mapstructure/v2 v2.0.0 h1:dhn8MZ1gZ0mzeodTG3jt5Vj/o87xZKuNAprG2mQfMfc= github.com/go-viper/mapstructure/v2 v2.0.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/go-viper/mapstructure/v2 v2.1.0 h1:gHnMa2Y/pIxElCH2GlZZ1lZSsn6XMtufpGyP1XxdC/w= +github.com/go-viper/mapstructure/v2 v2.1.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/go-xmlfmt/xmlfmt v1.1.2 h1:Nea7b4icn8s57fTx1M5AI4qQT5HEM3rVUO8MuE6g80U= github.com/go-xmlfmt/xmlfmt v1.1.2/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= @@ -216,6 +228,8 @@ github.com/golangci/golangci-lint v1.60.2 h1:Y8aWnZCMOLY5T7Ga5hcoemyKsZZJCUmIIK3 github.com/golangci/golangci-lint v1.60.2/go.mod h1:4UvjLpOJoQSvmyWkmO1urDR3txhL9R9sn4oM/evJ95g= github.com/golangci/golangci-lint v1.60.3 h1:l38A5de24ZeDlcFF+EB7m3W5joPD99/hS5SIHJPyZa0= github.com/golangci/golangci-lint v1.60.3/go.mod h1:J4vOpcjzRI+lDL2DKNGBZVB3EQSBfCBCMpaydWLtJNo= +github.com/golangci/golangci-lint v1.61.0 h1:VvbOLaRVWmyxCnUIMTbf1kDsaJbTzH20FAMXTAlQGu8= +github.com/golangci/golangci-lint v1.61.0/go.mod h1:e4lztIrJJgLPhWvFPDkhiMwEFRrWlmFbrZea3FsJyN8= github.com/golangci/misspell v0.6.0 h1:JCle2HUTNWirNlDIAUO44hUsKhOFqGPoC4LZxlaSXDs= github.com/golangci/misspell v0.6.0/go.mod h1:keMNyY6R9isGaSAu+4Q8NMBwMPkh15Gtc8UCVoDtAWo= github.com/golangci/modinfo v0.3.4 h1:oU5huX3fbxqQXdfspamej74DFX0kyGLkw1ppvXoJ8GA= @@ -381,6 +395,8 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= +github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -412,6 +428,8 @@ github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/quasilyte/go-ruleguard v0.4.2 h1:htXcXDK6/rO12kiTHKfHuqR4kr3Y4M0J0rOL6CH/BYs= github.com/quasilyte/go-ruleguard v0.4.2/go.mod h1:GJLgqsLeo4qgavUoL8JeGFNS7qcisx3awV/w9eWTmNI= +github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 h1:+Wl/0aFp0hpuHM3H//KMft64WQ1yX9LdJY64Qm/gFCo= +github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1/go.mod h1:GJLgqsLeo4qgavUoL8JeGFNS7qcisx3awV/w9eWTmNI= github.com/quasilyte/go-ruleguard/dsl v0.3.22 h1:wd8zkOhSNr+I+8Qeciml08ivDt1pSXe60+5DqOpCjPE= github.com/quasilyte/go-ruleguard/dsl v0.3.22/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= github.com/quasilyte/gogrep v0.5.0 h1:eTKODPXbI8ffJMN+W2aE0+oL0z/nh8/5eNdiO34SOAo= @@ -424,6 +442,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryancurrah/gomodguard v1.3.3 h1:eiSQdJVNr9KTNxY2Niij8UReSwR8Xrte3exBrAZfqpg= github.com/ryancurrah/gomodguard v1.3.3/go.mod h1:rsKQjj4l3LXe8N344Ow7agAy5p9yjsWOtRzUMYmA0QY= +github.com/ryancurrah/gomodguard v1.3.5 h1:cShyguSwUEeC0jS7ylOiG/idnd1TpJ1LfHGpV3oJmPU= +github.com/ryancurrah/gomodguard v1.3.5/go.mod h1:MXlEPQRxgfPQa62O8wzK3Ozbkv9Rkqr+wKjSxTdsNJE= github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU= github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ= github.com/sanposhiho/wastedassign/v2 v2.0.7 h1:J+6nrY4VW+gC9xFzUc+XjPD3g3wF3je/NsJFwFK7Uxc= @@ -438,6 +458,8 @@ github.com/securego/gosec/v2 v2.20.1-0.20240820084340-81cda2f91fbe h1:exdneYmXwZ github.com/securego/gosec/v2 v2.20.1-0.20240820084340-81cda2f91fbe/go.mod h1:iyeMMRw8QEmueUSZ2VqmkQMiDyDcobfPnG00CV/NWdE= github.com/securego/gosec/v2 v2.20.1-0.20240822074752-ab3f6c1c83a0 h1:VqD4JMoqwuuCz8GZlBDsIDyE6K4YUsWJpbNtuOWHoFk= github.com/securego/gosec/v2 v2.20.1-0.20240822074752-ab3f6c1c83a0/go.mod h1:iyeMMRw8QEmueUSZ2VqmkQMiDyDcobfPnG00CV/NWdE= +github.com/securego/gosec/v2 v2.21.2 h1:deZp5zmYf3TWwU7A7cR2+SolbTpZ3HQiwFqnzQyEl3M= +github.com/securego/gosec/v2 v2.21.2/go.mod h1:au33kg78rNseF5PwPnTWhuYBFf534bvJRvOrgZ/bFzU= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= @@ -495,6 +517,8 @@ github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= github.com/tetafro/godot v1.4.16 h1:4ChfhveiNLk4NveAZ9Pu2AN8QZ2nkUGFuadM9lrr5D0= github.com/tetafro/godot v1.4.16/go.mod h1:2oVxTBSftRTh4+MVfUaUXR6bn2GDXCaMcOG4Dk3rfio= +github.com/tetafro/godot v1.4.17 h1:pGzu+Ye7ZUEFx7LHU0dAKmCOXWsPjl7qA6iMGndsjPs= +github.com/tetafro/godot v1.4.17/go.mod h1:2oVxTBSftRTh4+MVfUaUXR6bn2GDXCaMcOG4Dk3rfio= github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M= github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ= github.com/timonwong/loggercheck v0.9.4 h1:HKKhqrjcVj8sxL7K77beXh0adEm6DLjV/QOGeMXEVi4= @@ -563,6 +587,8 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= +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/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f h1:phY1HzDcf18Aq9A8KkmRtY9WvOFIxN8wgfvy6Zm1DV8= @@ -597,6 +623,8 @@ golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -711,6 +739,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= golang.org/x/sys v0.23.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/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -729,6 +759,8 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= 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/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/.bingo/k3d.mod b/.bingo/k3d.mod index a2602cd5..a346bd6f 100644 --- a/.bingo/k3d.mod +++ b/.bingo/k3d.mod @@ -4,4 +4,4 @@ go 1.22.5 replace k8s.io/kubelet => k8s.io/kubelet v0.30.2 -require github.com/k3d-io/k3d/v5 v5.7.3 +require github.com/k3d-io/k3d/v5 v5.7.4 diff --git a/.bingo/k3d.sum b/.bingo/k3d.sum index 68627e50..39ee0d99 100644 --- a/.bingo/k3d.sum +++ b/.bingo/k3d.sum @@ -137,6 +137,8 @@ github.com/k3d-io/k3d/v5 v5.7.2 h1:eeXDUeFVd98pF/opKKspHv/mwS1v0r2ZZO9WjjcVT/k= github.com/k3d-io/k3d/v5 v5.7.2/go.mod h1:bFlhRV/R1cPT42ZZzQAHPHUF33CbCT8VSbjtjTr3J1Y= github.com/k3d-io/k3d/v5 v5.7.3 h1:n0+QvaKMH7j2mTToIMDfiLnE+4goCOeucV23AZJUVjQ= github.com/k3d-io/k3d/v5 v5.7.3/go.mod h1:bFlhRV/R1cPT42ZZzQAHPHUF33CbCT8VSbjtjTr3J1Y= +github.com/k3d-io/k3d/v5 v5.7.4 h1:L7Ix6zFMqjoPuEJ5dctLb7kCFXXlF5js6I7bm+tEgo0= +github.com/k3d-io/k3d/v5 v5.7.4/go.mod h1:bFlhRV/R1cPT42ZZzQAHPHUF33CbCT8VSbjtjTr3J1Y= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= diff --git a/.bingo/variables.env b/.bingo/variables.env index b0894291..0bdf157d 100644 --- a/.bingo/variables.env +++ b/.bingo/variables.env @@ -8,15 +8,15 @@ if [ -z "$GOBIN" ]; then fi -CMCTL="${GOBIN}/cmctl-v2.1.0" +CMCTL="${GOBIN}/cmctl-v2.1.1" COPYRIGHT="${GOBIN}/copyright-v0.0.0-20230505153745-6b7392939a60" GOFUMPT="${GOBIN}/gofumpt-v0.7.0" -GOIMPORTS="${GOBIN}/goimports-v0.24.0" +GOIMPORTS="${GOBIN}/goimports-v0.25.0" -GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.60.3" +GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.61.0" GORELEASER="${GOBIN}/goreleaser-v1.26.2" @@ -26,7 +26,7 @@ JB="${GOBIN}/jb-v0.6.0" JSONNETFMT="${GOBIN}/jsonnetfmt-v0.20.0" -K3D="${GOBIN}/k3d-v5.7.3" +K3D="${GOBIN}/k3d-v5.7.4" KUSTOMIZE="${GOBIN}/kustomize-v5.4.3" diff --git a/docker-compose/common/config/loki/microservices-mode-logs.yaml b/docker-compose/common/config/loki/microservices-mode-logs.yaml index 67ea57d9..fb908b4f 100644 --- a/docker-compose/common/config/loki/microservices-mode-logs.yaml +++ b/docker-compose/common/config/loki/microservices-mode-logs.yaml @@ -2,7 +2,6 @@ # https://grafana.com/docs/loki/latest/operations/multi-tenancy/ auth_enabled: true -# -reporting.enabled=false analytics: reporting_enabled: false @@ -30,32 +29,60 @@ common: index_gateway: mode: simple +bloom_gateway: + enabled: true + client: + addresses: bloom-gateway:9095 + cache_results: true + results_cache: + cache: + memcached_client: + addresses: "dns+memcached:11211" + +bloom_compactor: + enabled: true + ring: + kvstore: + store: memberlist + compactor: - working_directory: /tmp/compactor + working_directory: /loki/compactor + compactor_ring: + kvstore: + store: memberlist frontend: - scheduler_address: query-scheduler:9095 tail_proxy_url: http://querier:3100 + scheduler_address: query-scheduler:9095 frontend_worker: scheduler_address: query-scheduler:9095 -memberlist: - join_members: - - loki-memberlist:7946 +ingester: + lifecycler: + ring: + kvstore: + store: memberlist + wal: + dir: /loki/wal pattern_ingester: enabled: true limits_config: + bloom_gateway_enable_filtering: true + bloom_compactor_enable_compaction: true max_global_streams_per_user: 0 ingestion_rate_mb: 50000 ingestion_burst_size_mb: 50000 volume_enabled: true +memberlist: + join_members: + - loki-memberlist:7946 + # https://github.com/grafana/loki/blob/main/docs/sources/configure/_index.md#query_range query_range: align_queries_with_step: true - cache_results: true results_cache: cache: @@ -93,6 +120,8 @@ storage_config: cache_location: /loki/cache index_gateway_client: server_address: dns:///index-gateway:9095 + bloom_shipper: + working_directory: /loki/blooms chunk_store_config: chunk_cache_config: diff --git a/docker-compose/common/config/loki/monolithic-mode-logs.yaml b/docker-compose/common/config/loki/monolithic-mode-logs.yaml index 95cee3a9..0541fc16 100644 --- a/docker-compose/common/config/loki/monolithic-mode-logs.yaml +++ b/docker-compose/common/config/loki/monolithic-mode-logs.yaml @@ -2,7 +2,6 @@ # https://grafana.com/docs/loki/latest/operations/multi-tenancy/ auth_enabled: true -# -reporting.enabled=false analytics: reporting_enabled: false diff --git a/docker-compose/common/config/loki/read-write-mode-logs.yaml b/docker-compose/common/config/loki/read-write-mode-logs.yaml index 056cd215..0235436c 100644 --- a/docker-compose/common/config/loki/read-write-mode-logs.yaml +++ b/docker-compose/common/config/loki/read-write-mode-logs.yaml @@ -2,7 +2,6 @@ # https://grafana.com/docs/loki/latest/operations/multi-tenancy/ auth_enabled: true -# -reporting.enabled=false analytics: reporting_enabled: false diff --git a/docker-compose/microservices-mode/logs/compose.yaml b/docker-compose/microservices-mode/logs/compose.yaml index 51e0778f..a49f8816 100644 --- a/docker-compose/microservices-mode/logs/compose.yaml +++ b/docker-compose/microservices-mode/logs/compose.yaml @@ -226,3 +226,45 @@ services: default: aliases: - loki-memberlist + + bloom-builder: + labels: *loki-labels + # depends_on: { query-scheduler: { condition: service_healthy } } + image: *lokiImage + configs: + - source: loki_config_file + target: /etc/loki/config.yaml + volumes: + - ../../common/config/loki:/etc/loki/configs + command: + - -config.file=/etc/loki/config.yaml + - -target=bloom-builder + - -config.expand-env=true + + bloom-gateway: + labels: *loki-labels + # depends_on: { query-scheduler: { condition: service_healthy } } + image: *lokiImage + configs: + - source: loki_config_file + target: /etc/loki/config.yaml + volumes: + - ../../common/config/loki:/etc/loki/configs + command: + - -config.file=/etc/loki/config.yaml + - -target=bloom-gateway + - -config.expand-env=true + + bloom-planner: + labels: *loki-labels + # depends_on: { query-scheduler: { condition: service_healthy } } + image: *lokiImage + configs: + - source: loki_config_file + target: /etc/loki/config.yaml + volumes: + - ../../common/config/loki:/etc/loki/configs + command: + - -config.file=/etc/loki/config.yaml + - -target=bloom-planner + - -config.expand-env=true diff --git a/kubernetes/common/kube-prometheus-stack/kustomization.yaml b/kubernetes/common/kube-prometheus-stack/kustomization.yaml index 36f7d362..8ad9f74a 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.4.0 + version: 62.7.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 7f0dd143..2da23c1d 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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -405,31 +405,41 @@ apiVersion: v1 data: cluster-total.json: '{"editable":true,"panels":[{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"binBps"}},"gridPos":{"h":9,"w":12,"x":0,"y":0},"id":1,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Current + by (namespace) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Current Rate of Bytes Received","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"binBps"}},"gridPos":{"h":9,"w":12,"x":12,"y":0},"id":2,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Current + by (namespace) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Current Rate of Bytes Transmitted","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"overrides":[{"matcher":{"id":"byRegexp","options":"/Bytes/"},"properties":[{"id":"unit","value":"binBps"}]},{"matcher":{"id":"byRegexp","options":"/Packets/"},"properties":[{"id":"unit","value":"pps"}]},{"matcher":{"id":"byName","options":"Namespace"},"properties":[{"id":"links","value":[{"title":"Drill down","url":"/d/8b7a8b326d7a6f1f04244066368c67af/kubernetes-networking-namespace-pods?${datasource:queryparam}&var-cluster=${cluster}&var-namespace=${__data.fields.Namespace}"}]}]}]},"gridPos":{"h":9,"w":24,"x":0,"y":9},"id":3,"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"avg - by (namespace) (rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"avg - by (namespace) (rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","format":"table","instant":true}],"title":"Current + by (namespace) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (namespace) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"avg + by (namespace) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"avg + by (namespace) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (namespace) (\n rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (namespace) (\n rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (namespace) (\n rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (namespace) (\n rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true}],"title":"Current Status","transformations":[{"id":"joinByField","options":{"byField":"namespace","mode":"outer"}},{"id":"organize","options":{"excludeByName":{"Time":true,"Time 1":true,"Time 2":true,"Time 3":true,"Time 4":true,"Time 5":true,"Time 6":true,"Time 7":true,"Time 8":true},"indexByName":{"Time 1":0,"Time 2":1,"Time 3":2,"Time 4":3,"Time @@ -439,46 +449,56 @@ data: Bytes (Avg)","Value #E":"Rx Packets","Value #F":"Tx Packets","Value #G":"Rx Packets Dropped","Value #H":"Tx Packets Dropped","namespace":"Namespace"}}}],"type":"table"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"binBps"}},"gridPos":{"h":9,"w":12,"x":0,"y":18},"id":4,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"avg - by (namespace) (rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Average + by (namespace) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Average Rate of Bytes Received","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"binBps"}},"gridPos":{"h":9,"w":12,"x":12,"y":18},"id":5,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"avg - by (namespace) (rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Average + by (namespace) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Average Rate of Bytes Transmitted","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"binBps"}},"gridPos":{"h":9,"w":12,"x":0,"y":27},"id":6,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Receive + by (namespace) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Receive Bandwidth","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"binBps"}},"gridPos":{"h":9,"w":12,"x":12,"y":27},"id":7,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Transmit + by (namespace) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Transmit Bandwidth","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":0,"y":36},"id":8,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Rate + by (namespace) (\n rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Rate of Received Packets","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":12,"y":36},"id":9,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Rate + by (namespace) (\n rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Rate of Transmitted Packets","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":0,"y":45},"id":10,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Rate + by (namespace) (\n rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Rate of Received Packets Dropped","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":12,"y":45},"id":11,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Rate + by (namespace) (\n rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Rate of Transmitted Packets Dropped","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"percentunit"}},"gridPos":{"h":9,"w":12,"x":0,"y":54},"id":12,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (instance) (rate(node_netstat_Tcp_RetransSegs{cluster=\"$cluster\"}[$__rate_interval]) - / rate(node_netstat_Tcp_OutSegs{cluster=\"$cluster\"}[$__rate_interval]) * on - (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Rate + by (instance) (\n rate(node_netstat_Tcp_RetransSegs{cluster=\"$cluster\"}[$__rate_interval]) + / rate(node_netstat_Tcp_OutSegs{cluster=\"$cluster\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Rate of TCP Retransmits out of all sent segments","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"percentunit"}},"gridPos":{"h":9,"w":12,"x":12,"y":54},"id":13,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (instance) (rate(node_netstat_TcpExt_TCPSynRetrans{cluster=\"$cluster\"}[$__rate_interval]) - / rate(node_netstat_Tcp_RetransSegs{cluster=\"$cluster\"}[$__rate_interval]) * - on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Rate + by (instance) (\n rate(node_netstat_TcpExt_TCPSynRetrans{cluster=\"$cluster\"}[$__rate_interval]) + / rate(node_netstat_Tcp_RetransSegs{cluster=\"$cluster\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Rate of TCP SYN Retransmits out of all retransmits","type":"timeseries"}],"refresh":"10s","schemaVersion":39,"tags":["kubernetes-mixin"],"templating":{"list":[{"current":{"selected":true,"text":"default","value":"default"},"hide":0,"label":"Data source","name":"datasource","query":"prometheus","regex":"","type":"datasource"},{"datasource":{"type":"prometheus","uid":"${datasource}"},"hide":0,"label":"cluster","name":"cluster","query":"label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)","refresh":2,"sort":1,"type":"query","allValue":".*"}]},"time":{"from":"now-1h","to":"now"},"timezone": @@ -492,8 +512,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -551,8 +571,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -618,8 +638,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -660,8 +680,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -751,8 +771,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -762,7 +782,7 @@ metadata: apiVersion: v1 data: k8s-resources-cluster.json: '{"editable":true,"panels":[{"datasource":{"type":"datasource","uid":"-- - Mixed --"},"fieldConfig":{"defaults":{"unit":"none"}},"gridPos":{"h":3,"w":4,"x":0,"y":0},"id":1,"interval":"1m","options":{"colorMode":"none"},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"cluster:node_cpu:ratio_rate5m{cluster=\"$cluster\"}","instant":true}],"title":"CPU + Mixed --"},"fieldConfig":{"defaults":{"unit":"percentunit"}},"gridPos":{"h":3,"w":4,"x":0,"y":0},"id":1,"interval":"1m","options":{"colorMode":"none"},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"cluster:node_cpu:ratio_rate5m{cluster=\"$cluster\"}","instant":true}],"title":"CPU Utilisation","type":"stat"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"unit":"percentunit"}},"gridPos":{"h":3,"w":4,"x":4,"y":0},"id":2,"interval":"1m","options":{"colorMode":"none"},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(namespace_cpu:kube_pod_container_resource_requests:sum{cluster=\"$cluster\"}) / sum(kube_node_status_allocatable{job=\"kube-state-metrics\",resource=\"cpu\",cluster=\"$cluster\"})","instant":true}],"title":"CPU @@ -926,8 +946,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1000,8 +1020,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1177,8 +1197,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1240,8 +1260,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1404,8 +1424,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1582,8 +1602,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1767,8 +1787,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1883,8 +1903,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1894,20 +1914,36 @@ metadata: apiVersion: v1 data: namespace-by-pod.json: '{"editable":true,"panels":[{"datasource":{"type":"datasource","uid":"-- - Mixed --"},"fieldConfig":{"defaults":{"displayName":"$namespace","max":10000000000,"min":0,"thresholds":{"steps":[{"color":"dark-green","index":0,"value":null},{"color":"dark-yellow","index":1,"value":5000000000},{"color":"dark-red","index":2,"value":7000000000}]},"unit":"Bps"}},"gridPos":{"h":9,"w":12,"x":0,"y":0},"id":1,"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Current + Mixed --"},"fieldConfig":{"defaults":{"displayName":"$namespace","max":10000000000,"min":0,"thresholds":{"steps":[{"color":"dark-green","index":0,"value":null},{"color":"dark-yellow","index":1,"value":5000000000},{"color":"dark-red","index":2,"value":7000000000}]},"unit":"Bps"}},"gridPos":{"h":9,"w":12,"x":0,"y":0},"id":1,"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Current Rate of Bytes Received","type":"gauge"},{"datasource":{"type":"datasource","uid":"-- - Mixed --"},"fieldConfig":{"defaults":{"displayName":"$namespace","max":10000000000,"min":0,"thresholds":{"steps":[{"color":"dark-green","index":0,"value":null},{"color":"dark-yellow","index":1,"value":5000000000},{"color":"dark-red","index":2,"value":7000000000}]},"unit":"Bps"}},"gridPos":{"h":9,"w":12,"x":12,"y":0},"id":2,"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Current + Mixed --"},"fieldConfig":{"defaults":{"displayName":"$namespace","max":10000000000,"min":0,"thresholds":{"steps":[{"color":"dark-green","index":0,"value":null},{"color":"dark-yellow","index":1,"value":5000000000},{"color":"dark-red","index":2,"value":7000000000}]},"unit":"Bps"}},"gridPos":{"h":9,"w":12,"x":12,"y":0},"id":2,"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Current Rate of Bytes Transmitted","type":"gauge"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"overrides":[{"matcher":{"id":"byRegexp","options":"/Bandwidth/"},"properties":[{"id":"unit","value":"Bps"}]},{"matcher":{"id":"byRegexp","options":"/Packets/"},"properties":[{"id":"unit","value":"pps"}]},{"matcher":{"id":"byName","options":"Pod"},"properties":[{"id":"links","value":[{"title":"Drill - down","url":"/d/7a18067ce943a40ae25454675c19ff5c/kubernetes-networking-pod?${datasource:queryparam}&var-cluster=${cluster}&var-namespace=${namespace}&var-pod=${__data.fields.Pod}"}]}]}]},"gridPos":{"h":9,"w":24,"x":0,"y":9},"id":3,"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)","format":"table","instant":true}],"title":"Current + down","url":"/d/7a18067ce943a40ae25454675c19ff5c/kubernetes-networking-pod?${datasource:queryparam}&var-cluster=${cluster}&var-namespace=${namespace}&var-pod=${__data.fields.Pod}"}]}]}]},"gridPos":{"h":9,"w":24,"x":0,"y":9},"id":3,"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (pod) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (pod) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (pod) (\n rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (pod) (\n rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (pod) (\n rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true},{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (pod) (\n rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","format":"table","instant":true}],"title":"Current Network Usage","transformations":[{"id":"joinByField","options":{"byField":"pod","mode":"outer"}},{"id":"organize","options":{"excludeByName":{"Time":true,"Time 1":true,"Time 2":true,"Time 3":true,"Time 4":true,"Time 5":true,"Time 6":true},"indexByName":{"Time 1":0,"Time 2":1,"Time 3":2,"Time 4":3,"Time 5":4,"Time 6":5,"Value #A":7,"Value @@ -1916,24 +1952,35 @@ data: #C":"Rate of Received Packets","Value #D":"Rate of Transmitted Packets","Value #E":"Rate of Received Packets Dropped","Value #F":"Rate of Transmitted Packets Dropped","pod":"Pod"}}}],"type":"table"},{"datasource":{"type":"datasource","uid":"-- - Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"binBps"}},"gridPos":{"h":9,"w":12,"x":0,"y":18},"id":4,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)","legendFormat":"__auto"}],"title":"Receive + Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"binBps"}},"gridPos":{"h":9,"w":12,"x":0,"y":18},"id":4,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (pod) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Receive Bandwidth","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed - --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"binBps"}},"gridPos":{"h":9,"w":12,"x":12,"y":18},"id":5,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)","legendFormat":"__auto"}],"title":"Transmit + --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"binBps"}},"gridPos":{"h":9,"w":12,"x":12,"y":18},"id":5,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (pod) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Transmit Bandwidth","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed - --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":0,"y":27},"id":6,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)","legendFormat":"__auto"}],"title":"Rate + --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":0,"y":27},"id":6,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (pod) (\n rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Rate of Received Packets","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- - Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":12,"y":27},"id":7,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)","legendFormat":"__auto"}],"title":"Rate + Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":12,"y":27},"id":7,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (pod) (\n rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Rate of Transmitted Packets","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":0,"y":36},"id":8,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum - by (namespace) (rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})","legendFormat":"__auto"}],"title":"Rate + by (pod) (\n rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Rate of Received Packets Dropped","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- - Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":12,"y":36},"id":9,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum(rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) - * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)","legendFormat":"__auto"}],"title":"Rate + Mixed --"},"fieldConfig":{"defaults":{"custom":{"showPoints":"never"},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":12,"y":36},"id":9,"interval":"1m","options":{"legend":{"asTable":true,"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sum + by (pod) (\n rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n","legendFormat":"__auto"}],"title":"Rate of Transmitted Packets Dropped","type":"timeseries"}],"refresh":"10s","schemaVersion":39,"tags":["kubernetes-mixin"],"templating":{"list":[{"current":{"selected":true,"text":"default","value":"default"},"hide":0,"label":"Data source","name":"datasource","query":"prometheus","regex":"","type":"datasource"},{"datasource":{"type":"prometheus","uid":"${datasource}"},"hide":0,"label":"cluster","name":"cluster","query":"label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)","refresh":2,"sort":1,"type":"query","allValue":".*"},{"allValue":".+","current":{"selected":false,"text":"kube-system","value":"kube-system"},"datasource":{"type":"prometheus","uid":"${datasource}"},"hide":0,"includeAll":true,"label":"namespace","name":"namespace","query":"label_values(container_network_receive_packets_total{cluster=\"$cluster\"}, @@ -1948,8 +1995,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -1960,13 +2007,15 @@ apiVersion: v1 data: namespace-by-workload.json: '{"editable":true,"panels":[{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"color":{"fixedColor":"green","mode":"fixed"},"unit":"Bps"}},"gridPos":{"h":9,"w":12,"x":0,"y":0},"id":1,"options":{"displayMode":"basic","showUnfilled":false},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sort_desc(sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* - on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) - namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* + on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n","legendFormat":"__auto"}],"title":"Current Rate of Bytes Received","type":"bargauge"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"color":{"fixedColor":"green","mode":"fixed"},"unit":"Bps"}},"gridPos":{"h":9,"w":12,"x":12,"y":0},"id":2,"options":{"displayMode":"basic","showUnfilled":false},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sort_desc(sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* - on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) - namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* + on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n","legendFormat":"__auto"}],"title":"Current Rate of Bytes Transmitted","type":"bargauge"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"overrides":[{"matcher":{"id":"byRegexp","options":"/Bytes/"},"properties":[{"id":"unit","value":"binBps"}]},{"matcher":{"id":"byRegexp","options":"/Packets/"},"properties":[{"id":"unit","value":"pps"}]},{"matcher":{"id":"byName","options":"Workload"},"properties":[{"id":"links","value":[{"title":"Drill @@ -2009,43 +2058,51 @@ data: Dropped","Value #H":"Tx Packets Dropped","workload":"Workload","workload_type 1":"Type"}}}],"type":"table"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"fillOpacity":10,"showPoints":"never","spanNulls":true},"unit":"Bps"}},"gridPos":{"h":9,"w":12,"x":0,"y":18},"id":4,"interval":"1m","options":{"legend":{"asTable":true,"calcs":["lastNotNull"],"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sort_desc(sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* - on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) - namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* + on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n","legendFormat":"__auto"}],"title":"Receive Bandwidth","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"fillOpacity":10,"showPoints":"never","spanNulls":true},"unit":"Bps"}},"gridPos":{"h":9,"w":12,"x":12,"y":18},"id":5,"interval":"1m","options":{"legend":{"asTable":true,"calcs":["lastNotNull"],"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sort_desc(sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* - on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) - namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* + on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n","legendFormat":"__auto"}],"title":"Transmit Bandwidth","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"fillOpacity":10,"showPoints":"never","spanNulls":true},"unit":"Bps"}},"gridPos":{"h":9,"w":12,"x":0,"y":27},"id":6,"interval":"1m","options":{"legend":{"asTable":true,"calcs":["lastNotNull"],"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sort_desc(avg(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* - on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) - namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* + on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n","legendFormat":"__auto"}],"title":"Average Container Bandwidth by Workload: Received","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"fillOpacity":10,"showPoints":"never","spanNulls":true},"unit":"Bps"}},"gridPos":{"h":9,"w":12,"x":12,"y":27},"id":7,"interval":"1m","options":{"legend":{"asTable":true,"calcs":["lastNotNull"],"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sort_desc(avg(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* - on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) - namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* + on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n","legendFormat":"__auto"}],"title":"Average Container Bandwidth by Workload: Transmitted","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"fillOpacity":10,"showPoints":"never","spanNulls":true},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":0,"y":36},"id":8,"interval":"1m","options":{"legend":{"asTable":true,"calcs":["lastNotNull"],"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sort_desc(sum(rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* - on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) - namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* + on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n","legendFormat":"__auto"}],"title":"Rate of Received Packets","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"fillOpacity":10,"showPoints":"never","spanNulls":true},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":12,"y":36},"id":9,"interval":"1m","options":{"legend":{"asTable":true,"calcs":["lastNotNull"],"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sort_desc(sum(rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* - on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) - namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* + on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n","legendFormat":"__auto"}],"title":"Rate of Transmitted Packets","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"fillOpacity":10,"showPoints":"never","spanNulls":true},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":0,"y":45},"id":10,"interval":"1m","options":{"legend":{"asTable":true,"calcs":["lastNotNull"],"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sort_desc(sum(rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* - on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) - namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* + on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n","legendFormat":"__auto"}],"title":"Rate of Received Packets Dropped","type":"timeseries"},{"datasource":{"type":"datasource","uid":"-- Mixed --"},"fieldConfig":{"defaults":{"custom":{"fillOpacity":10,"showPoints":"never","spanNulls":true},"unit":"pps"}},"gridPos":{"h":9,"w":12,"x":12,"y":45},"id":11,"interval":"1m","options":{"legend":{"asTable":true,"calcs":["lastNotNull"],"displayMode":"table","placement":"right","showLegend":true},"tooltip":{"mode":"single"}},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":"prometheus","uid":"${datasource}"},"expr":"sort_desc(sum(rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* - on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) - namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", + on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) + (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* + on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n","legendFormat":"__auto"}],"title":"Rate of Transmitted Packets Dropped","type":"timeseries"}],"refresh":"10s","schemaVersion":39,"tags":["kubernetes-mixin"],"templating":{"list":[{"current":{"selected":true,"text":"default","value":"default"},"hide":0,"label":"Data source","name":"datasource","query":"prometheus","regex":"","type":"datasource"},{"datasource":{"type":"prometheus","uid":"${datasource}"},"hide":0,"label":"cluster","name":"cluster","query":"label_values(up{job=\"kubelet\", @@ -2062,8 +2119,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2115,7 +2172,7 @@ data: Space","titleSize":"h6","type":"row"}],"schemaVersion":14,"style":"dark","tags":["node-exporter-mixin"],"templating":{"list":[{"current":{"text":"default","value":"default"},"hide":0,"label":"Data Source","name":"datasource","options":[],"query":"prometheus","refresh":1,"regex":"","type":"datasource"},{"allValue":".*","current":{"text":"","value":""},"datasource":"$datasource","hide":0,"includeAll":false,"label":null,"multi":false,"name":"cluster","options":[],"query":"label_values(node_time_seconds, cluster)","refresh":2,"regex":"","sort":1,"tagValuesQuery":"","tags":[],"tagsQuery":"","type":"query","useTags":false}]},"time":{"from":"now-1h","to":"now"},"timepicker":{"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"],"time_options":["5m","15m","1h","6h","12h","24h","2d","7d","30d"]},"timezone": - "browser","title":"Node Exporter / USE Method / Cluster","version":0}' + "browser","title":"Node Exporter / USE Method / Cluster","uid":"3e97d1d02672cdd0861f4c97c64f89b2","version":0}' kind: ConfigMap metadata: annotations: @@ -2125,8 +2182,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2166,7 +2223,7 @@ data: Source","name":"datasource","options":[],"query":"prometheus","refresh":1,"regex":"","type":"datasource"},{"allValue":".*","current":{"text":"","value":""},"datasource":"$datasource","hide":0,"includeAll":false,"label":null,"multi":false,"name":"cluster","options":[],"query":"label_values(node_time_seconds, cluster)","refresh":2,"regex":"","sort":1,"tagValuesQuery":"","tags":[],"tagsQuery":"","type":"query","useTags":false},{"allValue":null,"current":{},"datasource":"$datasource","hide":0,"includeAll":false,"label":null,"multi":false,"name":"instance","options":[],"query":"label_values(node_exporter_build_info{job=\"node-exporter\", cluster=\"$cluster\"}, instance)","refresh":2,"regex":"","sort":1,"tagValuesQuery":"","tags":[],"tagsQuery":"","type":"query","useTags":false}]},"time":{"from":"now-1h","to":"now"},"timepicker":{"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"],"time_options":["5m","15m","1h","6h","12h","24h","2d","7d","30d"]},"timezone": - "browser","title":"Node Exporter / USE Method / Node","version":0}' + "browser","title":"Node Exporter / USE Method / Node","uid":"fac67cfbe174d3ef53eb473d73d9212f","version":0}' kind: ConfigMap metadata: annotations: @@ -2176,8 +2233,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2250,7 +2307,7 @@ data: Source","name":"datasource","options":[],"query":"prometheus","refresh":1,"regex":"","type":"datasource"},{"allValue":".*","current":{},"datasource":"$datasource","hide":0,"includeAll":false,"label":"Cluster","multi":false,"name":"cluster","options":[],"query":"label_values(node_uname_info{job=\"node-exporter\", sysname!=\"Darwin\"}, cluster)","refresh":2,"regex":"","sort":0,"tagValuesQuery":"","tags":[],"tagsQuery":"","type":"query","useTags":false},{"allValue":null,"current":{},"datasource":"$datasource","hide":0,"includeAll":false,"label":"Instance","multi":false,"name":"instance","options":[],"query":"label_values(node_uname_info{job=\"node-exporter\", cluster=\"$cluster\", sysname!=\"Darwin\"}, instance)","refresh":2,"regex":"","sort":0,"tagValuesQuery":"","tags":[],"tagsQuery":"","type":"query","useTags":false}]},"time":{"from":"now-1h","to":"now"},"timepicker":{"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"],"time_options":["5m","15m","1h","6h","12h","24h","2d","7d","30d"]},"timezone": - "browser","title":"Node Exporter / Nodes","version":0}' + "browser","title":"Node Exporter / Nodes","uid":"7d57716318ee0dddbac5a7f451fb7753","version":0}' kind: ConfigMap metadata: annotations: @@ -2260,8 +2317,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2316,8 +2373,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2365,8 +2422,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2451,8 +2508,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2512,8 +2569,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2582,8 +2639,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2658,8 +2715,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 grafana_dashboard: "1" heritage: Helm release: kube-prometheus-stack @@ -2933,8 +2990,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-alertmanager.rules @@ -3092,8 +3149,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-config-reloaders @@ -3123,8 +3180,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-etcd @@ -3324,8 +3381,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-general.rules @@ -3384,8 +3441,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-cpu-usage-seconds-tot @@ -3410,8 +3467,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-memory-cache @@ -3435,8 +3492,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-memory-rss @@ -3460,8 +3517,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-memory-swap @@ -3485,8 +3542,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-memory-working-set-by @@ -3510,8 +3567,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.container-resource @@ -3597,8 +3654,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-k8s.rules.pod-owner @@ -3663,8 +3720,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-apiserver-availability.rules @@ -3794,8 +3851,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-apiserver-burnrate.rules @@ -4114,8 +4171,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-apiserver-histogram.rules @@ -4145,8 +4202,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-apiserver-slos @@ -4220,8 +4277,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-prometheus-general.rules @@ -4243,8 +4300,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-prometheus-node-recording.rules @@ -4278,8 +4335,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-scheduler.rules @@ -4342,8 +4399,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kube-state-metrics @@ -4417,8 +4474,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubelet.rules @@ -4454,8 +4511,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-apps @@ -4578,7 +4635,7 @@ spec: summary: StatefulSet update has not been rolled out. expr: |- ( - max without (revision) ( + max by (namespace, statefulset) ( kube_statefulset_status_current_revision{job="kube-state-metrics", namespace=~".*"} unless kube_statefulset_status_update_revision{job="kube-state-metrics", namespace=~".*"} @@ -4733,8 +4790,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-resources @@ -4750,7 +4807,7 @@ spec: runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubecpuovercommit summary: Cluster has overcommitted CPU resource requests. expr: |- - sum(namespace_cpu:kube_pod_container_resource_requests:sum{job="kube-state-metrics",}) by (cluster) - (sum(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster) - max(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster)) > 0 + sum(namespace_cpu:kube_pod_container_resource_requests:sum{}) by (cluster) - (sum(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster) - max(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster)) > 0 and (sum(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster) - max(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster)) > 0 for: 10m @@ -4864,8 +4921,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-storage @@ -4990,8 +5047,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system @@ -5034,8 +5091,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system-apiserver @@ -5121,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system-controller-manager @@ -5150,8 +5207,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system-kube-proxy @@ -5178,8 +5235,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system-kubelet @@ -5337,8 +5394,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-kubernetes-system-scheduler @@ -5365,8 +5422,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-node-exporter @@ -5721,8 +5778,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-node-exporter.rules @@ -5802,8 +5859,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-node-network @@ -5831,8 +5888,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-node.rules @@ -5886,8 +5943,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.0 heritage: Helm release: kube-prometheus-stack name: kube-prometheus-stack-prometheus @@ -6229,8 +6286,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.4.0 - chart: kube-prometheus-stack-62.4.0 + app.kubernetes.io/version: 62.7.0 + chart: kube-prometheus-stack-62.7.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 77c57d2a..f0619b06 100644 --- a/kubernetes/common/kube-prometheus-stack/values.yaml +++ b/kubernetes/common/kube-prometheus-stack/values.yaml @@ -767,7 +767,7 @@ alertmanager: # resources: # requests: # storage: 50Gi - # selector: {} + # selector: {} ## The external URL the Alertmanager instances will be available under. This is necessary to generate correct URLs. This is necessary if Alertmanager is not served from root of a DNS name. string false @@ -2310,6 +2310,7 @@ prometheusOperator: ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ ## serviceAccount: + annotations: {} automountServiceAccountToken: false create: true name: "" @@ -2531,6 +2532,7 @@ prometheusOperator: ## serviceAccount: create: true + annotations: {} automountServiceAccountToken: true # Security context for create job container @@ -2612,6 +2614,7 @@ prometheusOperator: create: true name: "" automountServiceAccountToken: true + annotations: {} ## Configuration for Prometheus operator service ## diff --git a/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml b/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml index 7305f111..c8a8874d 100644 --- a/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml +++ b/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml @@ -229,13 +229,12 @@ data: store: memberlist compactor: - working_directory: /tmp/compactor + working_directory: /var/loki/compactor compactor_ring: kvstore: store: memberlist frontend: - log_queries_longer_than: 5s tail_proxy_url: http://loki-distributed-querier.logging-system.svc.cluster.local:3100 scheduler_address: loki-distributed-query-scheduler.logging-system.svc.cluster.local:9095 frontend_worker: @@ -302,6 +301,8 @@ data: cache_location: /var/loki/cache index_gateway_client: server_address: dns:///loki-distributed-index-gateway.logging-system.svc.cluster.local:9095 + bloom_shipper: + working_directory: /var/loki/blooms chunk_store_config: chunk_cache_config: @@ -309,7 +310,7 @@ data: addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" kind: ConfigMap metadata: - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth namespace: logging-system --- apiVersion: v1 @@ -5479,6 +5480,8 @@ spec: name: config - mountPath: /etc/loki/runtime-config name: runtime-config + - mountPath: /var/loki + name: data securityContext: fsGroup: 10001 runAsGroup: 10001 @@ -5491,11 +5494,13 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime name: runtime-config + - emptyDir: {} + name: data --- apiVersion: apps/v1 kind: Deployment @@ -5591,7 +5596,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime @@ -5700,7 +5705,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime @@ -5800,7 +5805,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime @@ -5898,7 +5903,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime @@ -6070,8 +6075,6 @@ spec: name: runtime-config - mountPath: /var/loki name: data - - mountPath: /data - name: temp securityContext: fsGroup: 10001 runAsGroup: 10001 @@ -6086,7 +6089,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime @@ -6192,7 +6195,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime @@ -6299,7 +6302,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime @@ -6402,7 +6405,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime @@ -6512,7 +6515,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime @@ -6618,7 +6621,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime @@ -6723,7 +6726,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-b7m6ch6f6t + name: loki-config-mcdb67bbth name: config - configMap: name: loki-runtime diff --git a/kubernetes/microservices-mode/logs/loki/configs/loki.yaml b/kubernetes/microservices-mode/logs/loki/configs/loki.yaml index 7ec18a70..ffe3a4b5 100644 --- a/kubernetes/microservices-mode/logs/loki/configs/loki.yaml +++ b/kubernetes/microservices-mode/logs/loki/configs/loki.yaml @@ -44,13 +44,12 @@ bloom_compactor: store: memberlist compactor: - working_directory: /tmp/compactor + working_directory: /var/loki/compactor compactor_ring: kvstore: store: memberlist frontend: - log_queries_longer_than: 5s tail_proxy_url: http://loki-distributed-querier.logging-system.svc.cluster.local:3100 scheduler_address: loki-distributed-query-scheduler.logging-system.svc.cluster.local:9095 frontend_worker: @@ -117,6 +116,8 @@ storage_config: cache_location: /var/loki/cache index_gateway_client: server_address: dns:///loki-distributed-index-gateway.logging-system.svc.cluster.local:9095 + bloom_shipper: + working_directory: /var/loki/blooms chunk_store_config: chunk_cache_config: diff --git a/kubernetes/microservices-mode/logs/loki/values-k3d-k3s.yaml b/kubernetes/microservices-mode/logs/loki/values-k3d-k3s.yaml index 1376bf7f..5b67c1a2 100644 --- a/kubernetes/microservices-mode/logs/loki/values-k3d-k3s.yaml +++ b/kubernetes/microservices-mode/logs/loki/values-k3d-k3s.yaml @@ -109,9 +109,6 @@ bloomGateway: extraEnvFrom: - secretRef: name: loki-env - extraVolumeMounts: - - mountPath: /data - name: temp bloomPlanner: replicas: 1 @@ -128,6 +125,12 @@ bloomBuilder: extraEnvFrom: - secretRef: name: loki-env + extraVolumeMounts: + - name: data + mountPath: /var/loki + extraVolumes: + - name: data + emptyDir: {} patternIngester: replicas: 1 diff --git a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml index abf68acd..85e9b61f 100644 --- a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml +++ b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml @@ -61,8 +61,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed namespace: tracing-system --- @@ -5072,8 +5072,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-config namespace: tracing-system --- @@ -5088,8 +5088,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-runtime namespace: tracing-system --- @@ -5380,8 +5380,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-compactor namespace: tracing-system spec: @@ -5404,8 +5404,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-distributor namespace: tracing-system spec: @@ -5443,8 +5443,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 prometheus.io/service-monitor: "false" name: tempo-distributed-distributor-discovery namespace: tracing-system @@ -5480,8 +5480,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-gossip-ring namespace: tracing-system spec: @@ -5506,8 +5506,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-ingester namespace: tracing-system spec: @@ -5533,8 +5533,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 prometheus.io/service-monitor: "false" name: tempo-distributed-ingester-discovery namespace: tracing-system @@ -5564,8 +5564,8 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-metrics-generator namespace: tracing-system spec: @@ -5592,8 +5592,8 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 prometheus.io/service-monitor: "false" name: tempo-distributed-metrics-generator-discovery namespace: tracing-system @@ -5622,8 +5622,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-querier namespace: tracing-system spec: @@ -5649,8 +5649,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-query-frontend namespace: tracing-system spec: @@ -5676,8 +5676,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-query-frontend-discovery namespace: tracing-system spec: @@ -5795,8 +5795,8 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-compactor namespace: tracing-system spec: @@ -5815,7 +5815,7 @@ spec: template: metadata: annotations: - checksum/config: b4884a48fdd9d65d93143cd21f9fb29aded9f1d1b095820b58851c9657c68ef0 + checksum/config: 262ef977c1a5d0de4d7aae52056b9e83d74e98d79668d5b9a28a7fc94b50848e logs.grafana.com/scrape: "true" profiles.grafana.com/cpu.port_name: http-metrics profiles.grafana.com/cpu.scrape: "true" @@ -5829,8 +5829,8 @@ spec: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 spec: containers: - args: @@ -5841,7 +5841,7 @@ spec: envFrom: - secretRef: name: tempo-distributed-env-2d6dmbhc82 - image: docker.io/grafana/tempo:2.5.0 + image: docker.io/grafana/tempo:2.6.0 imagePullPolicy: IfNotPresent name: compactor ports: @@ -5896,8 +5896,8 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-distributor namespace: tracing-system spec: @@ -5912,7 +5912,7 @@ spec: template: metadata: annotations: - checksum/config: b4884a48fdd9d65d93143cd21f9fb29aded9f1d1b095820b58851c9657c68ef0 + checksum/config: 262ef977c1a5d0de4d7aae52056b9e83d74e98d79668d5b9a28a7fc94b50848e logs.grafana.com/scrape: "true" profiles.grafana.com/cpu.port_name: http-metrics profiles.grafana.com/cpu.scrape: "true" @@ -5926,8 +5926,8 @@ spec: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 spec: affinity: podAntiAffinity: @@ -5956,7 +5956,7 @@ spec: envFrom: - secretRef: name: tempo-distributed-env-2d6dmbhc82 - image: docker.io/grafana/tempo:2.5.0 + image: docker.io/grafana/tempo:2.6.0 imagePullPolicy: IfNotPresent name: distributor ports: @@ -6033,8 +6033,8 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-metrics-generator namespace: tracing-system spec: @@ -6049,7 +6049,7 @@ spec: template: metadata: annotations: - checksum/config: b4884a48fdd9d65d93143cd21f9fb29aded9f1d1b095820b58851c9657c68ef0 + checksum/config: 262ef977c1a5d0de4d7aae52056b9e83d74e98d79668d5b9a28a7fc94b50848e logs.grafana.com/scrape: "true" profiles.grafana.com/cpu.port_name: http-metrics profiles.grafana.com/cpu.scrape: "true" @@ -6063,8 +6063,8 @@ spec: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 spec: affinity: podAntiAffinity: @@ -6089,7 +6089,7 @@ spec: - -target=metrics-generator - -config.file=/conf/tempo.yaml - -mem-ballast-size-mbs=1024 - image: docker.io/grafana/tempo:2.5.0 + image: docker.io/grafana/tempo:2.6.0 imagePullPolicy: IfNotPresent name: metrics-generator ports: @@ -6161,8 +6161,8 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-querier namespace: tracing-system spec: @@ -6181,7 +6181,7 @@ spec: template: metadata: annotations: - checksum/config: b4884a48fdd9d65d93143cd21f9fb29aded9f1d1b095820b58851c9657c68ef0 + checksum/config: 262ef977c1a5d0de4d7aae52056b9e83d74e98d79668d5b9a28a7fc94b50848e logs.grafana.com/scrape: "true" profiles.grafana.com/cpu.port_name: http-metrics profiles.grafana.com/cpu.scrape: "true" @@ -6195,8 +6195,8 @@ spec: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 spec: affinity: podAntiAffinity: @@ -6225,7 +6225,7 @@ spec: envFrom: - secretRef: name: tempo-distributed-env-2d6dmbhc82 - image: docker.io/grafana/tempo:2.5.0 + image: docker.io/grafana/tempo:2.6.0 imagePullPolicy: IfNotPresent name: querier ports: @@ -6295,8 +6295,8 @@ metadata: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-query-frontend namespace: tracing-system spec: @@ -6315,7 +6315,7 @@ spec: template: metadata: annotations: - checksum/config: b4884a48fdd9d65d93143cd21f9fb29aded9f1d1b095820b58851c9657c68ef0 + checksum/config: 262ef977c1a5d0de4d7aae52056b9e83d74e98d79668d5b9a28a7fc94b50848e logs.grafana.com/scrape: "true" profiles.grafana.com/cpu.port_name: http-metrics profiles.grafana.com/cpu.scrape: "true" @@ -6328,8 +6328,8 @@ spec: app.kubernetes.io/instance: tempo-distributed app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 spec: affinity: podAntiAffinity: @@ -6358,7 +6358,7 @@ spec: envFrom: - secretRef: name: tempo-distributed-env-2d6dmbhc82 - image: docker.io/grafana/tempo:2.5.0 + image: docker.io/grafana/tempo:2.6.0 imagePullPolicy: IfNotPresent name: query-frontend ports: @@ -6683,8 +6683,8 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-ingester namespace: tracing-system spec: @@ -6699,7 +6699,7 @@ spec: template: metadata: annotations: - checksum/config: b4884a48fdd9d65d93143cd21f9fb29aded9f1d1b095820b58851c9657c68ef0 + checksum/config: 262ef977c1a5d0de4d7aae52056b9e83d74e98d79668d5b9a28a7fc94b50848e logs.grafana.com/scrape: "true" profiles.grafana.com/cpu.port_name: http-metrics profiles.grafana.com/cpu.scrape: "true" @@ -6713,8 +6713,8 @@ spec: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 spec: affinity: podAntiAffinity: @@ -6744,7 +6744,7 @@ spec: envFrom: - secretRef: name: tempo-distributed-env-2d6dmbhc82 - image: docker.io/grafana/tempo:2.5.0 + image: docker.io/grafana/tempo:2.6.0 imagePullPolicy: IfNotPresent name: ingester ports: @@ -6820,8 +6820,8 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 2.5.0 - helm.sh/chart: tempo-distributed-1.17.0 + app.kubernetes.io/version: 2.6.0 + helm.sh/chart: tempo-distributed-1.18.0 name: tempo-distributed-ingester namespace: tracing-system spec: diff --git a/kubernetes/microservices-mode/traces/tempo-distributed/kustomization.yaml b/kubernetes/microservices-mode/traces/tempo-distributed/kustomization.yaml index 43a1bee9..b39ccbe5 100644 --- a/kubernetes/microservices-mode/traces/tempo-distributed/kustomization.yaml +++ b/kubernetes/microservices-mode/traces/tempo-distributed/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization namespace: tracing-system helmCharts: - name: tempo-distributed - version: 1.17.0 + version: 1.18.0 repo: https://grafana.github.io/helm-charts releaseName: tempo-distributed namespace: tracing-system 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 0e1f1224..95104caf 100644 --- a/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml +++ b/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml @@ -271,16 +271,16 @@ data: store: memberlist frontend: - scheduler_address: query-scheduler-discovery.logging-system.svc.cluster.local:9095 - tail_proxy_url: http://loki-querier.logging-system.svc.cluster.local:3100 + scheduler_address: loki-query-scheduler-discovery.logging-system.svc.cluster.local:9095 + tail_proxy_url: http://loki-read.logging-system.svc.cluster.local:3100 frontend_worker: - scheduler_address: query-scheduler-discovery.logging-system.svc.cluster.local:9095 + scheduler_address: loki-query-scheduler-discovery.logging-system.svc.cluster.local:9095 index_gateway: mode: simple compactor: - working_directory: /tmp/compactor + working_directory: /var/loki/compactor memberlist: join_members: @@ -335,6 +335,8 @@ data: cache_location: /var/loki/cache index_gateway_client: server_address: dns+loki-backend-headless.logging-system.svc.cluster.local:9095 + bloom_shipper: + working_directory: /var/loki/blooms chunk_store_config: chunk_cache_config: @@ -342,7 +344,7 @@ data: addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" kind: ConfigMap metadata: - name: loki-config-g8ttct59ct + name: loki-config-6ttcfmt98b namespace: logging-system --- apiVersion: v1 @@ -5268,7 +5270,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-g8ttct59ct + name: loki-config-6ttcfmt98b name: config - configMap: name: loki-runtime @@ -5483,7 +5485,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-g8ttct59ct + name: loki-config-6ttcfmt98b name: config - configMap: name: loki-runtime @@ -5591,7 +5593,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-g8ttct59ct + name: loki-config-6ttcfmt98b name: config - configMap: name: loki-runtime diff --git a/kubernetes/read-write-mode/logs/loki/configs/loki.yaml b/kubernetes/read-write-mode/logs/loki/configs/loki.yaml index 42d70684..90b27998 100644 --- a/kubernetes/read-write-mode/logs/loki/configs/loki.yaml +++ b/kubernetes/read-write-mode/logs/loki/configs/loki.yaml @@ -45,16 +45,16 @@ bloom_compactor: store: memberlist frontend: - scheduler_address: query-scheduler-discovery.logging-system.svc.cluster.local:9095 - tail_proxy_url: http://loki-querier.logging-system.svc.cluster.local:3100 + scheduler_address: loki-query-scheduler-discovery.logging-system.svc.cluster.local:9095 + tail_proxy_url: http://loki-read.logging-system.svc.cluster.local:3100 frontend_worker: - scheduler_address: query-scheduler-discovery.logging-system.svc.cluster.local:9095 + scheduler_address: loki-query-scheduler-discovery.logging-system.svc.cluster.local:9095 index_gateway: mode: simple compactor: - working_directory: /tmp/compactor + working_directory: /var/loki/compactor memberlist: join_members: @@ -109,6 +109,8 @@ storage_config: cache_location: /var/loki/cache index_gateway_client: server_address: dns+loki-backend-headless.logging-system.svc.cluster.local:9095 + bloom_shipper: + working_directory: /var/loki/blooms chunk_store_config: chunk_cache_config: