Repository: ambari Updated Branches: refs/heads/trunk 5fdbc1625 -> 76d2edc51
AMBARI-16653. Add missing Ambari Server Logs to Logfeeder (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/76d2edc5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/76d2edc5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/76d2edc5 Branch: refs/heads/trunk Commit: 76d2edc516fe2bcbc767a987aee2ba9caf037cad Parents: 5fdbc16 Author: Miklos Gergely <mgerg...@hortonworks.com> Authored: Tue May 17 12:13:30 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Tue May 17 12:13:30 2016 +0200 ---------------------------------------------------------------------- .../templates/input.config-ambari.json.j2 | 163 +++++++++++++++++++ 1 file changed, 163 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/76d2edc5/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2 index ed997ab..e34b267 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2 @@ -26,6 +26,37 @@ "type":"ambari_server", "rowtype":"service", "path":"{{ambari_server_log_dir}}/ambari-server.log" + }, + { + "type":"ambari_alerts", + "rowtype":"service", + "add_fields":{ + "level":"INFO" + }, + "path":"{{ambari_server_log_dir}}/ambari-alerts.log" + }, + { + "type":"ambari_config_changes", + "rowtype":"service", + "path":"{{ambari_server_log_dir}}/ambari-config-changes.log" + }, + { + "type":"ambari_eclipselink", + "rowtype":"service", + "path":"{{ambari_server_log_dir}}/ambari-eclipselink.log" + }, + { + "type":"ambari_server_check_database", + "rowtype":"service", + "path":"{{ambari_server_log_dir}}/ambari-server-check-database.log" + }, + { + "type":"ambari_audit", + "rowtype":"service", + "add_fields":{ + "level":"INFO" + }, + "path":"{{ambari_server_log_dir}}/ambari-audit.log" } ], @@ -86,6 +117,138 @@ } + }, + { + "filter":"grok", + "conditions":{ + "fields":{ + "type":[ + "ambari_alerts" + ] + + } + + }, + "log4j_format":"%d{DATE} %5p [%t] %c{1}:%L - %m%n", + "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})", + "message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}%{GREEDYDATA:log_message}", + "post_map_values":{ + "logtime":{ + "map_date":{ + "date_pattern":"yyyy-MM-dd HH:mm:ss,SSS" + } + + } + + } + + }, + { + "filter":"grok", + "conditions":{ + "fields":{ + "type":[ + "ambari_config_changes" + ] + + } + + }, + "log4j_format":"%d{DATE} %5p [%t] %c{1}:%L - %m%n", + "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})", + "message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}%{LOGLEVEL:level}%{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":[ + "ambari_eclipselink" + ] + + } + + }, + "log4j_format":"%d{DATE} %5p [%t] %c{1}:%L - %m%n", + "multiline_pattern":"^(\\[EL%{SPACE}%{LOGLEVEL:level}\\])", + "message_pattern":"(?m)^\\[EL%{SPACE}%{LOGLEVEL:level}\\]:%{SPACE}%{TIMESTAMP_ISO8601:logtime}%{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" + } + + } + + } + + }, + { + "filter":"grok", + "conditions":{ + "fields":{ + "type":[ + "ambari_server_check_database" + ] + + } + + }, + "log4j_format":"%d{DATE} %5p [%t] %c{1}:%L - %m%n", + "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})", + "message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}%{LOGLEVEL:level}%{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":[ + "ambari_audit" + ] + + } + + }, + "log4j_format":"%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n", + "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})", + "message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime},%{SPACE}%{GREEDYDATA:log_message}", + "post_map_values":{ + "logtime":{ + "map_date":{ + "date_pattern":"yyyy-MM-dd'T'HH:mm:ss,SSSZ" + } + + } + + } + } ]
