From 04910ba52e34d6a16d26c836ea2f66c0cb72dabb Mon Sep 17 00:00:00 2001 From: Gilles Miraillet Date: Thu, 12 Oct 2023 16:54:35 +0200 Subject: [PATCH] fix wrongly renamed label applicationID --- collectors/applications.go | 10 +++++----- collectors/service_bindings.go | 2 +- collectors/tasks.go | 30 +++++++++++++++--------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/collectors/applications.go b/collectors/applications.go index c60c78dc..18165860 100644 --- a/collectors/applications.go +++ b/collectors/applications.go @@ -39,7 +39,7 @@ func NewApplicationsCollector( Help: "Labeled Cloud Foundry Application information with a constant '1' value.", ConstLabels: prometheus.Labels{"environment": environment, "deployment": deployment}, }, - []string{"applicationID", "application_name", "detected_buildpack", "buildpack", "organization_id", "organization_name", "space_id", "space_name", "stack_id", "state"}, + []string{"application_id", "application_name", "detected_buildpack", "buildpack", "organization_id", "organization_name", "space_id", "space_name", "stack_id", "state"}, ) applicationInstancesMetric := prometheus.NewGaugeVec( @@ -50,7 +50,7 @@ func NewApplicationsCollector( Help: "Number of desired Cloud Foundry Application Instances.", ConstLabels: prometheus.Labels{"environment": environment, "deployment": deployment}, }, - []string{"applicationID", "application_name", "organization_id", "organization_name", "space_id", "space_name", "state"}, + []string{"application_id", "application_name", "organization_id", "organization_name", "space_id", "space_name", "state"}, ) applicationInstancesRunningMetric := prometheus.NewGaugeVec( @@ -61,7 +61,7 @@ func NewApplicationsCollector( Help: "Number of running Cloud Foundry Application Instances.", ConstLabels: prometheus.Labels{"environment": environment, "deployment": deployment}, }, - []string{"applicationID", "application_name", "organization_id", "organization_name", "space_id", "space_name", "state"}, + []string{"application_id", "application_name", "organization_id", "organization_name", "space_id", "space_name", "state"}, ) applicationMemoryMbMetric := prometheus.NewGaugeVec( @@ -72,7 +72,7 @@ func NewApplicationsCollector( Help: "Cloud Foundry Application Memory (Mb).", ConstLabels: prometheus.Labels{"environment": environment, "deployment": deployment}, }, - []string{"applicationID", "application_name", "organization_id", "organization_name", "space_id", "space_name"}, + []string{"application_id", "application_name", "organization_id", "organization_name", "space_id", "space_name"}, ) applicationDiskQuotaMbMetric := prometheus.NewGaugeVec( @@ -83,7 +83,7 @@ func NewApplicationsCollector( Help: "Cloud Foundry Application Disk Quota (Mb).", ConstLabels: prometheus.Labels{"environment": environment, "deployment": deployment}, }, - []string{"applicationID", "application_name", "organization_id", "organization_name", "space_id", "space_name"}, + []string{"application_id", "application_name", "organization_id", "organization_name", "space_id", "space_name"}, ) applicationsScrapesTotalMetric := prometheus.NewCounter( diff --git a/collectors/service_bindings.go b/collectors/service_bindings.go index 8935a8c5..7cff5076 100644 --- a/collectors/service_bindings.go +++ b/collectors/service_bindings.go @@ -32,7 +32,7 @@ func NewServiceBindingsCollector( Help: "Labeled Cloud Foundry Service Binding information with a constant '1' value.", ConstLabels: prometheus.Labels{"environment": environment, "deployment": deployment}, }, - []string{"service_binding_id", "applicationID", "service_instance_id"}, + []string{"service_binding_id", "application_id", "service_instance_id"}, ) serviceBindingsScrapesTotalMetric := prometheus.NewCounter( diff --git a/collectors/tasks.go b/collectors/tasks.go index 84072492..53849b92 100644 --- a/collectors/tasks.go +++ b/collectors/tasks.go @@ -36,7 +36,7 @@ func NewTasksCollector( Help: "Labeled Cloud Foundry Task information with a constant '1' value.", ConstLabels: prometheus.Labels{"environment": environment, "deployment": deployment}, }, - []string{"applicationID", "state"}, + []string{"application_id", "state"}, ) tasksCountMetric := prometheus.NewGaugeVec( @@ -47,7 +47,7 @@ func NewTasksCollector( Help: "Number of Cloud Foundry Tasks.", ConstLabels: prometheus.Labels{"environment": environment, "deployment": deployment}, }, - []string{"applicationID", "state"}, + []string{"application_id", "state"}, ) tasksMemoryMbSumMetric := prometheus.NewGaugeVec( @@ -58,7 +58,7 @@ func NewTasksCollector( Help: "Sum of Cloud Foundry Tasks Memory (Mb).", ConstLabels: prometheus.Labels{"environment": environment, "deployment": deployment}, }, - []string{"applicationID", "state"}, + []string{"application_id", "state"}, ) tasksDiskQuotaMbSumMetric := prometheus.NewGaugeVec( @@ -69,7 +69,7 @@ func NewTasksCollector( Help: "Sum of Cloud Foundry Tasks Disk Quota (Mb).", ConstLabels: prometheus.Labels{"environment": environment, "deployment": deployment}, }, - []string{"applicationID", "state"}, + []string{"application_id", "state"}, ) tasksOldestCreatedAtMetric := prometheus.NewGaugeVec( @@ -80,7 +80,7 @@ func NewTasksCollector( Help: "Number of seconds since 1970 of creation time of oldest Cloud Foundry task.", ConstLabels: prometheus.Labels{"environment": environment, "deployment": deployment}, }, - []string{"applicationID", "state"}, + []string{"application_id", "state"}, ) tasksScrapesTotalMetric := prometheus.NewCounter( @@ -194,16 +194,16 @@ func (c TasksCollector) reportTasksMetrics(objs *models.CFObjects, ch chan<- pro c.tasksOldestCreatedAtMetric.Reset() type keyType struct { - applicationID string - state string + application_id string + state string } groupedTasks := map[keyType][]models.Task{} for _, task := range objs.Tasks { - applicationID := "unavailable" + application_id := "unavailable" if app, ok := task.Relationships["app"]; ok && app.GUID != "" { - applicationID = app.GUID + application_id = app.GUID } - key := keyType{applicationID, string(task.State)} + key := keyType{application_id, string(task.State)} existingValue, ok := groupedTasks[key] if !ok { @@ -214,12 +214,12 @@ func (c TasksCollector) reportTasksMetrics(objs *models.CFObjects, ch chan<- pro for key, tasks := range groupedTasks { c.taskInfoMetric.WithLabelValues( - key.applicationID, + key.application_id, key.state, ).Set(float64(1)) c.tasksCountMetric.WithLabelValues( - key.applicationID, + key.application_id, key.state, ).Set(float64(len(tasks))) @@ -228,7 +228,7 @@ func (c TasksCollector) reportTasksMetrics(objs *models.CFObjects, ch chan<- pro memorySum += task.MemoryInMb } c.tasksMemoryMbSumMetric.WithLabelValues( - key.applicationID, + key.application_id, key.state, ).Set(float64(memorySum)) @@ -237,7 +237,7 @@ func (c TasksCollector) reportTasksMetrics(objs *models.CFObjects, ch chan<- pro diskSum += task.DiskInMb } c.tasksDiskQuotaMbSumMetric.WithLabelValues( - key.applicationID, + key.application_id, key.state, ).Set(float64(diskSum)) @@ -248,7 +248,7 @@ func (c TasksCollector) reportTasksMetrics(objs *models.CFObjects, ch chan<- pro } } c.tasksOldestCreatedAtMetric.WithLabelValues( - key.applicationID, + key.application_id, key.state, ).Set(float64(createdAtOldest.Unix())) }