ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject [3/7] ambari git commit: AMBARI-9005 Port the AMS service scripts from HDP to HDPWIN (Eugene Chekanskiy via jluniya)
Date Wed, 14 Jan 2015 23:38:13 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/3c202998/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
index 174355f..92f6616 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
@@ -52,13 +52,3 @@ def hdfs(component=None):
             mode="f",
             configuration_attributes=params.config['configuration_attributes']['hdfs-site']
   )
-  File(os.path.join(params.hadoop_conf_dir, "hadoop-metrics2.properties"),
-       content=Template("hadoop-metrics2.properties.j2"),
-       owner=params.hdfs_user,
-       mode="f"
-  )
-  File(os.path.join(params.hbase_conf_dir, "hadoop-metrics2-hbase.properties"),
-       content=Template("hadoop-metrics2.properties.j2"),
-       owner=params.hdfs_user,
-       mode="f"
-  )

http://git-wip-us.apache.org/repos/asf/ambari/blob/3c202998/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/params.py
index 1abad5c..6246ef0 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/params.py
@@ -50,16 +50,9 @@ if dfs_ha_enabled:
     if hostname in nn_host:
       namenode_id = nn_id
       namenode_rpc = nn_host
-dbserver = config['configurations']['cluster-env']['sink.dbservername'].replace('\\', '\\\\')
-dblogin = config['configurations']['cluster-env']['sink.dblogin']
-dbpassword = config['configurations']['cluster-env']['sink.dbpassword']
-dburl = config['configurations']['cluster-env']['sink.jdbc.url'].replace('\\', '\\\\')
-
-if 'integratedSecurity=true' not in dburl:
-  dburl = dburl + ';user=' + dblogin + ';password=' + dbpassword;
 
 hdfs_user = "hadoop"
 
 grep_exe = "findstr"
 
-name_node_params = default("/commandParams/namenode", None)
\ No newline at end of file
+name_node_params = default("/commandParams/namenode", None)

http://git-wip-us.apache.org/repos/asf/ambari/blob/3c202998/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/templates/hadoop-metrics2.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/templates/hadoop-metrics2.properties.j2
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/templates/hadoop-metrics2.properties.j2
deleted file mode 100644
index ee5b60e..0000000
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/templates/hadoop-metrics2.properties.j2
+++ /dev/null
@@ -1,53 +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.
-#}
-
-#
-#   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.
-#
-
-# syntax: [prefix].[source|sink].[instance].[options]
-# See javadoc of package-info.java for org.apache.hadoop.metrics2 for details
-
-*.sink.sql.class=org.apache.hadoop.metrics2.sink.SqlServerSinkHadoop2
-
-namenode.sink.sql.databaseUrl={{dburl}}
-datanode.sink.sql.databaseUrl={{dburl}}
-jobtracker.sink.sql.databaseUrl={{dburl}}
-tasktracker.sink.sql.databaseUrl={{dburl}}
-maptask.sink.sql.databaseUrl={{dburl}}
-reducetask.sink.sql.databaseUrl={{dburl}}
-resourcemanager.sink.sql.databaseUrl={{dburl}}
-nodemanager.sink.sql.databaseUrl={{dburl}}
-historyserver.sink.sql.databaseUrl={{dburl}}
-journalnode.sink.sql.databaseUrl={{dburl}}
-nimbus.sink.sql.databaseUrl={{dburl}}
-supervisor.sink.sql.databaseUrl={{dburl}}
-hbase.sink.sql.databaseUrl={{dburl}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3c202998/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metrics.json
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metrics.json
deleted file mode 100644
index a1451dd..0000000
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metrics.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "STORM_REST_API": {
-    "Component": [
-      {
-        "type": "jmx",
-        "metrics": {
-          "metrics/api/cluster/summary/tasks.total": {
-            "metric": "tasks.total",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/slots.total": {
-            "metric": "slots.total",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/slots.free": {
-            "metric": "slots.free",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/supervisors": {
-            "metric": "supervisors",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/executors.total": {
-            "metric": "executors.total",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/slots.used": {
-            "metric": "slots.used",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/topologies": {
-            "metric": "topologies",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/nimbus.uptime": {
-            "metric": "nimbus.uptime",
-            "pointInTime": true,
-            "temporal": false
-          }
-        }
-      }
-    ],
-    "HostComponent": [
-      {
-        "type": "jmx",
-        "metrics": {
-          "metrics/api/cluster/summary/tasks.total": {
-            "metric": "tasks.total",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/slots.total": {
-            "metric": "slots.total",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/slots.free": {
-            "metric": "slots.free",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/supervisors": {
-            "metric": "supervisors",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/executors.total": {
-            "metric": "executors.total",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/slots.used": {
-            "metric": "slots.used",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/topologies": {
-            "metric": "topologies",
-            "pointInTime": true,
-            "temporal": false
-          },
-          "metrics/api/cluster/summary/nimbus.uptime": {
-            "metric": "nimbus.uptime",
-            "pointInTime": true,
-            "temporal": false
-          }
-        }
-      }
-
-    ]
-  }
-}


Mime
View raw message