From ee427988a9d274bc06261f9f0e3247d3c5fc50d8 Mon Sep 17 00:00:00 2001 From: Bryan Moyles Date: Fri, 23 Feb 2018 12:31:24 -0500 Subject: [PATCH] Remove "Name" postfix in the local resource ID for consistency. --- src/docker.cc | 2 +- src/kubernetes.cc | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/docker.cc b/src/docker.cc index db90fcd1..f90454db 100644 --- a/src/docker.cc +++ b/src/docker.cc @@ -104,7 +104,7 @@ std::vector std::string("container") + resource_type_separator + id; // The container name reported by Docker will always have a leading '/'. const std::string resource_name = - std::string("containerName") + resource_type_separator + name.substr(1); + std::string("container") + resource_type_separator + name.substr(1); result.emplace_back(std::vector{resource_id, resource_name}, resource, MetadataAgent::Metadata(config_.DockerApiVersion(), diff --git a/src/kubernetes.cc b/src/kubernetes.cc index b3d1dd51..fa70c121 100644 --- a/src/kubernetes.cc +++ b/src/kubernetes.cc @@ -48,12 +48,9 @@ constexpr const char kResourceTypeSeparator[] = "."; constexpr const char kRawContentVersion[] = "0.1"; constexpr const char kGkeContainerResourcePrefix[] = "gke_container"; -constexpr const char kGkeContainerNameResourcePrefix[] = "gke_containerName"; constexpr const char kK8sContainerResourcePrefix[] = "k8s_container"; -constexpr const char kK8sContainerNameResourcePrefix[] = "k8s_containerName"; constexpr const char kK8sPodResourcePrefix[] = "k8s_pod"; -constexpr const char kK8sPodNameResourcePrefix[] = "k8s_podName"; -constexpr const char kK8sNodeNameResourcePrefix[] = "k8s_nodeName"; +constexpr const char kK8sNodeResourcePrefix[] = "k8s_node"; constexpr const char kNodeSelectorPrefix[] = "?fieldSelector=spec.nodeName%3D"; @@ -138,7 +135,7 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetNodeMetadata( } const std::string k8s_node_name = boost::algorithm::join( - std::vector{kK8sNodeNameResourcePrefix, node_name}, + std::vector{kK8sNodeResourcePrefix, node_name}, kResourceTypeSeparator); return MetadataUpdater::ResourceMetadata( std::vector{k8s_node_name}, @@ -241,7 +238,7 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetPodMetadata( std::vector{kK8sPodResourcePrefix, pod_id}, kResourceTypeSeparator); const std::string k8s_pod_name = boost::algorithm::join( - std::vector{kK8sPodNameResourcePrefix, namespace_name, pod_name}, + std::vector{kK8sPodResourcePrefix, namespace_name, pod_name}, kResourceTypeSeparator); return MetadataUpdater::ResourceMetadata( std::vector{k8s_pod_id, k8s_pod_name}, @@ -326,7 +323,7 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetContainerMetadata( std::vector{kK8sContainerResourcePrefix, pod_id, container_name}, kResourceTypeSeparator); const std::string k8s_container_name = boost::algorithm::join( - std::vector{kK8sContainerNameResourcePrefix, namespace_name, pod_name, container_name}, + std::vector{kK8sContainerResourcePrefix, namespace_name, pod_name, container_name}, kResourceTypeSeparator); std::vector local_resource_ids = { @@ -392,7 +389,7 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetLegacyResource( std::vector{kGkeContainerResourcePrefix, namespace_name, pod_id, container_name}, kResourceTypeSeparator); const std::string gke_container_name = boost::algorithm::join( - std::vector{kGkeContainerNameResourcePrefix, namespace_name, pod_name, container_name}, + std::vector{kGkeContainerResourcePrefix, namespace_name, pod_name, container_name}, kResourceTypeSeparator); return MetadataUpdater::ResourceMetadata( std::vector{gke_container_pod_id, gke_container_name},