diff --git a/README.md b/README.md index 693e3d6..4679a92 100644 --- a/README.md +++ b/README.md @@ -228,7 +228,6 @@ It would be successfuly parsed and the resulting JSON string (linted for readme) "kubernetes.node_hostname":"localhost", "kubernetes.pod_name":"pod", "logstash_prefix":"k8s-unknown", - "namespace":"namespace", "purpose":"staging", "remote_addr":"10.154.18.198", "remote_user":"", @@ -313,7 +312,6 @@ Environment variables are taken at random. Resulting output entry map would look "kubernetes.node_hostname": "localhost", "kubernetes.pod_name": "deis-router-77745f5559-f424j", "logstash_prefix": "k8s-unknown", - "namespace": "deis", "purpose": "staging", "type": "containers" }, diff --git a/common/constants.go b/common/constants.go index fd943f1..a1ae664 100644 --- a/common/constants.go +++ b/common/constants.go @@ -6,7 +6,6 @@ const ( LabelPurpose = "purpose" LabelContainerID = "docker.container_id" LabelLogstashPrefix = "logstash_prefix" - LabelLogstashNamespace = "namespace" LabelLogType = "type" LabelTime = "time" ) diff --git a/dispatcher/dispatcher.go b/dispatcher/dispatcher.go index 0465dfe..3d64423 100644 --- a/dispatcher/dispatcher.go +++ b/dispatcher/dispatcher.go @@ -220,7 +220,6 @@ func (d *Dispatcher) finalize() { func (d *Dispatcher) containerExtends(c *containers.Container) (extends common.EntryMap) { extends = make(common.EntryMap) extends[common.LabelContainerID] = c.ID - extends[common.LabelLogstashNamespace] = c.GetPodNamespace() extends[common.KubernetesPodName] = c.GetPodName() extends[common.KubernetesNamespaceName] = c.GetPodNamespace() extends[common.KubernetesContainerName] = c.GetName() diff --git a/dispatcher/workers/workers_fabric.go b/dispatcher/workers/workers_fabric.go index 16cc181..45d8695 100644 --- a/dispatcher/workers/workers_fabric.go +++ b/dispatcher/workers/workers_fabric.go @@ -92,7 +92,6 @@ func (f *FollowersFabric) NewFollowerJournald(output chan<- string, config confi common.LabelPurpose: f.config.K8SExtends.Purpose, common.LabelLogstashPrefix: f.config.K8SExtends.LogstashPrefix, common.KubernetesNodeHostname: f.config.K8SExtends.NodeHostname, - common.LabelLogstashNamespace: common.NamespaceJournald, common.KubernetesNamespaceName: common.NamespaceJournald, }, f.storage,