mirror of
https://github.com/prometheus/prometheus.git
synced 2024-11-14 17:44:06 -08:00
6ebfbd2d54
For: #14355 This commit updates Prometheus to adopt stdlib's log/slog package in favor of go-kit/log. As part of converting to use slog, several other related changes are required to get prometheus working, including: - removed unused logging util func `RateLimit()` - forward ported the util/logging/Deduper logging by implementing a small custom slog.Handler that does the deduping before chaining log calls to the underlying real slog.Logger - move some of the json file logging functionality to use prom/common package functionality - refactored some of the new json file logging for scraping - changes to promql.QueryLogger interface to swap out logging methods for relevant slog sugar wrappers - updated lots of tests that used/replicated custom logging functionality, attempting to keep the logical goal of the tests consistent after the transition - added a healthy amount of `if logger == nil { $makeLogger }` type conditional checks amongst various functions where none were provided -- old code that used the go-kit/log.Logger interface had several places where there were nil references when trying to use functions like `With()` to add keyvals on the new *slog.Logger type Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>
141 lines
6.7 KiB
Go
141 lines
6.7 KiB
Go
// Copyright 2020 The Prometheus Authors
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package moby
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
"github.com/prometheus/common/model"
|
|
"github.com/prometheus/common/promslog"
|
|
"github.com/stretchr/testify/require"
|
|
"gopkg.in/yaml.v2"
|
|
|
|
"github.com/prometheus/prometheus/discovery"
|
|
)
|
|
|
|
func TestDockerSwarmNodesSDRefresh(t *testing.T) {
|
|
sdmock := NewSDMock(t, "swarmprom")
|
|
sdmock.Setup()
|
|
|
|
e := sdmock.Endpoint()
|
|
url := e[:len(e)-1]
|
|
cfgString := fmt.Sprintf(`
|
|
---
|
|
role: nodes
|
|
host: %s
|
|
`, url)
|
|
var cfg DockerSwarmSDConfig
|
|
require.NoError(t, yaml.Unmarshal([]byte(cfgString), &cfg))
|
|
|
|
reg := prometheus.NewRegistry()
|
|
refreshMetrics := discovery.NewRefreshMetrics(reg)
|
|
metrics := cfg.NewDiscovererMetrics(reg, refreshMetrics)
|
|
require.NoError(t, metrics.Register())
|
|
defer metrics.Unregister()
|
|
defer refreshMetrics.Unregister()
|
|
|
|
d, err := NewDiscovery(&cfg, promslog.NewNopLogger(), metrics)
|
|
require.NoError(t, err)
|
|
|
|
ctx := context.Background()
|
|
tgs, err := d.refresh(ctx)
|
|
require.NoError(t, err)
|
|
|
|
require.Len(t, tgs, 1)
|
|
|
|
tg := tgs[0]
|
|
require.NotNil(t, tg)
|
|
require.NotNil(t, tg.Targets)
|
|
require.Len(t, tg.Targets, 5)
|
|
|
|
for i, lbls := range []model.LabelSet{
|
|
{
|
|
"__address__": model.LabelValue("10.0.232.3:80"),
|
|
"__meta_dockerswarm_node_address": model.LabelValue("10.0.232.3"),
|
|
"__meta_dockerswarm_node_availability": model.LabelValue("active"),
|
|
"__meta_dockerswarm_node_engine_version": model.LabelValue("19.03.11"),
|
|
"__meta_dockerswarm_node_hostname": model.LabelValue("master-3"),
|
|
"__meta_dockerswarm_node_id": model.LabelValue("bvtjl7pnrtg0k88ywialsldpd"),
|
|
"__meta_dockerswarm_node_manager_address": model.LabelValue("10.0.232.3:2377"),
|
|
"__meta_dockerswarm_node_manager_leader": model.LabelValue("false"),
|
|
"__meta_dockerswarm_node_manager_reachability": model.LabelValue("reachable"),
|
|
"__meta_dockerswarm_node_platform_architecture": model.LabelValue("x86_64"),
|
|
"__meta_dockerswarm_node_platform_os": model.LabelValue("linux"),
|
|
"__meta_dockerswarm_node_role": model.LabelValue("manager"),
|
|
"__meta_dockerswarm_node_status": model.LabelValue("ready"),
|
|
},
|
|
{
|
|
"__address__": model.LabelValue("10.0.232.1:80"),
|
|
"__meta_dockerswarm_node_address": model.LabelValue("10.0.232.1"),
|
|
"__meta_dockerswarm_node_availability": model.LabelValue("active"),
|
|
"__meta_dockerswarm_node_engine_version": model.LabelValue("19.03.5-ce"),
|
|
"__meta_dockerswarm_node_hostname": model.LabelValue("oxygen"),
|
|
"__meta_dockerswarm_node_id": model.LabelValue("d3cw2msquo0d71yn42qrnb0tu"),
|
|
"__meta_dockerswarm_node_manager_address": model.LabelValue("10.0.232.1:2377"),
|
|
"__meta_dockerswarm_node_manager_leader": model.LabelValue("true"),
|
|
"__meta_dockerswarm_node_manager_reachability": model.LabelValue("reachable"),
|
|
"__meta_dockerswarm_node_platform_architecture": model.LabelValue("x86_64"),
|
|
"__meta_dockerswarm_node_platform_os": model.LabelValue("linux"),
|
|
"__meta_dockerswarm_node_role": model.LabelValue("manager"),
|
|
"__meta_dockerswarm_node_status": model.LabelValue("ready"),
|
|
},
|
|
{
|
|
"__address__": model.LabelValue("10.0.232.2:80"),
|
|
"__meta_dockerswarm_node_address": model.LabelValue("10.0.232.2"),
|
|
"__meta_dockerswarm_node_availability": model.LabelValue("active"),
|
|
"__meta_dockerswarm_node_engine_version": model.LabelValue("19.03.11"),
|
|
"__meta_dockerswarm_node_hostname": model.LabelValue("master-2"),
|
|
"__meta_dockerswarm_node_id": model.LabelValue("i9woemzxymn1n98o9ufebclgm"),
|
|
"__meta_dockerswarm_node_manager_address": model.LabelValue("10.0.232.2:2377"),
|
|
"__meta_dockerswarm_node_manager_leader": model.LabelValue("false"),
|
|
"__meta_dockerswarm_node_manager_reachability": model.LabelValue("reachable"),
|
|
"__meta_dockerswarm_node_platform_architecture": model.LabelValue("x86_64"),
|
|
"__meta_dockerswarm_node_platform_os": model.LabelValue("linux"),
|
|
"__meta_dockerswarm_node_role": model.LabelValue("manager"),
|
|
"__meta_dockerswarm_node_status": model.LabelValue("ready"),
|
|
},
|
|
{
|
|
"__address__": model.LabelValue("10.0.232.4:80"),
|
|
"__meta_dockerswarm_node_address": model.LabelValue("10.0.232.4"),
|
|
"__meta_dockerswarm_node_availability": model.LabelValue("active"),
|
|
"__meta_dockerswarm_node_engine_version": model.LabelValue("19.03.11"),
|
|
"__meta_dockerswarm_node_hostname": model.LabelValue("worker-1"),
|
|
"__meta_dockerswarm_node_id": model.LabelValue("jkc2xd7p3xdazf0u6sh1m9dmr"),
|
|
"__meta_dockerswarm_node_platform_architecture": model.LabelValue("x86_64"),
|
|
"__meta_dockerswarm_node_platform_os": model.LabelValue("linux"),
|
|
"__meta_dockerswarm_node_role": model.LabelValue("worker"),
|
|
"__meta_dockerswarm_node_status": model.LabelValue("ready"),
|
|
},
|
|
{
|
|
"__address__": model.LabelValue("10.0.232.5:80"),
|
|
"__meta_dockerswarm_node_address": model.LabelValue("10.0.232.5"),
|
|
"__meta_dockerswarm_node_availability": model.LabelValue("active"),
|
|
"__meta_dockerswarm_node_engine_version": model.LabelValue("19.03.11"),
|
|
"__meta_dockerswarm_node_hostname": model.LabelValue("worker-2"),
|
|
"__meta_dockerswarm_node_id": model.LabelValue("ldawcom10uqi6owysgi28n4ve"),
|
|
"__meta_dockerswarm_node_platform_architecture": model.LabelValue("x86_64"),
|
|
"__meta_dockerswarm_node_platform_os": model.LabelValue("linux"),
|
|
"__meta_dockerswarm_node_role": model.LabelValue("worker"),
|
|
"__meta_dockerswarm_node_status": model.LabelValue("ready"),
|
|
},
|
|
} {
|
|
t.Run(fmt.Sprintf("item %d", i), func(t *testing.T) {
|
|
require.Equal(t, lbls, tg.Targets[i])
|
|
})
|
|
}
|
|
}
|