Skip to content
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.

Sign up for GitHub

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

Improvement in handling of silences #5090

Merged
merged 2 commits into from
Feb 25, 2025
Merged

Improvement in handling of silences #5090

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c75f0ee
Improvements in silences
chavakula Feb 20, 2025
03976c2
Merge branch 'develop/6' into silences_improvement
chavakula Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions backend/store/etcd/silenced_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"errors"
"fmt"
"github.com/gogo/protobuf/proto"
"time"

"github.com/gogo/protobuf/proto"
corev2 "github.com/sensu/core/v2"
"github.com/sensu/sensu-go/backend/etcd"
"github.com/sensu/sensu-go/backend/store"
Expand Down Expand Up @@ -208,13 +208,9 @@ func (s *Store) UpdateSilencedEntry(ctx context.Context, silenced *corev2.Silenc
if err := silenced.Validate(); err != nil {
return &store.ErrNotValid{Err: err}
}
allowedMaxTime := time.Now().Add(s.cfg.MaxSilencedExpiryTimeAllowed).Unix()

// check for maximum allowed duration for silenced allowed
if silenced.ExpireAt > 0 && (silenced.ExpireAt > allowedMaxTime) {
err := errors.New(silencedLimitError)
return &store.ErrThreshold{Err: err}
}
// calculate maximum allowed time based on max-silenced-expiry-time-allowed in yaml
allowedMaxTime := time.Now().Add(s.cfg.MaxSilencedExpiryTimeAllowed).Unix()

if silenced.ExpireAt == 0 && silenced.Expire > 0 {
start := time.Now()
Expand All @@ -230,13 +226,25 @@ func (s *Store) UpdateSilencedEntry(ctx context.Context, silenced *corev2.Silenc
}
}

// set default silenced expiry time configured in backend yaml file
if silenced.Expire <= 0 && silenced.ExpireAt == 0 {
// if Expiry date is not set
if silenced.ExpireAt == 0 {
start := time.Now()
if silenced.Begin > 0 {
start = time.Unix(silenced.Begin, 0)
}
silenced.ExpireAt = start.Add(s.cfg.DefaultSilencedExpiryTime).Unix()

// if default-silenced-expiry-time in yaml is set
if s.cfg.DefaultSilencedExpiryTime > 0 {
silenced.ExpireAt = start.Add(s.cfg.DefaultSilencedExpiryTime).Unix()
}
} else {
// if max-silenced-expiry-time-allowed in yaml is set
if s.cfg.MaxSilencedExpiryTimeAllowed > 0 {
if silenced.ExpireAt > allowedMaxTime {
err := errors.New(silencedLimitError)
return &store.ErrThreshold{Err: err}
}
}
}

silencedBytes, err := proto.Marshal(silenced)
Expand Down
Loading