incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r1398196 [10/11] - in /incubator/ambari/branches/branch-0.9-h2-dev: ./ hmc/js/ hmc/package/rpm/ hmc/php/conf/ hmc/php/db/ hmc/php/frontend/ hmc/php/orchestrator/ hmc/php/puppet/ hmc/php/puppet/genmanifest/ hmc/php/util/ hmc/puppet/modules/h...
Date Mon, 15 Oct 2012 05:55:57 GMT
Added: incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/java/package.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/java/package.pp?rev=1398196&view=auto
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/java/package.pp (added)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/java/package.pp Mon Oct 15 05:55:46 2012
@@ -0,0 +1,70 @@
+#
+#
+# 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.
+#
+#
+define hdp2::java::package(
+  $size,
+  $include_artifact_dir = true
+)
+{
+    
+  include hdp2::params
+  
+  $jdk_bin = $hdp2::params::jdk_bins[$size]
+  $artifact_dir = $hdp2::params::artifact_dir
+  $jdk_location = $hdp2::params::jdk_location
+  $jdk_curl_target = "${artifact_dir}/${jdk_bin}"
+ 
+  
+  if ($size == "32") {
+    $java_home = $hdp2::params::java32_home
+  } else {
+    $java_home = $hdp2::params::java64_home
+  }
+  $java_exec = "${java_home}/bin/java"
+  $java_dir = regsubst($java_home,'/[^/]+$','')
+   
+  if ($include_artifact_dir == true) {
+    hdp2::artifact_dir{ "java::package::${name}": }
+  }
+  
+  $curl_cmd = "mkdir -p ${artifact_dir} ; curl -f --retry 10 ${jdk_location}/${jdk_bin} -o ${jdk_curl_target}"
+  exec{ "${curl_cmd} ${name}":
+    command => $curl_cmd,
+    creates => $jdk_curl_target,
+    path    => ["/bin","/usr/bin/"],
+    unless  => "test -e ${java_exec}"
+  }
+ 
+  $install_cmd = "mkdir -p ${java_dir} ; chmod +x ${jdk_curl_target}; cd ${java_dir} ; echo A | ${jdk_curl_target} -noregister > /dev/null 2>&1"
+  exec{ "${install_cmd} ${name}":
+    command => $install_cmd,
+    unless  => "test -e ${java_exec}",
+    path    => ["/bin","/usr/bin/"]
+  }
+ 
+  file { "${java_exec} ${name}":
+  ensure => present
+  }   
+ 
+  anchor{"hdp2::java::package::${name}::begin":} -> Exec["${curl_cmd} ${name}"] ->  Exec["${install_cmd} ${name}"] -> File["${java_exec} ${name}"] -> anchor{"hdp2::java::package::${name}::end":}
+  if ($include_artifact_dir == true) {
+    Anchor["hdp2::java::package::${name}::begin"] -> Hdp2::Artifact_dir["java::package::${name}"] -> Exec["${curl_cmd} ${name}"]
+  }
+}

Added: incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/lzo/package.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/lzo/package.pp?rev=1398196&view=auto
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/lzo/package.pp (added)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/lzo/package.pp Mon Oct 15 05:55:46 2012
@@ -0,0 +1,46 @@
+#
+#
+# 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.
+#
+#
+define hdp2::lzo::package()
+{
+  $size = $name
+
+
+  case $hdp2::params::hdp_os_type {
+    centos6, rhel6: {
+      $pkg_type = 'lzo-rhel6'
+    }
+    default: {
+      $pkg_type = 'lzo-rhel5'
+    }
+  }
+
+
+  hdp2::package {"lzo ${size}":
+    package_type  => "${pkg_type}", 
+    size          => $size,
+    java_needed   => false
+  }
+
+  $anchor_beg = "hdp2::lzo::package::${size}::begin"
+  $anchor_end = "hdp2::lzo::package::${size}::end"
+  anchor{$anchor_beg:} ->  Hdp2::Package["lzo ${size}"] -> anchor{$anchor_end:}
+}
+

Added: incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/namenode-conn.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/namenode-conn.pp?rev=1398196&view=auto
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/namenode-conn.pp (added)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/namenode-conn.pp Mon Oct 15 05:55:46 2012
@@ -0,0 +1,24 @@
+#
+#
+# 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.
+#
+#
+class hdp2::namenode-conn($namenode_host)
+{
+  Hdp2::Configfile<||>{namenode_host => $namenode_host}
+}

Added: incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/package.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/package.pp?rev=1398196&view=auto
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/package.pp (added)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/package.pp Mon Oct 15 05:55:46 2012
@@ -0,0 +1,100 @@
+#
+#
+# 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.
+#
+#
+define hdp2::package(
+  $ensure = present,
+  $package_type = undef,
+  $size = 64,
+  $java_needed = true,
+  $lzo_needed = false,
+  $provider = yum
+  )
+{
+ 
+  $pt = $package_type ? {
+    undef  => $name,
+    default  => $package_type
+  }
+  
+  case $provider {
+    'yum': { 
+      hdp2::package::yum { $name:
+        ensure       => $ensure,
+        package_type => $pt,
+        size         => $size,
+        java_needed  => $java_needed,
+        lzo_needed   => $lzo_needed
+      }
+    }
+    default: {
+      hdp_fail("No support for provider ${provider}")
+    }
+  }
+}
+
+define hdp2::package::yum(
+  $ensure = present,
+  $package_type,
+  $size,
+  $java_needed,
+  $lzo_needed
+  )
+{
+    
+  include hdp2::params
+ 
+  $package_type_info = $hdp2::params::package_names[$package_type]
+  if hdp_is_empty($package_type_info) {
+    hdp_fail("Cannot find info about package type ${package_type}") 
+  }
+  $package_name = $package_type_info[$size]
+  if hdp_is_empty($package_name) {
+    hdp_fail("Cannot find package ${package_type} of size ${size}")
+  }
+  
+  if (($java_needed == true) and ($ensure == 'present')){
+    hdp2::java::package{ $name:
+      size                 => $size,
+      include_artifact_dir => true
+    }
+  }
+
+  if (($lzo_needed == true) and ($ensure == 'present')){
+    Hdp2::Lzo::Package<|title == $size|>
+  }
+
+  if ($ensure == 'uninstalled') {
+    $ensure_actual = 'purged'
+  } else {
+    $ensure_actual = $ensure
+  }
+  $tag = regsubst($name,' ','-',G)
+  package{ $package_name:
+    ensure   => $ensure_actual,
+    provider => yum,
+    tag      => $tag
+  }
+  anchor{ "hdp2::package::${name}::begin": } -> Package<|tag == $tag|> -> anchor{ "hdp2::package::${name}::end": }
+  
+  if (($java_needed == true)and ($ensure == 'present')) {
+   Anchor["hdp2::package::${name}::begin"] -> Hdp2::Java::Package[$name] -> Anchor["hdp2::package::${name}::end"] 
+  }
+}
+

Added: incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/params.pp?rev=1398196&view=auto
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/params.pp (added)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/params.pp Mon Oct 15 05:55:46 2012
@@ -0,0 +1,364 @@
+#
+#
+# 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.
+#
+#
+class hdp2::params()
+{
+
+  ##### global state defaults ####
+  $cluster_service_state = hdp_default("cluster_service_state","running")
+  $cluster_client_state = hdp_default("cluster_client_state","installed_and_configured")
+
+  ###### hostnames
+  $namenode_host = hdp_default("namenode_host")
+  $snamenode_host = hdp_default("snamenode_host")
+  $yarn_rm_host = hdp_default("yarn_rm_host")
+  $slave_hosts = hdp_default("slave_hosts")
+  
+  $zookeeper_hosts = hdp_default("zookeeper_hosts")
+
+  $hbase_master_host = hdp_default("hbase_master_host")
+  $hbase_rs_hosts = hdp_default("hbase_rs_hosts",$slave_hosts) #if hbase_rs_hosts not given it is assumed that region servers on same nodes as slaves
+
+  $hive_server_host = hdp_default("hive_server_host")
+  $oozie_server =  hdp_default("oozie_server")
+  $templeton_server_host = hdp_default("templeton_server_host")
+  $gateway_host = hdp_default("gateway_host")
+  
+  $nagios_server_host = hdp_default("nagios_server_host")
+  $ganglia_server_host = hdp_default("ganglia_server_host")
+  
+  $dashboard_host = hdp_default("dashboard_host")
+
+  $hdp_os = $::operatingsystem
+  $hdp_os_version = $::operatingsystemrelease
+  case $::operatingsystem {
+    centos: {
+      case $::operatingsystemrelease {
+        /^5\..+$/: { $hdp_os_type = "centos5" }
+        /^6\..+$/: { $hdp_os_type = "centos6" }
+      }
+    }
+    redhat: {
+      case $::operatingsystemrelease {
+        /^5\..+$/: { $hdp_os_type = "rhel5" }
+        /^6\..+$/: { $hdp_os_type = "rhel6" }
+      }
+    }
+    default: {
+      hdp_fail("No support for os  ${hdp_os} ${hdp_os_version}")
+    }
+  }
+
+  if ($hostAttributes != undef) {
+    $public_namenode_host = hdp_host_attribute($hostAttributes,"publicfqdn",$namenode_host)
+    $public_snamenode_host = hdp_host_attribute($hostAttributes,"publicfqdn",$snamenode_host)
+    $public_yarn_rm_host = hdp_host_attribute($hostAttributes,"publicfqdn",$yarn_rm_host)
+    $public_hbase_master_host = hdp_host_attribute($hostAttributes,"publicfqdn",$hbase_master_host)
+    $public_zookeeper_hosts = hdp_host_attribute($hostAttributes,"publicfqdn",$zookeeper_hosts)
+    $public_ganglia_server_host = hdp_host_attribute($hostAttributes,"publicfqdn",$ganglia_server_host)
+    $public_nagios_server_host = hdp_host_attribute($hostAttributes,"publicfqdn",$nagios_server_host)
+    $public_dashboard_host = hdp_host_attribute($hostAttributes,"publicfqdn",$dashboard_host)
+    $public_hive_server_host = hdp_host_attribute($hostAttributes,"publicfqdn",$hive_server_host)
+    $public_oozie_server = hdp_host_attribute($hostAttributes,"publicfqdn",$oozie_server)
+    $public_templeton_server_host = hdp_host_attribute($hostAttributes,"publicfqdn",$templeton_server_host)
+  } else {
+    $public_namenode_host = hdp_default("namenode_host")
+    $public_snamenode_host = hdp_default("snamenode_host")
+    $public_yarn_rm_host = hdp_default("yarn_rm_host")
+    $public_hbase_master_host = hdp_default("hbase_master_host")
+    $public_zookeeper_hosts = hdp_default("zookeeper_hosts")
+    $public_ganglia_server_host = hdp_default("ganglia_server_host")
+    $public_nagios_server_host = hdp_default("nagios_server_host")
+    $public_dashboard_host = hdp_default("dashboard_host")
+    $public_hive_server_host = hdp_default("hive_server_host")
+    $public_oozie_server = hdp_default("oozie_server")
+    $public_templeton_server_host = hdp_default("templeton_server_host")
+  }
+
+
+  ############ users
+  $user_info = hdp_default("user_info",{})
+
+  $hdfs_user = hdp_default("hdfs_user","hdfs")
+  $yarn_user = hdp_default("yarn_user","yarn")
+  $mapred_user = hdp_default("mapred_user","mapred")
+
+  $zk_user = hdp_default("zk_user","zookeeper") 
+  $hbase_user = hdp_default("hbase_user","hbase")
+
+  $hive_user = hdp_default("hive_user","hive")
+  $hcat_user = hdp_default("hcat_user","hcat")
+
+  $oozie_user = hdp_default("oozie_user","oozie")
+  $templeton_user = hdp_default("templeton_user","templeton")
+
+  $gmetad_user = hdp_default("gmetad_user","nobody")
+  $gmond_user = hdp_default("gmond_user","nobody")
+
+  $smokeuser = hdp_default("smokeuser","ambari_qa")
+  $smoke_user_group = hdp_default("smoke_user_group","users")
+
+  #because of Puppet user resource issue make sure that $hadoop_user is different from hadoop_user_group
+  $hadoop_user = hdp_default("hadoop_user", "hadoop_deploy")
+  $hadoop_user_group = hdp_default("hadoop_user_group","hadoop")
+
+  $ganglia_enabled = hdp_default("ganglia_enabled",true) 
+
+  #TODO: either remove or make conditional on ec2
+  $host_address = undef 
+
+  ##### java 
+  $java32_home = hdp_default("java32_home","/usr/jdk32/jdk1.6.0_31")
+  $java64_home = hdp_default("java64_home","/usr/jdk64/jdk1.6.0_31")
+  
+  $wipeoff_data =  hdp_default("wipeoff_data",false) 
+
+  $jdk_location = hdp_default("jdk_location","http://download.oracle.com/otn-pub/java/jdk/6u31-b04")
+  $jdk_bins = hdp_default("jdk_bins",{
+    32 => "jdk-6u31-linux-i586.bin",
+    64 => "jdk-6u31-linux-x64.bin"
+  })
+  
+  #####
+  $hadoop_home = hdp_default("hadoop_home","/usr")
+  $hadoop_lib_home = hdp_default("hadoop_lib_home","/usr/lib/hadoop/lib")
+
+  #### We don't need this if Hadoop and Bigtop auto detect yarn-home
+  ## Temporary work-around todo: remove
+  $hadoop_yarn_home = hdp_default("hadoop_yarn_home","/usr")
+
+  #####compression related
+
+  $mapreduce_lzo_enabled = hdp_default("mapreduce_lzo_enabled",false)
+  $mapreduce_snappy_enabled = hdp_default("mapreduce_snappy_enabled",false)
+  
+  $lzo_compression_so_dirs = {
+    32 => "${hadoop_lib_home}/native/Linux-i386-32/",
+    64 => "${hadoop_lib_home}/native/Linux-amd64-64/"
+  }
+  
+  $snappy_so_src_dir = {
+    32 => "${hadoop_home}/lib",
+    64 => "${hadoop_home}/lib64"
+  }
+  $snappy_compression_so_dirs = {
+    32 => "${hadoop_lib_home}/native/Linux-i386-32/",
+    64 => "${hadoop_lib_home}/native/Linux-amd64-64/"
+  }
+
+  $lzo_tar_name = hdp_default("lzo_tar_name","hadoop-lzo-0.5.0")
+  
+  $snappy_so = hdp_default("snappy_so","libsnappy.so")
+  #####
+ 
+  $exec_path = ["/bin","/usr/bin", "/usr/sbin"]
+
+   #### params used on multiple modules
+  $dfs_data_dir = hdp_default("hadoop/hdfs-site/dfs_data_dir","/tmp/hadoop-hdfs/dfs/data")
+
+  ### artifact dir
+  $artifact_dir = hdp_default("artifact_dir","/tmp/HDP2-artifacts/")
+
+  ### artifacts download url ##
+  $apache_artifacts_download_url = hdp_default("apache_artifacts_download_url","https://s3.amazonaws.com/dev.hortonworks.com/HDP-1.0.11/repos/centos5/tars")
+  $gpl_artifacts_download_url = hdp_default("gpl_artifacts_download_url","https://s3.amazonaws.com/dev.hortonworks.com/ARTIFACTS") 
+
+  ### related to package resources  
+ 
+  $package_names = {
+   # hadoop => {
+   #   32 => 'hadoop.i386',
+   #   64 => 'hadoop.x86_64'
+   # },
+   # zookeeper => {
+   #   64 => 'zookeeper.x86_64'
+   # },
+   # hbase => {
+   #   64 => 'hbase.x86_64'
+   # },
+   # hcat-server => {
+   #   64 => 'hcatalog-server.x86_64'
+   # },
+   # hcat-base => {
+   #   64 => 'hcatalog.x86_64'
+   # },
+   # pig => {
+   #   32 => 'pig.i386'
+   # },
+    ganglia-monitor => {
+      64 => 'ganglia-gmond-3.2.0'
+    },
+    ganglia-server => {
+      64 => ['ganglia-gmetad-3.2.0']
+    },
+    ganglia-gweb => {
+      64 => 'gweb'
+    },
+    ganglia-hdp-gweb-addons => {
+      64 => 'hdp_mon_ganglia_addons'
+    },
+    glibc-rhel6 => {
+      32 => ['glibc','glibc.i686'],
+      64 => ['glibc','glibc.i686']
+    },
+    nagios-addons => {
+      64 => 'hdp_mon_nagios_addons'
+    },
+    nagios-server => {
+      64 => 'nagios-3.2.3'
+    },
+    nagios-plugins => {
+      64 => 'nagios-plugins-1.4.9'
+    },
+    nagios-fping => {
+      64 =>'fping'
+    },
+    nagios-php-pecl-json => {
+      64 => 'php-pecl-json.x86_64'
+    },
+    snmp => {
+      64 => ['net-snmp','net-snmp-utils'],
+    },
+    dashboard => {
+      64 => 'hdp_mon_dashboard'
+    },
+    # sqoop => {
+    #   32 => 'sqoop-1.4.1-1.noarch'
+    #},
+    templeton => {
+       32 => 'templeton',
+       64 => 'templeton'
+    },
+    oozie-client => {
+      64 => 'oozie-client.noarch'
+    },
+    oozie-server => {
+      64 => 'oozie.noarch'
+    },
+    lzo-rhel5 => {
+      32 => ['lzo','lzo.i386','lzo-devel','lzo-devel.i386'],
+      64 => ['lzo','lzo.i386','lzo-devel','lzo-devel.i386']
+    },
+    lzo-rhel6 => {
+      32 => ['lzo','lzo.i686','lzo-devel','lzo-devel.i686'],
+      64 => ['lzo','lzo.i686','lzo-devel','lzo-devel.i686']
+    },
+    #TODO: make these two consistent on whether case of 64/32 bits
+    snappy => {
+      32 =>  ['snappy','snappy-devel'],
+      64 => ['snappy','snappy-devel']
+    },
+    mysql => {
+      32 =>  ['mysql','mysql-server']
+    },
+    mysql-connector => {
+      64 =>  ['mysql-connector-java']
+    },
+    extjs => {
+      64 =>  ['extjs-2.2-1']
+    },
+    templeton-tar-hive => {
+      64 => ['templeton-tar-hive-0.0.1.15-1']
+    },
+    templeton-tar-pig => {
+      64 => ['templeton-tar-pig-0.0.1.15-1']
+    }
+  }
+  $packages = 'bigtop' 
+  if ($packages == 'hdp') {
+    $package_names[hadoop] = { 32 => ['hadoop.i386'], 64 => ['hadoop.x86_64']}
+    $mapred_smoke_test_script = "/usr/sbin/hadoop-validate-setup.sh"
+    $hadoop_bin = "/usr/sbin"
+    $hadoop_conf_dir = "/etc/hadoop"
+    $zk_conf_dir = "/etc/zookeeper"
+    $hbase_conf_dir = "/etc/hbase"
+    $sqoop_conf_dir = "/etc/sqoop"
+    $pig_conf_dir = "/etc/pig"
+    $oozie_conf_dir = "/etc/oozie"
+    $hadoop_jar_location = "/usr/share/hadoop"
+    $mapred_examples_jar = "${hadoop_jar_location}/hadoop-mapreduce-examples-*.jar"
+    $hbase_daemon_script = "/usr/bin/hbase-daemon.sh"
+    $use_32_bits_on_slaves = false
+    $package_names[zookeeper] = {64 => 'zookeeper.x86_64'}
+    $package_names[hbase] = {64 => 'hbase.x86_64'}
+    $package_names[sqoop] = {32 => 'sqoop-1.4.1-1.noarch'}
+    $package_names[pig] = { 32 => 'pig.i386'}
+    $package_names[hcat-server] = { 64 => 'hcatalog-server.x86_64'}
+    $package_names[hcat-base] = { 64 => 'hcatalog.x86_64'}
+    $zk_bin = '/usr/sbin'
+    $zk_smoke_test_script = '/usr/bin/zkCli.sh'
+    $update_zk_shell_files = false
+
+    $hcat_server_host = hdp_default("hcat_server_host")
+    $hcat_mysql_host = hdp_default("hcat_mysql_host")
+
+  } elsif ($packages == 'bigtop') {  
+
+    $package_names[hadoop] = {32 => ['hadoop', 'hadoop-hdfs', 'hadoop-yarn', 'hadoop-mapreduce', 'hadoop-client', 'hadoop-libhdfs.i386'], 64 => ['hadoop', 'hadoop-hdfs', 'hadoop-yarn', 'hadoop-mapreduce', 'hadoop-client', 'hadoop-libhdfs.x86_64']}
+# TODO - Add lzo, pipes etc.
+# $package_names[hadoop] = {32 => ['hadoop','hadoop-hdfs','hadoop-yarn','hadoop-mapreduce','hadoop-libhdfs.i386','hadoop-native.i386','hadoop-pipes.i386','hadoop-sbin.i386','hadoop-lzo', 'hadoop-lzo-native.i386'], 64 => ['hadoop','hadoop-hdfs','hadoop-yarn','hadoop-mapreduce','hadoop-libhdfs','hadoop-native','hadoop-pipes','hadoop-sbin','hadoop-lzo', 'hadoop-lzo-native']}
+   
+    $mapred_smoke_test_script = "/usr/lib/hadoop/sbin/hadoop-validate-setup.sh"
+    $hadoop_bin = "/usr/lib/hadoop/bin"
+    $hadoop_sbin = "/usr/lib/hadoop/sbin"
+    $yarn_sbin = "/usr/lib/hadoop-yarn/sbin"
+    $mapred_sbin = "/usr/lib/hadoop-mapreduce/sbin"
+    $hadoop_conf_dir = "/etc/hadoop/conf"
+    $zk_conf_dir = "/etc/zookeeper/conf"
+    $hbase_conf_dir = "/etc/hbase/conf/"
+    $sqoop_conf_dir = "/usr/lib/sqoop/conf"
+    $pig_conf_dir = "/etc/pig/conf"
+    $oozie_conf_dir = "/etc/oozie/conf"
+    $hive_conf_dir = "/etc/hive/conf"
+    $hcat_conf_dir = "/etc/hcatalog/conf"
+    $hadoop_jar_location = "/usr/lib/hadoop-mapreduce"
+    $hadoop_client_jar_location = "/usr/lib/hadoop/client"
+    $mapred_examples_jar = "${hadoop_jar_location}/hadoop-mapreduce-examples-*.jar"
+    $hbase_daemon_script = "/usr/lib/hbase/bin/hbase-daemon.sh"
+    $use_32_bits_on_slaves = false
+    $package_names[zookeeper] = {64 => ['zookeeper']}
+    $package_names[hbase] = {64 => ['hbase']}
+    $package_names[sqoop] = {32 => ['sqoop'], 64 => ['sqoop']}
+    $package_names[pig] = {32 => ['pig.noarch'], 64 => ['pig.noarch']}
+    $package_names[hcat] = {32 => ['hcatalog'], 64 => ['hcatalog']}
+    $package_names[hive] = {64 => ['hive']}
+    $zk_bin = '/usr/lib/zookeeper/bin'
+    $zk_smoke_test_script = "/usr/lib/zookeeper/bin/zkCli.sh"
+    $update_zk_shell_files = false
+
+    $hive_mysql_host = hdp_default("hive_mysql_host","localhost")
+
+    $hcat_server_host = hdp_default("hive_server_host")
+    $hcat_mysql_host = hdp_default("hive_mysql_host")
+
+  }
+ 
+###### snmp
+
+  $snmp_conf_dir = hdp_default("snmp_conf_dir","/etc/snmp/")
+  $snmp_source = hdp_default("snmp_source","0.0.0.0/0") ##TODO!!! for testing needs to be closed up
+  $snmp_community = hdp_default("snmp_community","hadoop")
+
+###### aux
+  #used by ganglia monitor to tell what components and services are present
+  $component_exists = {} 
+  $service_exists = {} 
+}
+

Added: incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/snappy/package.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/snappy/package.pp?rev=1398196&view=auto
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/snappy/package.pp (added)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/snappy/package.pp Mon Oct 15 05:55:46 2012
@@ -0,0 +1,52 @@
+#
+#
+# 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.
+#
+#
+class hdp2::snappy::package()
+{
+ hdp2::package {'snappy':
+    package_type  => 'snappy',
+    java_needed   => false
+  }
+  
+  hdp2::snappy::package::ln{ 64:} 
+  hdp2::snappy::package::ln{ 32:} 
+  
+  anchor{'hdp2::snappy::package::begin':} ->  Hdp2::Package['snappy'] -> Hdp2::Snappy::Package::Ln<||> -> anchor{'hdp2::snappy::package::end':}
+}
+
+define hdp2::snappy::package::ln()
+{
+  $size = $name
+  $hadoop_home = $hdp2::params::hadoop_home  
+  $snappy_so = $hdp2::params::snappy_so
+  $so_target_dir = $hdp2::params::snappy_compression_so_dirs[$size]
+  $so_target = "${so_target_dir}/libsnappy.so"
+  $so_src_dir = $hdp2::params::snappy_so_src_dir[$size]
+  $so_src = "${so_src_dir}/${snappy_so}" 
+  
+  if ($so_target != $so_src) { 
+    $ln_cmd = "mkdir -p $so_target_dir; ln -sf ${so_src} ${so_target}"
+    hdp2::exec{ "hdp2::snappy::package::ln ${name}":
+      command => $ln_cmd,
+      unless  => "test -f ${so_target}",
+      creates => $so_target
+    }
+  }
+}

Added: incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/snmp.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/snmp.pp?rev=1398196&view=auto
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/snmp.pp (added)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/snmp.pp Mon Oct 15 05:55:46 2012
@@ -0,0 +1,48 @@
+#
+#
+# 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.
+#
+#
+class hdp2::snmp(
+  $service_state = 'running'
+)
+{
+  include hdp2::params
+
+  hdp2::package {'snmp':}
+ 
+  hdp2::snmp-configfile {'snmpd.conf': 
+    notify => Service['snmpd']    
+  }
+
+  service { 'snmpd' :
+    ensure => $service_state
+  }
+  
+   anchor{'hdp2::snmp::begin':} -> Hdp2::Package['snmp'] -> Hdp2::Snmp-configfile<||> -> Service['snmpd'] -> anchor{'hdp2::snmp::end':}
+}
+
+define hdp2::snmp-configfile()
+{ 
+  hdp2::configfile { "${hdp2::params::snmp_conf_dir}/${name}":
+    component     => 'base',
+    owner         => root,
+    group         => root
+  }
+}
+

Added: incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/testing_env_patch.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/testing_env_patch.pp?rev=1398196&view=auto
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/testing_env_patch.pp (added)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/testing_env_patch.pp Mon Oct 15 05:55:46 2012
@@ -0,0 +1,53 @@
+#
+#
+# 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.
+#
+#
+class hdp2::testing_env_patch()
+{
+  $cmd = "mkdir /tmp/repos; mv /etc/yum.repos.d/* /tmp/repos"
+  $repo_target = "/etc/yum.repos.d/${hdp2::params::hdp_yum_repo}"
+
+  anchor { 'hdp2::testing_env_patch::begin' :}
+  class{ 'hdp2::iptables': 
+    ensure => stopped,
+    require => Anchor['hdp2::testing_env_patch::begin']
+  }
+  exec { '/bin/echo 0 > /selinux/enforce':
+    require => Class['hdp2::iptables']
+  }
+  hdp2::testing_env_patch::packages { 'common' :
+    require => Exec['/bin/echo 0 > /selinux/enforce']
+  }
+  hdp2::exec { $cmd :
+    command => $cmd,
+    unless => "test -e ${repo_target}",
+    require => Hdp2::Testing_env_patch::Packages['common']
+  }  
+  anchor { 'hdp2::testing_env_patch::end' :
+    require => Exec[$cmd]
+  }
+}
+
+define hdp2::testing_env_patch::packages(
+  $needed = false)
+{
+ if ($needed == true) {
+   package { ['perl-Digest-HMAC','perl-Socket6','perl-Crypt-DES','xorg-x11-fonts-Type1','libdbi'] :} 
+ }
+}

Added: incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/templates/hdp103.repo.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/templates/hdp103.repo.erb?rev=1398196&view=auto
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/templates/hdp103.repo.erb (added)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/templates/hdp103.repo.erb Mon Oct 15 05:55:46 2012
@@ -0,0 +1,6 @@
+[HDP-1.0.7]
+name=Hortonworks Data Platform Version 1.0.7
+baseurl = <%=scope.function_hdp_template_var("hdp_yum_repo_base_url")%>
+enabled=1
+gpgcheck=0
+priority=1

Added: incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/templates/snmpd.conf.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/templates/snmpd.conf.erb?rev=1398196&view=auto
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/templates/snmpd.conf.erb (added)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/templates/snmpd.conf.erb Mon Oct 15 05:55:46 2012
@@ -0,0 +1,48 @@
+#/*
+# * 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.
+# */
+
+com2sec notConfigUser  <%=scope.function_hdp_template_var("snmp_source")%>   <%=scope.function_hdp_template_var("snmp_community")%>
+group   notConfigGroup v1           notConfigUser
+group   notConfigGroup v2c           notConfigUser
+view    systemview    included   .1
+access  notConfigGroup ""      any       noauth    exact  systemview none none
+
+syslocation Hadoop 
+syscontact HadoopMaster 
+dontLogTCPWrappersConnects yes
+
+###############################################################################
+# disk checks
+
+disk / 10000
+
+
+###############################################################################
+# load average checks
+#
+
+# load [1MAX=12.0] [5MAX=12.0] [15MAX=12.0]
+#
+# 1MAX:   If the 1 minute load average is above this limit at query
+#         time, the errorFlag will be set.
+# 5MAX:   Similar, but for 5 min average.
+# 15MAX:  Similar, but for 15 min average.
+
+# Check for loads:
+#load 12 14 14
+

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/tests/php/orchestrator/test.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/tests/php/orchestrator/test.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/tests/php/orchestrator/test.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/tests/php/orchestrator/test.php Mon Oct 15 05:55:46 2012
@@ -52,7 +52,7 @@ class TestDB extends OrchestratorDB {
   private $hbase_regionserver;
 
   function __construct($puppet) {
-    parent::__construct("./test.db", "DataCluster", $puppet);
+    parent::__construct("/homes/hortonmu/HMC/src/php/db/test.db", "DataCluster", $puppet);
 
     $this->namenode = new ServiceComponent($clusterName, "namenode", "hdfs", State::UNINSTALLED, $this, $puppet, FALSE);
     $this->secondary_namenode = new ServiceComponent($clusterName, "secondary_namenode", "hdfs", State::UNINSTALLED, $this, $puppet, FALSE);
@@ -217,7 +217,7 @@ print_r($zookeeper->stop());
 */
 
 $puppet = new MockPuppetInvoker();
-$db = new OrchestratorDB("./test.db", "DataCluster", $puppet);
+$db = new OrchestratorDB("/homes/hortonmu/HMC/src/php/db/test.db", "DataCluster", $puppet);
 $cluster = new Cluster($clusterName, $db, $puppet);
 $t0 = new Transaction(0, 0, 0);
 print_r($cluster->deployHDP($t0));

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_dashboard_rpm.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_dashboard_rpm.sh?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_dashboard_rpm.sh (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_dashboard_rpm.sh Mon Oct 15 05:55:46 2012
@@ -27,7 +27,7 @@ if [[ -z "${BUILD_DIR}" ]]; then
 fi
 
 if [[ -z "${VERSION}" ]]; then
-  VERSION="0.0.2.14"
+  VERSION="0.0.2.15"
 fi
 
 if [[ -z "${RELEASE}" ]]; then

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_ganglia_addon_rpm.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_ganglia_addon_rpm.sh?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_ganglia_addon_rpm.sh (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_ganglia_addon_rpm.sh Mon Oct 15 05:55:46 2012
@@ -27,7 +27,7 @@ if [[ -z "${BUILD_DIR}" ]]; then
 fi
 
 if [[ -z "${VERSION}" ]]; then
-  VERSION="0.0.2.14"
+  VERSION="0.0.2.15"
 fi
 
 if [[ -z "${RELEASE}" ]]; then

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_nagios_addon_rpm.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_nagios_addon_rpm.sh?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_nagios_addon_rpm.sh (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_nagios_addon_rpm.sh Mon Oct 15 05:55:46 2012
@@ -27,7 +27,7 @@ if [[ -z "${BUILD_DIR}" ]]; then
 fi
 
 if [[ -z "${VERSION}" ]]; then
-  VERSION="0.0.2.14"
+  VERSION="0.0.2.15"
 fi
 
 if [[ -z "${RELEASE}" ]]; then

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_dashboard.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_dashboard.spec?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_dashboard.spec (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_dashboard.spec Mon Oct 15 05:55:46 2012
@@ -24,17 +24,21 @@
 
 Summary: HDP Monitoring Dashboard Frontend
 Name: hdp_mon_dashboard
-Version: 0.0.2.14
-URL: http://incubator.apache.org/projects/ambari.html
+Version: 0.0.2.15
+URL: http://hortonworks.com
 Release: 1
 License: Apache License, Version 2.0
-Vendor: Apache Software Foundation (ambari-dev@incubator.apache.org)
+Vendor: Hortonworks <ambari-group@hortonworks.com>
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
 Requires: php >= 5, httpd
 %define web_prefixdir %{_prefix}/share/hdp/dashboard
+%if 0%{?suse_version}
+%define httpd_confdir %{_sysconfdir}/apache2/conf.d
+%else
 %define httpd_confdir %{_sysconfdir}/httpd/conf.d
+%endif
 BuildArchitectures: noarch
 
 %description
@@ -55,16 +59,29 @@ This package provides a monitoring dashb
 
 %__cp -rf dataServices/* $RPM_BUILD_ROOT/%{web_prefixdir}/dataServices/
 %__cp -rf ui/* $RPM_BUILD_ROOT/%{web_prefixdir}/ui/
-echo "Alias /hdp %{_prefix}/share/hdp" > $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_dashboard.conf
+
+echo "Alias /hdp %{_prefix}/share/hdp" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_dashboard.conf
+echo "<Directory /usr/share/hdp>" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_dashboard.conf
+echo "  Options None" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_dashboard.conf
+echo "  AllowOverride None" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_dashboard.conf
+echo "  Order allow,deny" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_dashboard.conf
+echo "  Allow from all" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_dashboard.conf
+echo "</Directory>" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_dashboard.conf
 
 %files
 %defattr(-,root,root)
-%{web_prefixdir}/*
 %{httpd_confdir}/hdp_mon_dashboard.conf
+%if 0%{?suse_version}
+%defattr(-,wwwrun,www)
+%{web_prefixdir}/*
+%else
+%defattr(-,root,root)
+%{web_prefixdir}/*
+%endif
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Thu Jun 07 2012 Ambari <ambari-dev@incubator.apache.org>
+* Fri Feb 17 2011 Hortonworks <ambari-group@hortonworks.com>
 - Initial version

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_ganglia_addons.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_ganglia_addons.spec?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_ganglia_addons.spec (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_ganglia_addons.spec Mon Oct 15 05:55:46 2012
@@ -24,17 +24,23 @@
 
 Summary: Ganglia Add-ons for HDP Monitoring Dashboard
 Name: hdp_mon_ganglia_addons
-Version: 0.0.2.14
-URL: http://incubator.apache.org/projects/ambari.html
+Version: 0.0.2.15
+URL: http://hortonworks.com
 Release: 1
 License: Apache License, Version 2.0
-Vendor: Apache Software Foundation (ambari-dev@incubator.apache.org)
+Vendor: Hortonworks <ambari-group@hortonworks.com>
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
 Requires: gweb >= 2.2
+
+%if 0%{?suse_version}
+%define graphd_dir /srv/www/htdocs/ganglia/graph.d/
+%else
 %define graphd_dir /var/www/html/ganglia/graph.d/
+%endif
 %define gconf_dir /var/lib/ganglia/conf/
+
 BuildArchitectures: noarch
 
 %description
@@ -65,5 +71,5 @@ for a better monitoring integration with
 %__rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Thu Jun 07 2011 Ambari <ambari-dev@incubator.apache.org>
+* Fri Feb 17 2011 Hortonworks <ambari-group@hortonworks.com>
 - Initial version

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_nagios_addons.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_nagios_addons.spec?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_nagios_addons.spec (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_nagios_addons.spec Mon Oct 15 05:55:46 2012
@@ -24,18 +24,22 @@
 
 Summary: Nagios Add-ons for HDP Monitoring Dashboard
 Name: hdp_mon_nagios_addons
-Version: 0.0.2.14
-URL: http://incubator.apache.org/projects/ambari.html
+Version: 0.0.2.15
+URL: http://hortonworks.com
 Release: 1
 License: Apache License, Version 2.0
-Vendor: Apache Software Foundation (ambari-dev@incubator.apache.org)
+Vendor: Hortonworks <ambari-group@hortonworks.com>
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
 Requires: nagios, nagios-plugins, php >= 5
 %define nagioshdpscripts_dir %{_prefix}/share/hdp/nagios
 %define nagiosplugin_dir %{_libdir}/nagios/plugins
+%if 0%{?suse_version}
+%define httpd_confdir %{_sysconfdir}/apache2/conf.d
+%else
 %define httpd_confdir %{_sysconfdir}/httpd/conf.d
+%endif
 BuildArchitectures: noarch
 
 %description
@@ -56,7 +60,13 @@ monitoring of a Hadoop Cluster
 
 %__cp -rf scripts/* $RPM_BUILD_ROOT/%{nagioshdpscripts_dir}/
 %__cp -rf plugins/* $RPM_BUILD_ROOT/%{nagiosplugin_dir}/
-echo "Alias /hdp %{_prefix}/share/hdp" > $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
+echo "Alias /hdp %{_prefix}/share/hdp" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
+echo "<Directory /usr/share/hdp>" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
+echo "  Options None" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
+echo "  AllowOverride None" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
+echo "  Order allow,deny" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
+echo "  Allow from all" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
+echo "</Directory>" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
 
 %files
 %defattr(-,root,root)
@@ -68,5 +78,5 @@ echo "Alias /hdp %{_prefix}/share/hdp" >
 %__rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Thu Jun 07 2012 Ambari <ambari-dev@incubator.apache.org>
+* Fri Feb 17 2011 Hortonworks <ambari-group@hortonworks.com>
 - Initial version

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_hdfs_io_report.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_hdfs_io_report.json?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_hdfs_io_report.json (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_hdfs_io_report.json Mon Oct 15 05:55:46 2012
@@ -4,7 +4,7 @@
    "title" : "HDFS I/O",
    "vertical_label" : "Bytes/Sec",
    "series" : [
-      { "metric": "dfs.datanode.bytes_written", "color": "ff0000", "label": "Bytes Written/Sec", "line_width": "2", "type": "line" },
-      { "metric": "dfs.datanode.bytes_read", "color": "0000ff", "label": "Bytes Read/Sec", "line_width": "2", "type": "line" }
+      { "metric": "dfs.datanode.BytesWritten", "color": "ff0000", "label": "Bytes Written/Sec", "line_width": "2", "type": "line" },
+      { "metric": "dfs.datanode.BytesRead", "color": "0000ff", "label": "Bytes Read/Sec", "line_width": "2", "type": "line" }
    ]
 }

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_gc_report.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_gc_report.json?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_gc_report.json (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_gc_report.json Mon Oct 15 05:55:46 2012
@@ -4,7 +4,7 @@
    "title" : "Time spent in Garbage Collection",
    "vertical_label" : "Milliseconds",
    "series" : [
-      { "metric": "jvm.metrics.gcTimeMillis", "color": "ff0000", "label": "Time Spent", 
+      { "metric": "jvm.JvmMetrics.GcTimeMillis", "color": "ff0000", "label": "Time Spent", 
         "line_width": "2", "type": "stack" }
    ]
 }

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_mem_heap_used_report.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_mem_heap_used_report.json?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_mem_heap_used_report.json (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_mem_heap_used_report.json Mon Oct 15 05:55:46 2012
@@ -4,7 +4,7 @@
    "title" : "JVM Heap Memory Used",
    "vertical_label" : "MB",
    "series" : [
-      { "metric": "jvm.metrics.memHeapUsedM", "color": "ff0000", "label": "Heap Memory Used", 
+      { "metric": "jvm.JvmMetrics.MemHeapUsedM", "color": "ff0000", "label": "Heap Memory Used", 
         "line_width": "2", "type": "line" }
    ]
 }

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_threads_report.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_threads_report.json?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_threads_report.json (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_threads_report.json Mon Oct 15 05:55:46 2012
@@ -4,13 +4,13 @@
    "title" : "JVM Threads Status",
    "vertical_label" : "Number Of Threads",
    "series" : [
-      { "metric": "jvm.metrics.threadsBlocked", "color": "ff0000", "label": "Blocked", 
+      { "metric": "jvm.JvmMetrics.ThreadsBlocked", "color": "ff0000", "label": "Blocked", 
         "line_width": "2", "type": "stack" },
-      { "metric": "jvm.metrics.threadsWaiting", "color": "ff6600", "label": "Waiting",
+      { "metric": "jvm.JvmMetrics.ThreadsWaiting", "color": "ff6600", "label": "Waiting",
         "line_width": "2", "type": "stack" },
-      { "metric": "jvm.metrics.threadsTimedWaiting", "color": "ffff00", "label": "Timed Waiting",
+      { "metric": "jvm.JvmMetrics.ThreadsTimedWaiting", "color": "ffff00", "label": "Timed Waiting",
         "line_width": "2", "type": "stack" },
-      { "metric": "jvm.metrics.threadsRunnable", "color": "00ff00", "label": "Runnable", 
+      { "metric": "jvm.JvmMetrics.ThreadsRunnable", "color": "00ff00", "label": "Runnable", 
         "line_width": "2", "type": "stack" }
    ]
 }

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_latency_report.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_latency_report.json?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_latency_report.json (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_latency_report.json Mon Oct 15 05:55:46 2012
@@ -4,9 +4,9 @@
    "title" : "Average RPC Latencies",
    "vertical_label" : "Seconds",
    "series" : [
-      { "metric": "rpc.rpc.RpcProcessingTime_avg_time", "color": "0000ff", "label": "Average Processing Time", 
+      { "metric": "rpc.rpc.RpcProcessingTimeAvgTime", "color": "0000ff", "label": "Average Processing Time", 
         "line_width": "2", "type": "stack" },
-      { "metric": "rpc.rpc.RpcQueueTime_avg_time", "color": "ff0000", "label": "Average Queue Time", 
+      { "metric": "rpc.rpc.RpcQueueTimeAvgTime", "color": "ff0000", "label": "Average Queue Time", 
         "line_width": "2", "type": "stack" }
    ]
 }

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_queue_time_avg_time_report.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_queue_time_avg_time_report.json?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_queue_time_avg_time_report.json (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_queue_time_avg_time_report.json Mon Oct 15 05:55:46 2012
@@ -4,7 +4,7 @@
    "title" : "Average RPC Wait Time",
    "vertical_label" : "Seconds",
    "series" : [
-      { "metric": "rpc.rpc.RpcQueueTime_avg_time", "color": "ff0000", "label": "Avg RPC Wait Time", 
+      { "metric": "rpc.rpc.RpcQueueTimeAvgTime", "color": "ff0000", "label": "Avg RPC Wait Time", 
         "line_width": "2", "type": "line" }
    ]
 }

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_queue_time_num_ops_report.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_queue_time_num_ops_report.json?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_queue_time_num_ops_report.json (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_queue_time_num_ops_report.json Mon Oct 15 05:55:46 2012
@@ -4,7 +4,7 @@
    "title" : "Average RPC Operations",
    "vertical_label" : "Operations/Sec",
    "series" : [
-      { "metric": "rpc.rpc.RpcQueueTime_num_ops", "color": "ff0000", "label": "Avg RPC Ops", 
+      { "metric": "rpc.rpc.RpcQueueTimeNumOps", "color": "ff0000", "label": "Avg RPC Ops", 
         "line_width": "2", "type": "line" }
    ]
 }

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpcdetailed_heartbeat_num_ops_report.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpcdetailed_heartbeat_num_ops_report.json?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpcdetailed_heartbeat_num_ops_report.json (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpcdetailed_heartbeat_num_ops_report.json Mon Oct 15 05:55:46 2012
@@ -4,7 +4,7 @@
    "title" : "Heartbeats",
    "vertical_label" : "Heartbeats/Sec",
    "series" : [
-      { "metric": "rpcdetailed.rpcdetailed.sendHeartbeat_num_ops", "color": "ff0000", "label": "Heartbeats/Sec", 
+      { "metric": "rpcdetailed.rpcdetailed.SendHeartbeatNumOps", "color": "ff0000", "label": "Heartbeats/Sec", 
         "line_width": "2", "type": "line" }
    ]
 }

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_aggregate.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_aggregate.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_aggregate.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_aggregate.php Mon Oct 15 05:55:46 2012
@@ -1,4 +1,3 @@
-#!/usr/bin/php
 <?php
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -114,6 +113,9 @@
       case "NAMENODE":
         $pieces[0] = "HDFS";
         break; 
+      case "RESOURCEMANAGER":
+        $pieces[0] = "YARN";
+        break; 
       case "JOBTRACKER":
         $pieces[0] = "MAPREDUCE";
         break; 
@@ -123,6 +125,7 @@
       case "SYSTEM":
       case "HDFS":
       case "MAPREDUCE":
+      case "YARN":
       case "HBASE":
         break; 
       default:

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_hdfs_blocks.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_hdfs_blocks.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_hdfs_blocks.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_hdfs_blocks.php Mon Oct 15 05:55:46 2012
@@ -1,4 +1,3 @@
-#!/usr/bin/php
 <?php
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_hdfs_capacity.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_hdfs_capacity.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_hdfs_capacity.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_hdfs_capacity.php Mon Oct 15 05:55:46 2012
@@ -1,4 +1,3 @@
-#!/usr/bin/php
 <?php
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_name_dir_status.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_name_dir_status.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_name_dir_status.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_name_dir_status.php Mon Oct 15 05:55:46 2012
@@ -1,4 +1,3 @@
-#!/usr/bin/php
 <?php
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_oozie_status.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_oozie_status.sh?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_oozie_status.sh (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_oozie_status.sh Mon Oct 15 05:55:46 2012
@@ -20,6 +20,7 @@
 #
 #
 # OOZIE_URL is of the form http://<hostname>:<port>/oozie
+# OOZIE_URL: http://hortonworks-sandbox.localdomain:11000/oozie
 HOST=$1
 PORT=$2
 JAVA_HOME=$3

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_rpcq_latency.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_rpcq_latency.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_rpcq_latency.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_rpcq_latency.php Mon Oct 15 05:55:46 2012
@@ -1,4 +1,3 @@
-#!/usr/bin/php
 <?php
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +21,7 @@
  * It checks the rpc wait time in the queue, RpcQueueTime_avg_time
  * check_rpcq_latency -h hostaddress -p port -t ServiceName -w 1 -c 1
  * Warning and Critical values are in seconds
- * Service Name = JobTracker, NameNode
+ * Service Name = JobTracker, ResourceManager, NameNode
  */
 
   $options = getopt ("h:p:w:c:n:");
@@ -63,6 +62,6 @@
 
   /* print usage */
   function usage () {
-    echo "Usage: $0 -h <host> -p port -n <JobTracker/NameNode> -w <warn_in_sec> -c <crit_in_sec>\n";
+    echo "Usage: $0 -h <host> -p port -n <JobTracker/ResourceManager/NameNode> -w <warn_in_sec> -c <crit_in_sec>\n";
   }
 ?>

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_webui.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_webui.sh?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_webui.sh (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_webui.sh Mon Oct 15 05:55:46 2012
@@ -42,6 +42,14 @@ jobtracker) 
       exit 1;
     fi
     ;;
+# Same file for both hdp1 and hdp2, so add YARN processes also here.
+resourcemanager) 
+    rmweburl="http://$host:8088"
+    if [[ `checkurl "$rmweburl"` -ne 0 ]]; then 
+      echo "WARNING: ResourceManager web UI not accessible : $rmweburl";
+      exit 1;
+    fi
+    ;;
 namenode)
     nnweburl="http://$host:50070"
     if [[ `checkurl "$nnweburl"` -ne 0 ]] ; then 
@@ -56,6 +64,14 @@ jobhistory)
       exit 1;
     fi
     ;;
+# For HDP2
+jobhistoryserver2)
+    jhs2weburl="http://$host:19888/"
+    if [[ `checkurl "$jhs2weburl"` -ne 0 ]]; then 
+      echo "WARNING: JobhistoryServer web UI not accessible : $jhs2weburl";
+      exit 1;
+    fi
+    ;;
 hbase)
     hbaseweburl="http://$host:60010/master-status"
     jhweburl="http://domU-12-31-39-16-DC-FB.compute-1.internal:51111/jobhistoryhome.jsp"
@@ -64,7 +80,7 @@ hbase)
       exit 1;
     fi
     ;;
-*) echo "UNKNOWN: Invalid service name [$service], valid options [jobtracker|jobhistory|hbase|namenode]"
+*) echo "UNKNOWN: Invalid service name [$service], valid options [jobtracker|resourcemanager|jobhistory|jobhistoryserver2|hbase|namenode]"
    exit 3
    ;;
 esac

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/scripts/nagios_alerts.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/scripts/nagios_alerts.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/scripts/nagios_alerts.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/scripts/nagios_alerts.php Mon Oct 15 05:55:46 2012
@@ -93,13 +93,21 @@ function hdp_mon_generate_response( $res
 
   define ("HDFS_SERVICE_CHECK", "NAMENODE::Namenode Process down");
   define ("MAPREDUCE_SERVICE_CHECK", "JOBTRACKER::Jobtracker Process down");
+  define ("YARN_SERVICE_CHECK", "RESOURCEMANAGER::ResourceManager Process down");
   define ("HBASE_SERVICE_CHECK", "HBASEMASTER::HBaseMaster Process down");
   define ("ZOOKEEPER_SERVICE_CHECK", "ZOOKEEPER::Percent zookeeper servers down");
   define ("HIVE_METASTORE_SERVICE_CHECK", "HIVE-METASTORE::HIVE-METASTORE status check");
   define ("OOZIE_SERVICE_CHECK", "OOZIE::Oozie status check");
   define ("TEMPLETON_SERVICE_CHECK", "TEMPLETON::Templeton status check");
+  define ("PUPPET_SERVICE_CHECK", "PUPPET::Puppet agent down");
+
+  /* If SUSE, status file is under /var/lib/nagios */
+  if (file_exists("/etc/SuSE-release")) {
+    $status_file="/var/lib/nagios/status.dat";
+  } else {
+    $status_file="/var/nagios/status.dat";
+  }
 
-  $status_file="/var/nagios/status.dat";
   $q1="";
   if (array_key_exists('q1', $_GET)) {
     $q1=$_GET["q1"];
@@ -152,6 +160,7 @@ function hdp_mon_generate_response( $res
   function query_service_states ($status_file_content) {
     $num_matches = preg_match_all("/servicestatus \{([\S\s]*?)\}/", $status_file_content, $matches, PREG_PATTERN_ORDER);
     $services_object = array ();
+    $services_object["PUPPET"] = 0;
     foreach ($matches[0] as $object) {
       if (getParameter($object, "service_description") == HDFS_SERVICE_CHECK) {
         $services_object["HDFS"] = getParameter($object, "last_hard_state");
@@ -205,6 +214,16 @@ function hdp_mon_generate_response( $res
         }
         continue;
       }
+      if (getParameter($object, "service_description") == PUPPET_SERVICE_CHECK) {
+        $state = getParameter($object, "last_hard_state");
+        if ($state >= 1) {
+          $services_object["PUPPET"]++;
+        }
+        continue;
+      }
+    }
+    if ($services_object["PUPPET"] >= 1) {
+      $services_object["PUPPET"] = 1;
     }
     return $services_object;
   }
@@ -347,6 +366,9 @@ function hdp_mon_generate_response( $res
       case "NAMENODE":
         $pieces[0] = "HDFS";
         break;
+      case "RESOURCEMANAGER":
+        $pieces[0] = "YARN";
+        break;
       case "JOBTRACKER":
         $pieces[0] = "MAPREDUCE";
         break;
@@ -360,6 +382,7 @@ function hdp_mon_generate_response( $res
       case "HIVE-METASTORE":
       case "OOZIE":
       case "TEMPLETON":
+      case "PUPPET":
         break;
       default:
         $pieces[0] = "UNKNOWN";

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/dataServices/ganglia/graph_info/dashboard/custom/hdp.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/dataServices/ganglia/graph_info/dashboard/custom/hdp.json?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/dataServices/ganglia/graph_info/dashboard/custom/hdp.json (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/dataServices/ganglia/graph_info/dashboard/custom/hdp.json Mon Oct 15 05:55:46 2012
@@ -1,28 +1,49 @@
 {
     "Global": [
-        {
-            "description": "Bytes written to and read from HDFS, aggregated across all the DataNodes", 
-            "link": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/?c=%NameNodeClusterName%", 
-            "title": "HDFS I/O", 
+        {   
+            "description": "Bytes written to and read from HDFS, aggregated across all the DataNodes",
+            "link": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/?c=%HDFSSlavesClusterName%",
+            "title": "HDFS I/O",
             "url": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/graph.php?c=%HDFSSlavesClusterName%&g=hdp_mon_hdfs_io_report"
-        }, 
+        },
+        {   
+            "description": "HDFS Capacity Remaining",
+            "link": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/?c=%NameNodeClusterName%",
+            "title": "HDFS Capacity Remaining",
+            "url": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/graph.php?c=%NameNodeClusterName%&g=hdp_mon_hdfs_capacity_remaining_report"
+        },
+        {   
+            "description": "HDFS operations per second",
+            "link": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/?c=%NameNodeClusterName%",
+            "title": "HDFS I/O",
+            "url": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/graph.php?c=%NameNodeClusterName%&g=hdp_mon_hdfs_ops_report"
+        },
+        {   
+            "description": "HDFS under replicated blocks",
+            "link": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/?c=%NameNodeClusterName%",
+            "title": "HDFS Under-Replicated Blocks",
+            "url": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/graph.php?c=%NameNodeClusterName%&g=hdp_mon_hdfs_under_replicated_blocks_report"
+        },
+    ],
+    "CommentedOutEditAndMoveBackAsNecessary" : [
         {
-            "description": "Total Map slots and Utilized Map slots (occupied + reserved)", 
-            "link": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/?c=%JobTrackerClusterName%", 
-            "title": "Map Slot Utilization", 
+            "description": "Total Map slots and Utilized Map slots (occupied + reserved)",
+            "link": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/?c=%JobTrackerClusterName%",
+            "title": "Map Slot Utilization",
             "url": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/graph.php?c=%JobTrackerClusterName%&g=hdp_mon_jobtracker_map_slot_report"
-        }, 
-        {
-            "description": "Total Reduce slots and Utilized Reduce slots (occupied + reserved)", 
-            "link": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/?c=%JobTrackerClusterName%", 
-            "title": "Reduce Slot Utilization", 
+        },
+        {   
+            "description": "Total Reduce slots and Utilized Reduce slots (occupied + reserved)",
+            "link": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/?c=%JobTrackerClusterName%",
+            "title": "Reduce Slot Utilization",
             "url": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/graph.php?c=%JobTrackerClusterName%&g=hdp_mon_jobtracker_reduce_slot_report"
-        }, 
-        {
-            "description": "Map and Reduce tasks waiting to be scheduled (indicates load on the Map/Reduce cluster)", 
-            "link": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/?c=%JobTrackerClusterName%", 
-            "title": "Waiting Map/Reduce Tasks", 
+        },
+        {   
+            "description": "Map and Reduce tasks waiting to be scheduled (indicates load on the Map/Reduce cluster)",
+            "link": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/?c=%JobTrackerClusterName%",
+            "title": "Waiting Map/Reduce Tasks",
             "url": "http://%GangliaWebHostName%:%GangliaWebPort%/ganglia/graph.php?c=%JobTrackerClusterName%&g=hdp_mon_jobtracker_mapreduce_report"
         }
+
     ]
 }

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/hbase.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/hbase.html?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/hbase.html (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/hbase.html Mon Oct 15 05:55:46 2012
@@ -25,13 +25,13 @@
 	<link type="text/css" rel="stylesheet" href="./libs/jqgrid/css/ui.jqgrid.css" media="screen"/>
 	<link type="text/css" rel="stylesheet" href="./libs/jquery.multiselect.css" media="screen"/>
 	<!--[if lt IE 9]><script type="text/javascript" src="./libs/html5shiv/html5shiv.min.js"></script><![endif]-->
-	<link rel="shortcut icon" href="/hmc/images/logo-micro.gif"/>
+	<link rel="shortcut icon" href="./logo/logo-micro.gif"/>
 </head>
 <body>
   <div class="navbar">
     <div class="navbar-inner">
       <div class="container">
-        <a href="/hmc/html"><img id="logo" src="/hmc/images/logo-small.gif"></a>
+        <a href="/hmc/html"><img id="logo" src="./logo/logo-small.gif"></a>
         <a id="brand" class="brand" href="/hmc/html"></a>
         <ul class="nav">
           <li><a href="/hmc/html">Cluster Management</a></li>
@@ -49,17 +49,19 @@
 			<ul>
 				<li><a href="./home.html">Dashboard</a></li>
 				<li><a href="./hdfs.html">HDFS</a></li>
+                                <!--
 				<li><a href="./mapreduce.html">MapReduce</a></li>
+                                -->
 				<li><a id="hbase_link" href="./hbase.html" class="selectedNavItem">HBase</a></li>
 			</ul>
 		</nav>
 		
 		<section id="links">
-			<a class="roundedBox" href="" target="_blank">Post Feedback</a>
-			<a class="roundedBox" href="" target="_blank">Documentation</a>
-			<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
-			<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
-                        <a id="oozie" class="hiddenLink" href="" target="_blank">Oozie</a>
+      <a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+      <a id="docsLink" class="roundedBox" href="javascript:void(0)" target="_blank">Documentation</a>
+      <a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
+      <a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
+      <a id="oozie" class="hiddenLink" href="" target="_blank">Oozie</a>
 		</section>
 		<section class="clear"></section>
 	</section>

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/hdfs.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/hdfs.html?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/hdfs.html (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/hdfs.html Mon Oct 15 05:55:46 2012
@@ -25,13 +25,13 @@
 	<link type="text/css" rel="stylesheet" href="./libs/jqgrid/css/ui.jqgrid.css" media="screen"/>
 	<link type="text/css" rel="stylesheet" href="./libs/jquery.multiselect.css" media="screen"/>
 	<!--[if lt IE 9]><script type="text/javascript" src="./libs/html5shiv/html5shiv.min.js"></script><![endif]-->
-	<link rel="shortcut icon" href="/hmc/images/logo-micro.gif"/>
+	<link rel="shortcut icon" href="./logo/logo-micro.gif"/>
 </head>
 <body>
   <div class="navbar">
     <div class="navbar-inner">
       <div class="container">
-        <a href="/hmc/html"><img id="logo" src="/hmc/images/logo-small.gif"></a>
+        <a href="/hmc/html"><img id="logo" src="./logo/logo-small.gif"></a>
         <a id="brand" class="brand" href="/hmc/html"></a>				
         <ul class="nav">
           <li><a href="/hmc/html">Cluster Management</a></li>
@@ -49,17 +49,19 @@
 			<ul>
 				<li><a href="./home.html">Dashboard</a></li>
 				<li><a href="./hdfs.html" class="selectedNavItem">HDFS</a></li>
+                                <!--
 				<li><a href="./mapreduce.html">MapReduce</a></li>
+                                -->
 				<li><a id="hbase_link" href="./hbase.html">HBase</a></li>
 			</ul>
 		</nav>
 		
 		<section id="links">
-			<a class="roundedBox" href="" target="_blank">Post Feedback</a>
-			<a class="roundedBox" href="" target="_blank">Documentation</a>
-			<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
-			<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
-                        <a id="oozie" class="hiddenLink" href="" target="_blank">Oozie</a>
+      <a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+      <a id="docsLink" class="roundedBox" href="javascript:void(0)" target="_blank">Documentation</a>
+      <a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
+      <a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
+      <a id="oozie" class="hiddenLink" href="" target="_blank">Oozie</a>
 		</section>
 		<section class="clear"></section>
 	</section>

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/home.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/home.html?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/home.html (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/home.html Mon Oct 15 05:55:46 2012
@@ -25,14 +25,14 @@
   <link type="text/css" rel="stylesheet" href="./libs/jqgrid/css/ui.jqgrid.css" media="screen"/>
   <link type="text/css" rel="stylesheet" href="./libs/jquery.multiselect.css" media="screen"/>
   <!--[if lt IE 9]><script type="text/javascript" src="./libs/html5shiv/html5shiv.min.js"></script><![endif]-->
-  <link rel="shortcut icon" href="/hmc/images/logo-micro.gif"/>
+  <link rel="shortcut icon" href="./logo/logo-micro.gif"/>
 </head>
 <body>
   <div class="navbar">
     <div class="navbar-inner">
       <div class="container">
-        <a href="/hmc/html"><img id="logo" src="/hmc/images/logo-small.gif"></a>
-        <a id="brand" class="brand" href="/hmc/html">Ambari</a>
+        <a href="/hmc/html"><img id="logo" src="./logo/logo-small.gif"></a>
+        <a id="brand" class="brand" href="/hmc/html"></a>
         <ul class="nav">
           <li><a href="/hmc/html">Cluster Management</a></li>
           <li class="active"><a href="/hdp/dashboard/ui/home.html">Monitoring</a></li>
@@ -48,14 +48,16 @@
       <ul>
         <li><a href="./home.html" class="selectedNavItem">Dashboard</a></li>
         <li><a href="./hdfs.html">HDFS</a></li>
+        <!--
         <li><a href="./mapreduce.html">MapReduce</a></li>
+        -->
         <li><a id="hbase_link" href="./hbase.html">HBase</a></li>
       </ul>
     </nav>
     
     <section id="links">
-      <a class="roundedBox" href="" target="_blank">Post Feedback</a>
-      <a class="roundedBox" href="" target="_blank">Documentation</a>
+      <a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+      <a id="docsLink" class="roundedBox" href="javascript:void(0)" target="_blank">Documentation</a>
       <a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
       <a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
       <a id="oozie" class="hiddenLink" href="" target="_blank">Oozie</a>
@@ -107,6 +109,8 @@
         </tbody>
       </table>
       <br/>
+      <!-- TODO: Fix this to change to YARN -->
+      <div style="visibility:hidden">
       <table id="clusterSummaryGrid2" class="clusterSummaryGrid" class="grid">
         <thead>
           <tr><th id="mapredsummarytitle" colspan="2">MapReduce</th></tr>
@@ -117,6 +121,7 @@
           <tr><td>Running & Waiting Jobs</td><td></td></tr>
         </tbody>
       </table>
+      </div>
       <br/>
       <table id="clusterSummaryGrid3" class="clusterSummaryGrid" class="grid">
         <thead>
@@ -163,15 +168,15 @@
   </section>
   
   <footer id="footer"></footer>
-</container>
-  <script type="text/javascript" src="./libs/jquery-1.7.1.js"></script>
-  <script type="text/javascript" src="./libs/jqueryui/js/jquery-ui-1.7.3.custom.min.js"></script>
-  <script type="text/javascript" src="./libs/jquery.multiselect.js"></script>
-  <script type="text/javascript" src="./libs/jqgrid/js/i18n/grid.locale-en.js"></script>
-  <script type="text/javascript" src="./libs/jqgrid/js/jquery.jqGrid.src.js"></script>
-  <script type="text/javascript" src="./libs/raphael/raphael.js"></script>
-  <script type="text/javascript" src="./libs/raphael/g.raphael.min.js"></script>
-  <script type="text/javascript" src="./libs/raphael/g.pie.min.js"></script>
-  <script type="text/javascript" src="./js/common.js"></script>  
+</div>
+<script type="text/javascript" src="./libs/jquery-1.7.1.js"></script>
+<script type="text/javascript" src="./libs/jqueryui/js/jquery-ui-1.7.3.custom.min.js"></script>
+<script type="text/javascript" src="./libs/jquery.multiselect.js"></script>
+<script type="text/javascript" src="./libs/jqgrid/js/i18n/grid.locale-en.js"></script>
+<script type="text/javascript" src="./libs/jqgrid/js/jquery.jqGrid.src.js"></script>
+<script type="text/javascript" src="./libs/raphael/raphael.js"></script>
+<script type="text/javascript" src="./libs/raphael/g.raphael.min.js"></script>
+<script type="text/javascript" src="./libs/raphael/g.pie.min.js"></script>
+<script type="text/javascript" src="./js/common.js"></script>
 </body>
 </html>

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/js/common.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/js/common.js?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/js/common.js (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/js/common.js Mon Oct 15 05:55:46 2012
@@ -29,13 +29,20 @@
     alerts, hostcounts, hbase_installed, hbase_link, hbase, 
     firstService, graphCounter = 0, errorFlag = false, errors = [], auto_refresh = false,
     gangliaErrorCount = 0;
+
+  var APP_NAME = 'Hortonworks Management Center';
+  var FOOTER_TEXT = 'Hortonworks &copy 2012<br><a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Licensed under the Apache License, Version 2.0</a>.<br><a href="/hmc/licenses/NOTICE.txt" target="_blank">See third-party tools/resources that Ambari uses and their respective authors</a>';
+  var TROUBLESHOOT_URL = 'http://docs.hortonworks.com/CURRENT/index.htm#Monitoring_HDP/Using_Nagios_With_Hadoop/Nagios_Alerts_For_Hadoop_Services.htm';
+  var DOCS_URL = 'http://docs.hortonworks.com/CURRENT/index.htm#Monitoring_HDP/Using_HDP_Monitoring_Dashboard/Using_HDP_Monitoring_Dashboard.htm';
+  var HELP_URL = 'http://docs.hortonworks.com/CURRENT/index.htm#Deploying_Hortonworks_Data_Platform/Using_HMC/Troubleshooting/Troubleshooting_HMC_Deployments.htm';
   
   // on document ready
   $(document).ready(function(){
-    document.title = 'Ambari';
-    $('#brand').html('Ambari');
-    $('#footer').html('<a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Licensed under the Apache License, Version 2.0</a>.<br><a href="/hmc/licenses/NOTICE.txt" target="_blank">See third-party tools/resources that Ambari uses and their respective authors</a>');
-    $('.navbar a.help').attr('href', 'http://incubator.apache.org/ambari/install.html');
+    document.title = APP_NAME;
+    $('#brand').html(APP_NAME);
+    $('#footer').html(FOOTER_TEXT);
+    $('.navbar a.help').attr('href', HELP_URL);
+    $('#docsLink').attr('href', DOCS_URL);
     self.clearTimeout(to);
     a.refreshPage();
     a.setEventDelegation();
@@ -92,7 +99,7 @@
       context = "dashboard";
       collection = "hdp";
       collection2 = "all";
-      alertParam = "nok";
+      alertParam = "all";
     } else if (page == "HDFS"){
       context = "hdfs";
       collection = "hdp";
@@ -513,7 +520,7 @@
       a.hideGraphPopup();
     } else if(target.parentNode){
       var targetParentId = target.parentNode.id;
-      if (targetParentId == "HDFS" || targetParentId == "MAPREDUCE" || targetParentId == "HBASE" || targetParentId == "ZOOKEEPER" || targetParentId == "HIVE-METASTORE" || targetParentId == "OOZIE" || targetParentId == "TEMPLETON") {
+      if (targetParentId == "HDFS" || targetParentId == "MAPREDUCE" || targetParentId == "HBASE" || targetParentId == "ZOOKEEPER" || targetParentId == "HIVE-METASTORE" || targetParentId == "OOZIE" || targetParentId == "TEMPLETON" || targetParentId == "PUPPET") {
         a.showAlerts(target);
       }
     }
@@ -685,7 +692,7 @@
       var hdfsCritCount = 0, hdfsWarnCount = 0, mrCritCount = 0, mrWarnCount = 0, 
       hbaseCritCount = 0, hbaseWarnCount = 0, zkCritCount = 0, zkWarnCount = 0, 
       hcatCritCount = 0, hcatWarnCount = 0, oozieWarnCount = 0, oozieCritCount = 0,
-                        templetonWarnCount = 0, templetonCritCount = 0;
+      templetonWarnCount = 0, templetonCritCount = 0, puppetWarnCount = 0, puppetCritCount = 0;
       
       //Set firstService in the table
       var servicestates = response.servicestates;
@@ -743,11 +750,14 @@
               converted.last_hard_state_change = a.convertToDDHHMM(actualTime - alerts[i].last_hard_state_change);
               
               // Plugin Output
-              converted.plugin_output = alerts[i].plugin_output;
-              
+              if (alerts[i].service_type === 'PUPPET' && alerts[i].plugin_output.toLowerCase().indexOf('connection refused') >= 0) {
+                converted.plugin_output = 'Puppet agent down on ' + alerts[i].host_name;
+              } else {
+                converted.plugin_output = alerts[i].plugin_output;
+              }
               filtered.push(converted);
             }
-            
+
             // Step 2 out of 3: Increment Counters for Alert Summary Table
             if (alerts[i].last_hard_state == 1) {
               if(alerts[i].service_type == "HDFS"){
@@ -764,6 +774,8 @@
                 oozieWarnCount++;
               } else if(alerts[i].service_type == "TEMPLETON"){
                 templetonWarnCount++;
+              } else if(alerts[i].service_type == "PUPPET"){
+                puppetWarnCount++;
               }
             } else if (alerts[i].last_hard_state == 2) {
               if(alerts[i].service_type == "HDFS"){
@@ -780,6 +792,8 @@
                 oozieCritCount++;
               } else if(alerts[i].service_type == "TEMPLETON"){
                 templetonCritCount++;
+              } else if(alerts[i].service_type == "PUPPET"){
+                puppetCritCount++;
               }
             }
             
@@ -821,9 +835,9 @@
 
           // Refresh the caption to indicate service name.
           if(page == "HDFS" || page == "MAPREDUCE" || page == "HBASE"){
-            $("#alertsGrid").jqGrid('setCaption',"Configured Alerts (<a href=\"\" target=\"\"></a>)");
+            $("#alertsGrid").jqGrid('setCaption', 'Configured Alerts (<a href="' + TROUBLESHOOT_URL + '" target="_blank">troubleshoot?</a>)');
           } else {
-            $("#alertsGrid").jqGrid('setCaption',targetId+" Alerts (<a href=\"\" target=\"\"></a>)");
+            $("#alertsGrid").jqGrid('setCaption', targetId + ' Alerts (<a href="' + TROUBLESHOOT_URL + '" target="_blank">troubleshoot?</a>)');
           }
           
           // Populate Alerts Grid
@@ -932,6 +946,13 @@
               } else {
                 criticalAlerts.className = "critical";
               }
+            } else if(key == "PUPPET"){
+              criticalAlerts.innerHTML = puppetCritCount;
+              if(puppetCritCount > 0) {
+                criticalAlerts.className = "highlighted-red critical";
+              } else {
+                criticalAlerts.className = "critical";
+              }
             }
             tr.appendChild(criticalAlerts);
             
@@ -986,6 +1007,13 @@
               } else {
                 warnAlerts.className = "warning";
               }
+            } else if(key == "PUPPET"){
+              warnAlerts.innerHTML = puppetWarnCount;
+              if(puppetWarnCount > 0) {
+                warnAlerts.className = "highlighted-orage warning";
+              } else {
+                warnAlerts.className = "warning";
+              }
             }
             tr.appendChild(warnAlerts);
             servicesGrid.append(tr);

Modified: incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/mapreduce.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/mapreduce.html?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/mapreduce.html (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/mapreduce.html Mon Oct 15 05:55:46 2012
@@ -25,13 +25,13 @@
 	<link type="text/css" rel="stylesheet" href="./libs/jqgrid/css/ui.jqgrid.css" media="screen"/>
 	<link type="text/css" rel="stylesheet" href="./libs/jquery.multiselect.css" media="screen"/>
 	<!--[if lt IE 9]><script type="text/javascript" src="./libs/html5shiv/html5shiv.min.js"></script><![endif]-->
-	<link rel="shortcut icon" href="/hmc/images/logo-micro.gif"/>
+	<link rel="shortcut icon" href="./logo/logo-micro.gif"/>
 </head>
 <body>
   <div class="navbar">
     <div class="navbar-inner">
       <div class="container">
-        <a href="/hmc/html"><img id="logo" src="/hmc/images/logo-small.gif"></a>
+        <a href="/hmc/html"><img id="logo" src="./logo/logo-small.gif"></a>
         <a id="brand" class="brand" href="/hmc/html"></a>
         <ul class="nav">
           <li><a href="/hmc/html">Cluster Management</a></li>
@@ -55,11 +55,11 @@
 		</nav>
 		
 		<section id="links">
-			<a class="roundedBox" href="" target="_blank">Post Feedback</a>
-			<a class="roundedBox" href="" target="_blank">Documentation</a>
-			<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
-			<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
-                        <a id="oozie" class="hiddenLink" href="" target="_blank">Oozie</a>
+      <a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+      <a id="docsLink" class="roundedBox" href="javascript:void(0)" target="_blank">Documentation</a>
+      <a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
+      <a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
+      <a id="oozie" class="hiddenLink" href="" target="_blank">Oozie</a>
 		</section>
 		<section class="clear"></section>
 	</section>



Mime
View raw message