Skip to content

Commit 48d5564

Browse files
CharlieTLeCharlieTLe
committed
Update dep prometheus-operator to v0.80.1
Signed-off-by: Charlie Le <[email protected]>
1 parent 9f152fb commit 48d5564

File tree

19 files changed

+211
-582
lines changed

19 files changed

+211
-582
lines changed

‎cmd/otel-allocator/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -409,4 +409,3 @@ Shards the received targets based on the discovered Collector instances
409409

410410
### Collector
411411
Client to watch for deployed Collector instances which will then provided to the Allocator.
412-

‎cmd/otel-allocator/benchmark_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"strings"
1212
"testing"
1313

14-
gokitlog "github.com/go-kit/log"
1514
"github.com/go-logr/logr"
1615
"github.com/prometheus/client_golang/prometheus"
1716
"github.com/prometheus/common/model"
@@ -173,7 +172,7 @@ func createTestDiscoverer(allocationStrategy string, prehookConfig map[string][]
173172
}
174173
registry := prometheus.NewRegistry()
175174
sdMetrics, _ := discovery.CreateAndRegisterSDMetrics(registry)
176-
discoveryManager := discovery.NewManager(ctx, gokitlog.NewNopLogger(), registry, sdMetrics)
175+
discoveryManager := discovery.NewManager(ctx, nil, registry, sdMetrics)
177176
targetDiscoverer := target.NewDiscoverer(logger, discoveryManager, allocatorPrehook, srv, allocator.SetTargets)
178177
return targetDiscoverer
179178
}

‎cmd/otel-allocator/internal/config/config_test.go

+10-16
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ import (
1717
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1818
)
1919

20-
var defaultScrapeProtocols = []promconfig.ScrapeProtocol{
21-
promconfig.OpenMetricsText1_0_0,
22-
promconfig.OpenMetricsText0_0_1,
23-
promconfig.PrometheusText0_0_4,
24-
}
25-
2620
func TestLoad(t *testing.T) {
2721
type args struct {
2822
file string
@@ -61,7 +55,7 @@ func TestLoad(t *testing.T) {
6155
PromConfig: &promconfig.Config{
6256
GlobalConfig: promconfig.GlobalConfig{
6357
ScrapeInterval: model.Duration(60 * time.Second),
64-
ScrapeProtocols: defaultScrapeProtocols,
58+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
6559
ScrapeTimeout: model.Duration(10 * time.Second),
6660
EvaluationInterval: model.Duration(60 * time.Second),
6761
},
@@ -72,7 +66,7 @@ func TestLoad(t *testing.T) {
7266
EnableCompression: true,
7367
HonorTimestamps: true,
7468
ScrapeInterval: model.Duration(60 * time.Second),
75-
ScrapeProtocols: defaultScrapeProtocols,
69+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
7670
ScrapeTimeout: model.Duration(10 * time.Second),
7771
MetricsPath: "/metrics",
7872
Scheme: "http",
@@ -143,7 +137,7 @@ func TestLoad(t *testing.T) {
143137
PromConfig: &promconfig.Config{
144138
GlobalConfig: promconfig.GlobalConfig{
145139
ScrapeInterval: model.Duration(60 * time.Second),
146-
ScrapeProtocols: defaultScrapeProtocols,
140+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
147141
ScrapeTimeout: model.Duration(10 * time.Second),
148142
EvaluationInterval: model.Duration(60 * time.Second),
149143
},
@@ -154,7 +148,7 @@ func TestLoad(t *testing.T) {
154148
EnableCompression: true,
155149
HonorTimestamps: true,
156150
ScrapeInterval: model.Duration(60 * time.Second),
157-
ScrapeProtocols: defaultScrapeProtocols,
151+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
158152
ScrapeTimeout: model.Duration(10 * time.Second),
159153
MetricsPath: "/metrics",
160154
Scheme: "http",
@@ -213,7 +207,7 @@ func TestLoad(t *testing.T) {
213207
PromConfig: &promconfig.Config{
214208
GlobalConfig: promconfig.GlobalConfig{
215209
ScrapeInterval: model.Duration(60 * time.Second),
216-
ScrapeProtocols: defaultScrapeProtocols,
210+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
217211
ScrapeTimeout: model.Duration(10 * time.Second),
218212
EvaluationInterval: model.Duration(60 * time.Second),
219213
},
@@ -224,7 +218,7 @@ func TestLoad(t *testing.T) {
224218
EnableCompression: true,
225219
HonorTimestamps: true,
226220
ScrapeInterval: model.Duration(60 * time.Second),
227-
ScrapeProtocols: defaultScrapeProtocols,
221+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
228222
ScrapeTimeout: model.Duration(10 * time.Second),
229223
MetricsPath: "/metrics",
230224
Scheme: "http",
@@ -307,7 +301,7 @@ func TestLoad(t *testing.T) {
307301
PromConfig: &promconfig.Config{
308302
GlobalConfig: promconfig.GlobalConfig{
309303
ScrapeInterval: model.Duration(60 * time.Second),
310-
ScrapeProtocols: defaultScrapeProtocols,
304+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
311305
ScrapeTimeout: model.Duration(10 * time.Second),
312306
EvaluationInterval: model.Duration(60 * time.Second),
313307
},
@@ -318,7 +312,7 @@ func TestLoad(t *testing.T) {
318312
EnableCompression: true,
319313
HonorTimestamps: true,
320314
ScrapeInterval: model.Duration(60 * time.Second),
321-
ScrapeProtocols: defaultScrapeProtocols,
315+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
322316
ScrapeTimeout: model.Duration(10 * time.Second),
323317
MetricsPath: "/metrics",
324318
Scheme: "http",
@@ -401,7 +395,7 @@ func TestLoad(t *testing.T) {
401395
PromConfig: &promconfig.Config{
402396
GlobalConfig: promconfig.GlobalConfig{
403397
ScrapeInterval: model.Duration(60 * time.Second),
404-
ScrapeProtocols: defaultScrapeProtocols,
398+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
405399
ScrapeTimeout: model.Duration(10 * time.Second),
406400
EvaluationInterval: model.Duration(60 * time.Second),
407401
},
@@ -412,7 +406,7 @@ func TestLoad(t *testing.T) {
412406
EnableCompression: true,
413407
HonorTimestamps: true,
414408
ScrapeInterval: model.Duration(60 * time.Second),
415-
ScrapeProtocols: defaultScrapeProtocols,
409+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
416410
ScrapeTimeout: model.Duration(10 * time.Second),
417411
MetricsPath: "/metrics",
418412
Scheme: "http",

‎cmd/otel-allocator/internal/target/discovery_test.go

+10-17
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"testing"
1212
"time"
1313

14-
gokitlog "github.com/go-kit/log"
1514
"github.com/prometheus/client_golang/prometheus"
1615
commonconfig "github.com/prometheus/common/config"
1716
"github.com/prometheus/common/model"
@@ -26,12 +25,6 @@ import (
2625
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/watcher"
2726
)
2827

29-
var defaultScrapeProtocols = []promconfig.ScrapeProtocol{
30-
promconfig.OpenMetricsText1_0_0,
31-
promconfig.OpenMetricsText0_0_1,
32-
promconfig.PrometheusText0_0_4,
33-
}
34-
3528
func TestDiscovery(t *testing.T) {
3629
type args struct {
3730
file string
@@ -61,7 +54,7 @@ func TestDiscovery(t *testing.T) {
6154
registry := prometheus.NewRegistry()
6255
sdMetrics, err := discovery.CreateAndRegisterSDMetrics(registry)
6356
require.NoError(t, err)
64-
d := discovery.NewManager(ctx, gokitlog.NewNopLogger(), registry, sdMetrics)
57+
d := discovery.NewManager(ctx, nil, registry, sdMetrics)
6558
results := make(chan []string)
6659
manager := NewDiscoverer(ctrl.Log.WithName("test"), d, nil, scu, func(targets map[string]*Item) {
6760
var result []string
@@ -122,7 +115,7 @@ func TestDiscovery_ScrapeConfigHashing(t *testing.T) {
122115
JobName: "serviceMonitor/testapp/testapp/0",
123116
HonorTimestamps: true,
124117
ScrapeInterval: model.Duration(30 * time.Second),
125-
ScrapeProtocols: defaultScrapeProtocols,
118+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
126119
ScrapeTimeout: model.Duration(30 * time.Second),
127120
MetricsPath: "/metrics",
128121
Scheme: "http",
@@ -151,7 +144,7 @@ func TestDiscovery_ScrapeConfigHashing(t *testing.T) {
151144
JobName: "serviceMonitor/testapp/testapp/0",
152145
HonorTimestamps: false,
153146
ScrapeInterval: model.Duration(30 * time.Second),
154-
ScrapeProtocols: defaultScrapeProtocols,
147+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
155148
ScrapeTimeout: model.Duration(30 * time.Second),
156149
MetricsPath: "/metrics",
157150
Scheme: "http",
@@ -180,7 +173,7 @@ func TestDiscovery_ScrapeConfigHashing(t *testing.T) {
180173
JobName: "serviceMonitor/testapp/testapp/1",
181174
HonorTimestamps: false,
182175
ScrapeInterval: model.Duration(30 * time.Second),
183-
ScrapeProtocols: defaultScrapeProtocols,
176+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
184177
ScrapeTimeout: model.Duration(30 * time.Second),
185178
MetricsPath: "/metrics",
186179
Scheme: "http",
@@ -209,7 +202,7 @@ func TestDiscovery_ScrapeConfigHashing(t *testing.T) {
209202
JobName: "serviceMonitor/testapp/testapp/1",
210203
HonorTimestamps: false,
211204
ScrapeInterval: model.Duration(30 * time.Second),
212-
ScrapeProtocols: defaultScrapeProtocols,
205+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
213206
ScrapeTimeout: model.Duration(30 * time.Second),
214207
MetricsPath: "/metrics",
215208
Scheme: "http",
@@ -238,7 +231,7 @@ func TestDiscovery_ScrapeConfigHashing(t *testing.T) {
238231
JobName: "serviceMonitor/testapp/testapp/1",
239232
HonorTimestamps: false,
240233
ScrapeTimeout: model.Duration(30 * time.Second),
241-
ScrapeProtocols: defaultScrapeProtocols,
234+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
242235
MetricsPath: "/metrics",
243236
Scheme: "http",
244237
HTTPClientConfig: commonconfig.HTTPClientConfig{
@@ -266,7 +259,7 @@ func TestDiscovery_ScrapeConfigHashing(t *testing.T) {
266259
JobName: "serviceMonitor/testapp/testapp/1",
267260
HonorTimestamps: false,
268261
ScrapeTimeout: model.Duration(30 * time.Second),
269-
ScrapeProtocols: defaultScrapeProtocols,
262+
ScrapeProtocols: promconfig.DefaultScrapeProtocols,
270263
MetricsPath: "/metrics",
271264
Scheme: "http",
272265
HTTPClientConfig: commonconfig.HTTPClientConfig{
@@ -309,7 +302,7 @@ func TestDiscovery_ScrapeConfigHashing(t *testing.T) {
309302
registry := prometheus.NewRegistry()
310303
sdMetrics, err := discovery.CreateAndRegisterSDMetrics(registry)
311304
require.NoError(t, err)
312-
d := discovery.NewManager(ctx, gokitlog.NewNopLogger(), registry, sdMetrics)
305+
d := discovery.NewManager(ctx, nil, registry, sdMetrics)
313306
manager := NewDiscoverer(ctrl.Log.WithName("test"), d, nil, scu, nil)
314307

315308
for _, tc := range tests {
@@ -348,7 +341,7 @@ func TestDiscovery_NoConfig(t *testing.T) {
348341
registry := prometheus.NewRegistry()
349342
sdMetrics, err := discovery.CreateAndRegisterSDMetrics(registry)
350343
require.NoError(t, err)
351-
d := discovery.NewManager(ctx, gokitlog.NewNopLogger(), registry, sdMetrics)
344+
d := discovery.NewManager(ctx, nil, registry, sdMetrics)
352345
manager := NewDiscoverer(ctrl.Log.WithName("test"), d, nil, scu, nil)
353346
defer close(manager.close)
354347
defer cancelFunc()
@@ -398,7 +391,7 @@ func BenchmarkApplyScrapeConfig(b *testing.B) {
398391
registry := prometheus.NewRegistry()
399392
sdMetrics, err := discovery.CreateAndRegisterSDMetrics(registry)
400393
require.NoError(b, err)
401-
d := discovery.NewManager(ctx, gokitlog.NewNopLogger(), registry, sdMetrics)
394+
d := discovery.NewManager(ctx, nil, registry, sdMetrics)
402395
manager := NewDiscoverer(ctrl.Log.WithName("test"), d, nil, scu, nil)
403396

404397
b.ResetTimer()

‎cmd/otel-allocator/internal/watcher/promOperator.go

+15-8
Original file line numberDiff line numberDiff line change
@@ -361,14 +361,21 @@ func (w *PrometheusCRWatcher) LoadConfig(ctx context.Context) (*promconfig.Confi
361361
return nil, err
362362
}
363363

364+
p := &monitoringv1.Prometheus{
365+
ObjectMeta: metav1.ObjectMeta{
366+
Name: "example",
367+
Namespace: "default",
368+
},
369+
Spec: monitoringv1.PrometheusSpec{
370+
CommonPrometheusFields: monitoringv1.CommonPrometheusFields{
371+
ScrapeInterval: "30s",
372+
},
373+
EvaluationInterval: "30s",
374+
},
375+
}
376+
364377
generatedConfig, err := w.configGenerator.GenerateServerConfiguration(
365-
"30s",
366-
"",
367-
nil,
368-
nil,
369-
&monitoringv1.TSDBSpec{},
370-
nil,
371-
nil,
378+
p,
372379
serviceMonitorInstances,
373380
podMonitorInstances,
374381
probeInstances,
@@ -377,7 +384,7 @@ func (w *PrometheusCRWatcher) LoadConfig(ctx context.Context) (*promconfig.Confi
377384
nil,
378385
nil,
379386
nil,
380-
[]string{})
387+
nil)
381388
if err != nil {
382389
return nil, err
383390
}

0 commit comments

Comments
 (0)