Change syslog to filelog.

Author: Random-Liu

config/docker-monitor-filelog.json

@@ -1,5 +1,5 @@
 {
-	"plugin": "syslog",
+	"plugin": "filelog",
 	"pluginConfig": {
 		"timestamp": "^time=\"(\\S*)\"",
 		"message": "msg=\"([^\n]*)\"",

config/kernel-monitor-filelog.json

@@ -1,5 +1,5 @@
 {
-	"plugin": "syslog",
+	"plugin": "filelog",
 	"pluginConfig": {
 		"timestamp": "^.{15}",
 		"message": "kernel: \\[.*\\] (.*)",

pkg/logmonitor/logwatchers/syslog/log_watcher.go renamed to pkg/logmonitor/logwatchers/filelog/log_watcher.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package syslog
+package filelog
 
 import (
 	"bufio"
@@ -35,7 +35,7 @@ import (
 	"k8s.io/node-problem-detector/pkg/logmonitor/util"
 )
 
-type syslogWatcher struct {
+type filelogWatcher struct {
 	cfg        types.WatcherConfig
 	reader     *bufio.Reader
 	closer     io.Closer
@@ -53,7 +53,7 @@ func NewSyslogWatcherOrDie(cfg types.WatcherConfig) types.LogWatcher {
 	if err := syscall.Sysinfo(&info); err != nil {
 		glog.Fatalf("Failed to get system info: %v", err)
 	}
-	return &syslogWatcher{
+	return &filelogWatcher{
 		cfg:        cfg,
 		translator: newTranslatorOrDie(cfg.PluginConfig),
 		uptime:     time.Now().Add(time.Duration(-info.Uptime * int64(time.Second))),
@@ -67,30 +67,30 @@ func NewSyslogWatcherOrDie(cfg types.WatcherConfig) types.LogWatcher {
 // Make sure NewSyslogWathcer is types.WatcherCreateFunc.
 var _ types.WatcherCreateFunc = NewSyslogWatcherOrDie
 
-// Watch starts the syslog watcher.
-func (s *syslogWatcher) Watch() (<-chan *logtypes.Log, error) {
+// Watch starts the filelog watcher.
+func (s *filelogWatcher) Watch() (<-chan *logtypes.Log, error) {
 	r, err := getLogReader(s.cfg.LogPath)
 	if err != nil {
 		return nil, err
 	}
 	s.reader = bufio.NewReader(r)
 	s.closer = r
-	glog.Info("Start watching syslog")
+	glog.Info("Start watching filelog")
 	go s.watchLoop()
 	return s.logCh, nil
 }
 
-// Stop stops the syslog watcher.
-func (s *syslogWatcher) Stop() {
+// Stop stops the filelog watcher.
+func (s *filelogWatcher) Stop() {
 	s.tomb.Stop()
 }
 
-// watchPollInterval is the interval syslog log watcher will
+// watchPollInterval is the interval filelog log watcher will
 // poll for pod change after reading to the end.
 const watchPollInterval = 500 * time.Millisecond
 
-// watchLoop is the main watch loop of syslog watcher.
-func (s *syslogWatcher) watchLoop() {
+// watchLoop is the main watch loop of filelog watcher.
+func (s *filelogWatcher) watchLoop() {
 	defer func() {
 		s.closer.Close()
 		close(s.logCh)
@@ -105,14 +105,14 @@ func (s *syslogWatcher) watchLoop() {
 	for {
 		select {
 		case <-s.tomb.Stopping():
-			glog.Infof("Stop watching syslog")
+			glog.Infof("Stop watching filelog")
 			return
 		default:
 		}
 
 		line, err := s.reader.ReadString('\n')
 		if err != nil && err != io.EOF {
-			glog.Errorf("Exiting syslog watch with error: %v", err)
+			glog.Errorf("Exiting filelog watch with error: %v", err)
 			return
 		}
 		buffer.WriteString(line)
@@ -135,7 +135,7 @@ func (s *syslogWatcher) watchLoop() {
 	}
 }
 
-// getLogReader returns log reader for syslog log. Note that getLogReader doesn't look back
+// getLogReader returns log reader for filelog log. Note that getLogReader doesn't look back
 // to the rolled out logs.
 func getLogReader(path string) (io.ReadCloser, error) {
 	if path == "" {

pkg/logmonitor/logwatchers/syslog/log_watcher_test.go renamed to pkg/logmonitor/logwatchers/filelog/log_watcher_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package syslog
+package filelog
 
 import (
 	"io/ioutil"
@@ -140,15 +140,15 @@ Jan  2 03:04:05 kernel: [2.000000] 3
 		assert.NoError(t, err)
 
 		w := NewSyslogWatcherOrDie(types.WatcherConfig{
-			Plugin:       "syslog",
+			Plugin:       "filelog",
 			PluginConfig: getTestPluginConfig(),
 			LogPath:      f.Name(),
 			Lookback:     test.lookback,
 		})
 		// Set the uptime.
-		w.(*syslogWatcher).uptime = test.uptime
+		w.(*filelogWatcher).uptime = test.uptime
 		// Set the fake clock.
-		w.(*syslogWatcher).clock = fakeClock
+		w.(*filelogWatcher).clock = fakeClock
 		logCh, err := w.Watch()
 		assert.NoError(t, err)
 		defer w.Stop()

pkg/logmonitor/logwatchers/syslog/translator.go renamed to pkg/logmonitor/logwatchers/filelog/translator.go

@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package syslog
+package filelog
 
 import (
 	"fmt"
@@ -95,7 +95,7 @@ func validatePluginConfig(cfg map[string]string) error {
 }
 
 // formalizeTimestamp formalizes the timestamp. We need this because some log doesn't contain full
-// timestamp, e.g. syslog.
+// timestamp, e.g. filelog.
 func formalizeTimestamp(t time.Time) time.Time {
 	if t.Year() == 0 {
 		t = t.AddDate(time.Now().Year(), 0, 0)

pkg/logmonitor/logwatchers/syslog/translator_test.go renamed to pkg/logmonitor/logwatchers/filelog/translator_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package syslog
+package filelog
 
 import (
 	"testing"

pkg/logmonitor/logwatchers/register_syslog.go renamed to pkg/logmonitor/logwatchers/register_filelog.go

@@ -17,12 +17,12 @@ limitations under the License.
 package logwatchers
 
 import (
-	"k8s.io/node-problem-detector/pkg/logmonitor/logwatchers/syslog"
+	"k8s.io/node-problem-detector/pkg/logmonitor/logwatchers/filelog"
 )
 
-const syslogPluginName = "syslog"
+const filelogPluginName = "filelog"
 
 func init() {
-	// Register the syslog plugin.
-	registerLogWatcher(syslogPluginName, syslog.NewSyslogWatcherOrDie)
+	// Register the filelog plugin.
+	registerLogWatcher(filelogPluginName, filelog.NewSyslogWatcherOrDie)
 }

pkg/logmonitor/logwatchers/register_journald.go

@@ -25,6 +25,6 @@ import (
 const journaldPluginName = "journald"
 
 func init() {
-	// Register the syslog plugin.
+	// Register the journald plugin.
 	registerLogWatcher(journaldPluginName, journald.NewJournaldWatcher)
 }

pkg/logmonitor/logwatchers/types/log_watcher.go

@@ -31,7 +31,7 @@ type LogWatcher interface {
 // WatcherConfig is the configuration of the log watcher.
 type WatcherConfig struct {
 	// Plugin is the name of plugin which is currently used.
-	// Currently supported: syslog, journald.
+	// Currently supported: filelog, journald.
 	Plugin string `json:"plugin, omitempty"`
 	// PluginConfig is a key/value configuration of a plugin. Valid configurations
 	// are defined in different log watcher plugin.