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

Fixed metric labels so that metric are tagged correct. Also added nil check (#44)

Browse Source 
Signed-off-by: Arjun Naik <arjun.rn@gmail.com>
This commit is contained in:
Arjun
2019-04-05 16:05:37 +02:00
committed by GitHub
parent d5b803d923
commit 8db22f38a3
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/collector/pod_collector.go
View File

@@ -31,7 +31,7 @@ func (p *PodCollectorPlugin) NewCollector(hpa *autoscalingv2.HorizontalPodAutosc
type PodCollector struct { type PodCollector struct {
client kubernetes.Interface client kubernetes.Interface
Getter PodMetricsGetter Getter PodMetricsGetter
podLabelSelector string podLabelSelector *metav1.LabelSelector
namespace string namespace string
metric autoscalingv2.MetricIdentifier metric autoscalingv2.MetricIdentifier
metricType autoscalingv2.MetricSourceType metricType autoscalingv2.MetricSourceType
@@ -79,7 +79,7 @@ func NewPodCollector(client kubernetes.Interface, hpa *autoscalingv2.HorizontalP
func (c *PodCollector) GetMetrics() ([]CollectedMetric, error) { func (c *PodCollector) GetMetrics() ([]CollectedMetric, error) {
opts := metav1.ListOptions{ opts := metav1.ListOptions{
LabelSelector: c.podLabelSelector, LabelSelector: labels.Set(c.podLabelSelector.MatchLabels).String(),
} }
pods, err := c.client.CoreV1().Pods(c.namespace).List(opts) pods, err := c.client.CoreV1().Pods(c.namespace).List(opts)
@@ -106,7 +106,7 @@ func (c *PodCollector) GetMetrics() ([]CollectedMetric, error) {
Name: pod.Name, Name: pod.Name,
Namespace: pod.Namespace, Namespace: pod.Namespace,
}, },
Metric: custom_metrics.MetricIdentifier{Name: c.metric.Name, Selector: c.metric.Selector}, Metric: custom_metrics.MetricIdentifier{Name: c.metric.Name, Selector: c.podLabelSelector},
Timestamp: metav1.Time{Time: time.Now().UTC()}, Timestamp: metav1.Time{Time: time.Now().UTC()},
Value: *resource.NewMilliQuantity(int64(value*1000), resource.DecimalSI), Value: *resource.NewMilliQuantity(int64(value*1000), resource.DecimalSI),
}, },
@@ -122,21 +122,21 @@ func (c *PodCollector) Interval() time.Duration {
return c.interval return c.interval
} }
func getPodLabelSelector(client kubernetes.Interface, hpa *autoscalingv2.HorizontalPodAutoscaler) (string, error) { func getPodLabelSelector(client kubernetes.Interface, hpa *autoscalingv2.HorizontalPodAutoscaler) (*metav1.LabelSelector, error) {
switch hpa.Spec.ScaleTargetRef.Kind { switch hpa.Spec.ScaleTargetRef.Kind {
case "Deployment": case "Deployment":
deployment, err := client.AppsV1().Deployments(hpa.Namespace).Get(hpa.Spec.ScaleTargetRef.Name, metav1.GetOptions{}) deployment, err := client.AppsV1().Deployments(hpa.Namespace).Get(hpa.Spec.ScaleTargetRef.Name, metav1.GetOptions{})
if err != nil { if err != nil {
return "", err return nil, err
} }
return labels.Set(deployment.Spec.Selector.MatchLabels).String(), nil return deployment.Spec.Selector, nil
case "StatefulSet": case "StatefulSet":
sts, err := client.AppsV1().StatefulSets(hpa.Namespace).Get(hpa.Spec.ScaleTargetRef.Name, metav1.GetOptions{}) sts, err := client.AppsV1().StatefulSets(hpa.Namespace).Get(hpa.Spec.ScaleTargetRef.Name, metav1.GetOptions{})
if err != nil { if err != nil {
return "", err return nil, err
} }
return labels.Set(sts.Spec.Selector.MatchLabels).String(), nil return sts.Spec.Selector, nil
} }
return "", fmt.Errorf("unable to get pod label selector for scale target ref '%s'", hpa.Spec.ScaleTargetRef.Kind) return nil, fmt.Errorf("unable to get pod label selector for scale target ref '%s'", hpa.Spec.ScaleTargetRef.Kind)
} }

2
pkg/provider/metric_store.go
View File

@@ -173,7 +173,7 @@ func (s *MetricStore) GetMetricsBySelector(namespace string, selector labels.Sel
} }
} else if metricMap, ok := group[namespace]; ok { } else if metricMap, ok := group[namespace]; ok {
for _, metric := range metricMap { for _, metric := range metricMap {
if selector.Matches(labels.Set(metric.Value.Metric.Selector.MatchLabels)) { if metric.Value.Metric.Selector != nil && selector.Matches(labels.Set(metric.Value.Metric.Selector.MatchLabels)) {
matchedMetrics = append(matchedMetrics, metric.Value) matchedMetrics = append(matchedMetrics, metric.Value)
} }
} }