Repository: ambari Updated Branches: refs/heads/trunk 0caf76005 -> bba526e3d
AMBARI-17583. Add SmartSense activty logs to Log Search (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/bba526e3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bba526e3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bba526e3 Branch: refs/heads/trunk Commit: bba526e3dbfbe47c34bfd5dbf4b1437ae51b0e56 Parents: caa7b9c Author: Miklos Gergely <[email protected]> Authored: Wed Jul 6 15:39:19 2016 +0200 Committer: oleewere <[email protected]> Committed: Wed Jul 6 16:25:03 2016 +0200 ---------------------------------------------------------------------- .../src/main/resources/HadoopServiceConfig.json | 6 ++++++ .../LOGSEARCH/0.5.0/package/scripts/params.py | 1 + .../package/templates/HadoopServiceConfig.json.j2 | 6 ++++++ .../0.5.0/package/templates/input.config-hst.json.j2 | 14 +++++++++++++- 4 files changed, 26 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bba526e3/ambari-logsearch/ambari-logsearch-portal/src/main/resources/HadoopServiceConfig.json ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/HadoopServiceConfig.json b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/HadoopServiceConfig.json index d407d82..d8c36e5 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/HadoopServiceConfig.json +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/HadoopServiceConfig.json @@ -354,6 +354,12 @@ }, { "name": "hst_agent" + }, + { + "name": "activity_analyzer" + }, + { + "name": "activity_explorer" } ], "dependencies": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/bba526e3/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py index 165ac08..9990a6c 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py @@ -243,6 +243,7 @@ ambari_server_log_dir = '/var/log/ambari-server' ambari_agent_log_dir = '/var/log/ambari-agent' knox_log_dir = '/var/log/knox' hst_log_dir = '/var/log/hst' +hst_activity_log_dir = '/var/log/smartsense-activity' metrics_collector_log_dir = default('/configurations/ams-env/metrics_collector_log_dir', '/var/log/ambari-metrics-collector') metrics_monitor_log_dir = default('/configurations/ams-env/metrics_monitor_log_dir', '/var/log/ambari-metrics-monitor') http://git-wip-us.apache.org/repos/asf/ambari/blob/bba526e3/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/HadoopServiceConfig.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/HadoopServiceConfig.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/HadoopServiceConfig.json.j2 index 64c81b5..c575cff 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/HadoopServiceConfig.json.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/HadoopServiceConfig.json.j2 @@ -400,6 +400,12 @@ }, { "name": "hst_agent" + }, + { + "name": "activity_analyzer" + }, + { + "name": "activity_explorer" } ], "dependencies": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/bba526e3/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 index ee19f14..6c216f4 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 @@ -27,6 +27,16 @@ "type":"hst_agent", "rowtype":"service", "path":"{{hst_log_dir}}/hst-agent.log" + }, + { + "type":"activity_analyzer", + "rowtype":"service", + "path":"{{hst_activity_log_dir}}/activity-analyzer.log" + }, + { + "type":"activity_explorer", + "rowtype":"service", + "path":"{{hst_activity_log_dir}}/activity-explorer.log" } ], "filter":[ @@ -64,7 +74,9 @@ "conditions":{ "fields":{ "type":[ - "hst_server" + "hst_server", + "activity_analyzer", + "activity_explorer" ] } },
