You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/12/20 19:48:37 UTC
[2/2] git commit: AMBARI-4132. Stale config indicator not shown when
reconfiguring WebHCat, Ganglia, Nagios, ZooKeeper. (swagle)
AMBARI-4132. Stale config indicator not shown when reconfiguring WebHCat, Ganglia, Nagios, ZooKeeper. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1a9c146d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1a9c146d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1a9c146d
Branch: refs/heads/branch-1.4.3
Commit: 1a9c146d1238d83ba9160b4a006bf4d18aa3fafe
Parents: 5479d02
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Fri Dec 20 09:40:34 2013 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Fri Dec 20 10:48:18 2013 -0800
----------------------------------------------------------------------
.../services/GANGLIA/configuration/global.xml | 51 ++++++++++++++++++++
.../HDP/2.0.6/services/GANGLIA/metainfo.xml | 4 ++
.../services/NAGIOS/configuration/global.xml | 51 ++++++++++++++++++++
.../HDP/2.0.6/services/NAGIOS/metainfo.xml | 4 ++
.../services/WEBHCAT/configuration/global.xml | 51 ++++++++++++++++++++
.../HDP/2.0.6/services/WEBHCAT/metainfo.xml | 4 ++
.../HDP/2.0.6/services/ZOOKEEPER/metainfo.xml | 4 ++
.../services/GANGLIA/configuration/global.xml | 51 ++++++++++++++++++++
.../HDP/2.0.8/services/GANGLIA/metainfo.xml | 4 ++
.../services/NAGIOS/configuration/global.xml | 51 ++++++++++++++++++++
.../HDP/2.0.8/services/NAGIOS/metainfo.xml | 4 ++
.../services/WEBHCAT/configuration/global.xml | 51 ++++++++++++++++++++
.../HDP/2.0.8/services/WEBHCAT/metainfo.xml | 4 ++
.../HDP/2.0.8/services/ZOOKEEPER/metainfo.xml | 4 ++
14 files changed, 338 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/global.xml
new file mode 100644
index 0000000..18eae57
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/global.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
+<configuration>
+
+ <property>
+ <name>ganglia_conf_dir</name>
+ <value>/etc/ganglia/hdp</value>
+ <description></description>
+ </property>
+ <property>
+ <name>ganglia_runtime_dir</name>
+ <value>/var/run/ganglia/hdp</value>
+ <description></description>
+ </property>
+ <property>
+ <name>gmetad_user</name>
+ <value>nobody</value>
+ <description></description>
+ </property>
+ <property>
+ <name>gmond_user</name>
+ <value>nobody</value>
+ <description></description>
+ </property>
+ <property>
+ <name>rrdcached_base_dir</name>
+ <value>/var/lib/ganglia/rrds</value>
+ <description>Location of rrd files.</description>
+ </property>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
index 9f7444b..3e6d37a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
@@ -33,4 +33,8 @@
</components>
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ </configuration-dependencies>
+
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/configuration/global.xml
new file mode 100644
index 0000000..9c420bd
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/configuration/global.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
+<configuration>
+
+ <property>
+ <name>nagios_contact</name>
+ <value></value>
+ <description>Email address.</description>
+ </property>
+ <property>
+ <name>nagios_group</name>
+ <value>nagios</value>
+ <description></description>
+ </property>
+ <property>
+ <name>nagios_user</name>
+ <value>nagios</value>
+ <description>Nagios process user.</description>
+ </property>
+ <property>
+ <name>nagios_web_login</name>
+ <value>nagiosadmin</value>
+ <description>Web user name.</description>
+ </property>
+ <property>
+ <name>nagios_web_password</name>
+ <value></value>
+ <description></description>
+ </property>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
index 76471cf..42bee82 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
@@ -27,4 +27,8 @@
</component>
</components>
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ </configuration-dependencies>
+
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/configuration/global.xml
new file mode 100644
index 0000000..fed9c6f
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/configuration/global.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
+<configuration>
+
+ <property>
+ <name>hcat_conf_dir</name>
+ <value></value>
+ <description></description>
+ </property>
+ <property>
+ <name>hcat_log_dir</name>
+ <value>/var/log/webhcat</value>
+ <description></description>
+ </property>
+ <property>
+ <name>hcat_pid_dir</name>
+ <value>/var/run/webhcat</value>
+ <description></description>
+ </property>
+ <property>
+ <name>hcat_user</name>
+ <value>hcat</value>
+ <description></description>
+ </property>
+ <property>
+ <name>webhcat_user</name>
+ <value>hcat</value>
+ <description></description>
+ </property>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml
index 91267e4..f8e8318 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml
@@ -27,5 +27,9 @@
</component>
</components>
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ <config-type>webhcat-site</config-type>
+ </configuration-dependencies>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
index 9c7757a..565b4d4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
@@ -32,4 +32,8 @@
</component>
</components>
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ </configuration-dependencies>
+
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/configuration/global.xml
new file mode 100644
index 0000000..18eae57
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/configuration/global.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
+<configuration>
+
+ <property>
+ <name>ganglia_conf_dir</name>
+ <value>/etc/ganglia/hdp</value>
+ <description></description>
+ </property>
+ <property>
+ <name>ganglia_runtime_dir</name>
+ <value>/var/run/ganglia/hdp</value>
+ <description></description>
+ </property>
+ <property>
+ <name>gmetad_user</name>
+ <value>nobody</value>
+ <description></description>
+ </property>
+ <property>
+ <name>gmond_user</name>
+ <value>nobody</value>
+ <description></description>
+ </property>
+ <property>
+ <name>rrdcached_base_dir</name>
+ <value>/var/lib/ganglia/rrds</value>
+ <description>Location of rrd files.</description>
+ </property>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/metainfo.xml
index 9f7444b..3e6d37a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/metainfo.xml
@@ -33,4 +33,8 @@
</components>
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ </configuration-dependencies>
+
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/configuration/global.xml
new file mode 100644
index 0000000..9c420bd
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/configuration/global.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
+<configuration>
+
+ <property>
+ <name>nagios_contact</name>
+ <value></value>
+ <description>Email address.</description>
+ </property>
+ <property>
+ <name>nagios_group</name>
+ <value>nagios</value>
+ <description></description>
+ </property>
+ <property>
+ <name>nagios_user</name>
+ <value>nagios</value>
+ <description>Nagios process user.</description>
+ </property>
+ <property>
+ <name>nagios_web_login</name>
+ <value>nagiosadmin</value>
+ <description>Web user name.</description>
+ </property>
+ <property>
+ <name>nagios_web_password</name>
+ <value></value>
+ <description></description>
+ </property>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/metainfo.xml
index 76471cf..42bee82 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/metainfo.xml
@@ -27,4 +27,8 @@
</component>
</components>
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ </configuration-dependencies>
+
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/WEBHCAT/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/WEBHCAT/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/WEBHCAT/configuration/global.xml
new file mode 100644
index 0000000..fed9c6f
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/WEBHCAT/configuration/global.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
+<configuration>
+
+ <property>
+ <name>hcat_conf_dir</name>
+ <value></value>
+ <description></description>
+ </property>
+ <property>
+ <name>hcat_log_dir</name>
+ <value>/var/log/webhcat</value>
+ <description></description>
+ </property>
+ <property>
+ <name>hcat_pid_dir</name>
+ <value>/var/run/webhcat</value>
+ <description></description>
+ </property>
+ <property>
+ <name>hcat_user</name>
+ <value>hcat</value>
+ <description></description>
+ </property>
+ <property>
+ <name>webhcat_user</name>
+ <value>hcat</value>
+ <description></description>
+ </property>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/WEBHCAT/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/WEBHCAT/metainfo.xml
index 776fc1b..cf1b4e3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/WEBHCAT/metainfo.xml
@@ -27,5 +27,9 @@
</component>
</components>
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ <config-type>webhcat-site</config-type>
+ </configuration-dependencies>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a9c146d/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/ZOOKEEPER/metainfo.xml
index c9afa00..e04563b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/ZOOKEEPER/metainfo.xml
@@ -32,4 +32,8 @@
</component>
</components>
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ </configuration-dependencies>
+
</metainfo>