ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mgerg...@apache.org
Subject ambari git commit: AMBARI-21212 Remove unnecessary Log Search stack definition parts (mgergely)
Date Mon, 19 Jun 2017 10:25:50 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 2a844d706 -> b7d422526


AMBARI-21212 Remove unnecessary Log Search stack definition parts (mgergely)

Change-Id: I624ef5e6a6b987f2c6976c89622933fbd6199796


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

Branch: refs/heads/trunk
Commit: b7d422526326fea373a5e9b067df8ce0b05867f6
Parents: 2a844d7
Author: Miklos Gergely <mgergely@hortonworks.com>
Authored: Mon Jun 19 12:25:19 2017 +0200
Committer: Miklos Gergely <mgergely@hortonworks.com>
Committed: Mon Jun 19 12:25:19 2017 +0200

----------------------------------------------------------------------
 .../LOGSEARCH/0.5.0/metainfo.xml                | 24 ------
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |  1 -
 .../package/templates/input.config-nifi.json.j2 | 79 --------------------
 3 files changed, 104 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b7d42252/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
index ab66696..4a7b3e0 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
@@ -153,30 +153,6 @@
       </commandScript>
 
       <configuration-dependencies>
-        <config-type>logfeeder-ambari-config</config-type>
-        <config-type>logfeeder-custom-logsearch-config</config-type>
-        <config-type>accumulo-logsearch-conf</config-type>
-        <config-type>ams-logsearch-conf</config-type>
-        <config-type>atlas-logsearch-conf</config-type>
-        <config-type>falcon-logsearch-conf</config-type>
-        <config-type>flume-logsearch-conf</config-type>
-        <config-type>hbase-logsearch-conf</config-type>
-        <config-type>hdfs-logsearch-conf</config-type>
-        <config-type>hive-logsearch-conf</config-type>
-        <config-type>infra-logsearch-conf</config-type>
-        <config-type>kafka-logsearch-conf</config-type>
-        <config-type>knox-logsearch-conf</config-type>
-        <config-type>mapred-logsearch-conf</config-type>
-        <config-type>nifi-logsearch-conf</config-type>
-        <config-type>oozie-logsearch-conf</config-type>
-        <config-type>ranger-kms-logsearch-conf</config-type>
-        <config-type>ranger-logsearch-conf</config-type>
-        <config-type>spark-logsearch-conf</config-type>
-        <config-type>spark2-logsearch-conf</config-type>
-        <config-type>storm-logsearch-conf</config-type>
-        <config-type>yarn-logsearch-conf</config-type>
-        <config-type>zeppelin-logsearch-conf</config-type>
-        <config-type>zookeeper-logsearch-conf</config-type>
       </configuration-dependencies>
 
       <quickLinksConfigurations>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b7d42252/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 6738c5c..662f49e 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
@@ -204,7 +204,6 @@ logsearch_app_log4j_content = config['configurations']['logsearch-log4j']['conte
 # Log dirs
 ambari_server_log_dir = '/var/log/ambari-server'
 ambari_agent_log_dir = '/var/log/ambari-agent'
-nifi_log_dir = default('/configurations/nifi-env/nifi_node_log_dir', '/var/log/nifi')
 
 # System logs
 logfeeder_system_messages_content = config['configurations']['logfeeder-system_log-env']['logfeeder_system_messages_content']

http://git-wip-us.apache.org/repos/asf/ambari/blob/b7d42252/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-nifi.json.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-nifi.json.j2
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-nifi.json.j2
deleted file mode 100644
index fe5c426..0000000
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-nifi.json.j2
+++ /dev/null
@@ -1,79 +0,0 @@
-{#
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements.  See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership.  The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License.  You may obtain a copy of the License at
- #
- #   http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
- #}
-{
-  "input":[
-    {
-      "type":"nifi_app",
-      "rowtype":"service",
-      "path":"{{nifi_log_dir}}/nifi-app.log"
-    },
-    {
-      "type":"nifi_bootstrap",
-      "rowtype":"service",
-      "path":"{{nifi_log_dir}}/nifi-bootstrap.log"
-    },
-    {
-      "type":"nifi_setup",
-      "rowtype":"service",
-      "path":"{{nifi_log_dir}}/nifi-setup.log"
-    },
-    {
-      "type":"nifi_user",
-      "rowtype":"service",
-      "path":"{{nifi_log_dir}}/nifi-user.log"
-    },
-    {
-      "type":"nifi_ca",
-      "rowtype":"service",
-      "path":"{{nifi_log_dir}}/nifi-ca.stdout"
-    }
-  ],
-  "filter":[
-    {
-      "filter":"grok",
-      "conditions":{
-        "fields":{
-          "type":[
-            "nifi_app",
-            "nifi_bootstrap",
-            "nifi_setup",
-            "nifi_user",
-            "nifi_ca"
-          ]
-
-        }
-
-      },
-      "log4j_format":"",
-      "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})",
-      "message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}%{LOGLEVEL:level}%{SPACE}\\[%{DATA:thread_name}\\]%{SPACE}%{GREEDYDATA:log_message}",
-      "post_map_values":{
-        "logtime":{
-          "map_date":{
-            "target_date_pattern":"yyyy-MM-dd HH:mm:ss,SSS"
-          }
-
-        }
-
-      }
-
-    }
-
-  ]
-
-}


Mime
View raw message