Skip to content

Commit c225435

Browse files
committed
Use --revert-pattern to discount proactive restarts
1 parent 1002df5 commit c225435

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

config/systemd-monitor-counter.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
"--lookback=20m",
3838
"--delay=5m",
3939
"--count=5",
40-
"--pattern=Started (Kubernetes kubelet|kubelet.service|kubelet.service - Kubernetes kubelet)."
40+
"--pattern=Started (Kubernetes kubelet|kubelet.service|kubelet.service - Kubernetes kubelet).",
41+
"--revert-pattern=Stopping (Kubernetes kubelet|kubelet.service|kubelet.service - Kubernetes kubelet)..."
4142
],
4243
"timeout": "1m"
4344
},
@@ -51,7 +52,8 @@
5152
"--log-path=/var/log/journal",
5253
"--lookback=20m",
5354
"--count=5",
54-
"--pattern=Starting (Docker Application Container Engine|docker.service|docker.service - Docker Application Container Engine)..."
55+
"--pattern=Starting (Docker Application Container Engine|docker.service|docker.service - Docker Application Container Engine)...",
56+
"--revert-pattern=Stopping (Docker Application Container Engine|docker.service|docker.service - Docker Application Container Engine)..."
5557
],
5658
"timeout": "1m"
5759
},
@@ -65,7 +67,8 @@
6567
"--log-path=/var/log/journal",
6668
"--lookback=20m",
6769
"--count=5",
68-
"--pattern=Starting (containerd container runtime|containerd.service|containerd.service - containerd container runtime)..."
70+
"--pattern=Starting (containerd container runtime|containerd.service|containerd.service - containerd container runtime)...",
71+
"--revert-pattern=Stopping (containerd container runtime|containerd.service|containerd.service - containerd container runtime)..."
6972
],
7073
"timeout": "1m"
7174
}

pkg/logcounter/log_counter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (e *logCounter) Count() (count int, err error) {
8686
if len(e.buffer.Match(e.pattern)) != 0 {
8787
count++
8888
}
89-
if len(e.buffer.Match(e.revertPattern)) != 0 {
89+
if e.revertPattern != "" && len(e.buffer.Match(e.revertPattern)) != 0 {
9090
count--
9191
}
9292
case <-e.clock.After(timeout):

0 commit comments

Comments
 (0)