2016-11-22 11:48:30 +00: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-25 04:21:42 +00:00
|
|
|
"context"
|
2017-11-29 22:52:38 +00:00
|
|
|
"fmt"
|
2017-11-12 02:39:08 +00:00
|
|
|
"reflect"
|
2018-01-04 21:41:54 +00:00
|
|
|
"sort"
|
2017-11-29 22:52:38 +00:00
|
|
|
"strconv"
|
2016-11-22 11:48:30 +00:00
|
|
|
"testing"
|
2017-11-06 17:33:52 +00:00
|
|
|
"time"
|
2016-11-22 11:48:30 +00:00
|
|
|
|
2017-11-12 02:39:08 +00:00
|
|
|
"github.com/prometheus/common/model"
|
2016-11-22 11:48:30 +00:00
|
|
|
"github.com/prometheus/prometheus/config"
|
2017-12-30 17:47:18 +00:00
|
|
|
sd_config "github.com/prometheus/prometheus/discovery/config"
|
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 20:01:34 +00:00
|
|
|
"github.com/prometheus/prometheus/discovery/targetgroup"
|
|
|
|
"gopkg.in/yaml.v2"
|
2016-11-22 11:48:30 +00:00
|
|
|
)
|
|
|
|
|
2018-01-27 12:03:06 +00:00
|
|
|
// TestTargetUpdatesOrder checks that the target updates are received in the expected order.
|
|
|
|
func TestTargetUpdatesOrder(t *testing.T) {
|
2017-11-29 22:52:38 +00:00
|
|
|
|
|
|
|
// The order by which the updates are send is detirmened by the interval passed to the mock discovery adapter
|
|
|
|
// 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-12 02:39:08 +00:00
|
|
|
testCases := []struct {
|
2017-11-29 22:52:38 +00: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 20:01:34 +00:00
|
|
|
expectedTargets [][]*targetgroup.Group
|
2017-11-12 02:39:08 +00:00
|
|
|
}{
|
|
|
|
{
|
|
|
|
title: "Single TP no updates",
|
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
expectedTargets: nil,
|
2017-11-06 17:33:52 +00:00
|
|
|
},
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
|
|
|
title: "Multips TPs no updates",
|
|
|
|
updates: map[string][]update{
|
|
|
|
"tp1": {},
|
|
|
|
"tp2": {},
|
|
|
|
"tp3": {},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
expectedTargets: nil,
|
2017-11-06 17:33:52 +00:00
|
|
|
},
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{},
|
2017-11-12 02:39:08 +00:00
|
|
|
interval: 5,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
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 20:01:34 +00:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-12 02:39:08 +00:00
|
|
|
{},
|
|
|
|
},
|
2017-11-06 17:33:52 +00:00
|
|
|
},
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{},
|
2017-11-12 02:39:08 +00:00
|
|
|
interval: 5,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
"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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{},
|
2017-11-29 22:52:38 +00:00
|
|
|
interval: 200,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{},
|
2017-11-12 02:39:08 +00:00
|
|
|
interval: 100,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
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 20:01:34 +00:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{},
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
}},
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-12-01 12:59:24 +00:00
|
|
|
{
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-12-01 12:59:24 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-12-01 12:59:24 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-12-01 12:59:24 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-12-01 12:59:24 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group1",
|
2017-12-01 12:59:24 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
interval: 10,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-12-01 12:59:24 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
}, {
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-12-01 12:59:24 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
interval: 0,
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
|
|
|
{
|
|
|
|
Source: "tp1_group1",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group2",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
interval: 10,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2018-01-04 21:41:54 +00:00
|
|
|
{
|
|
|
|
{
|
|
|
|
Source: "tp1_group1",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group2",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2017-11-29 22:52:38 +00:00
|
|
|
title: "Single TP initials and new groups",
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
interval: 0,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
|
|
|
},
|
2018-01-04 21:41:54 +00:00
|
|
|
{
|
|
|
|
Source: "tp1_group3",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
},
|
|
|
|
interval: 10,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
2018-01-04 21:41:54 +00:00
|
|
|
{
|
|
|
|
Source: "tp1_group3",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2017-11-29 22:52:38 +00:00
|
|
|
title: "Multiple TPs initials and new groups",
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
interval: 10,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group3",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group4",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
interval: 500,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
interval: 100,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group3",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "7"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group4",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "8"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
interval: 10,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp2_group2",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp2_group3",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "7"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group4",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "8"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group2",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group3",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group4",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group1",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp2_group2",
|
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp2_group3",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "7"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group4",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "8"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2017-11-06 17:33:52 +00:00
|
|
|
},
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
title: "One TP initials arrive after other TP updates.",
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
interval: 10,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
interval: 150,
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
"tp2": {
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
interval: 200,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "7"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "8"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
interval: 100,
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00: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 20:01:34 +00:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
},
|
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "5"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "6"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "7"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp2_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "8"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
title: "Single TP empty update in between",
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
interval: 30,
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
|
|
|
{
|
|
|
|
Source: "tp1_group1",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group2",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
interval: 10,
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups: []targetgroup.Group{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00:00
|
|
|
interval: 300,
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
2017-11-29 22:52:38 +00: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 20:01:34 +00:00
|
|
|
expectedTargets: [][]*targetgroup.Group{
|
2017-11-29 22:52:38 +00:00
|
|
|
{
|
2017-11-12 02:39:08 +00:00
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "1"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "2"}},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group1",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Source: "tp1_group2",
|
|
|
|
Targets: []model.LabelSet{},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Source: "tp1_group1",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "3"}},
|
|
|
|
},
|
|
|
|
{
|
2018-01-04 21:41:54 +00:00
|
|
|
Source: "tp1_group2",
|
2017-11-29 22:52:38 +00:00
|
|
|
Targets: []model.LabelSet{{"__instance__": "4"}},
|
2017-11-12 02:39:08 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2017-11-29 22:52:38 +00:00
|
|
|
for testIndex, testCase := range testCases {
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
2018-01-26 13:31:59 +00:00
|
|
|
discoveryManager := NewManager(ctx, nil)
|
2017-11-12 02:39:08 +00:00
|
|
|
|
2017-11-29 22:52:38 +00:00
|
|
|
var totalUpdatesCount int
|
2017-11-12 02:39:08 +00:00
|
|
|
|
2018-01-27 12:03:06 +00:00
|
|
|
provUpdates := make(chan []*targetgroup.Group)
|
|
|
|
for _, up := range testCase.updates {
|
|
|
|
go newMockDiscoveryProvider(up).Run(ctx, provUpdates)
|
|
|
|
if len(up) > 0 {
|
|
|
|
totalUpdatesCount = totalUpdatesCount + len(up)
|
2017-11-06 17:33:52 +00:00
|
|
|
}
|
2017-11-12 02:39:08 +00:00
|
|
|
}
|
|
|
|
|
2017-11-29 22:52:38 +00:00
|
|
|
Loop:
|
|
|
|
for x := 0; x < totalUpdatesCount; x++ {
|
|
|
|
select {
|
|
|
|
case <-time.After(10 * time.Second):
|
|
|
|
t.Errorf("%v. %q: no update arrived within the timeout limit", x, testCase.title)
|
|
|
|
break Loop
|
2018-01-27 12:03:06 +00:00
|
|
|
case tgs := <-provUpdates:
|
|
|
|
discoveryManager.updateGroup(poolKey{setName: strconv.Itoa(testIndex), provider: testCase.title}, tgs)
|
|
|
|
for _, received := range discoveryManager.allGroups() {
|
|
|
|
// Need to sort by the Groups source as the received order is not guaranteed.
|
2018-01-04 21:41:54 +00:00
|
|
|
sort.Sort(byGroupSource(received))
|
2017-11-29 22:52:38 +00:00
|
|
|
if !reflect.DeepEqual(received, testCase.expectedTargets[x]) {
|
|
|
|
var receivedFormated string
|
|
|
|
for _, receivedTargets := range received {
|
|
|
|
receivedFormated = receivedFormated + receivedTargets.Source + ":" + fmt.Sprint(receivedTargets.Targets)
|
|
|
|
}
|
|
|
|
var expectedFormated string
|
2017-12-01 12:59:24 +00:00
|
|
|
for _, expectedTargets := range testCase.expectedTargets[x] {
|
|
|
|
expectedFormated = expectedFormated + expectedTargets.Source + ":" + fmt.Sprint(expectedTargets.Targets)
|
2017-11-29 22:52:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
t.Errorf("%v. %v: \ntargets mismatch \nreceived: %v \nexpected: %v",
|
|
|
|
x, testCase.title,
|
|
|
|
receivedFormated,
|
|
|
|
expectedFormated)
|
|
|
|
}
|
2017-11-06 17:33:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-11-29 22:52:38 +00:00
|
|
|
}
|
|
|
|
}
|
2017-11-12 02:39:08 +00:00
|
|
|
|
2017-11-29 22:52:38 +00:00
|
|
|
func TestTargetSetRecreatesTargetGroupsEveryRun(t *testing.T) {
|
2018-01-04 21:41:54 +00:00
|
|
|
verifyPresence := func(tSets map[poolKey]map[string]*targetgroup.Group, poolKey poolKey, label string, present bool) {
|
2017-12-03 13:56:28 +00:00
|
|
|
if _, ok := tSets[poolKey]; !ok {
|
|
|
|
t.Fatalf("'%s' should be present in Pool keys: %v", poolKey, tSets)
|
2017-11-29 22:52:38 +00:00
|
|
|
return
|
2017-11-12 02:39:08 +00:00
|
|
|
}
|
|
|
|
|
2017-11-29 22:52:38 +00:00
|
|
|
match := false
|
|
|
|
var mergedTargets string
|
2017-12-03 13:56:28 +00:00
|
|
|
for _, targetGroup := range tSets[poolKey] {
|
2017-11-12 02:39:08 +00:00
|
|
|
|
2017-11-29 22:52:38 +00:00
|
|
|
for _, l := range targetGroup.Targets {
|
|
|
|
mergedTargets = mergedTargets + " " + l.String()
|
|
|
|
if l.String() == label {
|
|
|
|
match = true
|
|
|
|
}
|
|
|
|
}
|
2017-11-12 02:39:08 +00:00
|
|
|
|
|
|
|
}
|
2017-11-29 22:52:38 +00:00
|
|
|
if match != present {
|
2016-11-22 11:48:30 +00:00
|
|
|
msg := ""
|
|
|
|
if !present {
|
2017-11-29 22:52:38 +00:00
|
|
|
msg = "not"
|
2016-11-22 11:48:30 +00:00
|
|
|
}
|
2017-11-29 22:52:38 +00:00
|
|
|
t.Fatalf("'%s' should %s be present in Targets labels: %v", label, msg, mergedTargets)
|
2016-11-22 11:48:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-29 22:52:38 +00:00
|
|
|
cfg := &config.Config{}
|
2016-11-22 11:48:30 +00:00
|
|
|
|
|
|
|
sOne := `
|
2017-11-29 22:52:38 +00:00
|
|
|
scrape_configs:
|
|
|
|
- job_name: 'prometheus'
|
|
|
|
static_configs:
|
|
|
|
- targets: ["foo:9090"]
|
|
|
|
- targets: ["bar:9090"]
|
2016-11-22 11:48:30 +00:00
|
|
|
`
|
2018-04-04 08:07:39 +00:00
|
|
|
if err := yaml.UnmarshalStrict([]byte(sOne), cfg); err != nil {
|
2016-11-22 11:48:30 +00:00
|
|
|
t.Fatalf("Unable to load YAML config sOne: %s", err)
|
|
|
|
}
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
2018-01-26 13:31:59 +00:00
|
|
|
discoveryManager := NewManager(ctx, nil)
|
|
|
|
go discoveryManager.Run()
|
2016-11-22 11:48:30 +00:00
|
|
|
|
2017-12-30 17:47:18 +00:00
|
|
|
c := make(map[string]sd_config.ServiceDiscoveryConfig)
|
|
|
|
for _, v := range cfg.ScrapeConfigs {
|
|
|
|
c[v.JobName] = v.ServiceDiscoveryConfig
|
|
|
|
}
|
|
|
|
discoveryManager.ApplyConfig(c)
|
2016-11-22 11:48:30 +00:00
|
|
|
|
2018-02-26 07:58:10 +00:00
|
|
|
<-discoveryManager.SyncCh()
|
2017-12-18 19:41:31 +00:00
|
|
|
verifyPresence(discoveryManager.targets, poolKey{setName: "prometheus", provider: "static/0"}, "{__address__=\"foo:9090\"}", true)
|
|
|
|
verifyPresence(discoveryManager.targets, poolKey{setName: "prometheus", provider: "static/0"}, "{__address__=\"bar:9090\"}", true)
|
2016-11-22 11:48:30 +00:00
|
|
|
|
|
|
|
sTwo := `
|
2017-11-29 22:52:38 +00:00
|
|
|
scrape_configs:
|
|
|
|
- job_name: 'prometheus'
|
|
|
|
static_configs:
|
|
|
|
- targets: ["foo:9090"]
|
2016-11-22 11:48:30 +00:00
|
|
|
`
|
2018-04-04 08:07:39 +00:00
|
|
|
if err := yaml.UnmarshalStrict([]byte(sTwo), cfg); err != nil {
|
2017-11-29 22:52:38 +00:00
|
|
|
t.Fatalf("Unable to load YAML config sOne: %s", err)
|
2017-11-06 17:33:52 +00:00
|
|
|
}
|
2017-12-30 17:47:18 +00:00
|
|
|
c = make(map[string]sd_config.ServiceDiscoveryConfig)
|
|
|
|
for _, v := range cfg.ScrapeConfigs {
|
|
|
|
c[v.JobName] = v.ServiceDiscoveryConfig
|
|
|
|
}
|
|
|
|
discoveryManager.ApplyConfig(c)
|
2017-11-06 17:33:52 +00:00
|
|
|
|
2018-02-26 07:58:10 +00:00
|
|
|
<-discoveryManager.SyncCh()
|
2017-12-18 19:41:31 +00:00
|
|
|
verifyPresence(discoveryManager.targets, poolKey{setName: "prometheus", provider: "static/0"}, "{__address__=\"foo:9090\"}", true)
|
|
|
|
verifyPresence(discoveryManager.targets, poolKey{setName: "prometheus", provider: "static/0"}, "{__address__=\"bar:9090\"}", false)
|
2017-11-06 17:33:52 +00:00
|
|
|
}
|
|
|
|
|
2017-11-12 02:39:08 +00: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 20:01:34 +00:00
|
|
|
targetGroups []targetgroup.Group
|
2017-11-12 02:39:08 +00:00
|
|
|
interval time.Duration
|
|
|
|
}
|
|
|
|
|
2017-11-29 22:52:38 +00:00
|
|
|
type mockdiscoveryProvider struct {
|
|
|
|
updates []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 20:01:34 +00:00
|
|
|
up chan<- []*targetgroup.Group
|
2017-11-06 17:33:52 +00:00
|
|
|
}
|
|
|
|
|
2017-11-29 22:52:38 +00:00
|
|
|
func newMockDiscoveryProvider(updates []update) mockdiscoveryProvider {
|
2017-11-06 17:33:52 +00:00
|
|
|
|
2017-11-29 22:52:38 +00:00
|
|
|
tp := mockdiscoveryProvider{
|
|
|
|
updates: updates,
|
2017-11-06 17:33:52 +00:00
|
|
|
}
|
|
|
|
return tp
|
|
|
|
}
|
|
|
|
|
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 20:01:34 +00:00
|
|
|
func (tp mockdiscoveryProvider) Run(ctx context.Context, up chan<- []*targetgroup.Group) {
|
2017-11-06 17:33:52 +00:00
|
|
|
tp.up = up
|
|
|
|
tp.sendUpdates()
|
|
|
|
}
|
|
|
|
|
2017-11-29 22:52:38 +00:00
|
|
|
func (tp mockdiscoveryProvider) sendUpdates() {
|
2017-11-06 17:33:52 +00:00
|
|
|
for _, update := range tp.updates {
|
|
|
|
|
|
|
|
time.Sleep(update.interval * time.Millisecond)
|
|
|
|
|
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 20:01:34 +00:00
|
|
|
tgs := make([]*targetgroup.Group, len(update.targetGroups))
|
2017-11-12 02:39:08 +00:00
|
|
|
for i := range update.targetGroups {
|
|
|
|
tgs[i] = &update.targetGroups[i]
|
2017-11-06 17:33:52 +00:00
|
|
|
}
|
|
|
|
tp.up <- tgs
|
2017-11-06 16:14:15 +00:00
|
|
|
}
|
|
|
|
}
|
2018-01-04 21:41:54 +00: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 }
|