Skip to content
This repository was archived by the owner on Aug 19, 2019. It is now read-only.

Use the same prefix in all local resource IDs for consistency. #56

Merged
bmoyles0117 merged 1 commit into from
Feb 23, 2018
Merged

Use the same prefix in all local resource IDs for consistency. #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/docker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ std::vector<MetadataUpdater::ResourceMetadata>
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<std::string>{resource_id, resource_name},
resource,
MetadataAgent::Metadata(config_.DockerApiVersion(),
Expand Down
13 changes: 5 additions & 8 deletions src/kubernetes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -138,7 +135,7 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetNodeMetadata(
}

const std::string k8s_node_name = boost::algorithm::join(
std::vector<std::string>{kK8sNodeNameResourcePrefix, node_name},
std::vector<std::string>{kK8sNodeResourcePrefix, node_name},
kResourceTypeSeparator);
return MetadataUpdater::ResourceMetadata(
std::vector<std::string>{k8s_node_name},
Expand Down Expand Up @@ -241,7 +238,7 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetPodMetadata(
std::vector<std::string>{kK8sPodResourcePrefix, pod_id},
kResourceTypeSeparator);
const std::string k8s_pod_name = boost::algorithm::join(
std::vector<std::string>{kK8sPodNameResourcePrefix, namespace_name, pod_name},
std::vector<std::string>{kK8sPodResourcePrefix, namespace_name, pod_name},
kResourceTypeSeparator);
return MetadataUpdater::ResourceMetadata(
std::vector<std::string>{k8s_pod_id, k8s_pod_name},
Expand Down Expand Up @@ -326,7 +323,7 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetContainerMetadata(
std::vector<std::string>{kK8sContainerResourcePrefix, pod_id, container_name},
kResourceTypeSeparator);
const std::string k8s_container_name = boost::algorithm::join(
std::vector<std::string>{kK8sContainerNameResourcePrefix, namespace_name, pod_name, container_name},
std::vector<std::string>{kK8sContainerResourcePrefix, namespace_name, pod_name, container_name},
kResourceTypeSeparator);

std::vector<std::string> local_resource_ids = {
Expand Down Expand Up @@ -392,7 +389,7 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetLegacyResource(
std::vector<std::string>{kGkeContainerResourcePrefix, namespace_name, pod_id, container_name},
kResourceTypeSeparator);
const std::string gke_container_name = boost::algorithm::join(
std::vector<std::string>{kGkeContainerNameResourcePrefix, namespace_name, pod_name, container_name},
std::vector<std::string>{kGkeContainerResourcePrefix, namespace_name, pod_name, container_name},
kResourceTypeSeparator);
return MetadataUpdater::ResourceMetadata(
std::vector<std::string>{gke_container_pod_id, gke_container_name},
Expand Down