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

Jump to bottom

prometheus.operator.* - Fix issue with missing targets when one monitor's name is a prefix of another #5862

Merged
merged 6 commits into from
Nov 27, 2023
Merged

prometheus.operator.* - Fix issue with missing targets when one monitor's name is a prefix of another #5862

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7268b5f
use stored lookup of job names to clear configs instead of prefix mat…
captncraig Nov 27, 2023
6641374
add tests
captncraig Nov 27, 2023
cbe250f
add tests and stubs
captncraig Nov 27, 2023
a08f9f4
changelog
captncraig Nov 27, 2023
1ddb215
unexport interfaces
captncraig Nov 27, 2023
3606c1b
changelog
captncraig Nov 27, 2023
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
Prev Previous commit
Next Next commit
unexport interfaces
  • Loading branch information
@captncraig
captncraig committed Nov 27, 2023
commit 1ddb215c20b4ed81a7c7deeab68edb11f2fff17b
4 changes: 2 additions & 2 deletions component/prometheus/operator/common/crdmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ type crdManager struct {
// debug info by `kind/ns/name`
debugInfo map[string]*operator.DiscoveredResource

discoveryManager DiscoveryManager
scrapeManager ScrapeManager
discoveryManager discoveryManager
scrapeManager scrapeManager
clusteringUpdated chan struct{}
ls labelstore.LabelStore

Expand Down
8 changes: 4 additions & 4 deletions component/prometheus/operator/common/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import (
"github.com/prometheus/prometheus/scrape"
)

// DiscoveryManager is an interface around discovery.Manager
type DiscoveryManager interface {
// discoveryManager is an interface around discovery.Manager
type discoveryManager interface {
Run() error
SyncCh() <-chan map[string][]*targetgroup.Group
ApplyConfig(cfg map[string]discovery.Configs) error
}

// ScrapeManager is an interface around scrape.Manager
type ScrapeManager interface {
// scrapeManager is an interface around scrape.Manager
type scrapeManager interface {
Run(tsets <-chan map[string][]*targetgroup.Group) error
Stop()
TargetsActive() map[string][]*scrape.Target
Expand Down