Merge pull request #371 from x-qdo/add-ignore-log

Add regex filters to skip specific container log lines.

Author: ilya-lesikov

pkg/trackers/dyntracker/dynamic_readiness_tracker.go

@@ -48,6 +48,8 @@ type DynamicReadinessTracker struct {
 	saveLogsOnlyForContainers    []string
 	saveLogsByRegex              *regexp.Regexp
 	saveLogsByRegexForContainers map[string]*regexp.Regexp
+	skipLogsByRegex              *regexp.Regexp
+	skipLogsByRegexForContainers map[string]*regexp.Regexp
 	ignoreLogs                   bool
 	ignoreLogsForContainers      []string
 	saveEvents                   bool
@@ -164,6 +166,8 @@ func NewDynamicReadinessTracker(
 		saveLogsOnlyForContainers:    opts.SaveLogsOnlyForContainers,
 		saveLogsByRegex:              opts.SaveLogsByRegex,
 		saveLogsByRegexForContainers: opts.SaveLogsByRegexForContainers,
+		skipLogsByRegex:              opts.SkipLogsByRegex,
+		skipLogsByRegexForContainers: opts.SkipLogsByRegexForContainers,
 		ignoreLogs:                   opts.IgnoreLogs,
 		ignoreLogsForContainers:      opts.IgnoreLogsForContainers,
 		saveEvents:                   opts.SaveEvents,
@@ -178,6 +182,8 @@ type DynamicReadinessTrackerOptions struct {
 	SaveLogsOnlyForContainers                []string
 	SaveLogsByRegex                          *regexp.Regexp
 	SaveLogsByRegexForContainers             map[string]*regexp.Regexp
+	SkipLogsByRegex                          *regexp.Regexp
+	SkipLogsByRegexForContainers             map[string]*regexp.Regexp
 	IgnoreLogs                               bool
 	IgnoreLogsForContainers                  []string
 	SaveEvents                               bool
@@ -1201,6 +1207,29 @@ func (t *DynamicReadinessTracker) handlePodLogChunk(logChunk *pod.PodLogChunk, l
 	}
 
 	logLines := logChunk.LogLines
+
+	if t.skipLogsByRegex != nil {
+		var filteredLogLines []display.LogLine
+		for _, logLine := range logLines {
+			if !t.skipLogsByRegex.MatchString(logLine.Message) {
+				filteredLogLines = append(filteredLogLines, logLine)
+			}
+		}
+		logLines = filteredLogLines
+	}
+
+	if len(t.skipLogsByRegexForContainers) > 0 {
+		if regex, ok := t.skipLogsByRegexForContainers[logChunk.ContainerName]; ok {
+			var filteredLogLines []display.LogLine
+			for _, logLine := range logLines {
+				if !regex.MatchString(logLine.Message) {
+					filteredLogLines = append(filteredLogLines, logLine)
+				}
+			}
+			logLines = filteredLogLines
+		}
+	}
+
 	if t.saveLogsByRegex != nil {
 		var filteredLogLines []display.LogLine
 		for _, logLine := range logLines {