From 55f5bbf7fba321556c8fdb939d6675f6581a7dd4 Mon Sep 17 00:00:00 2001
From: Saso Matejina <>
Date: Tue, 30 Apr 2019 20:53:48 -0700
Subject: [PATCH 1/2] Use environment.Key instead of Name

---
 plugins/codeamp/metrics/collector/collector.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/codeamp/metrics/collector/collector.go b/plugins/codeamp/metrics/collector/collector.go
index efcdf7853..0f3d8ff16 100644
--- a/plugins/codeamp/metrics/collector/collector.go
+++ b/plugins/codeamp/metrics/collector/collector.go
@@ -132,9 +132,9 @@ func (c *Collector) collectEnvironments(db *gorm.DB) {
 		for _, environment := range environments {
 			var projectEnvironment model.ProjectEnvironment
 			if db.Where("environment_id = ? AND project_id = ?", environment.ID.String(), project.ID.String()).First(&projectEnvironment).RecordNotFound() {
-				environmentGauge.WithLabelValues(project.Name, environment.Name).Set(float64(0))
+				environmentGauge.WithLabelValues(project.Name, environment.Key).Set(float64(0))
 			} else {
-				environmentGauge.WithLabelValues(project.Name, environment.Name).Set(float64(1))
+				environmentGauge.WithLabelValues(project.Name, environment.Key).Set(float64(1))
 			}
 		}
 	}
@@ -151,11 +151,11 @@ func (c *Collector) collectProjectSettings(db *gorm.DB) {
 		for _, environment := range environments {
 			var projectSettings model.ProjectSettings
 			if db.Where("environment_id = ? AND project_id = ?", environment.ID.String(), project.ID.String()).First(&projectSettings).RecordNotFound() {
-				continuousDeploymentGauge.WithLabelValues(project.Name, environment.Name).Set(float64(-1))
-				onMasterGauge.WithLabelValues(project.Name, environment.Name, "").Set(float64(-1))
+				continuousDeploymentGauge.WithLabelValues(project.Name, environment.Key).Set(float64(-1))
+				onMasterGauge.WithLabelValues(project.Name, environment.Key, "").Set(float64(-1))
 			} else {
-				continuousDeploymentGauge.WithLabelValues(project.Name, environment.Name).Set(float64(bool2int(projectSettings.ContinuousDeploy)))
-				onMasterGauge.WithLabelValues(project.Name, environment.Name, projectSettings.GitBranch).Set(float64(onMaster2int(projectSettings.GitBranch)))
+				continuousDeploymentGauge.WithLabelValues(project.Name, environment.Key).Set(float64(bool2int(projectSettings.ContinuousDeploy)))
+				onMasterGauge.WithLabelValues(project.Name, environment.Key, projectSettings.GitBranch).Set(float64(onMaster2int(projectSettings.GitBranch)))
 			}
 		}
 	}

From dec0df84964232ea981b3d7373457798bf4d9197 Mon Sep 17 00:00:00 2001
From: Saso Matejina <>
Date: Tue, 30 Apr 2019 20:56:12 -0700
Subject: [PATCH 2/2] If environment is NotFound set it to -1

---
 plugins/codeamp/metrics/collector/collector.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/codeamp/metrics/collector/collector.go b/plugins/codeamp/metrics/collector/collector.go
index 0f3d8ff16..6097361ec 100644
--- a/plugins/codeamp/metrics/collector/collector.go
+++ b/plugins/codeamp/metrics/collector/collector.go
@@ -132,7 +132,7 @@ func (c *Collector) collectEnvironments(db *gorm.DB) {
 		for _, environment := range environments {
 			var projectEnvironment model.ProjectEnvironment
 			if db.Where("environment_id = ? AND project_id = ?", environment.ID.String(), project.ID.String()).First(&projectEnvironment).RecordNotFound() {
-				environmentGauge.WithLabelValues(project.Name, environment.Key).Set(float64(0))
+				environmentGauge.WithLabelValues(project.Name, environment.Key).Set(float64(-1))
 			} else {
 				environmentGauge.WithLabelValues(project.Name, environment.Key).Set(float64(1))
 			}