AMBARI-17442. Fix erroneous Logfeeder input configs (Miklos Gergely via oleewere)

ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/InputMgr.java

@@ -161,7 +161,7 @@ public class InputMgr {
       }
 
       if (isCheckPointFolderValid) {
-        logger.warn("Using folder " + checkPointFolderFile
+        logger.info("Using folder " + checkPointFolderFile
           + " for storing checkpoints");
       }
     }

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/grok-patterns.j2

@@ -104,10 +104,11 @@ TIME (?!<[0-9])%{HOUR}:%{MINUTE}(?::%{SECOND})(?![0-9])
 # datestamp is YYYY/MM/DD-HH:MM:SS.UUUU (or something like it)
 DATE_US %{MONTHNUM}[/-]%{MONTHDAY}[/-]%{YEAR}
 DATE_EU %{MONTHDAY}[./-]%{MONTHNUM}[./-]%{YEAR}
+DATE_EU2 %{YEAR}[./-]%{MONTHNUM}[./-]%{MONTHDAY}
 ISO8601_TIMEZONE (?:Z|[+-]%{HOUR}(?::?%{MINUTE}))
 ISO8601_SECOND (?:%{SECOND}|60)
 TIMESTAMP_ISO8601 %{YEAR}-%{MONTHNUM}-%{MONTHDAY}[T ]%{HOUR}:?%{MINUTE}(?::?%{SECOND})?%{ISO8601_TIMEZONE}?
-DATE %{DATE_US}|%{DATE_EU}
+DATE %{DATE_US}|%{DATE_EU}|%{DATE_EU2}
 DATESTAMP %{DATE}[- ]%{TIME}
 TZ (?:[PMCE][SD]T|UTC)
 DATESTAMP_RFC822 %{DAY} %{MONTH} %{MONTHDAY} %{YEAR} %{TIME} %{TZ}

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2

@@ -242,7 +242,7 @@
       "post_map_values":{
         "logtime":{
           "map_date":{
-            "date_pattern":"yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+            "date_pattern":"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
           }
 
         }

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ams.json.j2

@@ -107,8 +107,8 @@
 
       },
       "log4j_format":"%d{ISO8601} %-5p [%t] %c{2}: %m%n",
-      "multiline_pattern":"^(%{DATESTAMP})",
-      "message_pattern":"(?m)^%{DATESTAMP}%{SPACE}\\[%{WORD:level}\\]%{SPACE}%{GREEDYDATA:log_message}",
+      "multiline_pattern":"^(%{DATESTAMP:logtime})",
+      "message_pattern":"(?m)^%{DATESTAMP:logtime}%{SPACE}\\[%{WORD:level}\\]%{SPACE}%{GREEDYDATA:log_message}",
       "post_map_values":{
         "logtime":{
           "map_date":{
@@ -118,26 +118,34 @@
         },
         "level":[
           {
-           "map_fieldvalue":{
+            "map_fieldvalue":{
               "pre_value":"I",
               "post_value":"INFO"
-           },
-           "map_fieldvalue":{
-               "pre_value":"W",
-               "post_value":"WARN"
-           },
-           "map_fieldvalue":{
-               "pre_value":"D",
-               "post_value":"DEBUG"
-            },
+            }
+          },
+          {
+            "map_fieldvalue":{
+              "pre_value":"W",
+              "post_value":"WARN"
+            }
+          },
+          {
             "map_fieldvalue":{
+              "pre_value":"D",
+              "post_value":"DEBUG"
+             }
+           },
+           {
+             "map_fieldvalue":{
                "pre_value":"E",
                "post_value":"ERROR"
-            },
-            "map_fieldvalue":{
+             }
+           },
+           {
+             "map_fieldvalue":{
                "pre_value":"F",
                "post_value":"FATAL"
-            }
+             }
            }
          ]
 
@@ -145,28 +153,38 @@
 
     },
     {
-          "filter":"grok",
-          "conditions":{
-            "fields":{
-              "type":[
-                "ams_monitor"
-              ]
-            }
-          },
-          "log4j_format":"",
-          "multiline_pattern":"^(%{DATESTAMP:logtime})",
-          "message_pattern":"(?m)^%{DATESTAMP:logtime}%{SPACE}\\[%{LOGLEVEL:level}\\]%{SPACE}%{JAVAFILE:file}:%{INT:line_number}%{SPACE}-%{SPACE}%{GREEDYDATA:log_message}",
-          "post_map_values":{
-            "logtime":{
-              "map_date":{
-                "date_pattern":"yyyy-MM-dd HH:mm:ss,SSS"
-              }
+      "filter":"grok",
+      "conditions":{
+        "fields":{
+          "type":[
+            "ams_monitor"
+          ]
+ 
+        }
+ 
+      },
+      "log4j_format":"",
+      "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})",
+      "message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}\\[%{LOGLEVEL:level}\\]%{SPACE}%{JAVAFILE:file}:%{INT:line_number}%{SPACE}-%{SPACE}%{GREEDYDATA:log_message}",
+      "post_map_values":{
+        "logtime":{
+          "map_date":{
+            "date_pattern":"yyyy-MM-dd HH:mm:ss,SSS"
+          }
 
-            }
+        }
 
+      },
+      "level":[
+        {
+          "map_fieldvalue":{
+            "pre_value":"WARNING",
+            "post_value":"WARN"
           }
-
         }
+      ]
+
+    }
 
   ]