Merge pull request #41716 from Random-Liu/revert-kubemark-npd-change

Revert the npd change in kubemark.

test/kubemark/resources/hollow-node_template.json

@@ -38,6 +38,12 @@
 							"path": "/var/logs"
 						}
 					},
+					{
+						"name": "kernellog-volume",
+						"hostPath": {
+							"path": "/var/log"
+						}
+					},
 					{
 						"name": "no-serviceaccount-access-to-real-master",
 						"emptyDir": {}
@@ -145,7 +151,7 @@
 				},
 				{
 					"name": "hollow-node-problem-detector",
-					"image": "gcr.io/google_containers/node-problem-detector:v0.3.0-alpha.1",
+					"image": "gcr.io/google_containers/node-problem-detector:v0.3.0-alpha.0",
 					"env": [
 						{
 							"name": "NODE_NAME",
@@ -158,7 +164,7 @@
 					],
 					"command": [
 						"/node-problem-detector",
-						"--system-log-monitors=/config/kernel.monitor",
+						"--kernel-monitor=/config/kernel.monitor",
 						"--apiserver-override=https://{{master_ip}}:443?inClusterConfig=false&auth=/kubeconfig/npd.kubeconfig",
 						"--alsologtostderr",
 						"1>>/var/logs/npd_$(NODE_NAME).log 2>&1"
@@ -174,6 +180,11 @@
 							"mountPath": "/config",
 							"readOnly": true
 						},
+						{
+							"name": "kernellog-volume",
+							"mountPath": "/log",
+							"readOnly": true
+						},
 						{
 							"name": "no-serviceaccount-access-to-real-master",
 							"mountPath": "/var/run/secrets/kubernetes.io/serviceaccount",

test/kubemark/resources/kernel-monitor.json

@@ -1,12 +1,7 @@
 {
-	"plugin": "filelog",
-	"pluginConfig": {
-		"timestamp": "dummy",
-		"message": "dummy",
-		"timestampFormat": "dummy"
-	},
-	"logPath": "/dev/null",
+	"logPath": "/log/faillog",
 	"lookback": "10m",
+	"startPattern": "Initializing cgroup subsys cpuset",
 	"bufferSize": 10,
 	"source": "kernel-monitor",
 	"conditions": [],