ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject [2/3] ambari git commit: AMBARI-17581. Log search does not show Livy logs (Miklos Gergely via oleewere)
Date Wed, 06 Jul 2016 14:38:06 GMT
AMBARI-17581. Log search does not show Livy logs (Miklos Gergely via oleewere)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5482b8a8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5482b8a8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5482b8a8

Branch: refs/heads/branch-2.4
Commit: 5482b8a885f87f451777cfc20f1e9c59fe0ea147
Parents: 2e50b0b
Author: Miklos Gergely <mgergely@hortonworks.com>
Authored: Wed Jul 6 15:38:53 2016 +0200
Committer: oleewere <oleewere@gmail.com>
Committed: Wed Jul 6 16:26:58 2016 +0200

----------------------------------------------------------------------
 .../src/main/resources/grok-patterns                         | 6 +++++-
 .../0.5.0/package/templates/input.config-spark.json.j2       | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5482b8a8/ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/grok-patterns
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/grok-patterns
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/grok-patterns
index d25a78b..920f521 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/grok-patterns
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/grok-patterns
@@ -105,10 +105,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}
@@ -143,3 +144,6 @@ LOGLEVEL ([Aa]lert|ALERT|[Tt]race|TRACE|[Dd]ebug|DEBUG|[Nn]otice|NOTICE|[Ii]nfo|
 
 # Custom
 USER_SYNC_DATE %{MONTHDAY} %{MONTH} %{YEAR} %{TIME}
+SPARK_DATESTAMP %{YEAR}[/-]%{MONTHNUM2}[/-]%{MONTHDAY} %{TIME}
+CUSTOM_DATESTAMP %{MONTHDAY} %{MONTH} %{YEAR} %{TIME}
+CUSTOM_SEPARATOR %{SPACE}\|%{SPACE}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/5482b8a8/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-spark.json.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-spark.json.j2
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-spark.json.j2
index 80be6ee..4aacc6f 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-spark.json.j2
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-spark.json.j2
@@ -27,6 +27,11 @@
        "type":"spark_thriftserver",
        "rowtype":"service",
        "path":"{{spark_log_dir}}/spark-*-org.apache.spark.sql.hive.thriftserver.HiveThriftServer2*.out"
+     },
+     {
+       "type":"livy_server",
+       "rowtype":"service",
+       "path":"{{livy_log_dir}}/livy-livy-server.out"
      }
    ],
    "filter":[
@@ -36,7 +41,8 @@
             "fields":{
               "type":[
                 "spark_jobhistory_server",
-                "spark_thriftserver"
+                "spark_thriftserver",
+                "livy_server"
               ]
 
             }


Mime
View raw message