Skip to content

Commit

Permalink
helm: Replace internal agent with Grafana Agent (#2304)
Browse files Browse the repository at this point in the history 
* Adds grafana agent as a subcharts

* Add an extra agent level

* Configure annotations scraping with Grafana Agent Flow.

* Remove old tests

* CI Fixes

* CI FIxes

* Update helm-docs hoping it would remove subchart values

* Revert "Update helm-docs hoping it would remove subchart values"

This reverts commit d434dcf.

* lint river file

* fixes CI

* fixes lib upgrade

* helm: Update NOTES.txt

* helm: Update NOTES.txt

* Prefer port_name for multi container pod

* Re-render file

* Re-render helm doc

* wip

* Revert "wip"

This reverts commit 4a73dee.

* Fixes the NOTES.txt query-frontend port

---------

Co-authored-by: Christian Simon <[email protected]>
  • Loading branch information
@cyriltovena @simonswine
cyriltovena and simonswine authored Aug 25, 2023
1 parent 5807d76 commit 4d90dcc
Show file tree
Hide file tree
Showing 25 changed files with 3,666 additions and 2,407 deletions.
1 change: 1 addition & 0 deletions .github/workflows/helm-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ jobs:
ct_configfile: operations/pyroscope/helm/ct.yaml
ct_check_version_increment: false
helm_version: v3.8.2
kubeVersion: "1.22"
12 changes: 7 additions & 5 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ $(BIN)/jb: Makefile go.mod

$(BIN)/helm: Makefile go.mod
@mkdir -p $(@D)
GOBIN=$(abspath $(@D)) $(GO) install helm.sh/helm/v3/cmd/helm@v3.8.0
GOBIN=$(abspath $(@D)) $(GO) install helm.sh/helm/v3/cmd/helm@v3.12.3

$(BIN)/kubeconform: Makefile go.mod
@mkdir -p $(@D)
Expand Down Expand Up @@ -357,14 +357,16 @@ trunk/fmt: $(BIN)/trunk
.PHONY: helm/check
helm/check: $(BIN)/kubeconform $(BIN)/helm
$(BIN)/helm repo add --force-update minio https://charts.min.io/
$(BIN)/helm repo add --force-update grafana https://grafana.github.io/helm-charts
$(BIN)/helm dependency update ./operations/pyroscope/helm/pyroscope/
$(BIN)/helm dependency build ./operations/pyroscope/helm/pyroscope/
mkdir -p ./operations/pyroscope/helm/pyroscope/rendered/
$(BIN)/helm template pyroscope-dev ./operations/pyroscope/helm/pyroscope/ \
$(BIN)/helm template --kube-version "1.22.0" pyroscope-dev ./operations/pyroscope/helm/pyroscope/ \
| tee ./operations/pyroscope/helm/pyroscope/rendered/single-binary.yaml \
| $(BIN)/kubeconform --summary --strict --kubernetes-version 1.21.0
$(BIN)/helm template pyroscope-dev ./operations/pyroscope/helm/pyroscope/ --values operations/pyroscope/helm/pyroscope/values-micro-services.yaml \
| $(BIN)/kubeconform --summary --strict --kubernetes-version 1.22.0
$(BIN)/helm template --kube-version "1.22.0" pyroscope-dev ./operations/pyroscope/helm/pyroscope/ --values operations/pyroscope/helm/pyroscope/values-micro-services.yaml \
| tee ./operations/pyroscope/helm/pyroscope/rendered/micro-services.yaml \
| $(BIN)/kubeconform --summary --strict --kubernetes-version 1.21.0
| $(BIN)/kubeconform --summary --strict --kubernetes-version 1.22.0
cat operations/pyroscope/helm/pyroscope/values-micro-services.yaml \
| go run ./tools/yaml-to-json \
> ./operations/pyroscope/jsonnet/values-micro-services.json
Expand Down
2 changes: 1 addition & 1 deletion ebpf/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/common v0.44.0
github.com/prometheus/prometheus v0.46.0
github.com/samber/lo v1.37.0
github.com/samber/lo v1.38.1
github.com/stretchr/testify v1.8.4
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
golang.org/x/sys v0.10.0
Expand Down
4 changes: 2 additions & 2 deletions ebpf/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ github.com/prometheus/prometheus v0.46.0 h1:9JSdXnsuT6YsbODEhSQMwxNkGwPExfmzqG73
github.com/prometheus/prometheus v0.46.0/go.mod h1:10L5IJE5CEsjee1FnOcVswYXlPIscDWWt3IJ2UDYrz4=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/samber/lo v1.37.0 h1:XjVcB8g6tgUp8rsPsJ2CvhClfImrpL04YpQHXeHPhRw=
github.com/samber/lo v1.37.0/go.mod h1:9vaz2O4o8oOnK23pd2TrXufcbdbJIa3b6cstBWKpopA=
github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=
github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw=
Expand Down
72 changes: 35 additions & 37 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ require (
github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8
github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.8.0
github.com/grafana/agent v0.35.4
github.com/grafana/dskit v0.0.0-20230817134647-90d7ee0bed7c
github.com/grafana/pyroscope/api v0.0.0-00010101000000-000000000000
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd
github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
github.com/hashicorp/go-multierror v1.1.1
Expand All @@ -46,10 +47,10 @@ require (
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/common v0.44.0
github.com/prometheus/prometheus v0.46.0
github.com/prometheus/prometheus v1.99.0
github.com/pyroscope-io/client v0.7.2
github.com/pyroscope-io/jfr-parser v0.7.1
github.com/samber/lo v1.37.0
github.com/samber/lo v1.38.1
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.4
github.com/thanos-io/objstore v0.0.0-20230727115635-d0c43443ecda
Expand All @@ -75,10 +76,9 @@ require (
require (
cloud.google.com/go v0.110.4 // indirect
cloud.google.com/go/compute v1.22.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/storage v1.31.0 // indirect
github.com/Azure/azure-sdk-for-go v67.2.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
Expand All @@ -92,17 +92,17 @@ require (
github.com/armon/go-metrics v0.4.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go v1.44.321 // indirect
github.com/aws/aws-sdk-go-v2 v1.17.3 // indirect
github.com/aws/aws-sdk-go-v2/config v1.18.6 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.13.6 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.11.27 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 // indirect
github.com/aws/aws-sdk-go-v2 v1.18.1 // indirect
github.com/aws/aws-sdk-go-v2/config v1.18.27 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.13.26 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.35 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.28 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.12.12 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.19.2 // indirect
github.com/aws/smithy-go v1.13.5 // indirect
github.com/baidubce/bce-sdk-go v0.9.138 // indirect
github.com/benbjohnson/clock v1.3.3 // indirect
Expand All @@ -111,31 +111,30 @@ require (
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/efficientgo/core v1.0.0-rc.2 // indirect
github.com/efficientgo/e2e v0.14.1-0.20230710114240-c316eb95ae5b // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.21.4 // indirect
github.com/go-openapi/errors v0.20.4 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/errors v0.20.3 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/loads v0.21.2 // indirect
github.com/go-openapi/spec v0.20.9 // indirect
github.com/go-openapi/spec v0.20.8 // indirect
github.com/go-openapi/strfmt v0.21.7 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-openapi/validate v0.22.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.4 // indirect
Expand All @@ -149,11 +148,10 @@ require (
github.com/hashicorp/go-msgpack v1.1.5 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.6.0 // indirect
github.com/hashicorp/memberlist v0.5.0 // indirect
github.com/hashicorp/serf v0.10.1 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
Expand All @@ -175,12 +173,11 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/ncw/swift v1.0.53 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/oracle/oci-go-sdk/v65 v65.28.0 // indirect
github.com/pierrec/lz4/v4 v4.1.18 // indirect
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/alertmanager v0.25.1 // indirect
github.com/prometheus/alertmanager v0.25.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97 // indirect
Expand All @@ -197,10 +194,10 @@ require (
github.com/stretchr/objx v0.5.0 // indirect
github.com/tencentyun/cos-go-sdk-v5 v0.7.40 // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
go.etcd.io/etcd/api/v3 v3.5.6 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect
go.etcd.io/etcd/client/v3 v3.5.6 // indirect
go.mongodb.org/mongo-driver v1.12.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
go.mongodb.org/mongo-driver v1.11.7 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
Expand All @@ -221,14 +218,14 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.28.0-rc.0 // indirect
k8s.io/apimachinery v0.28.0-rc.0 // indirect
k8s.io/client-go v0.28.0-rc.0 // indirect
k8s.io/api v0.27.2 // indirect
k8s.io/apimachinery v0.27.2 // indirect
k8s.io/client-go v0.27.2 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230711102312-30195339c3c7 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/utils v0.0.0-20230308161112-d77c459e9343 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)

replace (
Expand All @@ -238,6 +235,7 @@ replace (
// Replace memberlist with our fork which includes some fixes that haven't been
// merged upstream yet.
github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220708130638-bd88e10a3d91
github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.45.0

github.com/thanos-io/objstore => github.com/grafana/objstore v0.0.0-20230727114110-2394c72a3ec7
// gopkg.in/yaml.v3
Expand Down
Loading

0 comments on commit 4d90dcc

Please sign in to comment.