Finish the journald support

Author: Random-Liu

cmd/node_problem_detector.go

@@ -18,15 +18,15 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"net/url"
 	"os"
 
+	"github.com/golang/glog"
+
 	"k8s.io/node-problem-detector/pkg/kernelmonitor"
 	"k8s.io/node-problem-detector/pkg/problemdetector"
 	"k8s.io/node-problem-detector/pkg/version"
-
-	"github.com/golang/glog"
-	"fmt"
 )
 
 // TODO: Move flags to options directory.
@@ -86,5 +86,7 @@ func main() {
 
 	k := kernelmonitor.NewKernelMonitorOrDie(*kernelMonitorConfigPath)
 	p := problemdetector.NewProblemDetector(k, *apiServerOverride, nodeName)
-	p.Run()
+	if err := p.Run(); err != nil {
+		glog.Fatalf("Problem detector failed with error: %v", err)
+	}
 }

config/kernel-monitor.json

@@ -1,5 +1,6 @@
 {
-	"logPath": "/log/kern.log",
+	"plugin": "journald",
+	"logPath": "/log/journal",
 	"lookback": "10m",
 	"startPattern": "Initializing cgroup subsys cpuset",
 	"bufferSize": 10,

node-problem-detector.yaml

@@ -26,6 +26,11 @@ spec:
         - name: log
           mountPath: /log
           readOnly: true
+        # Make sure node problem detector is in the same timezone
+        # with the host.
+        - name: localtime
+          mountPath: /etc/localtime
+          readOnly: true
         - name: config
           mountPath: /config
           readOnly: true
@@ -34,6 +39,9 @@ spec:
         # Config `log` to your system log directory
         hostPath:
           path: /var/log/
+      - name: localtime
+        hostPath:
+          path: /etc/localtime
       - name: config
         configMap:
           name: node-problem-detector-config

pkg/kernelmonitor/config.go

@@ -0,0 +1,49 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 kernelmonitor
+
+import (
+	watchertypes "k8s.io/node-problem-detector/pkg/kernelmonitor/logwatchers/types"
+	kerntypes "k8s.io/node-problem-detector/pkg/kernelmonitor/types"
+	"k8s.io/node-problem-detector/pkg/types"
+)
+
+// MonitorConfig is the configuration of kernel monitor.
+type MonitorConfig struct {
+	// WatcherConfig is the configuration of kernel log watcher.
+	watchertypes.WatcherConfig
+	// BufferSize is the size (in lines) of the log buffer.
+	BufferSize int `json:"bufferSize"`
+	// Source is the source name of the kernel monitor
+	Source string `json:"source"`
+	// DefaultConditions are the default states of all the conditions kernel monitor should handle.
+	DefaultConditions []types.Condition `json:"conditions"`
+	// Rules are the rules kernel monitor will follow to parse the log file.
+	Rules []kerntypes.Rule `json:"rules"`
+	// StartPattern is the pattern of the start line
+	StartPattern string `json:"startPattern, omitempty"`
+}
+
+// applyDefaultConfiguration applies default configurations.
+func applyDefaultConfiguration(cfg *MonitorConfig) {
+	if cfg.BufferSize == 0 {
+		cfg.BufferSize = 10
+	}
+	if cfg.WatcherConfig.Lookback == "" {
+		cfg.WatcherConfig.Lookback = "0"
+	}
+}

pkg/kernelmonitor/kernel_log_watcher.go

@@ -22,27 +22,15 @@ import (
 	"regexp"
 	"time"
 
+	"k8s.io/node-problem-detector/pkg/kernelmonitor/logwatchers"
+	watchertypes "k8s.io/node-problem-detector/pkg/kernelmonitor/logwatchers/types"
 	kerntypes "k8s.io/node-problem-detector/pkg/kernelmonitor/types"
 	"k8s.io/node-problem-detector/pkg/kernelmonitor/util"
 	"k8s.io/node-problem-detector/pkg/types"
 
 	"github.com/golang/glog"
 )
 
-// MonitorConfig is the configuration of kernel monitor.
-type MonitorConfig struct {
-	// WatcherConfig is the configuration of kernel log watcher.
-	WatcherConfig
-	// BufferSize is the size (in lines) of the log buffer.
-	BufferSize int `json:"bufferSize"`
-	// Source is the source name of the kernel monitor
-	Source string `json:"source"`
-	// DefaultConditions are the default states of all the conditions kernel monitor should handle.
-	DefaultConditions []types.Condition `json:"conditions"`
-	// Rules are the rules kernel monitor will follow to parse the log file.
-	Rules []kerntypes.Rule `json:"rules"`
-}
-
 // KernelMonitor monitors the kernel log and reports node problem condition and event according to
 // the rules.
 type KernelMonitor interface {
@@ -53,7 +41,7 @@ type KernelMonitor interface {
 }
 
 type kernelMonitor struct {
-	watcher    KernelLogWatcher
+	watcher    watchertypes.LogWatcher
 	buffer     LogBuffer
 	config     MonitorConfig
 	conditions []types.Condition
@@ -69,18 +57,23 @@ func NewKernelMonitorOrDie(configPath string) KernelMonitor {
 	}
 	f, err := ioutil.ReadFile(configPath)
 	if err != nil {
-		panic(err)
+		glog.Fatalf("Failed to read configuration file %q: %v", configPath, err)
 	}
 	err = json.Unmarshal(f, &k.config)
 	if err != nil {
-		panic(err)
+		glog.Fatalf("Failed to unmarshal configuration file %q: %v", configPath, err)
 	}
+	// Apply default configurations
+	applyDefaultConfiguration(&k.config)
 	err = validateRules(k.config.Rules)
 	if err != nil {
-		panic(err)
+		glog.Fatalf("Failed to validate matching rules %#v: %v", k.config.Rules, err)
 	}
 	glog.Infof("Finish parsing log file: %+v", k.config)
-	k.watcher = NewKernelLogWatcher(k.config.WatcherConfig)
+	k.watcher, err = logwatchers.GetLogWatcher(k.config.WatcherConfig)
+	if err != nil {
+		glog.Fatalf("Failed to create log watcher with watcher config %#v: %v", k.config.WatcherConfig, err)
+	}
 	k.buffer = NewLogBuffer(k.config.BufferSize)
 	// A 1000 size channel should be big enough.
 	k.output = make(chan *types.Status, 1000)