Skip to content

feat(kube-eagle): Add pod labels to metrics #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Prayer3th wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(kube-eagle): Add pod labels to metrics #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions collector/container_resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
log "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
v1beta1 "k8s.io/metrics/pkg/apis/metrics/v1beta1"
"strings"
"sync"
)

Expand All @@ -27,9 +28,17 @@ func init() {
registerCollector("container_resources", newContainerResourcesCollector)
}

var labels []string

func newContainerResourcesCollector(opts *options.Options) (Collector, error) {
subsystem := "pod_container_resource"
labels := []string{"pod", "container", "qos", "phase", "namespace", "node"}

// Determine whether to open labels
if opts.EnableLabels {
labels = []string{"pod", "labels", "container", "qos", "phase", "namespace", "node"}
} else {
labels = []string{"pod", "container", "qos", "phase", "namespace", "node"}
}

return &containerResourcesCollector{
// Prometheus metrics
Expand Down Expand Up @@ -111,23 +120,28 @@ func (c *containerResourcesCollector) updateMetrics(ch chan<- prometheus.Metric)
containerMetricses := buildEnrichedContainerMetricses(podList, podMetricses)

for _, containerMetrics := range containerMetricses {
var labelValues []string
cm := *containerMetrics
log.Debugf("Test")
labelValues := []string{cm.Pod, cm.Container, cm.Qos, cm.Phase, cm.Namespace, cm.Node}
labelValues = []string{cm.Pod, cm.Container, cm.Qos, cm.Phase, cm.Namespace, cm.Node}
// Determine whether the array contains labels
if itemExists(labels, "labels") {
labelValues = []string{cm.Pod, cm.Labels, cm.Container, cm.Qos, cm.Phase, cm.Namespace, cm.Node}
}
ch <- prometheus.MustNewConstMetric(c.requestCPUCoresDesc, prometheus.GaugeValue, cm.RequestCPUCores, labelValues...)
ch <- prometheus.MustNewConstMetric(c.requestMemoryBytesDesc, prometheus.GaugeValue, cm.RequestMemoryBytes, labelValues...)
ch <- prometheus.MustNewConstMetric(c.limitCPUCoresDesc, prometheus.GaugeValue, cm.LimitCPUCores, labelValues...)
ch <- prometheus.MustNewConstMetric(c.limitMemoryBytesDesc, prometheus.GaugeValue, cm.LimitMemoryBytes, labelValues...)
ch <- prometheus.MustNewConstMetric(c.usageCPUCoresDesc, prometheus.GaugeValue, cm.UsageCPUCores, labelValues...)
ch <- prometheus.MustNewConstMetric(c.usageMemoryBytesDesc, prometheus.GaugeValue, cm.UsageMemoryBytes, labelValues...)
}

return nil
}

type enrichedContainerMetricses struct {
Node string
Pod string
Labels string
Container string
Qos string
Phase string
Expand Down Expand Up @@ -161,6 +175,14 @@ func buildEnrichedContainerMetricses(podList *corev1.PodList, podMetricses *v1be
for _, containerInfo := range containers {
qos := string(podInfo.Status.QOSClass)

// Labels map to string
var labelString string
for labelKey, labelValue := range podInfo.Labels {
label := labelKey + ":" + labelValue
labelString = labelString + label + " "
}
labelString = strings.TrimSpace(labelString)

// Resources requested
requestCPUCores := float64(containerInfo.Resources.Requests.Cpu().MilliValue()) / 1000
requestMemoryBytes := float64(containerInfo.Resources.Requests.Memory().MilliValue()) / 1000
Expand All @@ -179,6 +201,7 @@ func buildEnrichedContainerMetricses(podList *corev1.PodList, podMetricses *v1be
Node: nodeName,
Container: containerInfo.Name,
Pod: podInfo.Name,
Labels: labelString,
Qos: qos,
Phase: string(podInfo.Status.Phase),
Namespace: podInfo.Namespace,
Expand All @@ -195,3 +218,12 @@ func buildEnrichedContainerMetricses(podList *corev1.PodList, podMetricses *v1be

return containerMetricses
}

func itemExists(items []string, item string) bool {
for _, eachItem := range items {
if eachItem == item {
return true
}
}
return false
}
7 changes: 4 additions & 3 deletions options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ type Options struct {
// Host - Host to bind socket on for the prometheus exporter
// Port - Port to listen on for the prometheus exporter
// Namespace - Prefix of exposed prometheus metrics
Host string `envconfig:"TELEMETRY_HOST" default:"0.0.0.0"`
Port int `envconfig:"TELEMETRY_PORT" default:"8080"`
Namespace string `envconfig:"METRICS_NAMESPACE" default:"eagle"`
Host string `envconfig:"TELEMETRY_HOST" default:"0.0.0.0"`
Port int `envconfig:"TELEMETRY_PORT" default:"8080"`
Namespace string `envconfig:"METRICS_NAMESPACE" default:"eagle"`
EnableLabels bool `envconfig:"ENABLE_LABELS" default:"false"`

// Logger
// LogLevel - Logger's log granularity (debug, info, warn, error, fatal, panic)
Expand Down