move node metadata keys into report package

Both the probe and the app (for rendering) need to know about them.

probe/awsecs/reporter.go

@@ -13,13 +13,13 @@ import (
 
 // TaskFamily is the key that stores the task family of an ECS Task
 const (
-	Cluster             = "ecs_cluster"
-	CreatedAt           = "ecs_created_at"
-	TaskFamily          = "ecs_task_family"
-	ServiceDesiredCount = "ecs_service_desired_count"
-	ServiceRunningCount = "ecs_service_running_count"
-	ScaleUp             = "ecs_scale_up"
-	ScaleDown           = "ecs_scale_down"
+	Cluster             = report.ECSCluster
+	CreatedAt           = report.ECSCreatedAt
+	TaskFamily          = report.ECSTaskFamily
+	ServiceDesiredCount = report.ECSServiceDesiredCount
+	ServiceRunningCount = report.ECSServiceRunningCount
+	ScaleUp             = report.ECSScaleUp
+	ScaleDown           = report.ECSScaleDown
 )
 
 var (

probe/docker/container.go

@@ -18,19 +18,19 @@ import (
 
 // These constants are keys used in node metadata
 const (
-	ContainerName          = "docker_container_name"
-	ContainerCommand       = "docker_container_command"
-	ContainerPorts         = "docker_container_ports"
-	ContainerCreated       = "docker_container_created"
-	ContainerNetworks      = "docker_container_networks"
-	ContainerIPs           = "docker_container_ips"
-	ContainerHostname      = "docker_container_hostname"
-	ContainerIPsWithScopes = "docker_container_ips_with_scopes"
-	ContainerState         = "docker_container_state"
-	ContainerStateHuman    = "docker_container_state_human"
-	ContainerUptime        = "docker_container_uptime"
-	ContainerRestartCount  = "docker_container_restart_count"
-	ContainerNetworkMode   = "docker_container_network_mode"
+	ContainerName          = report.DockerContainerName
+	ContainerCommand       = report.DockerContainerCommand
+	ContainerPorts         = report.DockerContainerPorts
+	ContainerCreated       = report.DockerContainerCreated
+	ContainerNetworks      = report.DockerContainerNetworks
+	ContainerIPs           = report.DockerContainerIPs
+	ContainerHostname      = report.DockerContainerHostname
+	ContainerIPsWithScopes = report.DockerContainerIPsWithScopes
+	ContainerState         = report.DockerContainerState
+	ContainerStateHuman    = report.DockerContainerStateHuman
+	ContainerUptime        = report.DockerContainerUptime
+	ContainerRestartCount  = report.DockerContainerRestartCount
+	ContainerNetworkMode   = report.DockerContainerNetworkMode
 
 	NetworkRxDropped = "network_rx_dropped"
 	NetworkRxBytes   = "network_rx_bytes"

probe/docker/controls.go

@@ -12,14 +12,14 @@ import (
 
 // Control IDs used by the docker integration.
 const (
-	StopContainer    = "docker_stop_container"
-	StartContainer   = "docker_start_container"
-	RestartContainer = "docker_restart_container"
-	PauseContainer   = "docker_pause_container"
-	UnpauseContainer = "docker_unpause_container"
-	RemoveContainer  = "docker_remove_container"
-	AttachContainer  = "docker_attach_container"
-	ExecContainer    = "docker_exec_container"
+	StopContainer    = report.DockerStopContainer
+	StartContainer   = report.DockerStartContainer
+	RestartContainer = report.DockerRestartContainer
+	PauseContainer   = report.DockerPauseContainer
+	UnpauseContainer = report.DockerUnpauseContainer
+	RemoveContainer  = report.DockerRemoveContainer
+	AttachContainer  = report.DockerAttachContainer
+	ExecContainer    = report.DockerExecContainer
 	ResizeExecTTY    = "docker_resize_exec_tty"
 
 	waitTime = 10

probe/docker/reporter.go

@@ -14,15 +14,15 @@ import (
 
 // Keys for use in Node
 const (
-	ImageID          = "docker_image_id"
-	ImageName        = "docker_image_name"
-	ImageSize        = "docker_image_size"
-	ImageVirtualSize = "docker_image_virtual_size"
+	ImageID          = report.DockerImageID
+	ImageName        = report.DockerImageName
+	ImageSize        = report.DockerImageSize
+	ImageVirtualSize = report.DockerImageVirtualSize
+	IsInHostNetwork  = report.DockerIsInHostNetwork
 	ImageLabelPrefix = "docker_image_label_"
-	IsInHostNetwork  = "docker_is_in_host_network"
 	ImageTableID     = "image_table"
-	ServiceName      = "service_name"
-	StackNamespace   = "stack_namespace"
+	ServiceName      = report.DockerServiceName
+	StackNamespace   = report.DockerStackNamespace
 	DefaultNamespace = "No Stack"
 )
 

probe/docker/tagger.go

@@ -10,9 +10,8 @@ import (
 
 // Node metadata keys.
 const (
-	ContainerID = "docker_container_id"
-	Domain      = "domain" // TODO this is ambiguous, be more specific
-	Name        = "name"   // TODO this is ambiguous, be more specific
+	ContainerID = report.DockerContainerID
+	Name        = report.Name
 )
 
 // These vars are exported for testing.

probe/endpoint/reporter.go

@@ -11,9 +11,9 @@ import (
 
 // Node metadata keys.
 const (
-	ReverseDNSNames = "reverse_dns_names"
-	SnoopedDNSNames = "snooped_dns_names"
-	CopyOf          = "copy_of"
+	ReverseDNSNames = report.ReverseDNSNames
+	SnoopedDNSNames = report.SnoopedDNSNames
+	CopyOf          = report.CopyOf
 )
 
 // ReporterConfig are the config options for the endpoint reporter.

probe/kubernetes/controls.go

@@ -11,10 +11,10 @@ import (
 
 // Control IDs used by the kubernetes integration.
 const (
-	GetLogs   = "kubernetes_get_logs"
-	DeletePod = "kubernetes_delete_pod"
-	ScaleUp   = "kubernetes_scale_up"
-	ScaleDown = "kubernetes_scale_down"
+	GetLogs   = report.KubernetesGetLogs
+	DeletePod = report.KubernetesDeletePod
+	ScaleUp   = report.KubernetesScaleUp
+	ScaleDown = report.KubernetesScaleDown
 )
 
 // GetLogs is the control to get the logs for a kubernetes pod

probe/kubernetes/cronjob.go

@@ -15,10 +15,10 @@ import (
 
 // These constants are keys used in node metadata
 const (
-	Schedule      = "kubernetes_schedule"
-	Suspended     = "kubernetes_suspended"
-	LastScheduled = "kubernetes_last_scheduled"
-	ActiveJobs    = "kubernetes_active_jobs"
+	Schedule      = report.KubernetesSchedule
+	Suspended     = report.KubernetesSuspended
+	LastScheduled = report.KubernetesLastScheduled
+	ActiveJobs    = report.KubernetesActiveJobs
 )
 
 // CronJob represents a Kubernetes cron job

probe/kubernetes/daemonset.go

@@ -12,7 +12,7 @@ import (
 
 // These constants are keys used in node metadata
 const (
-	MisscheduledReplicas = "kubernetes_misscheduled_replicas"
+	MisscheduledReplicas = report.KubernetesMisscheduledReplicas
 )
 
 // DaemonSet represents a Kubernetes daemonset

probe/kubernetes/deployment.go

@@ -13,10 +13,10 @@ import (
 
 // These constants are keys used in node metadata
 const (
-	UpdatedReplicas     = "kubernetes_updated_replicas"
-	AvailableReplicas   = "kubernetes_available_replicas"
-	UnavailableReplicas = "kubernetes_unavailable_replicas"
-	Strategy            = "kubernetes_strategy"
+	UpdatedReplicas     = report.KubernetesUpdatedReplicas
+	AvailableReplicas   = report.KubernetesAvailableReplicas
+	UnavailableReplicas = report.KubernetesUnavailableReplicas
+	Strategy            = report.KubernetesStrategy
 )
 
 // Deployment represents a Kubernetes deployment

probe/kubernetes/meta.go

@@ -10,9 +10,9 @@ import (
 
 // These constants are keys used in node metadata
 const (
-	Name        = "kubernetes_name"
-	Namespace   = "kubernetes_namespace"
-	Created     = "kubernetes_created"
+	Name        = report.KubernetesName
+	Namespace   = report.KubernetesNamespace
+	Created     = report.KubernetesCreated
 	LabelPrefix = "kubernetes_labels_"
 )
 

probe/kubernetes/pod.go

@@ -10,9 +10,9 @@ import (
 
 // These constants are keys used in node metadata
 const (
-	State           = "kubernetes_state"
-	IsInHostNetwork = "kubernetes_is_in_host_network"
-	RestartCount    = "kubernetes_restart_count"
+	State           = report.KubernetesState
+	IsInHostNetwork = report.KubernetesIsInHostNetwork
+	RestartCount    = report.KubernetesRestartCount
 
 	StateDeleted = "deleted"
 )

probe/kubernetes/replica_set.go

@@ -13,7 +13,7 @@ import (
 
 // These constants are keys used in node metadata
 const (
-	FullyLabeledReplicas = "kubernetes_fully_labeled_replicas"
+	FullyLabeledReplicas = report.KubernetesFullyLabeledReplicas
 )
 
 // ReplicaSet represents a Kubernetes replica set

probe/kubernetes/reporter.go

@@ -18,11 +18,11 @@ import (
 
 // These constants are keys used in node metadata
 const (
-	IP                 = "kubernetes_ip"
-	ObservedGeneration = "kubernetes_observed_generation"
-	Replicas           = "kubernetes_replicas"
-	DesiredReplicas    = "kubernetes_desired_replicas"
-	NodeType           = "kubernetes_node_type"
+	IP                 = report.KubernetesIP
+	ObservedGeneration = report.KubernetesObservedGeneration
+	Replicas           = report.KubernetesReplicas
+	DesiredReplicas    = report.KubernetesDesiredReplicas
+	NodeType           = report.KubernetesNodeType
 )
 
 // Exposed for testing

probe/kubernetes/service.go

@@ -9,7 +9,7 @@ import (
 
 // These constants are keys used in node metadata
 const (
-	PublicIP = "kubernetes_public_ip"
+	PublicIP = report.KubernetesPublicIP
 )
 
 // Service represents a Kubernetes service

probe/process/reporter.go

@@ -10,11 +10,11 @@ import (
 
 // We use these keys in node metadata
 const (
-	PID            = "pid"
-	Name           = "name"
-	PPID           = "ppid"
-	Cmdline        = "cmdline"
-	Threads        = "threads"
+	PID            = report.PID
+	Name           = report.Name
+	PPID           = report.PPID
+	Cmdline        = report.Cmdline
+	Threads        = report.Threads
 	CPUUsage       = "process_cpu_usage_percent"
 	MemoryUsage    = "process_memory_usage_bytes"
 	OpenFilesCount = "open_files_count"

report/map_keys.go

@@ -0,0 +1,80 @@
+package report
+
+// node metadata keys
+const (
+	// probe/endpoint
+	ReverseDNSNames = "reverse_dns_names"
+	SnoopedDNSNames = "snooped_dns_names"
+	CopyOf          = "copy_of"
+	// probe/process
+	PID     = "pid"
+	Name    = "name" // also used by probe/docker
+	PPID    = "ppid"
+	Cmdline = "cmdline"
+	Threads = "threads"
+	// probe/docker
+	DockerContainerID            = "docker_container_id"
+	DockerImageID                = "docker_image_id"
+	DockerImageName              = "docker_image_name"
+	DockerImageSize              = "docker_image_size"
+	DockerImageVirtualSize       = "docker_image_virtual_size"
+	DockerIsInHostNetwork        = "docker_is_in_host_network"
+	DockerServiceName            = "service_name"
+	DockerStackNamespace         = "stack_namespace"
+	DockerStopContainer          = "docker_stop_container"
+	DockerStartContainer         = "docker_start_container"
+	DockerRestartContainer       = "docker_restart_container"
+	DockerPauseContainer         = "docker_pause_container"
+	DockerUnpauseContainer       = "docker_unpause_container"
+	DockerRemoveContainer        = "docker_remove_container"
+	DockerAttachContainer        = "docker_attach_container"
+	DockerExecContainer          = "docker_exec_container"
+	DockerContainerName          = "docker_container_name"
+	DockerContainerCommand       = "docker_container_command"
+	DockerContainerPorts         = "docker_container_ports"
+	DockerContainerCreated       = "docker_container_created"
+	DockerContainerNetworks      = "docker_container_networks"
+	DockerContainerIPs           = "docker_container_ips"
+	DockerContainerHostname      = "docker_container_hostname"
+	DockerContainerIPsWithScopes = "docker_container_ips_with_scopes"
+	DockerContainerState         = "docker_container_state"
+	DockerContainerStateHuman    = "docker_container_state_human"
+	DockerContainerUptime        = "docker_container_uptime"
+	DockerContainerRestartCount  = "docker_container_restart_count"
+	DockerContainerNetworkMode   = "docker_container_network_mode"
+	// probe/kubernetes
+	KubernetesName                 = "kubernetes_name"
+	KubernetesNamespace            = "kubernetes_namespace"
+	KubernetesCreated              = "kubernetes_created"
+	KubernetesIP                   = "kubernetes_ip"
+	KubernetesObservedGeneration   = "kubernetes_observed_generation"
+	KubernetesReplicas             = "kubernetes_replicas"
+	KubernetesDesiredReplicas      = "kubernetes_desired_replicas"
+	KubernetesNodeType             = "kubernetes_node_type"
+	KubernetesGetLogs              = "kubernetes_get_logs"
+	KubernetesDeletePod            = "kubernetes_delete_pod"
+	KubernetesScaleUp              = "kubernetes_scale_up"
+	KubernetesScaleDown            = "kubernetes_scale_down"
+	KubernetesUpdatedReplicas      = "kubernetes_updated_replicas"
+	KubernetesAvailableReplicas    = "kubernetes_available_replicas"
+	KubernetesUnavailableReplicas  = "kubernetes_unavailable_replicas"
+	KubernetesStrategy             = "kubernetes_strategy"
+	KubernetesFullyLabeledReplicas = "kubernetes_fully_labeled_replicas"
+	KubernetesState                = "kubernetes_state"
+	KubernetesIsInHostNetwork      = "kubernetes_is_in_host_network"
+	KubernetesRestartCount         = "kubernetes_restart_count"
+	KubernetesMisscheduledReplicas = "kubernetes_misscheduled_replicas"
+	KubernetesPublicIP             = "kubernetes_public_ip"
+	KubernetesSchedule             = "kubernetes_schedule"
+	KubernetesSuspended            = "kubernetes_suspended"
+	KubernetesLastScheduled        = "kubernetes_last_scheduled"
+	KubernetesActiveJobs           = "kubernetes_active_jobs"
+	// probe/awsecs
+	ECSCluster             = "ecs_cluster"
+	ECSCreatedAt           = "ecs_created_at"
+	ECSTaskFamily          = "ecs_task_family"
+	ECSServiceDesiredCount = "ecs_service_desired_count"
+	ECSServiceRunningCount = "ecs_service_running_count"
+	ECSScaleUp             = "ecs_scale_up"
+	ECSScaleDown           = "ecs_scale_down"
+)