You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/09/06 01:16:17 UTC
git commit: AMBARI-7128. Default blueprints fail because of Nagios
property. (Krisztian Horvath via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk a7761fcd8 -> a6e5c8b3c
AMBARI-7128. Default blueprints fail because of Nagios property. (Krisztian Horvath via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a6e5c8b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a6e5c8b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a6e5c8b3
Branch: refs/heads/trunk
Commit: a6e5c8b3c5f3385da4a4439c7e3482511f1a8b83
Parents: a7761fc
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Fri Sep 5 16:15:06 2014 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Fri Sep 5 16:15:51 2014 -0700
----------------------------------------------------------------------
.../src/main/resources/blueprints/hdp-multinode-default | 5 +----
.../main/resources/blueprints/hdp-singlenode-default | 2 +-
.../src/main/resources/blueprints/lambda-architecture | 12 +++---------
.../src/main/resources/blueprints/multi-node-hdfs-yarn | 6 +++---
.../src/main/resources/blueprints/single-node-hdfs-yarn | 2 +-
.../groovy-client/src/main/resources/blueprints/warmup | 8 ++++----
.../HDP/2.1.GlusterFS/blueprints/multinode-default.json | 7 ++-----
.../2.1.GlusterFS/blueprints/singlenode-default.json | 4 ++--
.../stacks/HDP/2.1/blueprints/multinode-default.json | 7 ++-----
.../stacks/HDP/2.1/blueprints/singlenode-default.json | 4 ++--
10 files changed, 21 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6e5c8b3/ambari-client/groovy-client/src/main/resources/blueprints/hdp-multinode-default
----------------------------------------------------------------------
diff --git a/ambari-client/groovy-client/src/main/resources/blueprints/hdp-multinode-default b/ambari-client/groovy-client/src/main/resources/blueprints/hdp-multinode-default
index 4247c41..0a76808 100644
--- a/ambari-client/groovy-client/src/main/resources/blueprints/hdp-multinode-default
+++ b/ambari-client/groovy-client/src/main/resources/blueprints/hdp-multinode-default
@@ -1,7 +1,7 @@
{
"configurations" : [
{
- "global" : {
+ "nagios-env" : {
"nagios_contact" : "admin@localhost"
}
}
@@ -135,9 +135,6 @@
"name" : "NAGIOS_SERVER"
},
{
- "name" : "GANGLIA_SERVER"
- },
- {
"name" : "ZOOKEEPER_CLIENT"
},
{
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6e5c8b3/ambari-client/groovy-client/src/main/resources/blueprints/hdp-singlenode-default
----------------------------------------------------------------------
diff --git a/ambari-client/groovy-client/src/main/resources/blueprints/hdp-singlenode-default b/ambari-client/groovy-client/src/main/resources/blueprints/hdp-singlenode-default
index aa752de..34fa5a0 100644
--- a/ambari-client/groovy-client/src/main/resources/blueprints/hdp-singlenode-default
+++ b/ambari-client/groovy-client/src/main/resources/blueprints/hdp-singlenode-default
@@ -1,7 +1,7 @@
{
"configurations" : [
{
- "global" : {
+ "nagios-env" : {
"nagios_contact" : "admin@localhost"
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6e5c8b3/ambari-client/groovy-client/src/main/resources/blueprints/lambda-architecture
----------------------------------------------------------------------
diff --git a/ambari-client/groovy-client/src/main/resources/blueprints/lambda-architecture b/ambari-client/groovy-client/src/main/resources/blueprints/lambda-architecture
index 1750e59..26fa576 100644
--- a/ambari-client/groovy-client/src/main/resources/blueprints/lambda-architecture
+++ b/ambari-client/groovy-client/src/main/resources/blueprints/lambda-architecture
@@ -1,9 +1,9 @@
{
"configurations": [
{
- "global": {
- "nagios_contact": "me@my-awesome-domain.example"
- }
+ "nagios-env" : {
+ "nagios_contact" : "admin@localhost"
+ }
}
],
"host_groups": [
@@ -101,9 +101,6 @@
"name": "YARN_CLIENT"
},
{
- "name" : "APP_TIMELINE_SERVER"
- },
- {
"name": "MAPREDUCE2_CLIENT"
},
{
@@ -158,9 +155,6 @@
"name": "DATANODE"
},
{
- "name" : "APP_TIMELINE_SERVER"
- },
- {
"name": "GANGLIA_MONITOR"
}
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6e5c8b3/ambari-client/groovy-client/src/main/resources/blueprints/multi-node-hdfs-yarn
----------------------------------------------------------------------
diff --git a/ambari-client/groovy-client/src/main/resources/blueprints/multi-node-hdfs-yarn b/ambari-client/groovy-client/src/main/resources/blueprints/multi-node-hdfs-yarn
index 6d6a364..82f3042 100644
--- a/ambari-client/groovy-client/src/main/resources/blueprints/multi-node-hdfs-yarn
+++ b/ambari-client/groovy-client/src/main/resources/blueprints/multi-node-hdfs-yarn
@@ -1,9 +1,9 @@
{
"configurations": [
{
- "global": {
- "nagios_contact": "me@my-awesome-domain.example"
- }
+ "nagios-env" : {
+ "nagios_contact" : "admin@localhost"
+ }
}
],
"host_groups": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6e5c8b3/ambari-client/groovy-client/src/main/resources/blueprints/single-node-hdfs-yarn
----------------------------------------------------------------------
diff --git a/ambari-client/groovy-client/src/main/resources/blueprints/single-node-hdfs-yarn b/ambari-client/groovy-client/src/main/resources/blueprints/single-node-hdfs-yarn
index 3772a7f..768741b 100644
--- a/ambari-client/groovy-client/src/main/resources/blueprints/single-node-hdfs-yarn
+++ b/ambari-client/groovy-client/src/main/resources/blueprints/single-node-hdfs-yarn
@@ -8,7 +8,7 @@
},
{
"name" : "SECONDARY_NAMENODE"
- },
+ },
{
"name" : "DATANODE"
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6e5c8b3/ambari-client/groovy-client/src/main/resources/blueprints/warmup
----------------------------------------------------------------------
diff --git a/ambari-client/groovy-client/src/main/resources/blueprints/warmup b/ambari-client/groovy-client/src/main/resources/blueprints/warmup
index 8b745d6..e6587c1 100644
--- a/ambari-client/groovy-client/src/main/resources/blueprints/warmup
+++ b/ambari-client/groovy-client/src/main/resources/blueprints/warmup
@@ -1,9 +1,9 @@
{
"configurations": [
{
- "global": {
- "nagios_contact": "me@my-awesome-domain.example"
- }
+ "nagios-env" : {
+ "nagios_contact" : "admin@localhost"
+ }
}
],
"host_groups": [
@@ -91,4 +91,4 @@
"stack_name": "HDP",
"stack_version": "2.1"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6e5c8b3/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/blueprints/multinode-default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/blueprints/multinode-default.json b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/blueprints/multinode-default.json
index 682bc99..7be13b7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/blueprints/multinode-default.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/blueprints/multinode-default.json
@@ -1,7 +1,7 @@
{
"configurations" : [
{
- "global" : {
+ "nagios-env" : {
"nagios_contact" : "admin@localhost"
}
}
@@ -140,9 +140,6 @@
"name" : "NAGIOS_SERVER"
},
{
- "name" : "GANGLIA_SERVER"
- },
- {
"name" : "ZOOKEEPER_CLIENT"
},
{
@@ -184,4 +181,4 @@
"stack_name" : "HDP",
"stack_version" : "2.1"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6e5c8b3/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/blueprints/singlenode-default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/blueprints/singlenode-default.json b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/blueprints/singlenode-default.json
index c8a6dee..501b5d0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/blueprints/singlenode-default.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/blueprints/singlenode-default.json
@@ -1,7 +1,7 @@
{
"configurations" : [
{
- "global" : {
+ "nagios-env" : {
"nagios_contact" : "admin@localhost"
}
}
@@ -133,4 +133,4 @@
"stack_name" : "HDP",
"stack_version" : "2.1"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6e5c8b3/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/multinode-default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/multinode-default.json b/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/multinode-default.json
index 1069f8e..08ce8d5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/multinode-default.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/multinode-default.json
@@ -1,7 +1,7 @@
{
"configurations" : [
{
- "global" : {
+ "nagios-env" : {
"nagios_contact" : "admin@localhost"
}
}
@@ -135,9 +135,6 @@
"name" : "NAGIOS_SERVER"
},
{
- "name" : "GANGLIA_SERVER"
- },
- {
"name" : "ZOOKEEPER_CLIENT"
},
{
@@ -179,4 +176,4 @@
"stack_name" : "HDP",
"stack_version" : "2.1"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6e5c8b3/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/singlenode-default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/singlenode-default.json b/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/singlenode-default.json
index 153562b..1727ebb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/singlenode-default.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/singlenode-default.json
@@ -1,7 +1,7 @@
{
"configurations" : [
{
- "global" : {
+ "nagios-env" : {
"nagios_contact" : "admin@localhost"
}
}
@@ -130,4 +130,4 @@
"stack_name" : "HDP",
"stack_version" : "2.1"
}
-}
\ No newline at end of file
+}