emansije/kube-metrics-adapter
1
0
Fork 0
forked from yusheng-guo/kube-metrics-adapter
Code Pull Requests Activity

Remove unused Configuration key from MetricConfig

Browse Source 
This fixes an issue of setting up a ZMON collector where the incorrect
key `Configuration` was used, which was not initialized in the metrics
config parser. The `Config` key is the right one to use.

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
This commit is contained in:
Mikkel Oscar Lyderik Larsen
2019-04-26 16:19:49 +02:00
parent 5a6f4997bd
commit 3f019a1ceb
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/collector/collector.go
View File

@@ -165,7 +165,6 @@ type MetricConfig struct {
ObjectReference custom_metrics.ObjectReference ObjectReference custom_metrics.ObjectReference
PerReplica bool PerReplica bool
Interval time.Duration Interval time.Duration
Configuration map[string]string
} }
// ParseHPAMetrics parses the HPA object into a list of metric configurations. // ParseHPAMetrics parses the HPA object into a list of metric configurations.

10
pkg/collector/zmon_collector.go
View File

@@ -69,7 +69,7 @@ type ZMONCollector struct {
// NewZMONCollector initializes a new ZMONCollector. // NewZMONCollector initializes a new ZMONCollector.
func NewZMONCollector(zmon zmon.ZMON, config *MetricConfig, annotations map[string]string, interval time.Duration) (*ZMONCollector, error) { func NewZMONCollector(zmon zmon.ZMON, config *MetricConfig, annotations map[string]string, interval time.Duration) (*ZMONCollector, error) {
checkIDStr, ok := config.Configuration[zmonCheckIDLabelKey] checkIDStr, ok := config.Config[zmonCheckIDLabelKey]
if !ok { if !ok {
return nil, fmt.Errorf("ZMON check ID not specified on metric") return nil, fmt.Errorf("ZMON check ID not specified on metric")
} }
@@ -82,7 +82,7 @@ func NewZMONCollector(zmon zmon.ZMON, config *MetricConfig, annotations map[stri
key := "" key := ""
// get optional key // get optional key
if k, ok := config.Configuration[zmonKeyLabelKey]; ok { if k, ok := config.Config[zmonKeyLabelKey]; ok {
key = k key = k
} }
@@ -94,7 +94,7 @@ func NewZMONCollector(zmon zmon.ZMON, config *MetricConfig, annotations map[stri
duration := defaultQueryDuration duration := defaultQueryDuration
// parse optional duration value // parse optional duration value
if d, ok := config.Configuration[zmonDurationLabelKey]; ok { if d, ok := config.Config[zmonDurationLabelKey]; ok {
duration, err = time.ParseDuration(d) duration, err = time.ParseDuration(d)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -103,7 +103,7 @@ func NewZMONCollector(zmon zmon.ZMON, config *MetricConfig, annotations map[stri
// parse tags // parse tags
tags := make(map[string]string) tags := make(map[string]string)
for k, v := range config.Configuration { for k, v := range config.Config {
if strings.HasPrefix(k, zmonTagPrefixLabelKey) { if strings.HasPrefix(k, zmonTagPrefixLabelKey) {
key := strings.TrimPrefix(k, zmonTagPrefixLabelKey) key := strings.TrimPrefix(k, zmonTagPrefixLabelKey)
tags[key] = v tags[key] = v
@@ -122,7 +122,7 @@ func NewZMONCollector(zmon zmon.ZMON, config *MetricConfig, annotations map[stri
// default aggregator is last // default aggregator is last
aggregators := []string{"last"} aggregators := []string{"last"}
if k, ok := config.Configuration[zmonAggregatorsLabelKey]; ok { if k, ok := config.Config[zmonAggregatorsLabelKey]; ok {
aggregators = strings.Split(k, ",") aggregators = strings.Split(k, ",")
} }

6
pkg/collector/zmon_collector_test.go
View File

@@ -28,7 +28,7 @@ func TestZMONCollectorNewCollector(t *testing.T) {
MetricTypeName: MetricTypeName{ MetricTypeName: MetricTypeName{
Metric: newMetricIdentifier(ZMONCheckMetric), Metric: newMetricIdentifier(ZMONCheckMetric),
}, },
Configuration: map[string]string{ Config: map[string]string{
zmonCheckIDLabelKey: "1234", zmonCheckIDLabelKey: "1234",
zmonAggregatorsLabelKey: "max", zmonAggregatorsLabelKey: "max",
zmonTagPrefixLabelKey + "alias": "cluster_alias", zmonTagPrefixLabelKey + "alias": "cluster_alias",
@@ -70,7 +70,7 @@ func TestZMONCollectorNewCollector(t *testing.T) {
require.Error(t, err) require.Error(t, err)
// should fail if the check id is not specified. // should fail if the check id is not specified.
delete(config.Configuration, zmonCheckIDLabelKey) delete(config.Config, zmonCheckIDLabelKey)
config.Metric.Name = ZMONCheckMetric config.Metric.Name = ZMONCheckMetric
_, err = collectPlugin.NewCollector(nil, config, 1*time.Second) _, err = collectPlugin.NewCollector(nil, config, 1*time.Second)
require.Error(t, err) require.Error(t, err)
@@ -88,7 +88,7 @@ func TestZMONCollectorGetMetrics(tt *testing.T) {
Metric: newMetricIdentifier(ZMONCheckMetric), Metric: newMetricIdentifier(ZMONCheckMetric),
Type: "foo", Type: "foo",
}, },
Configuration: map[string]string{ Config: map[string]string{
zmonCheckIDLabelKey: "1234", zmonCheckIDLabelKey: "1234",
zmonAggregatorsLabelKey: "max", zmonAggregatorsLabelKey: "max",
zmonTagPrefixLabelKey + "alias": "cluster_alias", zmonTagPrefixLabelKey + "alias": "cluster_alias",