github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gather Fluentd logs

Browse Source
This commit is contained in:
Minhan Xia
2016-01-06 13:46:12 -08:00
parent ed8390a51f
commit c3d400f4bb
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
View File

@@ -12,8 +12,6 @@ spec:
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
args:
- -q
volumeMounts: volumeMounts:
- name: varlog - name: varlog
mountPath: /var/log mountPath: /var/log

20
test/e2e/es_cluster_logging.go
View File

@@ -219,9 +219,9 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) {
By("Checking to make sure the Fluentd pod are running on each healthy node") By("Checking to make sure the Fluentd pod are running on each healthy node")
label = labels.SelectorFromSet(labels.Set(map[string]string{k8sAppKey: fluentdValue})) label = labels.SelectorFromSet(labels.Set(map[string]string{k8sAppKey: fluentdValue}))
options = api.ListOptions{LabelSelector: label} options = api.ListOptions{LabelSelector: label}
pods, err = f.Client.Pods(api.NamespaceSystem).List(options) fluentdPods, err := f.Client.Pods(api.NamespaceSystem).List(options)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
for _, pod := range pods.Items { for _, pod := range fluentdPods.Items {
if nodeInNodeList(pod.Spec.NodeName, nodes) { if nodeInNodeList(pod.Spec.NodeName, nodes) {
err = waitForPodRunningInNamespace(f.Client, pod.Name, api.NamespaceSystem) err = waitForPodRunningInNamespace(f.Client, pod.Name, api.NamespaceSystem)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@@ -231,7 +231,7 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) {
// Check if each healthy node has fluentd running on it // Check if each healthy node has fluentd running on it
for _, node := range nodes.Items { for _, node := range nodes.Items {
exists := false exists := false
for _, pod := range pods.Items { for _, pod := range fluentdPods.Items {
if pod.Spec.NodeName == node.Name { if pod.Spec.NodeName == node.Name {
exists = true exists = true
break break
@@ -432,7 +432,7 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) {
} }
for n := range missingPerNode { for n := range missingPerNode {
if missingPerNode[n] > 0 { if missingPerNode[n] > 0 {
Logf("Node %d is missing %d logs", n, missingPerNode[n]) Logf("Node %d %s is missing %d logs", n, nodes.Items[n].Name, missingPerNode[n])
opts := &api.PodLogOptions{} opts := &api.PodLogOptions{}
body, err = f.Client.Pods(ns).GetLogs(podNames[n], opts).DoRaw() body, err = f.Client.Pods(ns).GetLogs(podNames[n], opts).DoRaw()
if err != nil { if err != nil {
@@ -440,6 +440,18 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) {
continue continue
} }
Logf("Pod %s has the following logs: %s", podNames[n], body) Logf("Pod %s has the following logs: %s", podNames[n], body)
for _, pod := range fluentdPods.Items {
if pod.Spec.NodeName == nodes.Items[n].Name {
body, err = f.Client.Pods(api.NamespaceSystem).GetLogs(pod.Name, opts).DoRaw()
if err != nil {
Logf("Cannot get logs from pod %v", pod.Name)
break
}
Logf("Fluentd Pod %s on node %s has the following logs: %s", pod.Name, nodes.Items[n].Name, body)
break
}
}
} }
} }
Failf("Failed to find all %d log lines", expected) Failf("Failed to find all %d log lines", expected)