feat: Add support for blocking a policy to be ingested #16203
Conversation
pkg/distributor/distributor.go
Outdated
| @@ -556,6 +556,16 @@ func (d *Distributor) Push(ctx context.Context, req *logproto.PushRequest) (*log | |||
| continue | |||
| } | |||
|
|
|||
| if ok, until := d.ShouldBlockPolicy(lbs, tenantID); ok { | |||
There was a problem hiding this comment.
Similarly to how we enforce labels, I think this one should also replace the d.validator.ShouldBlockIngestion down below which enforces the per-tenant block.
loki/pkg/distributor/distributor.go
Lines 652 to 653 in 9f9622d
pkg/distributor/distributor.go
Outdated
| @@ -556,6 +556,16 @@ func (d *Distributor) Push(ctx context.Context, req *logproto.PushRequest) (*log | |||
| continue | |||
| } | |||
|
|
|||
| if ok, until := d.ShouldBlockPolicy(lbs, tenantID); ok { | |||
There was a problem hiding this comment.
Also, we should pass the already resolved policy here to avoid resolving it twice.
pkg/validation/limits.go
Outdated
| BlockIngestionUntil dskit_flagext.Time `yaml:"block_ingestion_until" json:"block_ingestion_until"` | ||
| BlockIngestionStatusCode int `yaml:"block_ingestion_status_code" json:"block_ingestion_status_code"` | ||
| BlockIngestionPolicyUntil map[string]dskit_flagext.Time `yaml:"block_ingestion_policy_until" json:"block_ingestion_policy_until"` | ||
| BlockIngestionPolicyStatusCode map[string]int `yaml:"block_ingestion_policy_status_code" json:"block_ingestion_policy_status_code"` |
There was a problem hiding this comment.
Do we need a per policy status code? I think we can just reuse the per-tenant BlockIngestionStatusCode.
I wouldn't add it unless we need it in the future.
There was a problem hiding this comment.
not really. got rid of it, ty
github-actions
bot
added
the
type/docs
|
💻 Deploy preview available: https://deploy-preview-loki-16203-zb444pucvq-vp.a.run.app/docs/loki/latest/ |
What this PR does / why we need it:
Add support for blocking a policy from being ingested.
The policy is defined by stream mapping.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mddeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR