github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2450 from weaveworks/mike/docker-swarm/stack-ns

Browse Source 
swarm service: Capture stack namespace and strip it from name
This commit is contained in:
Mike Lang
2017-04-17 18:13:53 -07:00
committed by GitHub
parent e8ecfe1c76 72bcdba1c3
commit b58832df7e
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
probe/docker/reporter.go
View File

@@ -22,6 +22,7 @@ const (
IsInHostNetwork = "docker_is_in_host_network"
ImageTableID = "image_table"
ServiceName = "service_name"
StackNamespace = "stack_namespace"
)
// Exposed for testing
@@ -135,7 +136,8 @@ var (
}
SwarmServiceMetadataTemplates = report.MetadataTemplates{
ServiceName: {ID: ServiceName, Label: "Service Name", From: report.FromLatest, Priority: 0},
ServiceName: {ID: ServiceName, Label: "Service Name", From: report.FromLatest, Priority: 0},
StackNamespace: {ID: StackNamespace, Label: "Stack Namespace", From: report.FromLatest, Priority: 1},
}
)

12
probe/docker/tagger.go
View File

@@ -57,14 +57,20 @@ func (t *Tagger) Tag(r report.Report) (report.Report, error) {
if !ok {
continue
}
stackNamespace, ok := container.Latest.Lookup(LabelPrefix + "com.docker.stack.namespace")
if !ok {
continue
}
if strings.HasPrefix(serviceName, "dockerswarm_") {
serviceName = serviceName[len("dockerswarm_"):]
prefix := stackNamespace + "_"
if strings.HasPrefix(serviceName, prefix) {
serviceName = serviceName[len(prefix):]
}
nodeID := report.MakeSwarmServiceNodeID(serviceID)
node := report.MakeNodeWith(nodeID, map[string]string{
ServiceName: serviceName,
ServiceName: serviceName,
StackNamespace: stackNamespace,
})
r.SwarmService = r.SwarmService.AddNode(node)