AMBARI-7128. Default blueprints fail because of Nagios property. (Krisztian Horvath via yusaku)

ambari-client/groovy-client/src/main/resources/blueprints/hdp-multinode-default

@@ -1,7 +1,7 @@
 {
     "configurations" : [
         {
-            "global" : {
+            "nagios-env" : {
                 "nagios_contact" : "admin@localhost"
             }
         }
@@ -134,9 +134,6 @@
                 {
                     "name" : "NAGIOS_SERVER"
                 },
-                {
-                    "name" : "GANGLIA_SERVER"
-                },
                 {
                     "name" : "ZOOKEEPER_CLIENT"
                 },

ambari-client/groovy-client/src/main/resources/blueprints/hdp-singlenode-default

@@ -1,7 +1,7 @@
 {
     "configurations" : [
         {
-            "global" : {
+            "nagios-env" : {
                 "nagios_contact" : "admin@localhost"
             }
         }

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": [
@@ -100,9 +100,6 @@
         {
           "name": "YARN_CLIENT"
         },
-        {
-          "name" : "APP_TIMELINE_SERVER"
-        },
         {
           "name": "MAPREDUCE2_CLIENT"
         },
@@ -157,9 +154,6 @@
         {
           "name": "DATANODE"
         },
-        {
-          "name" : "APP_TIMELINE_SERVER"
-        },
         {
           "name": "GANGLIA_MONITOR"
         }

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": [

ambari-client/groovy-client/src/main/resources/blueprints/single-node-hdfs-yarn

@@ -8,7 +8,7 @@
       },
       {
         "name" : "SECONDARY_NAMENODE"
-      },       
+      },
       {
         "name" : "DATANODE"
       },

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"
   }
-}
+}

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"
             }
         }
@@ -139,9 +139,6 @@
                 {
                     "name" : "NAGIOS_SERVER"
                 },
-                {
-                    "name" : "GANGLIA_SERVER"
-                },
                 {
                     "name" : "ZOOKEEPER_CLIENT"
                 },
@@ -184,4 +181,4 @@
         "stack_name" : "HDP",
         "stack_version" : "2.1"
     }
-}
+}

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"
     }
-}
+}

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"
             }
         }
@@ -134,9 +134,6 @@
                 {
                     "name" : "NAGIOS_SERVER"
                 },
-                {
-                    "name" : "GANGLIA_SERVER"
-                },
                 {
                     "name" : "ZOOKEEPER_CLIENT"
                 },
@@ -179,4 +176,4 @@
         "stack_name" : "HDP",
         "stack_version" : "2.1"
     }
-}
+}

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"
     }
-}
+}