You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2016/04/25 19:28:39 UTC
ambari git commit: Revert "AMBARI-16091. Add 'logfeeder log level
include' feature to logsearch stack definition (oleewere)"
Repository: ambari
Updated Branches:
refs/heads/trunk 51cd067b0 -> 97b83d599
Revert "AMBARI-16091. Add 'logfeeder log level include' feature to logsearch stack definition (oleewere)"
This reverts commit cda7f2a3eb82a494a09ffca1a1c75ba3d658e307.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97b83d59
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97b83d59
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97b83d59
Branch: refs/heads/trunk
Commit: 97b83d599a9ab212a869bd212bb6f5ffccb33bf0
Parents: 51cd067
Author: Andrii Tkach <at...@apache.org>
Authored: Mon Apr 25 20:26:15 2016 +0300
Committer: Andrii Tkach <at...@apache.org>
Committed: Mon Apr 25 20:28:30 2016 +0300
----------------------------------------------------------------------
.../0.5.0/configuration/logsearch-site.xml | 7 ------
.../LOGSEARCH/0.5.0/package/scripts/params.py | 1 -
.../templates/input.config-logsearch.json.j2 | 6 ++---
.../package/templates/logsearch.properties.j2 | 4 ----
.../0.5.0/properties/logfeeder-log4j.xml.j2 | 24 ++++----------------
.../0.5.0/properties/logsearch-log4j.xml.j2 | 22 ++++++++----------
ambari-web/app/data/HDP2/site_properties.js | 7 ------
7 files changed, 18 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/97b83d59/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-site.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-site.xml
index fb775bf..45aa69a 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-site.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-site.xml
@@ -78,11 +78,4 @@
</description>
</property>
- <property>
- <name>logsearch.logfeeder.include.default.level</name>
- <value>fatal,error,warn</value>
- <description>Include default Logfeeder log levels for Logsearch</description>
- <display-name>Logfeeder log levels</display-name>
- </property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/97b83d59/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 5e12dde..a8cff81 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
@@ -149,7 +149,6 @@ logsearch_repfactor = str(config['configurations']['logsearch-site']['logsearch.
logsearch_solr_collection_service_logs = default('/configurations/logsearch-site/logsearch.solr.collection.service.logs', 'hadoop_logs')
logsearch_solr_collection_audit_logs = default('/configurations/logsearch-site/logsearch.solr.collection.audit.logs','audit_logs')
-logsearch_logfeeder_log_level_include = default('/configurations/logsearch-site/logsearch.logfeeder.include.default.level', 'fatal,error,warn')
solr_audit_logs_use_ranger = default('/configurations/logsearch-env/logsearch_solr_audit_logs_use_ranger', False)
solr_audit_logs_url = ''
http://git-wip-us.apache.org/repos/asf/ambari/blob/97b83d59/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2
index 06aaba6..d9ef66d 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2
@@ -20,17 +20,17 @@
{
"type":"logsearch_app",
"rowtype":"service",
- "path":"{{logsearch_log_dir}}/logsearch.json"
+ "path":"{{logsearch_log_dir}}/logsearch.log"
},
{
"type":"logsearch_feeder",
"rowtype":"service",
- "path":"{{logfeeder_log_dir}}/logfeeder.json"
+ "path":"{{logfeeder_log_dir}}/logfeeder.log"
},
{
"type":"logsearch_perf",
"rowtype":"service",
- "path":"{{logsearch_log_dir}}/logsearch-performance.json"
+ "path":"{{logsearch_log_dir}}/logsearch-performance.log"
}
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/97b83d59/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logsearch.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logsearch.properties.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logsearch.properties.j2
index 190d4e2..1e183bd 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logsearch.properties.j2
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logsearch.properties.j2
@@ -38,7 +38,3 @@ solr.audit_logs.replication_factor={{logsearch_repfactor}}
solr.core.history=history
solr.history.config_name=history
solr.history.replication_factor={{logsearch_repfactor}}
-
-#Logfeeder Settings
-
-logfeeder.include.default.level={{logsearch_logfeeder_log_level_include}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/97b83d59/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2
index 77318ee..cab680f 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2
@@ -34,38 +34,24 @@ limitations under the License.
</layout>
</appender>
- <appender name="rolling_file_json"
- class="org.apache.ambari.logsearch.appender.LogsearchRollingFileAppender">
- <param name="file" value="logs/logsearch-logfeeder.json" />
- <param name="append" value="true" />
- <param name="maxFileSize" value="10MB" />
- <param name="maxBackupIndex" value="10" />
- <layout class="org.apache.ambari.logsearch.appender.LogsearchConversion" />
- </appender>
-
-
<!-- Logs to suppress BEGIN -->
<category name="org.apache.solr.common.cloud.ZkStateReader" additivity="false">
<priority value="error" />
- <appender-ref ref="daily_rolling_file" />
+ <appender-ref ref="rolling_file" />
</category>
<category name="apache.solr.client.solrj.impl.CloudSolrClient" additivity="false">
<priority value="fatal" />
- <appender-ref ref="daily_rolling_file" />
+ <appender-ref ref="rolling_file" />
</category>
- <!-- Logs to suppress END -->
<category name="org.apache.ambari.logfeeder" additivity="false">
- <priority value="INFO" />
- <appender-ref ref="console" />
- <!-- <appender-ref ref="daily_rolling_file" /> -->
- <appender-ref ref="rolling_file_json"/>
+ <priority value="info"/>
+ <appender-ref ref="rolling_file"/>
</category>
<root>
<priority value="warn"/>
- <!-- <appender-ref ref="rolling_file"/> -->
- <!-- <appender-ref ref="daily_rolling_file" /> -->
+ <appender-ref ref="rolling_file"/>
</root>
</log4j:configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/97b83d59/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2
index 7dc09ba2..a1f5539 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2
@@ -24,8 +24,8 @@ limitations under the License.
</layout>
</appender>
- <appender name="rolling_file_json" class="org.apache.log4j.RollingFileAppender">
- <param name="file" value="{{logsearch_log_dir}}/logsearch.json"/>
+ <appender name="rolling_file" class="org.apache.log4j.RollingFileAppender">
+ <param name="file" value="{{logsearch_log_dir}}/logsearch.log"/>
<param name="append" value="true"/>
<param name="maxFileSize" value="10MB"/>
<param name="maxBackupIndex" value="10"/>
@@ -34,8 +34,8 @@ limitations under the License.
</layout>
</appender>
- <appender name="audit_rolling_file_json" class="org.apache.log4j.RollingFileAppender">
- <param name="file" value="{{logsearch_log_dir}}/logsearch-audit.json"/>
+ <appender name="audit_rolling_file" class="org.apache.log4j.RollingFileAppender">
+ <param name="file" value="{{logsearch_log_dir}}/logsearch-audit.log"/>
<param name="append" value="true"/>
<param name="maxFileSize" value="10MB"/>
<param name="maxBackupIndex" value="10"/>
@@ -44,8 +44,8 @@ limitations under the License.
</layout>
</appender>
- <appender name="performance_analyzer_json" class="org.apache.log4j.RollingFileAppender">
- <param name="file" value="{{logsearch_log_dir}}/logsearch-performance.json"/>
+ <appender name="performance_analyzer" class="org.apache.log4j.RollingFileAppender">
+ <param name="file" value="{{logsearch_log_dir}}/logsearch-performance.log"/>
<param name="Threshold" value="info"/>
<param name="append" value="true"/>
<param name="maxFileSize" value="10MB"/>
@@ -56,22 +56,20 @@ limitations under the License.
</appender>
<logger name="org.apache.ambari.logsearch.audit" additivity="true">
- <appender-ref ref="audit_rolling_file_json"/>
+ <appender-ref ref="audit_rolling_file"/>
</logger>
<logger name="org.apache.ambari.logsearch.performance" additivity="false">
- <appender-ref ref="performance_analyzer_json"/>
+ <appender-ref ref="performance_analyzer"/>
</logger>
<category name="org.apache.ambari.logsearch" additivity="false">
<priority value="info"/>
- <appender-ref ref="rolling_file_json"/>
+ <appender-ref ref="rolling_file"/>
</category>
<root>
<priority value="warn"/>
- <!-- <appender-ref ref="console" /> -->
- <!--<appender-ref ref="rolling_file" /> -->
- <appender-ref ref="rolling_file_json"/>
+ <appender-ref ref="rolling_file"/>
</root>
</log4j:configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/97b83d59/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 87993c6..7bc8944 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -2171,13 +2171,6 @@ var hdp2properties = [
"category": "Advanced logsearch-site",
"index": 8
},
- {
- "name": "logsearch.logfeeder.include.default.level",
- "serviceName": "LOGSEARCH",
- "filename": "logsearch-site.xml",
- "category": "Advanced logsearch-site",
- "index": 9
- }
/*logsearch-solr-env*/
{
"name": "logsearch_solr_datadir",