Merge pull request #222 from bmoyles0117/fix-new-resource-types-location

Fix location label for metrics using new resource types.
GoogleCloudPlatform · Jan 24, 2019 · 9778b1d · 9778b1d
2 parents 3d2aa1a + a163791
commit 9778b1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt
@@ -40,4 +40,4 @@ prometheus-to-sd/README.md:the prometheus-to-sd. Values of the `namespace_id` an
 prometheus-to-sd/translator/metrics.go:		[]string{"component_name", "metric_name"},
 prometheus-to-sd/translator/translator.go:				"namespace_id":   namespace,
 prometheus-to-sd/translator/translator.go:				"pod_id":         pod,
-prometheus-to-sd/translator/translator.go:				"pod_name":         pod,
+prometheus-to-sd/translator/translator.go:				"pod_name":       pod,
diff --git a/prometheus-to-sd/translator/translator.go b/prometheus-to-sd/translator/translator.go
@@ -433,23 +433,23 @@ func getMonitoredResourceFromLabels(config *config.CommonConfig, labels []*dto.L
 			return &v3.MonitoredResource{
 				Type: "k8s_node",
 				Labels: map[string]string{
-					"project_id":       config.GceConfig.Project,
-					"cluster_name":     config.GceConfig.Cluster,
-					"cluster_location": config.GceConfig.ClusterLocation,
-					"node_name":        config.GceConfig.Instance,
+					"project_id":   config.GceConfig.Project,
+					"location":     config.GceConfig.ClusterLocation,
+					"cluster_name": config.GceConfig.Cluster,
+					"node_name":    config.GceConfig.Instance,
 				},
 			}
 		}
 
 		return &v3.MonitoredResource{
 			Type: "k8s_container",
 			Labels: map[string]string{
-				"project_id":       config.GceConfig.Project,
-				"cluster_name":     config.GceConfig.Cluster,
-				"cluster_location": config.GceConfig.ClusterLocation,
-				"namespace_name":   namespace,
-				"pod_name":         pod,
-				"container_name":   container,
+				"project_id":     config.GceConfig.Project,
+				"location":       config.GceConfig.ClusterLocation,
+				"cluster_name":   config.GceConfig.Cluster,
+				"namespace_name": namespace,
+				"pod_name":       pod,
+				"container_name": container,
 			},
 		}
 	case "gke_container":