Skip to content

Commit e96c995

Browse files
cyriltovenasimonswinegithub-actions[bot]grafanabotpetethepig
authored
Recut f37 (#2585)
* Rename deploy-monitoring (#2551) * Tweak compaction configuration and performance. (#2564) * Tweak compaction configuration and performance. * Fixes config tests * review feedback * Fixes compaction range block grouping (#2570) * Update `make docs` procedure (#2567) Co-authored-by: grafanabot <[email protected]> * docs: improves naming in rideshare example (#2571) * Revert "fix: remove "Flamegraph" from timeline chart title (#2565)" (#2566) * Revert "fix: remove "Flamegraph" from timeline chart title (#2565)" This reverts commit b4e6cef. * fix: add time range * Add support for dashboards datasource filter (#2560) This commit add support for dashboards datasource filter using a regex named 'datasource_regex' provided in the config.libsonnet file. It's done in a similar way than for grafana/mimir. Signed-off-by: julien.girard <[email protected]> * Increase default compaction interval (#2575) * feat(ebpf): add pyperf (#2201) * Document the new configuration flag PYROSCOPE_AGENT_ENABLED (#2536) * Ignore block within 3h in the store-gateway (#2579) * chore(ebpf) py312 support (#2577) * add py312 testdata * chore(ebpf): py 3.12 support * unhardcode more offsets * ingest: drop empty pprof profiles (#2580) * ingest: drop empty pprof profiles * add testcase * Make sure loki extracts the right labels (#2582) * docs: fix the "Type mismatch" error in "Rust client configuration" (#2581) --------- Signed-off-by: julien.girard <[email protected]> Co-authored-by: Christian Simon <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: grafanabot <[email protected]> Co-authored-by: Dmitry Filimonov <[email protected]> Co-authored-by: Darren Janeczek <[email protected]> Co-authored-by: Julien Girard <[email protected]> Co-authored-by: Tolya Korniltsev <[email protected]> Co-authored-by: Franz Wimmer <[email protected]> Co-authored-by: Daxin Wang <[email protected]>
1 parent b4e6cef commit e96c995

File tree

99 files changed

+230681
-791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+230681
-791
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "ebpf/testdata"]
2+
path = ebpf/testdata
3+
url = https://github.com/pyroscope-io/pyroscope-ebpf-testdata.git

api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/grafana/pyroscope/api
33
go 1.19
44

55
require (
6-
github.com/bufbuild/connect-go v1.9.0
6+
github.com/bufbuild/connect-go v1.10.0
77
github.com/gorilla/mux v1.8.0
88
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
99
github.com/prometheus/common v0.44.0

api/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
22
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
3-
github.com/bufbuild/connect-go v1.9.0 h1:JIgAeNuFpo+SUPfU19Yt5TcWlznsN5Bv10/gI/6Pjoc=
4-
github.com/bufbuild/connect-go v1.9.0/go.mod h1:CAIePUgkDR5pAFaylSMtNK45ANQjp9JvpluG20rhpV8=
3+
github.com/bufbuild/connect-go v1.10.0 h1:QAJ3G9A1OYQW2Jbk3DeoJbkCxuKArrvZgDt47mjdTbg=
4+
github.com/bufbuild/connect-go v1.10.0/go.mod h1:CAIePUgkDR5pAFaylSMtNK45ANQjp9JvpluG20rhpV8=
55
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
66
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
77
github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw=

cmd/pyroscope/help-all.txt.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Usage of ./pyroscope:
44
-auth.multitenancy-enabled
55
When set to true, incoming HTTP requests must specify tenant ID in HTTP X-Scope-OrgId header. When set to false, tenant ID anonymous is used instead.
66
-blocks-storage.bucket-store.ignore-blocks-within duration
7-
Blocks with minimum time within this duration are ignored, and not loaded by store-gateway. Useful when used together with -querier.query-store-after to prevent loading young blocks, because there are usually many of them (depending on number of ingesters) and they are not yet compacted. Negative values or 0 disable the filter. (default 2h0m0s)
7+
Blocks with minimum time within this duration are ignored, and not loaded by store-gateway. Useful when used together with -querier.query-store-after to prevent loading young blocks, because there are usually many of them (depending on number of ingesters) and they are not yet compacted. Negative values or 0 disable the filter. (default 3h0m0s)
88
-blocks-storage.bucket-store.ignore-deletion-marks-delay duration
9-
Duration after which the blocks marked for deletion will be filtered out while fetching blocks. The idea of ignore-deletion-marks-delay is to ignore blocks that are marked for deletion with some delay. This ensures store can still serve blocks that are meant to be deleted but do not have a replacement yet. (default 1h0m0s)
9+
Duration after which the blocks marked for deletion will be filtered out while fetching blocks. The idea of ignore-deletion-marks-delay is to ignore blocks that are marked for deletion with some delay. This ensures store can still serve blocks that are meant to be deleted but do not have a replacement yet. (default 30m0s)
1010
-blocks-storage.bucket-store.meta-sync-concurrency int
1111
Number of Go routines to use when syncing block meta files from object storage per tenant. (default 20)
1212
-blocks-storage.bucket-store.sync-dir string
@@ -16,7 +16,7 @@ Usage of ./pyroscope:
1616
-blocks-storage.bucket-store.tenant-sync-concurrency int
1717
Maximum number of concurrent tenants synching blocks. (default 10)
1818
-compactor.block-ranges value
19-
List of compaction time ranges. (default 3h0m0s,6h0m0s,12h0m0s)
19+
List of compaction time ranges. (default 1h0m0s,2h0m0s,8h0m0s)
2020
-compactor.block-sync-concurrency int
2121
Number of Go routines to use when downloading blocks for compaction and uploading resulting blocks. (default 8)
2222
-compactor.blocks-retention-period duration
@@ -28,7 +28,7 @@ Usage of ./pyroscope:
2828
-compactor.compaction-concurrency int
2929
Max number of concurrent compactions running. (default 1)
3030
-compactor.compaction-interval duration
31-
The frequency at which the compaction runs (default 1h0m0s)
31+
The frequency at which the compaction runs (default 30m0s)
3232
-compactor.compaction-jobs-order string
3333
The sorting to use when deciding which compaction jobs should run first for a given tenant. Supported values are: smallest-range-oldest-blocks-first, newest-blocks-first. (default "smallest-range-oldest-blocks-first")
3434
-compactor.compaction-retries int
@@ -50,7 +50,7 @@ Usage of ./pyroscope:
5050
-compactor.max-compaction-time duration
5151
Max time for starting compactions for a single tenant. After this time no new compactions for the tenant are started before next compaction cycle. This can help in multi-tenant environments to avoid single tenant using all compaction time, but also in single-tenant environments to force new discovery of blocks more often. 0 = disabled. (default 1h0m0s)
5252
-compactor.max-opening-blocks-concurrency int
53-
Number of goroutines opening blocks before compaction. (default 1)
53+
Number of goroutines opening blocks before compaction. (default 16)
5454
-compactor.meta-sync-concurrency int
5555
Number of Go routines to use when syncing block meta files from the long term storage. (default 20)
5656
-compactor.no-blocks-file-cleanup-enabled
@@ -464,7 +464,7 @@ Usage of ./pyroscope:
464464
-pyroscopedb.data-path string
465465
Directory used for local storage. (default "./data")
466466
-pyroscopedb.max-block-duration duration
467-
Upper limit to the duration of a Pyroscope block. (default 3h0m0s)
467+
Upper limit to the duration of a Pyroscope block. (default 1h0m0s)
468468
-pyroscopedb.row-group-target-size uint
469469
How big should a single row group be uncompressed (default 1342177280)
470470
-querier.client-cleanup-period duration

cmd/pyroscope/help.txt.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Usage of ./pyroscope:
122122
-pyroscopedb.data-path string
123123
Directory used for local storage. (default "./data")
124124
-pyroscopedb.max-block-duration duration
125-
Upper limit to the duration of a Pyroscope block. (default 3h0m0s)
125+
Upper limit to the duration of a Pyroscope block. (default 1h0m0s)
126126
-pyroscopedb.row-group-target-size uint
127127
How big should a single row group be uncompressed (default 1342177280)
128128
-querier.client-cleanup-period duration

docs/docs.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ endif
3434
# First project is considered the primary one used for doc-validator.
3535
PRIMARY_PROJECT := $(subst /,-,$(firstword $(subst :, ,$(firstword $(PROJECTS)))))
3636

37-
# Name for the container.
38-
ifeq ($(origin DOCS_CONTAINER), undefined)
39-
export DOCS_CONTAINER := $(PRIMARY_PROJECT)-docs
40-
endif
41-
4237
# Host port to publish container port to.
4338
ifeq ($(origin DOCS_HOST_PORT), undefined)
4439
export DOCS_HOST_PORT := 3002

0 commit comments

Comments
 (0)