2016-11-22 03:48:30 -08:00
|
|
|
// Copyright 2016 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 discovery
|
|
|
|
|
|
|
|
import (
|
2017-10-24 21:21:42 -07:00
|
|
|
"context"
|
2017-11-29 14:52:38 -08:00
|
|
|
"fmt"
|
2018-09-01 00:51:31 -07:00
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
2017-11-11 18:39:08 -08:00
|
|
|
"reflect"
|
2018-01-04 13:41:54 -08:00
|
|
|
"sort"
|
2017-11-29 14:52:38 -08:00
|
|
|
"strconv"
|
2016-11-22 03:48:30 -08:00
|
|
|
"testing"
|
2017-11-06 09:33:52 -08:00
|
|
|
"time"
|
2016-11-22 03:48:30 -08:00
|
|
|
|
2018-09-05 04:32:47 -07:00
|
|
|
"github.com/go-kit/kit/log"
|
2020-07-24 02:10:20 -07:00
|
|
|
client_testutil "github.com/prometheus/client_golang/prometheus/testutil"
|
2019-09-24 09:11:43 -07:00
|
|
|
common_config "github.com/prometheus/common/config"
|
2017-11-11 18:39:08 -08:00
|
|
|
"github.com/prometheus/common/model"
|
2016-11-22 03:48:30 -08:00
|
|
|
"github.com/prometheus/prometheus/config"
|
2017-12-30 09:47:18 -08:00
|
|
|
sd_config "github.com/prometheus/prometheus/discovery/config"
|
2019-09-24 09:11:43 -07:00
|
|
|
"github.com/prometheus/prometheus/discovery/consul"
|
|
|
|
"github.com/prometheus/prometheus/discovery/file"
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
"github.com/prometheus/prometheus/discovery/targetgroup"
|
2020-07-24 02:10:20 -07:00
|
|
|
"github.com/prometheus/prometheus/util/testutil"
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
"gopkg.in/yaml.v2"
|
2016-11-22 03:48:30 -08:00
|
|
|
)
|
|
|
|
|
2020-07-24 02:10:20 -07:00
|
|
|
func TestMain(m *testing.M) {
|
|
|
|
testutil.TolerantVerifyLeak(m)
|
|
|
|
}
|
|
|
|
|
2018-01-27 04:03:06 -08:00
|
|
|
// TestTargetUpdatesOrder checks that the target updates are received in the expected order.
|
|
|
|
func TestTargetUpdatesOrder(t *testing.T) {
|
2017-11-29 14:52:38 -08:00
|
|
|
|
2018-09-01 00:51:31 -07:00
|
|
|
// The order by which the updates are send is determined by the interval passed to the mock discovery adapter
|
2017-11-29 14:52:38 -08:00
|
|
|
// Final targets array is ordered alphabetically by the name of the discoverer.
|
|
|
|
// For example discoverer "A" with targets "t2,t3" and discoverer "B" with targets "t1,t2" will result in "t2,t3,t1,t2" after the merge.
|
2017-11-11 18:39:08 -08:00
|
|
|
testCases := []struct {
|
2017-11-29 14:52:38 -08:00
|
|
|
title string
|
|
|
|
updates map[string][]update
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedTargets [][]*targetgroup.Group
|
2017-11-11 18:39:08 -08:00
|
|
|
}{
|
|
|
|
{
|
|
|
|
title: "Single TP no updates",
|
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
expectedTargets: nil,
|
2017-11-06 09:33:52 -08:00
|
|
|
},
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2019-02-27 02:22:31 -08:00
|
|
|
title: "Multiple TPs no updates",
|
2017-11-11 18:39:08 -08:00
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {},
|
|
|
|
"tp2": {},
|
|
|
|
"tp3": {},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
expectedTargets: nil,
|
2017-11-06 09:33:52 -08:00
|
|
|
},
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
|
|
|
title: "Single TP empty initials",
|
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 5 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-11 18:39:08 -08:00
|
|
|
{},
|
|
|
|
},
|
2017-11-06 09:33:52 -08:00
|
|
|
},
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
|
|
|
title: "Multiple TPs empty initials",
|
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 5 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
"tp2": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 200 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
"tp3": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 100 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{},
|
2017-11-11 18:39:08 -08:00
|
|
|
{},
|
|
|
|
{},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
title: "Single TP initials only",
|
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-12-01 04:59:24 -08:00
|
|
|
{
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-12-01 04:59:24 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-12-01 04:59:24 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
title: "Multiple TPs initials only",
|
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-12-01 04:59:24 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
"tp2": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-12-01 04:59:24 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group1",
|
2017-12-01 04:59:24 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 10 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-12-01 04:59:24 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
}, {
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-12-01 04:59:24 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
title: "Single TP initials followed by empty updates",
|
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
interval: 0,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
|
|
|
{
|
|
|
|
Source: "tp1_group1",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group2",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 10 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2018-01-04 13:41:54 -08:00
|
|
|
{
|
|
|
|
{
|
|
|
|
Source: "tp1_group1",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group2",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2017-11-29 14:52:38 -08:00
|
|
|
title: "Single TP initials and new groups",
|
2017-11-11 18:39:08 -08:00
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
interval: 0,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
|
|
|
},
|
2018-01-04 13:41:54 -08:00
|
|
|
{
|
|
|
|
Source: "tp1_group3",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 10 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
2018-01-04 13:41:54 -08:00
|
|
|
{
|
|
|
|
Source: "tp1_group3",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2017-11-29 14:52:38 -08:00
|
|
|
title: "Multiple TPs initials and new groups",
|
2017-11-11 18:39:08 -08:00
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 10 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group3",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group4",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 500 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
"tp2": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 100 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group3",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "7"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group4",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "8"}},
|
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 10 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp2_group2",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp2_group3",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "7"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group4",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "8"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group2",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group3",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group4",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp2_group2",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp2_group3",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "7"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group4",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "8"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2017-11-06 09:33:52 -08:00
|
|
|
},
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
title: "One TP initials arrive after other TP updates.",
|
2017-11-11 18:39:08 -08:00
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 10 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 150 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
"tp2": {
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 200 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "7"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "8"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 100 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
},
|
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "7"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "8"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
title: "Single TP empty update in between",
|
2017-11-11 18:39:08 -08:00
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 30 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
|
|
|
{
|
|
|
|
Source: "tp1_group1",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group2",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 10 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 300 * time.Millisecond,
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 14:52:38 -08:00
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 14:52:38 -08:00
|
|
|
{
|
2017-11-11 18:39:08 -08:00
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group1",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group2",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Source: "tp1_group1",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 13:41:54 -08:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 14:52:38 -08:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-11 18:39:08 -08:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2018-09-05 06:44:52 -07:00
|
|
|
for i, tc := range testCases {
|
|
|
|
tc := tc
|
|
|
|
t.Run(tc.title, func(t *testing.T) {
|
2018-09-12 07:15:03 -07:00
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
2018-09-05 06:44:52 -07:00
|
|
|
defer cancel()
|
2018-09-12 07:15:03 -07:00
|
|
|
|
2018-09-05 06:44:52 -07:00
|
|
|
discoveryManager := NewManager(ctx, log.NewNopLogger())
|
|
|
|
discoveryManager.updatert = 100 * time.Millisecond
|
|
|
|
|
|
|
|
var totalUpdatesCount int
|
|
|
|
provUpdates := make(chan []*targetgroup.Group)
|
|
|
|
for _, up := range tc.updates {
|
2018-09-12 01:15:57 -07:00
|
|
|
go newMockDiscoveryProvider(up...).Run(ctx, provUpdates)
|
2018-09-05 06:44:52 -07:00
|
|
|
if len(up) > 0 {
|
2020-08-03 02:29:59 -07:00
|
|
|
totalUpdatesCount += len(up)
|
2018-09-05 06:44:52 -07:00
|
|
|
}
|
2017-11-06 09:33:52 -08:00
|
|
|
}
|
2017-11-11 18:39:08 -08:00
|
|
|
|
2018-09-05 06:44:52 -07:00
|
|
|
for x := 0; x < totalUpdatesCount; x++ {
|
|
|
|
select {
|
2018-09-12 07:15:03 -07:00
|
|
|
case <-ctx.Done():
|
2020-08-03 02:29:59 -07:00
|
|
|
t.Fatalf("%d: no update arrived within the timeout limit", x)
|
2018-09-05 06:44:52 -07:00
|
|
|
case tgs := <-provUpdates:
|
|
|
|
discoveryManager.updateGroup(poolKey{setName: strconv.Itoa(i), provider: tc.title}, tgs)
|
|
|
|
for _, got := range discoveryManager.allGroups() {
|
|
|
|
assertEqualGroups(t, got, tc.expectedTargets[x], func(got, expected string) string {
|
|
|
|
return fmt.Sprintf("%d: \ntargets mismatch \ngot: %v \nexpected: %v",
|
|
|
|
x,
|
|
|
|
got,
|
|
|
|
expected)
|
|
|
|
})
|
2017-11-29 14:52:38 -08:00
|
|
|
}
|
2017-11-06 09:33:52 -08:00
|
|
|
}
|
|
|
|
}
|
2018-09-05 06:44:52 -07:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func assertEqualGroups(t *testing.T, got, expected []*targetgroup.Group, msg func(got, expected string) string) {
|
|
|
|
t.Helper()
|
|
|
|
format := func(groups []*targetgroup.Group) string {
|
|
|
|
var s string
|
|
|
|
for i, group := range groups {
|
|
|
|
if i > 0 {
|
|
|
|
s += ","
|
|
|
|
}
|
|
|
|
s += group.Source + ":" + fmt.Sprint(group.Targets)
|
2017-11-06 09:33:52 -08:00
|
|
|
}
|
2018-09-05 06:44:52 -07:00
|
|
|
return s
|
|
|
|
}
|
|
|
|
|
|
|
|
// Need to sort by the groups's source as the received order is not guaranteed.
|
|
|
|
sort.Sort(byGroupSource(got))
|
|
|
|
sort.Sort(byGroupSource(expected))
|
|
|
|
|
|
|
|
if !reflect.DeepEqual(got, expected) {
|
|
|
|
t.Errorf(msg(format(got), format(expected)))
|
2017-11-29 14:52:38 -08:00
|
|
|
}
|
2018-09-05 06:44:52 -07:00
|
|
|
|
2017-11-29 14:52:38 -08:00
|
|
|
}
|
2017-11-11 18:39:08 -08:00
|
|
|
|
2018-09-01 00:51:31 -07:00
|
|
|
func verifyPresence(t *testing.T, tSets map[poolKey]map[string]*targetgroup.Group, poolKey poolKey, label string, present bool) {
|
2018-11-30 08:59:57 -08:00
|
|
|
t.Helper()
|
2018-09-01 00:51:31 -07:00
|
|
|
if _, ok := tSets[poolKey]; !ok {
|
|
|
|
t.Fatalf("'%s' should be present in Pool keys: %v", poolKey, tSets)
|
|
|
|
return
|
|
|
|
}
|
2017-11-11 18:39:08 -08:00
|
|
|
|
2018-09-01 00:51:31 -07:00
|
|
|
match := false
|
|
|
|
var mergedTargets string
|
|
|
|
for _, targetGroup := range tSets[poolKey] {
|
2017-11-11 18:39:08 -08:00
|
|
|
|
2018-09-01 00:51:31 -07:00
|
|
|
for _, l := range targetGroup.Targets {
|
|
|
|
mergedTargets = mergedTargets + " " + l.String()
|
|
|
|
if l.String() == label {
|
|
|
|
match = true
|
2017-11-29 14:52:38 -08:00
|
|
|
}
|
2017-11-11 18:39:08 -08:00
|
|
|
}
|
2018-09-01 00:51:31 -07:00
|
|
|
|
|
|
|
}
|
|
|
|
if match != present {
|
|
|
|
msg := ""
|
|
|
|
if !present {
|
|
|
|
msg = "not"
|
2016-11-22 03:48:30 -08:00
|
|
|
}
|
2018-11-30 08:59:57 -08:00
|
|
|
t.Fatalf("%q should %s be present in Targets labels: %q", label, msg, mergedTargets)
|
2016-11-22 03:48:30 -08:00
|
|
|
}
|
2018-09-01 00:51:31 -07:00
|
|
|
}
|
2016-11-22 03:48:30 -08:00
|
|
|
|
2018-09-01 00:51:31 -07:00
|
|
|
func TestTargetSetRecreatesTargetGroupsEveryRun(t *testing.T) {
|
2016-11-22 03:48:30 -08:00
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
2018-09-05 04:32:47 -07:00
|
|
|
discoveryManager := NewManager(ctx, log.NewNopLogger())
|
2018-09-12 07:06:31 -07:00
|
|
|
discoveryManager.updatert = 100 * time.Millisecond
|
2018-01-26 05:31:59 -08:00
|
|
|
go discoveryManager.Run()
|
2016-11-22 03:48:30 -08:00
|
|
|
|
2019-09-24 09:11:43 -07:00
|
|
|
c := map[string]sd_config.ServiceDiscoveryConfig{
|
2020-04-09 03:29:19 -07:00
|
|
|
"prometheus": {
|
2019-09-24 09:11:43 -07:00
|
|
|
StaticConfigs: []*targetgroup.Group{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
Source: "0",
|
|
|
|
Targets: []model.LabelSet{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
model.AddressLabel: model.LabelValue("foo:9090"),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
Source: "1",
|
|
|
|
Targets: []model.LabelSet{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
model.AddressLabel: model.LabelValue("bar:9090"),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2017-12-30 09:47:18 -08:00
|
|
|
}
|
|
|
|
discoveryManager.ApplyConfig(c)
|
2016-11-22 03:48:30 -08:00
|
|
|
|
2018-02-25 23:58:10 -08:00
|
|
|
<-discoveryManager.SyncCh()
|
2018-09-01 00:51:31 -07:00
|
|
|
verifyPresence(t, discoveryManager.targets, poolKey{setName: "prometheus", provider: "string/0"}, "{__address__=\"foo:9090\"}", true)
|
|
|
|
verifyPresence(t, discoveryManager.targets, poolKey{setName: "prometheus", provider: "string/0"}, "{__address__=\"bar:9090\"}", true)
|
2016-11-22 03:48:30 -08:00
|
|
|
|
2019-09-24 09:11:43 -07:00
|
|
|
c["prometheus"] = sd_config.ServiceDiscoveryConfig{
|
|
|
|
StaticConfigs: []*targetgroup.Group{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
Source: "0",
|
|
|
|
Targets: []model.LabelSet{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
model.AddressLabel: model.LabelValue("foo:9090"),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2017-12-30 09:47:18 -08:00
|
|
|
}
|
|
|
|
discoveryManager.ApplyConfig(c)
|
2017-11-06 09:33:52 -08:00
|
|
|
|
2018-02-25 23:58:10 -08:00
|
|
|
<-discoveryManager.SyncCh()
|
2018-09-01 00:51:31 -07:00
|
|
|
verifyPresence(t, discoveryManager.targets, poolKey{setName: "prometheus", provider: "string/0"}, "{__address__=\"foo:9090\"}", true)
|
|
|
|
verifyPresence(t, discoveryManager.targets, poolKey{setName: "prometheus", provider: "string/0"}, "{__address__=\"bar:9090\"}", false)
|
|
|
|
}
|
|
|
|
|
2018-11-30 08:59:57 -08:00
|
|
|
// TestTargetSetRecreatesEmptyStaticConfigs ensures that reloading a config file after
|
|
|
|
// removing all targets from the static_configs sends an update with empty targetGroups.
|
|
|
|
// This is required to signal the receiver that this target set has no current targets.
|
|
|
|
func TestTargetSetRecreatesEmptyStaticConfigs(t *testing.T) {
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
|
|
|
discoveryManager := NewManager(ctx, log.NewNopLogger())
|
|
|
|
discoveryManager.updatert = 100 * time.Millisecond
|
|
|
|
go discoveryManager.Run()
|
|
|
|
|
2019-09-24 09:11:43 -07:00
|
|
|
c := map[string]sd_config.ServiceDiscoveryConfig{
|
2020-04-09 03:29:19 -07:00
|
|
|
"prometheus": {
|
2019-09-24 09:11:43 -07:00
|
|
|
StaticConfigs: []*targetgroup.Group{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
Source: "0",
|
|
|
|
Targets: []model.LabelSet{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
model.AddressLabel: model.LabelValue("foo:9090"),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2018-11-30 08:59:57 -08:00
|
|
|
}
|
|
|
|
discoveryManager.ApplyConfig(c)
|
|
|
|
|
|
|
|
<-discoveryManager.SyncCh()
|
|
|
|
verifyPresence(t, discoveryManager.targets, poolKey{setName: "prometheus", provider: "string/0"}, "{__address__=\"foo:9090\"}", true)
|
|
|
|
|
2019-09-24 09:11:43 -07:00
|
|
|
c["prometheus"] = sd_config.ServiceDiscoveryConfig{
|
|
|
|
StaticConfigs: []*targetgroup.Group{},
|
2018-11-30 08:59:57 -08:00
|
|
|
}
|
|
|
|
discoveryManager.ApplyConfig(c)
|
|
|
|
|
|
|
|
<-discoveryManager.SyncCh()
|
|
|
|
|
|
|
|
pkey := poolKey{setName: "prometheus", provider: "string/0"}
|
|
|
|
targetGroups, ok := discoveryManager.targets[pkey]
|
|
|
|
if !ok {
|
|
|
|
t.Fatalf("'%v' should be present in target groups", pkey)
|
|
|
|
}
|
|
|
|
group, ok := targetGroups[""]
|
|
|
|
if !ok {
|
|
|
|
t.Fatalf("missing '' key in target groups %v", targetGroups)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(group.Targets) != 0 {
|
|
|
|
t.Fatalf("Invalid number of targets: expected 0, got %d", len(group.Targets))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-01 00:51:31 -07:00
|
|
|
func TestIdenticalConfigurationsAreCoalesced(t *testing.T) {
|
|
|
|
tmpFile, err := ioutil.TempFile("", "sd")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error creating temporary file: %v", err)
|
|
|
|
}
|
|
|
|
defer os.Remove(tmpFile.Name())
|
|
|
|
if _, err := tmpFile.Write([]byte(`[{"targets": ["foo:9090"]}]`)); err != nil {
|
|
|
|
t.Fatalf("error writing temporary file: %v", err)
|
|
|
|
}
|
|
|
|
if err := tmpFile.Close(); err != nil {
|
|
|
|
t.Fatalf("error closing temporary file: %v", err)
|
|
|
|
}
|
|
|
|
tmpFile2 := fmt.Sprintf("%s.json", tmpFile.Name())
|
|
|
|
if err = os.Link(tmpFile.Name(), tmpFile2); err != nil {
|
|
|
|
t.Fatalf("error linking temporary file: %v", err)
|
|
|
|
}
|
|
|
|
defer os.Remove(tmpFile2)
|
|
|
|
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
|
|
|
discoveryManager := NewManager(ctx, nil)
|
2018-09-12 07:06:31 -07:00
|
|
|
discoveryManager.updatert = 100 * time.Millisecond
|
2018-09-01 00:51:31 -07:00
|
|
|
go discoveryManager.Run()
|
|
|
|
|
2019-09-24 09:11:43 -07:00
|
|
|
c := map[string]sd_config.ServiceDiscoveryConfig{
|
2020-04-09 03:29:19 -07:00
|
|
|
"prometheus": {
|
2019-09-24 09:11:43 -07:00
|
|
|
FileSDConfigs: []*file.SDConfig{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
Files: []string{
|
|
|
|
tmpFile2,
|
|
|
|
},
|
|
|
|
RefreshInterval: file.DefaultSDConfig.RefreshInterval,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2020-04-09 03:29:19 -07:00
|
|
|
"prometheus2": {
|
2019-09-24 09:11:43 -07:00
|
|
|
FileSDConfigs: []*file.SDConfig{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
Files: []string{
|
|
|
|
tmpFile2,
|
|
|
|
},
|
|
|
|
RefreshInterval: file.DefaultSDConfig.RefreshInterval,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2018-09-01 00:51:31 -07:00
|
|
|
}
|
|
|
|
discoveryManager.ApplyConfig(c)
|
|
|
|
|
|
|
|
<-discoveryManager.SyncCh()
|
|
|
|
verifyPresence(t, discoveryManager.targets, poolKey{setName: "prometheus", provider: "*file.SDConfig/0"}, "{__address__=\"foo:9090\"}", true)
|
|
|
|
verifyPresence(t, discoveryManager.targets, poolKey{setName: "prometheus2", provider: "*file.SDConfig/0"}, "{__address__=\"foo:9090\"}", true)
|
|
|
|
if len(discoveryManager.providers) != 1 {
|
|
|
|
t.Fatalf("Invalid number of providers: expected 1, got %d", len(discoveryManager.providers))
|
|
|
|
}
|
2017-11-06 09:33:52 -08:00
|
|
|
}
|
|
|
|
|
2018-06-13 08:34:59 -07:00
|
|
|
func TestApplyConfigDoesNotModifyStaticProviderTargets(t *testing.T) {
|
|
|
|
cfgText := `
|
|
|
|
scrape_configs:
|
|
|
|
- job_name: 'prometheus'
|
|
|
|
static_configs:
|
|
|
|
- targets: ["foo:9090"]
|
|
|
|
- targets: ["bar:9090"]
|
|
|
|
- targets: ["baz:9090"]
|
|
|
|
`
|
|
|
|
originalConfig := &config.Config{}
|
|
|
|
if err := yaml.UnmarshalStrict([]byte(cfgText), originalConfig); err != nil {
|
|
|
|
t.Fatalf("Unable to load YAML config cfgYaml: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
processedConfig := &config.Config{}
|
|
|
|
if err := yaml.UnmarshalStrict([]byte(cfgText), processedConfig); err != nil {
|
|
|
|
t.Fatalf("Unable to load YAML config cfgYaml: %s", err)
|
|
|
|
}
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
2018-09-05 04:32:47 -07:00
|
|
|
discoveryManager := NewManager(ctx, log.NewNopLogger())
|
2018-09-12 07:06:31 -07:00
|
|
|
discoveryManager.updatert = 100 * time.Millisecond
|
2018-06-13 08:34:59 -07:00
|
|
|
go discoveryManager.Run()
|
|
|
|
|
2019-09-24 09:11:43 -07:00
|
|
|
c := map[string]sd_config.ServiceDiscoveryConfig{
|
|
|
|
"prometheus": processedConfig.ScrapeConfigs[0].ServiceDiscoveryConfig,
|
2018-06-13 08:34:59 -07:00
|
|
|
}
|
|
|
|
discoveryManager.ApplyConfig(c)
|
|
|
|
<-discoveryManager.SyncCh()
|
|
|
|
|
2019-09-24 09:11:43 -07:00
|
|
|
origSdcfg := originalConfig.ScrapeConfigs[0].ServiceDiscoveryConfig
|
2018-06-13 08:34:59 -07:00
|
|
|
for _, sdcfg := range c {
|
2019-09-24 09:11:43 -07:00
|
|
|
if !reflect.DeepEqual(origSdcfg.StaticConfigs, sdcfg.StaticConfigs) {
|
2018-06-13 08:34:59 -07:00
|
|
|
t.Fatalf("discovery manager modified static config \n expected: %v\n got: %v\n",
|
2019-09-24 09:11:43 -07:00
|
|
|
origSdcfg.StaticConfigs, sdcfg.StaticConfigs)
|
2018-06-13 08:34:59 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-22 01:24:19 -08:00
|
|
|
func TestGaugeFailedConfigs(t *testing.T) {
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
|
|
|
discoveryManager := NewManager(ctx, log.NewNopLogger())
|
|
|
|
discoveryManager.updatert = 100 * time.Millisecond
|
|
|
|
go discoveryManager.Run()
|
|
|
|
|
2019-09-24 09:11:43 -07:00
|
|
|
c := map[string]sd_config.ServiceDiscoveryConfig{
|
2020-04-09 03:29:19 -07:00
|
|
|
"prometheus": {
|
2019-09-24 09:11:43 -07:00
|
|
|
ConsulSDConfigs: []*consul.SDConfig{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
Server: "foo:8500",
|
|
|
|
TLSConfig: common_config.TLSConfig{
|
|
|
|
CertFile: "/tmp/non_existent",
|
|
|
|
},
|
|
|
|
},
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
Server: "bar:8500",
|
|
|
|
TLSConfig: common_config.TLSConfig{
|
|
|
|
CertFile: "/tmp/non_existent",
|
|
|
|
},
|
|
|
|
},
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
Server: "foo2:8500",
|
|
|
|
TLSConfig: common_config.TLSConfig{
|
|
|
|
CertFile: "/tmp/non_existent",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2019-02-22 01:24:19 -08:00
|
|
|
}
|
|
|
|
discoveryManager.ApplyConfig(c)
|
|
|
|
<-discoveryManager.SyncCh()
|
|
|
|
|
2020-07-24 02:10:20 -07:00
|
|
|
failedCount := client_testutil.ToFloat64(failedConfigs)
|
2019-02-22 01:24:19 -08:00
|
|
|
if failedCount != 3 {
|
|
|
|
t.Fatalf("Expected to have 3 failed configs, got: %v", failedCount)
|
|
|
|
}
|
|
|
|
|
2019-09-24 09:11:43 -07:00
|
|
|
c["prometheus"] = sd_config.ServiceDiscoveryConfig{
|
|
|
|
StaticConfigs: []*targetgroup.Group{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
Source: "0",
|
|
|
|
Targets: []model.LabelSet{
|
2020-04-09 03:29:19 -07:00
|
|
|
{
|
2019-09-24 09:11:43 -07:00
|
|
|
model.AddressLabel: "foo:9090",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2019-02-22 01:24:19 -08:00
|
|
|
}
|
|
|
|
discoveryManager.ApplyConfig(c)
|
|
|
|
<-discoveryManager.SyncCh()
|
|
|
|
|
2020-07-24 02:10:20 -07:00
|
|
|
failedCount = client_testutil.ToFloat64(failedConfigs)
|
2019-02-22 01:24:19 -08:00
|
|
|
if failedCount != 0 {
|
|
|
|
t.Fatalf("Expected to get no failed config, got: %v", failedCount)
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2018-09-05 06:44:52 -07:00
|
|
|
func TestCoordinationWithReceiver(t *testing.T) {
|
|
|
|
updateDelay := 100 * time.Millisecond
|
|
|
|
|
|
|
|
type expect struct {
|
|
|
|
delay time.Duration
|
|
|
|
tgs map[string][]*targetgroup.Group
|
|
|
|
}
|
|
|
|
|
|
|
|
testCases := []struct {
|
|
|
|
title string
|
2018-09-12 01:15:57 -07:00
|
|
|
providers map[string]Discoverer
|
2018-09-05 06:44:52 -07:00
|
|
|
expected []expect
|
|
|
|
}{
|
2018-09-12 01:15:57 -07:00
|
|
|
{
|
2018-09-12 07:02:15 -07:00
|
|
|
title: "Receiver should get all updates even when one provider closes its channel",
|
2018-09-12 01:15:57 -07:00
|
|
|
providers: map[string]Discoverer{
|
|
|
|
"once1": &onceProvider{
|
|
|
|
tgs: []*targetgroup.Group{
|
|
|
|
{
|
|
|
|
Source: "tg1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
"mock1": newMockDiscoveryProvider(
|
|
|
|
update{
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 2 * updateDelay,
|
2018-09-12 01:15:57 -07:00
|
|
|
targetGroups: []targetgroup.Group{
|
|
|
|
{
|
|
|
|
Source: "tg2",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
},
|
|
|
|
expected: []expect{
|
|
|
|
{
|
|
|
|
tgs: map[string][]*targetgroup.Group{
|
2019-01-16 14:28:08 -08:00
|
|
|
"once1": {
|
2018-09-12 01:15:57 -07:00
|
|
|
{
|
|
|
|
Source: "tg1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
tgs: map[string][]*targetgroup.Group{
|
2019-01-16 14:28:08 -08:00
|
|
|
"once1": {
|
2018-09-12 01:15:57 -07:00
|
|
|
{
|
|
|
|
Source: "tg1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
},
|
2019-01-16 14:28:08 -08:00
|
|
|
"mock1": {
|
2018-09-12 01:15:57 -07:00
|
|
|
{
|
|
|
|
Source: "tg2",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2018-09-05 06:44:52 -07:00
|
|
|
{
|
2018-09-12 07:02:15 -07:00
|
|
|
title: "Receiver should get all updates even when the channel is blocked",
|
2018-09-12 01:15:57 -07:00
|
|
|
providers: map[string]Discoverer{
|
|
|
|
"mock1": newMockDiscoveryProvider(
|
2018-09-05 06:44:52 -07:00
|
|
|
update{
|
|
|
|
targetGroups: []targetgroup.Group{
|
|
|
|
{
|
|
|
|
Source: "tg1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
update{
|
2018-09-12 01:20:34 -07:00
|
|
|
interval: 4 * updateDelay,
|
2018-09-05 06:44:52 -07:00
|
|
|
targetGroups: []targetgroup.Group{
|
|
|
|
{
|
|
|
|
Source: "tg2",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2018-09-12 01:15:57 -07:00
|
|
|
),
|
2018-09-05 06:44:52 -07:00
|
|
|
},
|
|
|
|
expected: []expect{
|
|
|
|
{
|
|
|
|
delay: 2 * updateDelay,
|
|
|
|
tgs: map[string][]*targetgroup.Group{
|
2019-01-16 14:28:08 -08:00
|
|
|
"mock1": {
|
2018-09-05 06:44:52 -07:00
|
|
|
{
|
|
|
|
Source: "tg1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
delay: 4 * updateDelay,
|
|
|
|
tgs: map[string][]*targetgroup.Group{
|
2019-01-16 14:28:08 -08:00
|
|
|
"mock1": {
|
2018-09-05 06:44:52 -07:00
|
|
|
{
|
|
|
|
Source: "tg1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tg2",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tc := range testCases {
|
|
|
|
tc := tc
|
|
|
|
t.Run(tc.title, func(t *testing.T) {
|
2018-09-11 08:04:33 -07:00
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
2018-09-05 06:44:52 -07:00
|
|
|
defer cancel()
|
|
|
|
|
|
|
|
mgr := NewManager(ctx, nil)
|
|
|
|
mgr.updatert = updateDelay
|
|
|
|
go mgr.Run()
|
|
|
|
|
2018-09-12 01:15:57 -07:00
|
|
|
for name, p := range tc.providers {
|
2018-09-05 06:44:52 -07:00
|
|
|
mgr.StartCustomProvider(ctx, name, p)
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, expected := range tc.expected {
|
|
|
|
time.Sleep(expected.delay)
|
2018-09-11 08:04:33 -07:00
|
|
|
select {
|
|
|
|
case <-ctx.Done():
|
2018-09-12 01:15:57 -07:00
|
|
|
t.Fatalf("step %d: no update received in the expected timeframe", i)
|
2018-09-11 08:04:33 -07:00
|
|
|
case tgs, ok := <-mgr.SyncCh():
|
|
|
|
if !ok {
|
2018-09-12 01:15:57 -07:00
|
|
|
t.Fatalf("step %d: discovery manager channel is closed", i)
|
2018-09-11 08:04:33 -07:00
|
|
|
}
|
|
|
|
if len(tgs) != len(expected.tgs) {
|
|
|
|
t.Fatalf("step %d: target groups mismatch, got: %d, expected: %d\ngot: %#v\nexpected: %#v",
|
|
|
|
i, len(tgs), len(expected.tgs), tgs, expected.tgs)
|
|
|
|
}
|
|
|
|
for k := range expected.tgs {
|
|
|
|
if _, ok := tgs[k]; !ok {
|
2018-09-12 01:15:57 -07:00
|
|
|
t.Fatalf("step %d: target group not found: %s\ngot: %#v", i, k, tgs)
|
2018-09-11 08:04:33 -07:00
|
|
|
}
|
|
|
|
assertEqualGroups(t, tgs[k], expected.tgs[k], func(got, expected string) string {
|
|
|
|
return fmt.Sprintf("step %d: targets mismatch \ngot: %q \nexpected: %q", i, got, expected)
|
|
|
|
})
|
2018-09-05 06:44:52 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-11 18:39:08 -08:00
|
|
|
type update struct {
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
targetGroups []targetgroup.Group
|
2017-11-11 18:39:08 -08:00
|
|
|
interval time.Duration
|
|
|
|
}
|
|
|
|
|
2017-11-29 14:52:38 -08:00
|
|
|
type mockdiscoveryProvider struct {
|
|
|
|
updates []update
|
2017-11-06 09:33:52 -08:00
|
|
|
}
|
|
|
|
|
2018-09-12 01:15:57 -07:00
|
|
|
func newMockDiscoveryProvider(updates ...update) mockdiscoveryProvider {
|
2017-11-29 14:52:38 -08:00
|
|
|
tp := mockdiscoveryProvider{
|
|
|
|
updates: updates,
|
2017-11-06 09:33:52 -08:00
|
|
|
}
|
|
|
|
return tp
|
|
|
|
}
|
|
|
|
|
2018-09-05 06:44:52 -07:00
|
|
|
func (tp mockdiscoveryProvider) Run(ctx context.Context, upCh chan<- []*targetgroup.Group) {
|
|
|
|
for _, u := range tp.updates {
|
|
|
|
if u.interval > 0 {
|
2020-08-03 02:29:59 -07:00
|
|
|
select {
|
|
|
|
case <-ctx.Done():
|
|
|
|
return
|
|
|
|
case <-time.After(u.interval):
|
2018-09-05 06:44:52 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
tgs := make([]*targetgroup.Group, len(u.targetGroups))
|
|
|
|
for i := range u.targetGroups {
|
|
|
|
tgs[i] = &u.targetGroups[i]
|
2017-11-06 09:33:52 -08:00
|
|
|
}
|
2018-09-05 06:44:52 -07:00
|
|
|
upCh <- tgs
|
2017-11-06 08:14:15 -08:00
|
|
|
}
|
2018-09-05 06:44:52 -07:00
|
|
|
<-ctx.Done()
|
2017-11-06 08:14:15 -08:00
|
|
|
}
|
2018-01-04 13:41:54 -08:00
|
|
|
|
|
|
|
// byGroupSource implements sort.Interface so we can sort by the Source field.
|
|
|
|
type byGroupSource []*targetgroup.Group
|
|
|
|
|
|
|
|
func (a byGroupSource) Len() int { return len(a) }
|
|
|
|
func (a byGroupSource) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
|
|
|
func (a byGroupSource) Less(i, j int) bool { return a[i].Source < a[j].Source }
|
2018-09-11 08:04:33 -07:00
|
|
|
|
2018-09-12 01:15:57 -07:00
|
|
|
// onceProvider sends updates once (if any) and closes the update channel.
|
|
|
|
type onceProvider struct {
|
|
|
|
tgs []*targetgroup.Group
|
|
|
|
}
|
2018-09-11 08:04:33 -07:00
|
|
|
|
2018-09-12 01:15:57 -07:00
|
|
|
func (o onceProvider) Run(_ context.Context, ch chan<- []*targetgroup.Group) {
|
|
|
|
if len(o.tgs) > 0 {
|
|
|
|
ch <- o.tgs
|
|
|
|
}
|
2018-09-11 08:04:33 -07:00
|
|
|
close(ch)
|
|
|
|
}
|