This repository was archived by the owner on Jul 28, 2026. It is now read-only.

Merge patch release to main - #1153

Merged

rfratto merged 32 commits into

grafana-cold-storage:mainfrom

rfratto:bring-in-security-fix

Dec 8, 2021

Commits on Sep 23, 2021

Add secret type to sensitive values
mattdurham
committed
9182e1b

Commits on Sep 27, 2021

Break out config tests to their own implementation. Also remove username has a sensitive value.
mattdurham
committed
5b9eed5
Update changelog
mattdurham
committed
a34dc2f
Fix failing test
mattdurham
committed
7f868fe

Commits on Nov 18, 2021

Merge pull request #16 from grafana/main_merge_20211116
mattdurham
authored
0f748bd
Scrub secrets when marshaling instance configs
rfratto
committed
422450e
update for v0.21
rfratto
committed
05cc825
Merge remote-tracking branch 'origin/main' into secret_config
mattdurham
committed
39be902
Updated changes from the merge.
mattdurham
committed
d3ba88c
Remove changelog
mattdurham
committed
db4c6ed
Merge pull request #2 from grafana/secret_config
mattdurham
authored
62e21c9

Commits on Nov 19, 2021

Merge pull request #17 from grafana/marshal-instance-config-secrets-0.21.2
rfratto
authored
a547975
Scrub out receivers has ***receivers_scrubber***:null
mattdurham
committed
6d604d3
obscure etcd/consul credentials
rfratto
committed
7d68f46
Update pkg/traces/config_test.go

mattdurham
and
rfratto
authored
e48d4f8
Update pkg/config/config.go
rfratto
authored
37d9477
go fmt
rfratto
committed
4c14aa2
Change to using custom object and return <secret>
mattdurham
committed
bcef112
Merge pull request #20 from grafana/receiver_scrubbed
mattdurham
authored
310845a
Merge pull request #22 from grafana/obscure-scraping-service-credentials
rfratto
authored
297baef
Fix bad merge
mattdurham
committed
2cbed39
Merge pull request #24 from grafana/fix_merge
mattdurham
authored
3b36899
[v0.21.2] toggle config endpoint (#19)

rlankfo
and
rfratto
authored
9f0b596
Update version to v0.21.2
mattdurham
committed
2460feb
Update defaults.go
mattdurham
authored
01512bb
Merge pull request #29 from grafana/update_release_0_21_2
mattdurham
authored
dff80eb
fix /-/config endpoint
rfratto
committed
3ee1048
also fix non-pointer config bug
rfratto
committed
5fc7b4e
Merge pull request #31 from grafana/fix-config-endpoint
rfratto
authored
c758c6d

Commits on Dec 8, 2021

temporarily disable linting for release
rfratto
committed
379cbe8
Merge tag 'v0.21.2' into bring-in-security-fix
rfratto
committed
c268323
fix lint errors
rfratto
committed
4954fa6