Fix invalid JSON in disk-log-message-filelog.json and enforce config format

Makefile

@@ -15,7 +15,7 @@
 # Build the node-problem-detector image.
 
 .PHONY: all \
-        lint vet fmt version test e2e-test \
+        lint vet fmt fmt-configs version test e2e-test \
         build-binaries build-container build-tar build \
         docker-builder build-in-docker \
         push-container push-tar push release clean depup \
@@ -144,6 +144,9 @@ fmt: $(GOLANGCI_LINT)
 	find . -type f -name "*.go" | grep -v "./vendor/*" | xargs gofmt -s -w -l
 	$(GOLANGCI_LINT) run --config .golangci.yml --fix ./...
 
+fmt-configs:
+	UPDATE_EXPECTED=y go test -run TestShippedConfigs ./pkg/systemlogmonitor
+
 version:
 	@echo $(VERSION)
 

config/abrt-adaptor.json

@@ -1,38 +1,38 @@
 {
-	"plugin": "journald",
-	"pluginConfig": {
-		"source": "abrt-notification"
-	},
-	"logPath": "/var/log/journal",
-	"lookback": "5m",
-	"bufferSize": 10,
-	"source": "abrt-adaptor",
-	"conditions": [],
-	"rules": [
-		{
-			"type": "temporary",
-			"reason": "CCPPCrash",
-			"pattern": "Process \\d+ \\(\\S+\\) crashed in .*"
-		},
-		{
-			"type": "temporary",
-			"reason": "UncaughtException",
-			"pattern": "Process \\d+ \\(\\S+\\) of user \\d+ encountered an uncaught \\S+ exception"
-		},
-		{
-			"type": "temporary",
-			"reason": "XorgCrash",
-			"pattern": "Display server \\S+ crash in \\S+"
-		},
-		{
-			"type": "temporary",
-			"reason": "VMcore",
-			"pattern": "System encountered a fatal error in \\S+"
-		},
-		{
-			"type": "temporary",
-			"reason": "KernelOops",
-			"pattern": "System encountered a non-fatal error in \\S+"
-		}
-	]
+  "plugin": "journald",
+  "pluginConfig": {
+    "source": "abrt-notification"
+  },
+  "logPath": "/var/log/journal",
+  "lookback": "5m",
+  "bufferSize": 10,
+  "source": "abrt-adaptor",
+  "conditions": [],
+  "rules": [
+    {
+      "type": "temporary",
+      "reason": "CCPPCrash",
+      "pattern": "Process \\d+ \\(\\S+\\) crashed in .*"
+    },
+    {
+      "type": "temporary",
+      "reason": "UncaughtException",
+      "pattern": "Process \\d+ \\(\\S+\\) of user \\d+ encountered an uncaught \\S+ exception"
+    },
+    {
+      "type": "temporary",
+      "reason": "XorgCrash",
+      "pattern": "Display server \\S+ crash in \\S+"
+    },
+    {
+      "type": "temporary",
+      "reason": "VMcore",
+      "pattern": "System encountered a fatal error in \\S+"
+    },
+    {
+      "type": "temporary",
+      "reason": "KernelOops",
+      "pattern": "System encountered a non-fatal error in \\S+"
+    }
+  ]
 }

config/disk-log-message-filelog.json

@@ -1,28 +1,31 @@
 {
-	"plugin": "filelog",
-	"pluginConfig": {
-		"timestamp": "^.{15}",
-		"message": "(?i)Currently unreadable.*sectors|(?i)Offline uncorrectable sectors",
-		"timestampFormat": "Jan _2 15:04:05"
-	},
-	"logPath": "/var/log/messages",
-	"lookback": "10h",
-	"bufferSize": 1,
-	"source": "disk-monitor",
-	"skipList": [ " audit:", " audit[" ],
-	"conditions": [
-		{
-			"type": "DiskBadBlock",
-			"reason": "DiskBadBlock",
-			"message": "Disk no bad block"
-		},
-	],
-	"rules": [
-		{
-			"type": "permanent",
-			"condition": "DiskBadBlock",
-			"reason": "DiskBadBlock",
-			"pattern": ".*([1-9]\\d{2,}) (Currently unreadable.*sectors|Offline uncorrectable sectors).*"
-		},
-	]
-}
+  "plugin": "filelog",
+  "pluginConfig": {
+    "timestamp": "^.{15}",
+    "message": "(?i)Currently unreadable.*sectors|(?i)Offline uncorrectable sectors",
+    "timestampFormat": "Jan _2 15:04:05"
+  },
+  "logPath": "/var/log/messages",
+  "lookback": "10h",
+  "bufferSize": 1,
+  "source": "disk-monitor",
+  "skipList": [
+    " audit:",
+    " audit["
+  ],
+  "conditions": [
+    {
+      "type": "DiskBadBlock",
+      "reason": "DiskBadBlock",
+      "message": "Disk no bad block"
+    }
+  ],
+  "rules": [
+    {
+      "type": "permanent",
+      "condition": "DiskBadBlock",
+      "reason": "DiskBadBlock",
+      "pattern": ".*([1-9]\\d{2,}) (Currently unreadable.*sectors|Offline uncorrectable sectors).*"
+    }
+  ]
+}

config/docker-monitor-filelog.json

@@ -1,20 +1,20 @@
 {
-	"plugin": "filelog",
-	"pluginConfig": {
-		"timestamp": "^time=\"(\\S*)\"",
-		"message": "msg=\"([^\n]*)\"",
-		"timestampFormat": "2006-01-02T15:04:05.999999999-07:00"
-	},
-	"logPath": "/var/log/docker.log",
-	"lookback": "5m",
-	"bufferSize": 10,
-	"source": "docker-monitor",
-	"conditions": [],
-	"rules": [
-		{
-			"type": "temporary",
-			"reason": "CorruptDockerImage",
-			"pattern": "Error trying v2 registry: failed to register layer: rename /var/lib/docker/image/(.+) /var/lib/docker/image/(.+): directory not empty.*"
-		}
-	]
+  "plugin": "filelog",
+  "pluginConfig": {
+    "timestamp": "^time=\"(\\S*)\"",
+    "message": "msg=\"([^\n]*)\"",
+    "timestampFormat": "2006-01-02T15:04:05.999999999-07:00"
+  },
+  "logPath": "/var/log/docker.log",
+  "lookback": "5m",
+  "bufferSize": 10,
+  "source": "docker-monitor",
+  "conditions": [],
+  "rules": [
+    {
+      "type": "temporary",
+      "reason": "CorruptDockerImage",
+      "pattern": "Error trying v2 registry: failed to register layer: rename /var/lib/docker/image/(.+) /var/lib/docker/image/(.+): directory not empty.*"
+    }
+  ]
 }

config/docker-monitor.json

@@ -1,36 +1,36 @@
 {
-	"plugin": "journald",
-	"pluginConfig": {
-		"source": "dockerd"
-	},
-	"logPath": "/var/log/journal",
-	"lookback": "5m",
-	"bufferSize": 10,
-	"source": "docker-monitor",
-	"metricsReporting": true,
-	"conditions": [
-		{
-			"type": "CorruptDockerOverlay2",
-			"reason": "NoCorruptDockerOverlay2",
-			"message": "docker overlay2 is functioning properly"
-		}
-	],
-	"rules": [
-		{
-			"type": "temporary",
-			"reason": "CorruptDockerImage",
-			"pattern": "Error trying v2 registry: failed to register layer: rename /var/lib/docker/image/(.+) /var/lib/docker/image/(.+): directory not empty.*"
-		},
-		{
-			"type": "permanent",
-			"condition": "CorruptDockerOverlay2",
-			"reason": "CorruptDockerOverlay2",
-			"pattern": "returned error: readlink /var/lib/docker/overlay2.*: invalid argument.*"
-		},
-		{
-			"type": "temporary",
-			"reason": "DockerContainerStartupFailure",
-			"pattern": "OCI runtime start failed: container process is already dead: unknown"
-		}
-	]
+  "plugin": "journald",
+  "pluginConfig": {
+    "source": "dockerd"
+  },
+  "logPath": "/var/log/journal",
+  "lookback": "5m",
+  "bufferSize": 10,
+  "source": "docker-monitor",
+  "metricsReporting": true,
+  "conditions": [
+    {
+      "type": "CorruptDockerOverlay2",
+      "reason": "NoCorruptDockerOverlay2",
+      "message": "docker overlay2 is functioning properly"
+    }
+  ],
+  "rules": [
+    {
+      "type": "temporary",
+      "reason": "CorruptDockerImage",
+      "pattern": "Error trying v2 registry: failed to register layer: rename /var/lib/docker/image/(.+) /var/lib/docker/image/(.+): directory not empty.*"
+    },
+    {
+      "type": "permanent",
+      "condition": "CorruptDockerOverlay2",
+      "reason": "CorruptDockerOverlay2",
+      "pattern": "returned error: readlink /var/lib/docker/overlay2.*: invalid argument.*"
+    },
+    {
+      "type": "temporary",
+      "reason": "DockerContainerStartupFailure",
+      "pattern": "OCI runtime start failed: container process is already dead: unknown"
+    }
+  ]
 }

config/kernel-monitor-filelog.json

@@ -1,52 +1,52 @@
 {
-	"plugin": "filelog",
-	"pluginConfig": {
-		"timestamp": "^.{15}",
-		"message": "kernel: \\[.*\\] (.*)",
-		"timestampFormat": "Jan _2 15:04:05"
-	},
-	"logPath": "/var/log/kern.log",
-	"lookback": "5m",
-	"bufferSize": 10,
-	"source": "kernel-monitor",
-	"conditions": [
-		{
-			"type": "KernelDeadlock",
-			"reason": "KernelHasNoDeadlock",
-			"message": "kernel has no deadlock"
-		}
-	],
-	"rules": [
-		{
-			"type": "temporary",
-			"reason": "OOMKilling",
-			"pattern": "Killed process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"
-		},
-		{
-			"type": "temporary",
-			"reason": "TaskHung",
-			"pattern": "task \\S+:\\w+ blocked for more than \\w+ seconds\\."
-		},
-		{
-			"type": "temporary",
-			"reason": "UnregisterNetDevice",
-			"pattern": "unregister_netdevice: waiting for \\w+ to become free. Usage count = \\d+"
-		},
-		{
-			"type": "temporary",
-			"reason": "KernelOops",
-			"pattern": "BUG: unable to handle kernel NULL pointer dereference at .*"
-		},
-		{
-			"type": "temporary",
-			"reason": "KernelOops",
-			"pattern": "divide error: 0000 \\[#\\d+\\] SMP"
-		},
-		{
-			"type": "permanent",
-			"condition": "KernelDeadlock",
-			"reason": "DockerHung",
-			"pattern": "task docker:\\w+ blocked for more than \\w+ seconds\\."
-		}
-	]
+  "plugin": "filelog",
+  "pluginConfig": {
+    "timestamp": "^.{15}",
+    "message": "kernel: \\[.*\\] (.*)",
+    "timestampFormat": "Jan _2 15:04:05"
+  },
+  "logPath": "/var/log/kern.log",
+  "lookback": "5m",
+  "bufferSize": 10,
+  "source": "kernel-monitor",
+  "conditions": [
+    {
+      "type": "KernelDeadlock",
+      "reason": "KernelHasNoDeadlock",
+      "message": "kernel has no deadlock"
+    }
+  ],
+  "rules": [
+    {
+      "type": "temporary",
+      "reason": "OOMKilling",
+      "pattern": "Killed process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"
+    },
+    {
+      "type": "temporary",
+      "reason": "TaskHung",
+      "pattern": "task \\S+:\\w+ blocked for more than \\w+ seconds\\."
+    },
+    {
+      "type": "temporary",
+      "reason": "UnregisterNetDevice",
+      "pattern": "unregister_netdevice: waiting for \\w+ to become free. Usage count = \\d+"
+    },
+    {
+      "type": "temporary",
+      "reason": "KernelOops",
+      "pattern": "BUG: unable to handle kernel NULL pointer dereference at .*"
+    },
+    {
+      "type": "temporary",
+      "reason": "KernelOops",
+      "pattern": "divide error: 0000 \\[#\\d+\\] SMP"
+    },
+    {
+      "type": "permanent",
+      "condition": "KernelDeadlock",
+      "reason": "DockerHung",
+      "pattern": "task docker:\\w+ blocked for more than \\w+ seconds\\."
+    }
+  ]
 }