Merge pull request #67 from buildkite/expose-org-slug-as-cloudwatch-d…

…imension Expose org slug as a cloudwatch dimension
buildkite · Jan 2, 2019 · 49b8eba · 49b8eba
2 parents 65fb162 + 1171638
commit 49b8eba
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/backend/cloudwatch.go b/backend/cloudwatch.go
@@ -68,9 +68,10 @@ func (cb *CloudWatchBackend) Collect(r *collector.Result) error {
 			})
 		}
 
-		dimensions = append(dimensions, &cloudwatch.Dimension{
-			Name: aws.String("Queue"), Value: aws.String(name),
-		})
+		dimensions = append(dimensions,
+			&cloudwatch.Dimension{Name: aws.String("Queue"), Value: aws.String(name)},
+			&cloudwatch.Dimension{Name: aws.String("Org"), Value: aws.String(r.Org)},
+		)
 
 		metrics = append(metrics, cloudwatchMetrics(c, dimensions)...)
 	}

diff --git a/collector/collector.go b/collector/collector.go
@@ -32,6 +32,7 @@ type Collector struct {
 type Result struct {
 	Totals map[string]int
 	Queues map[string]map[string]int
+	Org    string
 }
 
 type metricsAgentsResponse struct {
@@ -61,9 +62,14 @@ type allMetricsJobsResponse struct {
 	Queues map[string]metricsJobsResponse `json:"queues"`
 }
 
+type allMetricsOrganizationResponse struct {
+	Slug string `json:"slug"`
+}
+
 type allMetricsResponse struct {
-	Agents allMetricsAgentsResponse `json:"agents"`
-	Jobs   allMetricsJobsResponse   `json:"jobs"`
+	Agents       allMetricsAgentsResponse       `json:"agents"`
+	Jobs         allMetricsJobsResponse         `json:"jobs"`
+	Organization allMetricsOrganizationResponse `json:"organization"`
 }
 
 func (c *Collector) Collect() (*Result, error) {
@@ -118,6 +124,9 @@ func (c *Collector) Collect() (*Result, error) {
 			return nil, err
 		}
 
+		log.Printf("Found organization %q", allMetrics.Organization.Slug)
+		result.Org = allMetrics.Organization.Slug
+
 		result.Totals[ScheduledJobsCount] = allMetrics.Jobs.Scheduled
 		result.Totals[RunningJobsCount] = allMetrics.Jobs.Running
 		result.Totals[UnfinishedJobsCount] = allMetrics.Jobs.Total
@@ -204,12 +213,12 @@ func (c *Collector) Collect() (*Result, error) {
 
 func (r Result) Dump() {
 	for name, c := range r.Totals {
-		log.Printf("Buildkite > %s = %d", name, c)
+		log.Printf("Buildkite > Org=%s > %s=%d", r.Org, name, c)
 	}
 
 	for name, c := range r.Queues {
 		for k, v := range c {
-			log.Printf("Buildkite > [queue = %s] > %s = %d", name, k, v)
+			log.Printf("Buildkite > Org=%s > Queue=%s > %s=%d", r.Org, name, k, v)
 		}
 	}
 }