-
Notifications
You must be signed in to change notification settings - Fork 832
Upgrade prometheus to v3.6.0 #7040
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
SungJin1212
wants to merge
2
commits into
cortexproject:master
Choose a base branch
from
SungJin1212:Update-prometheus-to-v0.306.0
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| //go:build requires_docker | ||
| // +build requires_docker | ||
|
|
||
| package integration | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "path/filepath" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/prometheus/prometheus/prompb" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/cortexproject/cortex/integration/e2e" | ||
| e2edb "github.com/cortexproject/cortex/integration/e2e/db" | ||
| "github.com/cortexproject/cortex/integration/e2ecortex" | ||
| ) | ||
|
|
||
| func Test_RulerExternalLabels_UTF8Validation(t *testing.T) { | ||
| s, err := e2e.NewScenario(networkName) | ||
| require.NoError(t, err) | ||
| defer s.Close() | ||
|
|
||
| // Start dependencies. | ||
| minio := e2edb.NewMinio(9000, bucketName) | ||
| require.NoError(t, s.StartAndWaitReady(minio)) | ||
|
|
||
| runtimeConfigYamlFile := ` | ||
| overrides: | ||
| 'user-2': | ||
| name_validation_scheme: utf8 | ||
| ruler_external_labels: | ||
| test.utf8.metric: 😄 | ||
| ` | ||
| require.NoError(t, writeFileToSharedDir(s, runtimeConfigFile, []byte(runtimeConfigYamlFile))) | ||
| filePath := filepath.Join(e2e.ContainerSharedDir, runtimeConfigFile) | ||
|
|
||
| // Start Cortex components. | ||
| require.NoError(t, copyFileToSharedDir(s, "docs/configuration/single-process-config-blocks.yaml", cortexConfigFile)) | ||
|
|
||
| flags := map[string]string{ | ||
| "-auth.enabled": "true", | ||
| "-runtime-config.file": filePath, | ||
| "-runtime-config.backend": "filesystem", | ||
| // ingester | ||
| "-blocks-storage.s3.access-key-id": e2edb.MinioAccessKey, | ||
| "-blocks-storage.s3.secret-access-key": e2edb.MinioSecretKey, | ||
| "-blocks-storage.s3.bucket-name": bucketName, | ||
| "-blocks-storage.s3.endpoint": fmt.Sprintf("%s-minio-9000:9000", networkName), | ||
| "-blocks-storage.s3.insecure": "true", | ||
| // alert manager | ||
| "-alertmanager.web.external-url": "http://localhost/alertmanager", | ||
| "-alertmanager-storage.backend": "local", | ||
| "-alertmanager-storage.local.path": filepath.Join(e2e.ContainerSharedDir, "alertmanager_configs"), | ||
| } | ||
| // make alert manager config dir | ||
| require.NoError(t, writeFileToSharedDir(s, "alertmanager_configs", []byte{})) | ||
|
|
||
| // The external labels validation should be success | ||
| cortex := e2ecortex.NewSingleBinaryWithConfigFile("cortex-1", cortexConfigFile, flags, "", 9009, 9095) | ||
| require.NoError(t, s.StartAndWaitReady(cortex)) | ||
| } | ||
|
|
||
| func Test_Distributor_UTF8ValidationPerTenant(t *testing.T) { | ||
| s, err := e2e.NewScenario(networkName) | ||
| require.NoError(t, err) | ||
| defer s.Close() | ||
|
|
||
| // Start dependencies. | ||
| minio := e2edb.NewMinio(9000, bucketName) | ||
| require.NoError(t, s.StartAndWaitReady(minio)) | ||
|
|
||
| runtimeConfigYamlFile := ` | ||
| overrides: | ||
| 'user-2': | ||
| name_validation_scheme: utf8 | ||
| ` | ||
|
|
||
| require.NoError(t, writeFileToSharedDir(s, runtimeConfigFile, []byte(runtimeConfigYamlFile))) | ||
| filePath := filepath.Join(e2e.ContainerSharedDir, runtimeConfigFile) | ||
|
|
||
| // Start Cortex components. | ||
| require.NoError(t, copyFileToSharedDir(s, "docs/configuration/single-process-config-blocks.yaml", cortexConfigFile)) | ||
|
|
||
| flags := map[string]string{ | ||
| "-auth.enabled": "true", | ||
| "-runtime-config.file": filePath, | ||
| "-runtime-config.backend": "filesystem", | ||
| // ingester | ||
| "-blocks-storage.s3.access-key-id": e2edb.MinioAccessKey, | ||
| "-blocks-storage.s3.secret-access-key": e2edb.MinioSecretKey, | ||
| "-blocks-storage.s3.bucket-name": bucketName, | ||
| "-blocks-storage.s3.endpoint": fmt.Sprintf("%s-minio-9000:9000", networkName), | ||
| "-blocks-storage.s3.insecure": "true", | ||
| // alert manager | ||
| "-alertmanager.web.external-url": "http://localhost/alertmanager", | ||
| "-alertmanager-storage.backend": "local", | ||
| "-alertmanager-storage.local.path": filepath.Join(e2e.ContainerSharedDir, "alertmanager_configs"), | ||
| } | ||
| // make alert manager config dir | ||
| require.NoError(t, writeFileToSharedDir(s, "alertmanager_configs", []byte{})) | ||
|
|
||
| cortex := e2ecortex.NewSingleBinaryWithConfigFile("cortex-1", cortexConfigFile, flags, "", 9009, 9095) | ||
| require.NoError(t, s.StartAndWaitReady(cortex)) | ||
|
|
||
| // user-1 uses legacy validation | ||
| user1Client, err := e2ecortex.NewClient(cortex.HTTPEndpoint(), "", "", "", "user-1") | ||
| require.NoError(t, err) | ||
|
|
||
| // user-2 uses utf8 validation | ||
| user2Client, err := e2ecortex.NewClient(cortex.HTTPEndpoint(), "", "", "", "user-2") | ||
| require.NoError(t, err) | ||
|
|
||
| now := time.Now() | ||
|
|
||
| utf8Series, _ := generateSeries("series_1", now, prompb.Label{Name: "test.utf8.metric", Value: "😄"}) | ||
| legacySeries, _ := generateSeries("series_2", now, prompb.Label{Name: "job", Value: "test"}) | ||
|
|
||
| res, err := user1Client.Push(legacySeries) | ||
| require.NoError(t, err) | ||
| require.Equal(t, 200, res.StatusCode) | ||
|
|
||
| // utf8Series push should be fail for user-1 | ||
| res, err = user1Client.Push(utf8Series) | ||
| require.NoError(t, err) | ||
| require.Equal(t, 400, res.StatusCode) | ||
|
|
||
| res, err = user2Client.Push(legacySeries) | ||
| require.NoError(t, err) | ||
| require.Equal(t, 200, res.StatusCode) | ||
|
|
||
| // utf8Series push should be success for user-2 | ||
| res, err = user2Client.Push(utf8Series) | ||
| require.NoError(t, err) | ||
| require.Equal(t, 200, res.StatusCode) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder why this is a runtime limit. Is it intended to be configurable per tenant? Where do we actually set this value
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
um.. I'd like to hear what other people think about whether it should be configurable per tenant or not. WDYT?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is ok to be a per tenant runtime config. But I don't see the code where we actually set this value.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/cortexproject/cortex/blob/v1.19.0/pkg/distributor/distributor.go#L721
The distributor is already using per-user config. I added some e2e tests.