diff --git a/README.md b/README.md index d3709fd15..e0dee9fab 100644 --- a/README.md +++ b/README.md @@ -221,13 +221,13 @@ To develop NPD on Windows you'll need to setup your Windows machine for Go devel ```powershell # Run these commands in the node-problem-detector directory. -# Build +# Build in MINGW64 Window make clean windows-binaries -# Test +# Test in MINGW64 Window make test -# Run with containerd log monitoring enabled. (Assumes containerd is installed.) +# Run with containerd log monitoring enabled in Command Prompt. (Assumes containerd is installed.) %CD%\bin\windows_amd64\node-problem-detector.exe --logtostderr --enable-k8s-exporter=false --config.system-log-monitor=%CD%\config\windows-containerd-monitor-filelog.json ``` diff --git a/config/windows-containerd-monitor-filelog.json b/config/windows-containerd-monitor-filelog.json index 1c9a36aae..b6f94d77a 100644 --- a/config/windows-containerd-monitor-filelog.json +++ b/config/windows-containerd-monitor-filelog.json @@ -2,10 +2,10 @@ "plugin": "filelog", "pluginConfig": { "timestamp": "^time=\"(\\S*)\"", - "message": "msg=\"([^\n]*)\"", - "timestampFormat": "2006-01-02T15:04:05.999999999-07:00" + "message": "msg=\"?([^\n]*)\"?", + "timestampFormat": "2006-01-02T15:04:05.999999999Z" }, - "logPath": "C:\\Program Files\\containerd\\containerd.log", + "logPath": "C:\\etc\\kubernetes\\logs\\containerd.log", "lookback": "5m", "bufferSize": 10, "source": "containerd",